Remove conflicts from bind-tools and the server ports.

All servers now depend on the same bind-tools, from the latest BIND9
release.

Chase dependencies to make sure they now depend on the correct port.

Differential Revision:	https://reviews.freebsd.org/D19922

3 files changed, 61 insertions, 60 deletions

diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index 008341b83733..1295e1ecc73f 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	911
@@ -16,6 +16,7 @@ LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2
+RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 
 USES=	cpe libedit
 
@@ -35,10 +36,11 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--with-readline="-L${LOCALBASE}/lib -ledit" \
 		--with-dlopen=yes \
 		--with-gost=no \
+		--without-python \
 		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS=	bind-tools bind912 bind913 bind914 bind9-devel
+CONFLICTS=	bind912 bind913 bind914 bind9-devel
 
 SUB_FILES=	pkg-message named.conf
 USE_RC_SUBR=	named
@@ -47,10 +49,10 @@ MAKE_JOBS_UNSAFE=	yes
 
 PORTDOCS=	*
 
-OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON \
+OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON \
 			DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN \
 			FILTER_AAAA
-OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON JSON \
+OPTIONS_DEFINE=		IDN LARGE_FILE JSON \
 			FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA \
 			RPZ_NSIP RPZ_NSDNAME DOCS \
 			MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
@@ -87,7 +89,6 @@ LMDB_DESC=		Use LMDB for zone management
 MINCACHE_DESC=		Use the mincachettl patch
 NATIVE_PKCS11_DESC=	Use PKCS\#11 native API (**READ HELP**)
 PORTREVISION_DESC=	Show PORTREVISION in the version string
-PYTHON_DESC=		Build with Python utilities
 QUERYTRACE_DESC=	Enable the very verbose query tracelogging
 RPZ_NSDNAME_DESC=	Enable RPZ NSDNAME policy records
 RPZ_NSIP_DESC=		Enable RPZ NSIP trigger rules
@@ -157,11 +158,6 @@ MINCACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-min-override-ttl
 NATIVE_PKCS11_CONFIGURE_ENABLE=	native-pkcs11
 NATIVE_PKCS11_IMPLIES=	THREADS
 
-PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR}
-PYTHON_CONFIGURE_WITH=	python=${PYTHON_CMD}
-PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR}
-PYTHON_USES=	python
-
 QUERYTRACE_CONFIGURE_ENABLE=	querytrace
 
 RPZ_NSDNAME_CONFIGURE_ENABLE=	rpz-nsdname
@@ -251,8 +247,4 @@ post-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/CHANGES \
 		${WRKSRC}/HISTORY* ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}
 
-# Can't use USE_PYTHON=autoplist
-post-install-PYTHON-on:
-	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST}
-
 .include <bsd.port.post.mk>
