Sun Oct 21 15:49:07 2012 UTC ()
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".
(cheusov)
diff -r1.32 -r1.33 pkgsrc/net/bind96/Makefile
diff -r1.21 -r1.22 pkgsrc/net/bind97/Makefile
diff -r1.18 -r1.19 pkgsrc/net/bind98/Makefile
diff -r1.13 -r1.14 pkgsrc/net/bind99/Makefile
diff -r1.22 -r1.23 pkgsrc/net/host/Makefile
--- pkgsrc/net/bind96/Attic/Makefile 2012/10/10 03:04:57 1.32
+++ pkgsrc/net/bind96/Attic/Makefile 2012/10/21 15:49:06 1.33
@@ -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
--- pkgsrc/net/bind97/Attic/Makefile 2012/10/10 03:05:52 1.21
+++ pkgsrc/net/bind97/Attic/Makefile 2012/10/21 15:49:06 1.22
@@ -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
--- pkgsrc/net/bind98/Attic/Makefile 2012/10/10 03:06:37 1.18
+++ pkgsrc/net/bind98/Attic/Makefile 2012/10/21 15:49:07 1.19
@@ -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
--- pkgsrc/net/bind99/Attic/Makefile 2012/10/10 03:07:12 1.13
+++ pkgsrc/net/bind99/Attic/Makefile 2012/10/21 15:49:07 1.14
@@ -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
--- pkgsrc/net/host/Makefile 2010/10/11 12:15:12 1.22
+++ pkgsrc/net/host/Makefile 2012/10/21 15:49:07 1.23
@@ -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/
@@ -10,6 +11,8 @@
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
NO_CONFIGURE = yes
+
+CONFLICTS+= bind-[0-9]*
USE_BSD_MAKEFILE= yes
MAKE_FILE= Makefile.BSD