[pkgsrc/trunk]: pkgsrc/net Add CONFLICTS between net/bind and net/host.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4649d347f6f1
branches:  trunk
changeset: 610229:4649d347f6f1
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Sun Oct 21 15:49:06 2012 +0000

description:
Add CONFLICTS between net/bind and net/host.
net/bind9*: remove "bind<x.y.z" entries from CONFLICTS. It is useless
   because package's PKGBASE is "bind".

diffstat:

 net/bind96/Makefile |  5 +++--
 net/bind97/Makefile |  5 +++--
 net/bind98/Makefile |  5 +++--
 net/bind99/Makefile |  5 +++--
 net/host/Makefile   |  5 ++++-
 5 files changed, 16 insertions(+), 9 deletions(-)

diffs (108 lines):

diff -r 838a1f7caaf0 -r 4649d347f6f1 net/bind96/Makefile
--- a/net/bind96/Makefile       Sun Oct 21 14:53:31 2012 +0000
+++ b/net/bind96/Makefile       Sun Oct 21 15:49:06 2012 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2012/10/10 03:04:57 taca Exp $
+# $NetBSD: Makefile,v 1.33 2012/10/21 15:49:06 cheusov Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-ESV/.3.1.ESV/:S/-R/./:S/-P/pl/}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
                http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
@@ -10,7 +11,7 @@
 HOMEPAGE=      http://www.isc.org/software/bind/
 COMMENT=       Version 9.6 of the Berkeley Internet Name Daemon, implementation of DNS
 
-CONFLICTS+=    bind<9.6.0
+CONFLICTS+=    host-[0-9]*
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
diff -r 838a1f7caaf0 -r 4649d347f6f1 net/bind97/Makefile
--- a/net/bind97/Makefile       Sun Oct 21 14:53:31 2012 +0000
+++ b/net/bind97/Makefile       Sun Oct 21 15:49:06 2012 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2012/10/10 03:05:52 taca Exp $
+# $NetBSD: Makefile,v 1.22 2012/10/21 15:49:06 cheusov Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
                http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
@@ -10,7 +11,7 @@
 HOMEPAGE=      http://www.isc.org/software/bind/
 COMMENT=       Version 9.7 of the Berkeley Internet Name Daemon, implementation of DNS
 
-CONFLICTS+=    bind<9.7.0
+CONFLICTS+=    host-[0-9]*
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
diff -r 838a1f7caaf0 -r 4649d347f6f1 net/bind98/Makefile
--- a/net/bind98/Makefile       Sun Oct 21 14:53:31 2012 +0000
+++ b/net/bind98/Makefile       Sun Oct 21 15:49:06 2012 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2012/10/10 03:06:37 taca Exp $
+# $NetBSD: Makefile,v 1.19 2012/10/21 15:49:07 cheusov Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/-P/pl/}
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
@@ -10,7 +11,7 @@
 HOMEPAGE=      http://www.isc.org/software/bind/
 COMMENT=       Version 9.8 of the Berkeley Internet Name Daemon, implementation of DNS
 
-CONFLICTS+=    bind<9.8.0
+CONFLICTS+=    host-[0-9]*
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
diff -r 838a1f7caaf0 -r 4649d347f6f1 net/bind99/Makefile
--- a/net/bind99/Makefile       Sun Oct 21 14:53:31 2012 +0000
+++ b/net/bind99/Makefile       Sun Oct 21 15:49:06 2012 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2012/10/10 03:07:12 taca Exp $
+# $NetBSD: Makefile,v 1.14 2012/10/21 15:49:07 cheusov Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
                http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
@@ -10,7 +11,7 @@
 HOMEPAGE=      http://www.isc.org/software/bind/
 COMMENT=       Version 9.9 of the Berkeley Internet Name Daemon, implementation of DNS
 
-CONFLICTS+=    bind<9.9.0
+CONFLICTS+=    host-[0-9]*
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
diff -r 838a1f7caaf0 -r 4649d347f6f1 net/host/Makefile
--- a/net/host/Makefile Sun Oct 21 14:53:31 2012 +0000
+++ b/net/host/Makefile Sun Oct 21 15:49:06 2012 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2010/10/11 12:15:12 obache Exp $
+# $NetBSD: Makefile,v 1.23 2012/10/21 15:49:07 cheusov Exp $
 
 DISTNAME=      host-20040812
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.weird.com/pub/local/
 
@@ -11,6 +12,8 @@
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
 NO_CONFIGURE = yes
 
+CONFLICTS+=    bind-[0-9]*
+
 USE_BSD_MAKEFILE=      yes
 MAKE_FILE=     Makefile.BSD
 MAKE_FLAGS+=   __NetBSD__=1