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
cvs diff -r1.32 -r1.33 pkgsrc/net/bind96/Attic/Makefile (expand / switch to unified diff)

--- 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,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.32 2012/10/10 03:04:57 taca Exp $ 1# $NetBSD: Makefile,v 1.33 2012/10/21 15:49:06 cheusov Exp $
2 2
3DISTNAME= bind-${BIND_VERSION} 3DISTNAME= bind-${BIND_VERSION}
4PKGNAME= ${DISTNAME:S/-ESV/.3.1.ESV/:S/-R/./:S/-P/pl/} 4PKGNAME= ${DISTNAME:S/-ESV/.3.1.ESV/:S/-R/./:S/-P/pl/}
 5PKGREVISION= 1
5CATEGORIES= net 6CATEGORIES= net
6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \ 7MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
7 http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/ 8 http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.isc.org/software/bind/ 11HOMEPAGE= http://www.isc.org/software/bind/
11COMMENT= Version 9.6 of the Berkeley Internet Name Daemon, implementation of DNS 12COMMENT= Version 9.6 of the Berkeley Internet Name Daemon, implementation of DNS
12 13
13CONFLICTS+= bind<9.6.0 14CONFLICTS+= host-[0-9]*
14 15
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no
18 19
19BIND_VERSION= 9.6-ESV-R7-P4 20BIND_VERSION= 9.6-ESV-R7-P4
20 21
21.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
22 23
23BUILD_DEFS+= BIND_DIR VARBASE 24BUILD_DEFS+= BIND_DIR VARBASE
24 25
25.include "options.mk" 26.include "options.mk"
26 27
cvs diff -r1.21 -r1.22 pkgsrc/net/bind97/Attic/Makefile (expand / switch to unified diff)

--- 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,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.21 2012/10/10 03:05:52 taca Exp $ 1# $NetBSD: Makefile,v 1.22 2012/10/21 15:49:06 cheusov Exp $
2 2
3DISTNAME= bind-${BIND_VERSION} 3DISTNAME= bind-${BIND_VERSION}
4PKGNAME= ${DISTNAME:S/-P/pl/} 4PKGNAME= ${DISTNAME:S/-P/pl/}
 5PKGREVISION= 1
5CATEGORIES= net 6CATEGORIES= net
6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \ 7MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
7 http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/ 8 http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.isc.org/software/bind/ 11HOMEPAGE= http://www.isc.org/software/bind/
11COMMENT= Version 9.7 of the Berkeley Internet Name Daemon, implementation of DNS 12COMMENT= Version 9.7 of the Berkeley Internet Name Daemon, implementation of DNS
12 13
13CONFLICTS+= bind<9.7.0 14CONFLICTS+= host-[0-9]*
14 15
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no
18 19
19BIND_VERSION= 9.7.7 20BIND_VERSION= 9.7.7
20 21
21.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
22 23
23BUILD_DEFS+= BIND_DIR VARBASE 24BUILD_DEFS+= BIND_DIR VARBASE
24 25
25.include "options.mk" 26.include "options.mk"
26 27
cvs diff -r1.18 -r1.19 pkgsrc/net/bind98/Attic/Makefile (expand / switch to unified diff)

--- 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,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.18 2012/10/10 03:06:37 taca Exp $ 1# $NetBSD: Makefile,v 1.19 2012/10/21 15:49:07 cheusov Exp $
2 2
3DISTNAME= bind-${BIND_VERSION} 3DISTNAME= bind-${BIND_VERSION}
 4PKGREVISION= 1
