20 files changed, 446 insertions, 318 deletions

diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index ec0078fe072e..819c52622282 100644
--- a/dns/bind-tools/pkg-plist
+++ b/dns/bind-tools/pkg-plist
@@ -6,7 +6,6 @@ bin/mdig
 bin/named-rrchecker
 bin/nslookup
 bin/nsupdate
-@comment lib/named/filter-aaaa.so
 man/man1/arpaname.1.gz
 man/man1/delv.1.gz
 man/man1/dig.1.gz
@@ -27,7 +26,6 @@ man/man8/dnssec-revoke.8.gz
 man/man8/dnssec-settime.8.gz
 man/man8/dnssec-signzone.8.gz
 man/man8/dnssec-verify.8.gz
-@comment man/man8/filter-aaaa.8.gz
 man/man8/named-journalprint.8.gz
 man/man8/nsec3hash.8.gz
 sbin/dnssec-cds
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index bf6a7104526f..1f027bb8e8c7 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -9,7 +9,7 @@ PORTREVISION=	0
 .else
 # XXX: correct version
 # dns/bind9xx here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net ipv6
 # XXX: put the ISC master_site
@@ -34,6 +34,9 @@ LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2
+.if !defined(BIND_TOOLS_SLAVE)
+RUN_DEPENDS=	bind-tools>0:dns/bind-tools
+.endif
 
 # XXX: remove tar:bz2
 USES=	compiler:c11 cpe libedit ssl tar:bz2
@@ -66,26 +69,29 @@ CONFLICTS=	bind911 bind912 bind913 bind914
 
 .if defined(BIND_TOOLS_SLAVE)
 CONFIGURE_ARGS+=	--disable-shared
-# XXX: Change to the correct version
-CONFLICTS+=		bind9-devel
+EXTRA_PATCHES=	${PATCHDIR}/extrapatch-bind-tools
 .else
+CONFIGURE_ARGS+=	--without-python
 USE_RC_SUBR=	named
 SUB_FILES=	pkg-message named.conf
-CONFLICTS+=		bind-tools
+EXTRA_PATCHES=	${PATCHDIR}/extrapatch-no-bind-tools
 
 PORTDOCS=	*
 .endif	# BIND_TOOLS_SLAVE
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFAULT=	SIGCHASE IDN GSSAPI_NONE JSON PYTHON
-OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON JSON \
+OPTIONS_DEFAULT=	SIGCHASE IDN GSSAPI_NONE JSON
+OPTIONS_DEFINE=		IDN LARGE_FILE JSON \
 			FIXED_RRSET SIGCHASE
 
 OPTIONS_RADIO=	CRYPTO
 OPTIONS_RADIO_CRYPTO=	NATIVE_PKCS11
 
-.if !defined(BIND_TOOLS_SLAVE)
+.if defined(BIND_TOOLS_SLAVE)
+OPTIONS_DEFINE+=	PYTHON
+OPTIONS_DEFAULT+=	PYTHON
+.else
 OPTIONS_DEFAULT+=	DLZ_FILESYSTEM LMDB TCP_FASTOPEN
 OPTIONS_DEFINE+=	DOCS \
 			OVERRIDECACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
@@ -225,24 +231,13 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e '/RELEASETYPE=/s#$$#-${GL_COMMIT}#' \
 		${WRKSRC}/version
-.if defined(BIND_TOOLS_SLAVE)
-	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \
-		-e 's#isc-config.sh installdirs#installdirs#' \
-		-e 's#.*INSTALL.*isc-config.*##' \
-		-e 's#.*INSTALL.*bind.keys.*##' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \
-		-e 's#^	.*check confgen ##' \
-		${WRKSRC}/bin/Makefile.in
-.else
-.  for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
+.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
 	rndc/rndc.8
 	@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
 		-e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \
 		-e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \
 		${WRKSRC}/bin/${FILE}
-.  endfor
-.endif
+.endfor
 
 .if !defined(BIND_TOOLS_SLAVE)
 .  if ${PORTREVISION:N0}
@@ -273,10 +268,11 @@ post-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \
 		${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-.endif	# BIND_TOOLS_SLAVE
+.else
 
 # Can't use USE_PYTHON=autoplist
 post-install-PYTHON-on:
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST}
+.endif	# BIND_TOOLS_SLAVE
 
 .include <bsd.port.post.mk>
