From cf2069b86990e32353b09df5c3044ace2e76d57e Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 12 May 2012 07:37:50 +0000 Subject: [PATCH] Add CONFLICTS with new man-pages package. For details, see man-pages/Makefile. --- converters/libiconv/Makefile | 4 +++- devel/dlcompat/Makefile | 4 +++- devel/libgetopt/Makefile | 4 +++- devel/pthread-sem/Makefile | 4 +++- lang/cint/Makefile | 4 +++- net/libbind/Makefile | 4 +++- net/tnftpd/Makefile | 3 ++- security/kth-krb4/Makefile | 3 ++- textproc/mdocml/Makefile | 4 +++- 9 files changed, 25 insertions(+), 9 deletions(-) diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index e78285eab273..cc281bbe9062 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2011/09/08 16:29:48 bsiegert Exp $ +# $NetBSD: Makefile,v 1.61 2012/05/12 07:37:50 wiz Exp $ DISTNAME= libiconv-1.14 PKGREVISION= 2 @@ -18,6 +18,8 @@ USE_LIBTOOL= yes USE_TOOLS+= pax GNU_CONFIGURE= yes +CONFLICTS= man-pages-[0-9]* + # Explicitly disable NLS since libiconv is a dependency for gettext-lib # and we don't want libiconv to pick up any NLS functions from libc # if they exist. diff --git a/devel/dlcompat/Makefile b/devel/dlcompat/Makefile index a4e07dbb7607..b9ab927cc40f 100644 --- a/devel/dlcompat/Makefile +++ b/devel/dlcompat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2010/03/15 02:39:36 schmonz Exp $ +# $NetBSD: Makefile,v 1.14 2012/05/12 07:37:51 wiz Exp $ # DISTNAME= dlcompat-20030629 @@ -15,4 +15,6 @@ ONLY_FOR_PLATFORM= Darwin-[56].*-* GNU_CONFIGURE= yes +CONFLICTS= man-pages-[0-9]* + .include "../../mk/bsd.pkg.mk" diff --git a/devel/libgetopt/Makefile b/devel/libgetopt/Makefile index 03cf2dad9552..3c2139a1f254 100644 --- a/devel/libgetopt/Makefile +++ b/devel/libgetopt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2010/01/08 22:45:58 tnn Exp $ +# $NetBSD: Makefile,v 1.33 2012/05/12 07:37:51 wiz Exp $ # DISTNAME= libgetopt-1.4.4 @@ -11,6 +11,8 @@ COMMENT= Library for handling --long options PKG_DESTDIR_SUPPORT= user-destdir +CONFLICTS= man-pages-[0-9]* + USE_LIBTOOL= YES WRKSRC= ${WRKDIR}/libgetopt diff --git a/devel/pthread-sem/Makefile b/devel/pthread-sem/Makefile index 94640d174c63..7551cce87ac0 100644 --- a/devel/pthread-sem/Makefile +++ b/devel/pthread-sem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/03/02 16:39:50 hans Exp $ +# $NetBSD: Makefile,v 1.8 2012/05/12 07:37:51 wiz Exp $ # DISTNAME= pthread-sem-1.0 @@ -11,6 +11,8 @@ COMMENT= Semaphore implementation for (PTH) pthreads PKG_DESTDIR_SUPPORT= user-destdir +CONFLICTS= man-pages-[0-9]* + PTHREAD_OPTS+= require USE_LIBTOOL= yes USE_FEATURES+= cdefs diff --git a/lang/cint/Makefile b/lang/cint/Makefile index 390ebf1d1dc4..855b25f82036 100644 --- a/lang/cint/Makefile +++ b/lang/cint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2008/09/05 05:27:30 dholland Exp $ +# $NetBSD: Makefile,v 1.27 2012/05/12 07:37:51 wiz Exp $ DISTNAME= cint5.15 PKGNAME= cint-5.15.174 @@ -13,6 +13,8 @@ COMMENT= C/C++ interpreter PKG_DESTDIR_SUPPORT= user-destdir +CONFLICTS= man-pages-[0-9]* + #same distribution file name for minor versions DIST_SUBDIR= ${PKGNAME_NOREV} WRKSRC= ${WRKDIR} diff --git a/net/libbind/Makefile b/net/libbind/Makefile index 041a46892de2..a4131f14503b 100644 --- a/net/libbind/Makefile +++ b/net/libbind/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/03/12 04:39:16 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2012/05/12 07:37:51 wiz Exp $ # DISTNAME= libbind-6.0 @@ -13,6 +13,8 @@ LICENSE= isc PKG_DESTDIR_SUPPORT= user-destdir +CONFLICTS= man-pages-[0-9]* + GNU_CONFIGURE= yes USE_LIBTOOL= yes diff --git a/net/tnftpd/Makefile b/net/tnftpd/Makefile index 616c1bff3945..3c534453c408 100644 --- a/net/tnftpd/Makefile +++ b/net/tnftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2010/03/24 14:12:44 lukem Exp $ +# $NetBSD: Makefile,v 1.22 2012/05/12 07:37:51 wiz Exp $ # DISTNAME= tnftpd-20100324 @@ -13,6 +13,7 @@ PKG_DESTDIR_SUPPORT= user-destdir CONFLICTS= wu-ftpd-[0-9]* CONFLICTS+= kth-krb4-[0-9]* CONFLICTS+= lukemftpd-[0-9]* +CONFLICTS= man-pages-[0-9]* GNU_CONFIGURE= YES MANCOMPRESSED_IF_MANZ= YES diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile index fcc0480ae144..f1161da4b012 100644 --- a/security/kth-krb4/Makefile +++ b/security/kth-krb4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2011/11/28 19:33:13 marino Exp $ +# $NetBSD: Makefile,v 1.55 2012/05/12 07:37:51 wiz Exp $ # DISTNAME= krb4-1.2.2 @@ -13,6 +13,7 @@ COMMENT= Kerberos IV distribution from KTH CONFLICTS+= arla-[0-9]* CONFLICTS+= libdes-[0-9]* +CONFLICTS= man-pages-[0-9]* PKG_DESTDIR_SUPPORT= user-destdir diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile index db01326caa31..8fa6d50bb95a 100644 --- a/textproc/mdocml/Makefile +++ b/textproc/mdocml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2012/03/10 16:06:35 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2012/05/12 07:37:51 wiz Exp $ DISTNAME= mdocml-1.12.0 PKGREVISION= 1 @@ -13,5 +13,7 @@ LICENSE= 2-clause-bsd # not exactly, but near enough PKG_DESTDIR_SUPPORT= user-destdir MAKE_FLAGS+= PREFIX=${PREFIX} DBLIB=${BDB_LIBS:Q} +CONFLICTS= man-pages-[0-9]* + .include "../../mk/bdb.buildlink3.mk" .include "../../mk/bsd.pkg.mk"