diff --git a/dns/bind911/files/patch-no-bind-tools b/dns/bind911/files/patch-no-bind-tools
new file mode 100644
index 000000000000..795d3e9e7568
--- /dev/null
+++ b/dns/bind911/files/patch-no-bind-tools
@@ -0,0 +1,55 @@
+Exclude the "tools" from building and installing.
+
+--- bin/Makefile.in.orig	2019-02-27 23:28:15 UTC
++++ bin/Makefile.in
+@@ -11,7 +11,7 @@ srcdir =	@srcdir@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig delv dnssec tools nsupdate check confgen \
++SUBDIRS =	named rndc tools check confgen \
+ 		@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
+ TARGETS =
+ 
+--- bin/tools/Makefile.in.orig	2019-02-27 23:28:15 UTC
++++ bin/tools/Makefile.in
+@@ -42,10 +42,7 @@ SUBDIRS =
+ 
+ DNSTAPTARGETS =	dnstap-read@EXEEXT@
+ NZDTARGETS =	named-nzd2nzf@EXEEXT@
+-TARGETS =	arpaname@EXEEXT@ named-journalprint@EXEEXT@ \
+-		named-rrchecker@EXEEXT@  nsec3hash@EXEEXT@ \
+-		genrandom@EXEEXT@ isc-hmac-fixup@EXEEXT@ mdig@EXEEXT@ \
+-		@DNSTAPTARGETS@ @NZDTARGETS@
++TARGETS =	@DNSTAPTARGETS@ @NZDTARGETS@
+ 
+ DNSTAPSRCS  =	dnstap-read.c
+ NZDSRCS  =	named-nzd2nzf.c
+@@ -130,27 +127,6 @@ dnstap:
+ 	${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1
+ 
+ install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@
+-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} arpaname@EXEEXT@ \
+-		${DESTDIR}${bindir}
+-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-journalprint@EXEEXT@ \
+-		${DESTDIR}${sbindir}
+-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-rrchecker@EXEEXT@ \
+-		${DESTDIR}${bindir}
+-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} nsec3hash@EXEEXT@ \
+-		${DESTDIR}${sbindir}
+-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} genrandom@EXEEXT@ \
+-		${DESTDIR}${sbindir}
+-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} isc-hmac-fixup@EXEEXT@ \
+-		${DESTDIR}${sbindir}
+-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} mdig@EXEEXT@ \
+-		${DESTDIR}${bindir}
+-	${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1
+-	${INSTALL_DATA} ${srcdir}/isc-hmac-fixup.8 ${DESTDIR}${mandir}/man8
+-	${INSTALL_DATA} ${srcdir}/named-journalprint.8 ${DESTDIR}${mandir}/man8
+-	${INSTALL_DATA} ${srcdir}/named-rrchecker.1 ${DESTDIR}${mandir}/man1
+-	${INSTALL_DATA} ${srcdir}/nsec3hash.8 ${DESTDIR}${mandir}/man8
+-	${INSTALL_DATA} ${srcdir}/genrandom.8 ${DESTDIR}${mandir}/man8
+-	${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1
+ 
+ uninstall::
+ 	rm -f ${DESTDIR}${mandir}/man1/mdig.1
diff --git a/dns/bind911/pkg-plist b/dns/bind911/pkg-plist
index 9e34eb5b04ed..9aba0a156526 100644
--- a/dns/bind911/pkg-plist
+++ b/dns/bind911/pkg-plist
@@ -1,14 +1,6 @@
-bin/arpaname
 bin/bind9-config
-bin/delv
-bin/dig
 %%DNSTAP%%bin/dnstap-read
-bin/host
 bin/isc-config.sh
-bin/mdig
-bin/named-rrchecker
-bin/nslookup
-bin/nsupdate
 @sample etc/mtree/BIND.chroot.dist.sample
 @sample etc/mtree/BIND.chroot.local.dist.sample
 %%ETCDIR%%/bind.keys
@@ -284,17 +276,9 @@ lib/libisc.a
 lib/libisccc.a
 lib/libisccfg.a
 lib/liblwres.a
-man/man1/arpaname.1.gz
 man/man1/bind9-config.1.gz
-man/man1/delv.1.gz
-man/man1/dig.1.gz
 %%DNSTAP%%man/man1/dnstap-read.1.gz
-man/man1/host.1.gz
 man/man1/isc-config.sh.1.gz
-man/man1/mdig.1.gz
-man/man1/named-rrchecker.1.gz
-man/man1/nslookup.1.gz
-man/man1/nsupdate.1.gz
 man/man3/lwres.3.gz
 man/man3/lwres_addr_parse.3.gz
 man/man3/lwres_buffer.3.gz
@@ -383,27 +367,12 @@ man/man3/lwres_string_parse.3.gz
 man/man5/named.conf.5.gz
 man/man5/rndc.conf.5.gz
 man/man8/ddns-confgen.8.gz
-%%PYTHON%%man/man8/dnssec-checkds.8.gz
-%%PYTHON%%man/man8/dnssec-coverage.8.gz
-man/man8/dnssec-dsfromkey.8.gz
-man/man8/dnssec-importkey.8.gz
-man/man8/dnssec-keyfromlabel.8.gz
-man/man8/dnssec-keygen.8.gz
-%%PYTHON%%man/man8/dnssec-keymgr.8.gz
-man/man8/dnssec-revoke.8.gz
-man/man8/dnssec-settime.8.gz
-man/man8/dnssec-signzone.8.gz
-man/man8/dnssec-verify.8.gz
-man/man8/genrandom.8.gz
-man/man8/isc-hmac-fixup.8.gz
 man/man8/lwresd.8.gz
 man/man8/named-checkconf.8.gz
 man/man8/named-checkzone.8.gz
 man/man8/named-compilezone.8.gz
-man/man8/named-journalprint.8.gz
 %%LMDB%%man/man8/named-nzd2nzf.8.gz
 man/man8/named.8.gz
-man/man8/nsec3hash.8.gz
 %%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz
 %%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz
 %%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz
@@ -412,27 +381,12 @@ man/man8/rndc-confgen.8.gz
 man/man8/rndc.8.gz
 man/man8/tsig-keygen.8.gz
 sbin/ddns-confgen
-%%PYTHON%%sbin/dnssec-checkds
-%%PYTHON%%sbin/dnssec-coverage
-sbin/dnssec-dsfromkey
-sbin/dnssec-importkey
-sbin/dnssec-keyfromlabel
-sbin/dnssec-keygen
-%%PYTHON%%sbin/dnssec-keymgr
-sbin/dnssec-revoke
-sbin/dnssec-settime
-sbin/dnssec-signzone
-sbin/dnssec-verify
-sbin/genrandom
-sbin/isc-hmac-fixup
 sbin/lwresd
 sbin/named
 sbin/named-checkconf
 sbin/named-checkzone
 sbin/named-compilezone
-sbin/named-journalprint
 %%LMDB%%sbin/named-nzd2nzf
-sbin/nsec3hash
 %%NATIVE_PKCS11%%sbin/pkcs11-destroy
 %%NATIVE_PKCS11%%sbin/pkcs11-keygen
 %%NATIVE_PKCS11%%sbin/pkcs11-list