4PKGNAME= ${DISTNAME:S/-P/pl/} 5PKGNAME= ${DISTNAME:S/-P/pl/}
5CATEGORIES= net 6CATEGORIES= net
6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \ 7MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
7 http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/ 8 http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.isc.org/software/bind/ 11HOMEPAGE= http://www.isc.org/software/bind/
11COMMENT= Version 9.8 of the Berkeley Internet Name Daemon, implementation of DNS 12COMMENT= Version 9.8 of the Berkeley Internet Name Daemon, implementation of DNS
12 13
13CONFLICTS+= bind<9.8.0 14CONFLICTS+= host-[0-9]*
14 15
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no
18 19
19BIND_VERSION= 9.8.4 20BIND_VERSION= 9.8.4
20 21
21.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
22 23
23BUILD_DEFS+= BIND_DIR VARBASE 24BUILD_DEFS+= BIND_DIR VARBASE
24 25
25.include "options.mk" 26.include "options.mk"
26 27
cvs diff -r1.13 -r1.14 pkgsrc/net/bind99/Attic/Makefile (expand / switch to unified diff)

--- 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,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.13 2012/10/10 03:07:12 taca Exp $ 1# $NetBSD: Makefile,v 1.14 2012/10/21 15:49:07 cheusov Exp $
2 2
3DISTNAME= bind-${BIND_VERSION} 3DISTNAME= bind-${BIND_VERSION}
4PKGNAME= ${DISTNAME:S/-P/pl/} 4PKGNAME= ${DISTNAME:S/-P/pl/}
 5PKGREVISION= 1
5CATEGORIES= net 6CATEGORIES= net
6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \ 7MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
7 http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/ 8 http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.isc.org/software/bind/ 11HOMEPAGE= http://www.isc.org/software/bind/
11COMMENT= Version 9.9 of the Berkeley Internet Name Daemon, implementation of DNS 12COMMENT= Version 9.9 of the Berkeley Internet Name Daemon, implementation of DNS
12 13
13CONFLICTS+= bind<9.9.0 14CONFLICTS+= host-[0-9]*
14 15
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no
18 19
19BIND_VERSION= 9.9.2 20BIND_VERSION= 9.9.2
20 21
21.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
22 23
23BUILD_DEFS+= BIND_DIR VARBASE 24BUILD_DEFS+= BIND_DIR VARBASE
24 25
25.include "options.mk" 26.include "options.mk"
26 27
cvs diff -r1.22 -r1.23 pkgsrc/net/host/Makefile (expand / switch to unified diff)

--- 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,26 +1,29 @@ @@ -1,26 +1,29 @@
1# $NetBSD: Makefile,v 1.22 2010/10/11 12:15:12 obache Exp $ 1# $NetBSD: Makefile,v 1.23 2012/10/21 15:49:07 cheusov Exp $
2 2
3DISTNAME= host-20040812 3DISTNAME= host-20040812
 4PKGREVISION= 1
4CATEGORIES= net 5CATEGORIES= net
5MASTER_SITES= ftp://ftp.weird.com/pub/local/ 6MASTER_SITES= ftp://ftp.weird.com/pub/local/
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.weird.com/~woods/projects/host.html 9HOMEPAGE= http://www.weird.com/~woods/projects/host.html
9COMMENT= Powerful DNS query and testing tool 10COMMENT= Powerful DNS query and testing tool
10 11
11INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1 12INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
12NO_CONFIGURE = yes 13NO_CONFIGURE = yes
13 14
 15CONFLICTS+= bind-[0-9]*
 16
14USE_BSD_MAKEFILE= yes 17USE_BSD_MAKEFILE= yes
15MAKE_FILE= Makefile.BSD 18MAKE_FILE= Makefile.BSD
16MAKE_FLAGS+= __NetBSD__=1 19MAKE_FLAGS+= __NetBSD__=1
17 20
18USE_TOOLS+= nroff 21USE_TOOLS+= nroff
19 22
20PKG_DESTDIR_SUPPORT= user-destdir 23PKG_DESTDIR_SUPPORT= user-destdir
21 24
22.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
23.if ${OPSYS} == "Darwin" 26.if ${OPSYS} == "Darwin"
24CPPFLAGS+= -DBIND_8_COMPAT 27CPPFLAGS+= -DBIND_8_COMPAT
25BUILDLINK_TRANSFORM+= rm:-Wl,--warn-common 28BUILDLINK_TRANSFORM+= rm:-Wl,--warn-common
26BUILDLINK_TRANSFORM+= rm:-static 29BUILDLINK_TRANSFORM+= rm:-static