diff --git a/dns/bind9-devel/files/extrapatch-bind-tools b/dns/bind9-devel/files/extrapatch-bind-tools
new file mode 100644
index 000000000000..a62fab8ace2f
--- /dev/null
+++ b/dns/bind9-devel/files/extrapatch-bind-tools
@@ -0,0 +1,41 @@
+Only select the "tools" part of bind for building.
+
+--- Makefile.in.orig	2019-03-20 05:57:56 UTC
++++ Makefile.in
+@@ -14,7 +14,7 @@ top_builddir =  @top_builddir@
+ 
+ VERSION=@BIND9_VERSION@
+ 
+-SUBDIRS =	make lib fuzz bin doc
++SUBDIRS =	lib bin
+ TARGETS =
+ PREREQS =	bind.keys.h
+ 
+@@ -54,14 +54,11 @@ installdirs:
+ 	${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir}
+ 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
+ 
+-install:: isc-config.sh installdirs
+-	${INSTALL_SCRIPT} isc-config.sh ${DESTDIR}${bindir}
++install:: installdirs
+ 	rm -f ${DESTDIR}${bindir}/bind9-config
+ 	@LN@ ${DESTDIR}${bindir}/isc-config.sh ${DESTDIR}${bindir}/bind9-config
+-	${INSTALL_DATA} ${top_srcdir}/isc-config.sh.1 ${DESTDIR}${mandir}/man1
+ 	rm -f ${DESTDIR}${mandir}/man1/bind9-config.1
+ 	@LN@ ${DESTDIR}${mandir}/man1/isc-config.sh.1 ${DESTDIR}${mandir}/man1/bind9-config.1
+-	${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir}
+ 
+ uninstall::
+ 	rm -f ${DESTDIR}${sysconfdir}/bind.keys
+--- bin/Makefile.in.orig	2019-03-20 05:57:56 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 \
+-		@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests
++SUBDIRS =	dig delv dnssec tools nsupdate \
++		@NZD_TOOLS@ @PYTHON_TOOLS@
+ TARGETS =
+ 
diff --git a/dns/bind9-devel/files/extrapatch-no-bind-tools b/dns/bind9-devel/files/extrapatch-no-bind-tools
new file mode 100644
index 000000000000..5c7e85f8cd4b
--- /dev/null
+++ b/dns/bind9-devel/files/extrapatch-no-bind-tools
@@ -0,0 +1,51 @@
+Exclude the "tools" from building and installing.
+
+--- bin/Makefile.in.orig	2019-03-20 05:57:56 UTC
++++ bin/Makefile.in
+@@ -11,8 +11,8 @@ srcdir =	@srcdir@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig delv dnssec tools nsupdate check confgen \
+-		@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests
++SUBDIRS =	named rndc tools check confgen \
++		@NZD_TOOLS@ @PKCS11_TOOLS@ plugins tests
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
+--- bin/tools/Makefile.in.orig	2019-04-15 14:30:39 UTC
++++ bin/tools/Makefile.in
+@@ -39,10 +39,7 @@ SUBDIRS =
+ 
+ DNSTAPTARGETS =	dnstap-read@EXEEXT@
+ NZDTARGETS =	named-nzd2nzf@EXEEXT@
+-TARGETS =	arpaname@EXEEXT@ named-journalprint@EXEEXT@ \
+-		named-rrchecker@EXEEXT@ nsec3hash@EXEEXT@ \
+-		mdig@EXEEXT@ \
+-		@DNSTAPTARGETS@ @NZDTARGETS@
++TARGETS =	@DNSTAPTARGETS@ @NZDTARGETS@
+ 
+ DNSTAPSRCS  =	dnstap-read.c
+ NZDSRCS  =	named-nzd2nzf.c
+@@ -118,21 +115,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} mdig@EXEEXT@ \
+-		${DESTDIR}${bindir}
+-	${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1
+-	${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}/mdig.1 ${DESTDIR}${mandir}/man1
+ 
+ uninstall::
+ 	rm -f ${DESTDIR}${mandir}/man1/mdig.1
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index 45bc62392a12..62d74c06f798 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/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
@@ -277,40 +269,18 @@ lib/libisccc.a
 lib/libisccfg.a
 lib/libns.a
 lib/named/filter-aaaa.so
-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/man5/named.conf.5.gz
 man/man5/rndc.conf.5.gz
 man/man8/ddns-confgen.8.gz
-man/man8/dnssec-cds.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/filter-aaaa.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
@@ -319,25 +289,11 @@ man/man8/rndc-confgen.8.gz
 man/man8/rndc.8.gz
 man/man8/tsig-keygen.8.gz
 sbin/ddns-confgen
-sbin/dnssec-cds
-%%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/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
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
diff --git a/dns/bind912/Makefile b/dns/bind912/Makefile
index 66700eeeee66..196f7c4ab0de 100644
--- a/dns/bind912/Makefile
+++ b/dns/bind912/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=	912
@@ -19,6 +19,7 @@ DEPRECATED=	Support ends, please move to dns/bind914.
 EXPIRATION_DATE=	2019-05-31
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2
+RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 
 USES=	compiler:c11 cpe libedit
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
@@ -37,10 +38,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=	bind911 bind913 bind914 bind9-devel bind-tools
+CONFLICTS=	bind911 bind913 bind914 bind9-devel
 
 USE_RC_SUBR=	named
 SUB_FILES=	pkg-message named.conf
@@ -49,9 +51,9 @@ PORTDOCS=	*
 
 MAKE_JOBS_UNSAFE=	yes
 
-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
-OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON JSON \
+OPTIONS_DEFINE=		IDN LARGE_FILE JSON \
 			FIXED_RRSET SIGCHASE IPV6 THREADS \
 			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
@@ -155,11 +156,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
@@ -248,8 +244,4 @@ post-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \
 		${WRKSRC}/README.md ${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/bind912/files/patch-no-bind-tools b/dns/bind912/files/patch-no-bind-tools
new file mode 100644
index 000000000000..f3c5f7fce0c0
--- /dev/null
+++ b/dns/bind912/files/patch-no-bind-tools
@@ -0,0 +1,52 @@
+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:42:04 UTC
++++ bin/tools/Makefile.in
+@@ -39,10 +39,7 @@ SUBDIRS =
+ 
+ DNSTAPTARGETS =	dnstap-read@EXEEXT@
+ NZDTARGETS =	named-nzd2nzf@EXEEXT@
+-TARGETS =	arpaname@EXEEXT@ named-journalprint@EXEEXT@ \
+-		named-rrchecker@EXEEXT@ nsec3hash@EXEEXT@ \
+-		genrandom@EXEEXT@ mdig@EXEEXT@ \
+-		@DNSTAPTARGETS@ @NZDTARGETS@
++TARGETS =	@DNSTAPTARGETS@ @NZDTARGETS@
+ 
+ DNSTAPSRCS  =	dnstap-read.c
+ NZDSRCS  =	named-nzd2nzf.c
+@@ -122,24 +119,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} mdig@EXEEXT@ \
+-		${DESTDIR}${bindir}
+-	${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1
+-	${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/bind912/pkg-plist b/dns/bind912/pkg-plist
index cdd3e74b1d14..fc17a016d5b7 100644
--- a/dns/bind912/pkg-plist
+++ b/dns/bind912/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
@@ -286,40 +278,17 @@ lib/libisc.a
 lib/libisccc.a
 lib/libisccfg.a
 lib/libns.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/man5/named.conf.5.gz
 man/man5/rndc.conf.5.gz
 man/man8/ddns-confgen.8.gz
-man/man8/dnssec-cds.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/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
@@ -328,26 +297,11 @@ man/man8/rndc-confgen.8.gz
 man/man8/rndc.8.gz
 man/man8/tsig-keygen.8.gz
 sbin/ddns-confgen
-sbin/dnssec-cds
-%%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/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
diff --git a/dns/bind913/Makefile b/dns/bind913/Makefile
index d9ec8299025f..d1eb5e501084 100644
--- a/dns/bind913/Makefile
+++ b/dns/bind913/Makefile
@@ -8,7 +8,7 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 PORTREVISION=	0
 .else
 # dns/bind913 here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
@@ -30,6 +30,9 @@ LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2
+.if !defined(BIND_TOOLS_SLAVE)
+RUN_DEPENDS=	bind-tools>0:dns/bind-tools
+.endif
 
 USES=	compiler:c11 cpe libedit ssl
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
@@ -54,25 +57,29 @@ CONFLICTS=	bind911 bind912 bind914 bind9-devel
 
 .if defined(BIND_TOOLS_SLAVE)
 CONFIGURE_ARGS+=	--disable-shared
-CONFLICTS+=		bind913
+EXTRA_PATCHES=	${PATCHDIR}/extrapatch-bind-tools
 .else
+CONFIGURE_ARGS+=	--without-python
 USE_RC_SUBR=	named
 SUB_FILES=	pkg-message named.conf
-CONFLICTS+=		bind-tools
+EXTRA_PATCHES=	${PATCHDIR}/extrapatch-no-bind-tools
 
 PORTDOCS=	*
 .endif	# BIND_TOOLS_SLAVE
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFAULT=	SIGCHASE IDN GSSAPI_NONE JSON PYTHON
-OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON JSON \
+OPTIONS_DEFAULT=	SIGCHASE IDN GSSAPI_NONE JSON
+OPTIONS_DEFINE=		IDN LARGE_FILE JSON \
 			FIXED_RRSET SIGCHASE
 
 OPTIONS_RADIO=	CRYPTO
 OPTIONS_RADIO_CRYPTO=	NATIVE_PKCS11
 
-.if !defined(BIND_TOOLS_SLAVE)
+.if defined(BIND_TOOLS_SLAVE)
+OPTIONS_DEFINE+=	PYTHON
+OPTIONS_DEFAULT+=	PYTHON
+.else
 OPTIONS_DEFAULT+=	DLZ_FILESYSTEM LMDB TCP_FASTOPEN
 OPTIONS_DEFINE+=	DOCS \
 			MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
@@ -205,24 +212,13 @@ SUB_LIST+=	ENGINES=${LOCALBASE}/lib/engines
 .endif
 
 post-patch:
-.if defined(BIND_TOOLS_SLAVE)
-	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \
-		-e 's#isc-config.sh installdirs#installdirs#' \
-		-e 's#.*INSTALL.*isc-config.*##' \
-		-e 's#.*INSTALL.*bind.keys.*##' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \
-		-e 's#^	.*check confgen ##' \
-		${WRKSRC}/bin/Makefile.in
-.else
-.  for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
+.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
 	rndc/rndc.8
 	@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
 		-e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \
 		-e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \
 		${WRKSRC}/bin/${FILE}
-.  endfor
-.endif
+.endfor
 
 .if !defined(BIND_TOOLS_SLAVE)
 .  if ${PORTREVISION:N0}
@@ -253,10 +249,11 @@ post-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \
 		${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-.endif	# BIND_TOOLS_SLAVE
+.else
 
 # Can't use USE_PYTHON=autoplist
 post-install-PYTHON-on:
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST}
+.endif	# BIND_TOOLS_SLAVE
 
 .include <bsd.port.post.mk>
diff --git a/dns/bind913/files/extrapatch-bind-tools b/dns/bind913/files/extrapatch-bind-tools
new file mode 100644
index 000000000000..185e1556c1e5
--- /dev/null
+++ b/dns/bind913/files/extrapatch-bind-tools
@@ -0,0 +1,40 @@
+--- Makefile.in.orig	2019-02-21 02:11:26 UTC
++++ Makefile.in
+@@ -14,7 +14,7 @@ top_builddir =  @top_builddir@
+ 
+ VERSION=@BIND9_VERSION@
+ 
+-SUBDIRS =	make lib fuzz bin doc
++SUBDIRS =	lib bin
+ TARGETS =
+ PREREQS =	bind.keys.h
+ 
+@@ -54,14 +54,11 @@ installdirs:
+ 	${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir}
+ 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
+ 
+-install:: isc-config.sh installdirs
+-	${INSTALL_SCRIPT} isc-config.sh ${DESTDIR}${bindir}
++install:: installdirs
+ 	rm -f ${DESTDIR}${bindir}/bind9-config
+ 	@LN@ ${DESTDIR}${bindir}/isc-config.sh ${DESTDIR}${bindir}/bind9-config
+-	${INSTALL_DATA} ${top_srcdir}/isc-config.sh.1 ${DESTDIR}${mandir}/man1
+ 	rm -f ${DESTDIR}${mandir}/man1/bind9-config.1
+ 	@LN@ ${DESTDIR}${mandir}/man1/isc-config.sh.1 ${DESTDIR}${mandir}/man1/bind9-config.1
+-	${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir}
+ 
+ uninstall::
+ 	rm -f ${DESTDIR}${sysconfdir}/bind.keys
+--- bin/Makefile.in.orig	2019-02-21 02:11:26 UTC
++++ bin/Makefile.in
+@@ -11,8 +11,8 @@ srcdir =	@srcdir@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig delv dnssec tools nsupdate check confgen \
+-		@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests
++SUBDIRS =	dig delv dnssec tools nsupdate \
++		@NZD_TOOLS@ @PYTHON_TOOLS@
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
diff --git a/dns/bind913/files/extrapatch-no-bind-tools b/dns/bind913/files/extrapatch-no-bind-tools
new file mode 100644
index 000000000000..f9f29d2cafdd
--- /dev/null
+++ b/dns/bind913/files/extrapatch-no-bind-tools
@@ -0,0 +1,49 @@
+--- bin/Makefile.in.orig	2019-02-21 02:11:26 UTC
++++ bin/Makefile.in
+@@ -11,8 +11,8 @@ srcdir =	@srcdir@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig delv dnssec tools nsupdate check confgen \
+-		@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests
++SUBDIRS =	named rndc tools check confgen \
++		@NZD_TOOLS@ @PKCS11_TOOLS@ plugins tests
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
+--- bin/tools/Makefile.in.orig	2019-02-21 02:11:26 UTC
++++ bin/tools/Makefile.in
+@@ -39,10 +39,7 @@ SUBDIRS =
+ 
+ DNSTAPTARGETS =	dnstap-read@EXEEXT@
+ NZDTARGETS =	named-nzd2nzf@EXEEXT@
+-TARGETS =	arpaname@EXEEXT@ named-journalprint@EXEEXT@ \
+-		named-rrchecker@EXEEXT@ nsec3hash@EXEEXT@ \
+-		mdig@EXEEXT@ \
+-		@DNSTAPTARGETS@ @NZDTARGETS@
++TARGETS =	@DNSTAPTARGETS@ @NZDTARGETS@
+ 
+ DNSTAPSRCS  =	dnstap-read.c
+ NZDSRCS  =	named-nzd2nzf.c
+@@ -118,21 +115,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} mdig@EXEEXT@ \
+-		${DESTDIR}${bindir}
+-	${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1
+-	${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}/mdig.1 ${DESTDIR}${mandir}/man1
+ 
+ uninstall::
+ 	rm -f ${DESTDIR}${mandir}/man1/mdig.1
diff --git a/dns/bind913/pkg-plist b/dns/bind913/pkg-plist
index b9699d58e377..3ff23642534a 100644
--- a/dns/bind913/pkg-plist
+++ b/dns/bind913/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
@@ -278,40 +270,18 @@ lib/libisc.a
 lib/libisccc.a
 lib/libisccfg.a
 lib/libns.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/man5/named.conf.5.gz
 man/man5/rndc.conf.5.gz
 man/man8/ddns-confgen.8.gz
-man/man8/dnssec-cds.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/filter-aaaa.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
@@ -320,25 +290,11 @@ man/man8/rndc-confgen.8.gz
 man/man8/rndc.8.gz
 man/man8/tsig-keygen.8.gz
 sbin/ddns-confgen
-sbin/dnssec-cds
-%%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/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
diff --git a/dns/bind914/Makefile b/dns/bind914/Makefile
index 32c563fc8a95..6a3343636fa2 100644
--- a/dns/bind914/Makefile
+++ b/dns/bind914/Makefile
@@ -7,8 +7,8 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 # dns/bind-tools here
 PORTREVISION=	0
 .else
-# dns/bind913 here
-PORTREVISION=	0
+# dns/bind914 here
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
@@ -30,6 +30,9 @@ LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2
+.if !defined(BIND_TOOLS_SLAVE)
+RUN_DEPENDS=	bind-tools>0:dns/bind-tools
+.endif
 
 USES=	compiler:c11 cpe libedit ssl
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
@@ -54,25 +57,29 @@ CONFLICTS=	bind911 bind912 bind13 bind9-devel
 
 .if defined(BIND_TOOLS_SLAVE)
 CONFIGURE_ARGS+=	--disable-shared
-CONFLICTS+=		bind914
+EXTRA_PATCHES=	${PATCHDIR}/extrapatch-bind-tools
 .else
+CONFIGURE_ARGS+=	--without-python
 USE_RC_SUBR=	named
 SUB_FILES=	pkg-message named.conf
-CONFLICTS+=		bind-tools
+EXTRA_PATCHES=	${PATCHDIR}/extrapatch-no-bind-tools
 
 PORTDOCS=	*
 .endif	# BIND_TOOLS_SLAVE
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFAULT=	SIGCHASE IDN GSSAPI_NONE JSON PYTHON
-OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON JSON \
+OPTIONS_DEFAULT=	SIGCHASE IDN GSSAPI_NONE JSON
+OPTIONS_DEFINE=		IDN LARGE_FILE JSON \
 			FIXED_RRSET SIGCHASE
 
 OPTIONS_RADIO=	CRYPTO
 OPTIONS_RADIO_CRYPTO=	NATIVE_PKCS11
 
-.if !defined(BIND_TOOLS_SLAVE)
+.if defined(BIND_TOOLS_SLAVE)
+OPTIONS_DEFINE+=	PYTHON
+OPTIONS_DEFAULT+=	PYTHON
+.else
 OPTIONS_DEFAULT+=	DLZ_FILESYSTEM LMDB TCP_FASTOPEN
 OPTIONS_DEFINE+=	DOCS \
 			MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
@@ -205,24 +212,13 @@ SUB_LIST+=	ENGINES=${LOCALBASE}/lib/engines
 .endif
 
 post-patch:
-.if defined(BIND_TOOLS_SLAVE)
-	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \
-		-e 's#isc-config.sh installdirs#installdirs#' \
-		-e 's#.*INSTALL.*isc-config.*##' \
-		-e 's#.*INSTALL.*bind.keys.*##' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \
-		-e 's#^	.*check confgen ##' \
-		${WRKSRC}/bin/Makefile.in
-.else
-.  for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
+.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
 	rndc/rndc.8
 	@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
 		-e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \
 		-e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \
 		${WRKSRC}/bin/${FILE}
-.  endfor
-.endif
+.endfor
 
 .if !defined(BIND_TOOLS_SLAVE)
 .  if ${PORTREVISION:N0}
@@ -253,10 +249,11 @@ post-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \
 		${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-.endif	# BIND_TOOLS_SLAVE
+.else
 
 # Can't use USE_PYTHON=autoplist
 post-install-PYTHON-on:
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST}
+.endif	# BIND_TOOLS_SLAVE
 
 .include <bsd.port.post.mk>
diff --git a/dns/bind914/files/extrapatch-bind-tools b/dns/bind914/files/extrapatch-bind-tools
new file mode 100644
index 000000000000..a62fab8ace2f
--- /dev/null
+++ b/dns/bind914/files/extrapatch-bind-tools
@@ -0,0 +1,41 @@
+Only select the "tools" part of bind for building.
+
+--- Makefile.in.orig	2019-03-20 05:57:56 UTC
++++ Makefile.in
+@@ -14,7 +14,7 @@ top_builddir =  @top_builddir@
+ 
+ VERSION=@BIND9_VERSION@
+ 
+-SUBDIRS =	make lib fuzz bin doc
++SUBDIRS =	lib bin
+ TARGETS =
+ PREREQS =	bind.keys.h
+ 
+@@ -54,14 +54,11 @@ installdirs:
+ 	${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir}
+ 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
+ 
+-install:: isc-config.sh installdirs
+-	${INSTALL_SCRIPT} isc-config.sh ${DESTDIR}${bindir}
++install:: installdirs
+ 	rm -f ${DESTDIR}${bindir}/bind9-config
+ 	@LN@ ${DESTDIR}${bindir}/isc-config.sh ${DESTDIR}${bindir}/bind9-config
+-	${INSTALL_DATA} ${top_srcdir}/isc-config.sh.1 ${DESTDIR}${mandir}/man1
+ 	rm -f ${DESTDIR}${mandir}/man1/bind9-config.1
+ 	@LN@ ${DESTDIR}${mandir}/man1/isc-config.sh.1 ${DESTDIR}${mandir}/man1/bind9-config.1
+-	${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir}
+ 
+ uninstall::
+ 	rm -f ${DESTDIR}${sysconfdir}/bind.keys
+--- bin/Makefile.in.orig	2019-03-20 05:57:56 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 \
+-		@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests
++SUBDIRS =	dig delv dnssec tools nsupdate \
++		@NZD_TOOLS@ @PYTHON_TOOLS@
+ TARGETS =
+ 
diff --git a/dns/bind914/files/extrapatch-no-bind-tools b/dns/bind914/files/extrapatch-no-bind-tools
new file mode 100644
index 000000000000..5c7e85f8cd4b
--- /dev/null
+++ b/dns/bind914/files/extrapatch-no-bind-tools
@@ -0,0 +1,51 @@
+Exclude the "tools" from building and installing.
+
+--- bin/Makefile.in.orig	2019-03-20 05:57:56 UTC
++++ bin/Makefile.in
+@@ -11,8 +11,8 @@ srcdir =	@srcdir@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig delv dnssec tools nsupdate check confgen \
+-		@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests
++SUBDIRS =	named rndc tools check confgen \
++		@NZD_TOOLS@ @PKCS11_TOOLS@ plugins tests
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
+--- bin/tools/Makefile.in.orig	2019-04-15 14:30:39 UTC
++++ bin/tools/Makefile.in
+@@ -39,10 +39,7 @@ SUBDIRS =
+ 
+ DNSTAPTARGETS =	dnstap-read@EXEEXT@
+ NZDTARGETS =	named-nzd2nzf@EXEEXT@
+-TARGETS =	arpaname@EXEEXT@ named-journalprint@EXEEXT@ \
+-		named-rrchecker@EXEEXT@ nsec3hash@EXEEXT@ \
+-		mdig@EXEEXT@ \
+-		@DNSTAPTARGETS@ @NZDTARGETS@
++TARGETS =	@DNSTAPTARGETS@ @NZDTARGETS@
+ 
+ DNSTAPSRCS  =	dnstap-read.c
+ NZDSRCS  =	named-nzd2nzf.c
+@@ -118,21 +115,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} mdig@EXEEXT@ \
+-		${DESTDIR}${bindir}
+-	${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1
+-	${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}/mdig.1 ${DESTDIR}${mandir}/man1
+ 
+ uninstall::
+ 	rm -f ${DESTDIR}${mandir}/man1/mdig.1
diff --git a/dns/bind914/pkg-plist b/dns/bind914/pkg-plist
index ec879674a533..1dd6639b7b30 100644
--- a/dns/bind914/pkg-plist
+++ b/dns/bind914/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
@@ -278,40 +270,18 @@ lib/libisccc.a
 lib/libisccfg.a
 lib/libns.a
 lib/named/filter-aaaa.so
-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/man5/named.conf.5.gz
 man/man5/rndc.conf.5.gz
 man/man8/ddns-confgen.8.gz
-man/man8/dnssec-cds.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/filter-aaaa.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
@@ -320,25 +290,11 @@ man/man8/rndc-confgen.8.gz
 man/man8/rndc.8.gz
 man/man8/tsig-keygen.8.gz
 sbin/ddns-confgen
-sbin/dnssec-cds
-%%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/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
diff --git a/dns/zkt/Makefile b/dns/zkt/Makefile
index 5f23618afb69..8e8e7df2ba59 100644
--- a/dns/zkt/Makefile
+++ b/dns/zkt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		zkt
 DISTVERSION=		1.1.2
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		dns
 MASTER_SITES=		http://www.hznet.de/dns/zkt/
 
@@ -13,7 +13,7 @@ COMMENT=		Tool to manage keys and signatures for DNSSEC-zones
 LICENSE=		BSD3CLAUSE
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=		dnssec-signzone:dns/bind911
+BUILD_DEPENDS=		dnssec-signzone:dns/bind-tools
 RUN_DEPENDS:=		${BUILD_DEPENDS}
 
 DIR_NAMED_CONF?=	/etc/namedb