[pkgsrc/trunk]: pkgsrc Add CONFLICTS with new man-pages package. For details,...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/44b813858826
branches:  trunk
changeset: 603733:44b813858826
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat May 12 07:37:50 2012 +0000

description:
Add CONFLICTS with new man-pages package. For details, see
man-pages/Makefile.

diffstat:

 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(-)

diffs (157 lines):

diff -r 5ebe972f82ca -r 44b813858826 converters/libiconv/Makefile
--- a/converters/libiconv/Makefile      Sat May 12 07:18:43 2012 +0000
+++ b/converters/libiconv/Makefile      Sat May 12 07:37:50 2012 +0000
@@ -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_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 -r 5ebe972f82ca -r 44b813858826 devel/dlcompat/Makefile
--- a/devel/dlcompat/Makefile   Sat May 12 07:18:43 2012 +0000
+++ b/devel/dlcompat/Makefile   Sat May 12 07:37:50 2012 +0000
@@ -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 @@
 
 GNU_CONFIGURE=         yes
 
+CONFLICTS=             man-pages-[0-9]*
+
 .include "../../mk/bsd.pkg.mk"
diff -r 5ebe972f82ca -r 44b813858826 devel/libgetopt/Makefile
--- a/devel/libgetopt/Makefile  Sat May 12 07:18:43 2012 +0000
+++ b/devel/libgetopt/Makefile  Sat May 12 07:37:50 2012 +0000
@@ -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 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+CONFLICTS=             man-pages-[0-9]*
+
 USE_LIBTOOL=   YES
 WRKSRC=                ${WRKDIR}/libgetopt
 
diff -r 5ebe972f82ca -r 44b813858826 devel/pthread-sem/Makefile
--- a/devel/pthread-sem/Makefile        Sat May 12 07:18:43 2012 +0000
+++ b/devel/pthread-sem/Makefile        Sat May 12 07:37:50 2012 +0000
@@ -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 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+CONFLICTS=             man-pages-[0-9]*
+
 PTHREAD_OPTS+= require
 USE_LIBTOOL=   yes
 USE_FEATURES+= cdefs
diff -r 5ebe972f82ca -r 44b813858826 lang/cint/Makefile
--- a/lang/cint/Makefile        Sat May 12 07:18:43 2012 +0000
+++ b/lang/cint/Makefile        Sat May 12 07:37:50 2012 +0000
@@ -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 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+CONFLICTS=             man-pages-[0-9]*
+
 #same distribution file name for minor versions
 DIST_SUBDIR=           ${PKGNAME_NOREV}
 WRKSRC=                        ${WRKDIR}
diff -r 5ebe972f82ca -r 44b813858826 net/libbind/Makefile
--- a/net/libbind/Makefile      Sat May 12 07:18:43 2012 +0000
+++ b/net/libbind/Makefile      Sat May 12 07:37:50 2012 +0000
@@ -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 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+CONFLICTS=             man-pages-[0-9]*
+
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 
diff -r 5ebe972f82ca -r 44b813858826 net/tnftpd/Makefile
--- a/net/tnftpd/Makefile       Sat May 12 07:18:43 2012 +0000
+++ b/net/tnftpd/Makefile       Sat May 12 07:37:50 2012 +0000
@@ -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 @@
 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 -r 5ebe972f82ca -r 44b813858826 security/kth-krb4/Makefile
--- a/security/kth-krb4/Makefile        Sat May 12 07:18:43 2012 +0000
+++ b/security/kth-krb4/Makefile        Sat May 12 07:37:50 2012 +0000
@@ -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 @@
 
 CONFLICTS+=            arla-[0-9]*
 CONFLICTS+=            libdes-[0-9]*
+CONFLICTS=             man-pages-[0-9]*
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
diff -r 5ebe972f82ca -r 44b813858826 textproc/mdocml/Makefile
--- a/textproc/mdocml/Makefile  Sat May 12 07:18:43 2012 +0000
+++ b/textproc/mdocml/Makefile  Sat May 12 07:37:50 2012 +0000
@@ -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 @@
 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"