8 files changed, 61 insertions, 23 deletions

diff --git a/dns/bind-tools/Makefile b/dns/bind-tools/Makefile
index e5e0a35a3d1e..a4cb643acf80 100644
--- a/dns/bind-tools/Makefile
+++ b/dns/bind-tools/Makefile
@@ -22,24 +22,12 @@ post-patch:
 		-e 's#.*INSTALL.*isc-config.*##' \
 		-e 's#.*INSTALL.*bind.keys.*##' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec nsupdate#' \
+	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec nsupdate \\#' \
 		-e 's#^	.*check confgen ##' \
 		${WRKSRC}/bin/Makefile.in
 
 do-install:
-.for file in dig host nslookup
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/dig/${file} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/bin/dig/${file}.1 ${STAGEDIR}${MANPREFIX}/man/man1
-.endfor
-.for file in delv nsupdate
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file}/${file} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/bin/${file}/${file}.1 ${STAGEDIR}${MANPREFIX}/man/man1
-.endfor
-.for file in dnssec-dsfromkey dnssec-importkey dnssec-keyfromlabel \
-	dnssec-keygen dnssec-revoke dnssec-settime dnssec-signzone \
-	dnssec-verify
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/dnssec/${file} ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/bin/dnssec/${file}.8 ${STAGEDIR}${MANPREFIX}/man/man8
-.endfor
+	@(cd ${INSTALL_WRKSRC}/bin && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+	
 
 .include "${MASTERDIR}/Makefile"
diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index 6cd3a0f99b07..b199437b4cb5 100644
--- a/dns/bind-tools/pkg-plist
+++ b/dns/bind-tools/pkg-plist
@@ -8,6 +8,8 @@ man/man1/dig.1.gz
 man/man1/host.1.gz
 man/man1/nslookup.1.gz
 man/man1/nsupdate.1.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
@@ -16,6 +18,8 @@ man/man8/dnssec-revoke.8.gz
 man/man8/dnssec-settime.8.gz
 man/man8/dnssec-signzone.8.gz
 man/man8/dnssec-verify.8.gz
+%%PYTHON%%sbin/dnssec-checkds
+%%PYTHON%%sbin/dnssec-coverage
 sbin/dnssec-dsfromkey
 sbin/dnssec-importkey
 sbin/dnssec-keyfromlabel
diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile
index 484ea6ffbe42..051507451545 100644
--- a/dns/bind910/Makefile
+++ b/dns/bind910/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX?=	910
@@ -24,8 +24,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
 		--with-randomdev=/dev/random \
-		--with-libxml2=${LOCALBASE} \
-		--without-python
+		--with-libxml2=${LOCALBASE}
 ETCDIR=		${PREFIX}/etc/namedb
 
 CONFLICTS=	bind9*-9.[456789].* bind9*-sdb-9.[456789].*
@@ -34,7 +33,7 @@ SUB_FILES=	pkg-message
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFAULT=	IPV6 SSL THREADS SIGCHASE IDN GSSAPI_NONE
-OPTIONS_DEFINE=		IDN LARGE_FILE GOST \
+OPTIONS_DEFINE=		IDN LARGE_FILE GOST PYTHON \
 			FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA
 OPTIONS_RADIO=	CRYPTO
 OPTIONS_RADIO_CRYPTO=	SSL NATIVE_PKCS11
@@ -49,6 +48,8 @@ OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
 			DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
 .endif	# BIND_TOOLS_SLAVE
 
+OPTIONS_SUB=	yes
+
 SSL_DESC=		Build with OpenSSL (Required for DNSSEC)
 LARGE_FILE_DESC=	64-bit file support
 FIXED_RRSET_DESC=	Enable fixed rrset ordering
@@ -58,6 +59,7 @@ CRYPTO_DESC=		Choose which crypto engine to use
 NATIVE_PKCS11_DESC=	Use PKCS\#11 native API (**READ HELP**)
 GEOIP_DESC=		Allow geographically based ACL.
 GOST_DESC=		Enable GOST ciphers, needs SSL (see help)
+PYTHON_DESC=		Build with Python utilities
 
 LINKS_DESC=		Create conf file symlinks in ${PREFIX}
 NEWSTATS_DESC=		Enable alternate xml statistics channel format
@@ -106,6 +108,10 @@ GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
 
 GOST_CONFIGURE_WITH=	gost
 
+PYTHON_CONFIGURE_WITH=	python
+PYTHON_USE=	PYTHON=yes
+PYTHON_USES=	gmake
+
 DLZ_POSTGRESQL_CONFIGURE_ON=	--with-dlz-postgres=yes
 DLZ_POSTGRESQL_USE=		pgsql=yes
 
diff --git a/dns/bind910/files/patch-bin__python__Makefile.in b/dns/bind910/files/patch-bin__python__Makefile.in
new file mode 100644
index 000000000000..e53306aec09c
--- /dev/null
+++ b/dns/bind910/files/patch-bin__python__Makefile.in
@@ -0,0 +1,13 @@
+--- ./bin/python/Makefile.in.orig	2014-05-27 06:45:53.000000000 +0200
++++ ./bin/python/Makefile.in	2014-06-24 14:32:28.000000000 +0200
+@@ -41,8 +41,8 @@
+ 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
+ 
+ install:: ${TARGETS} installdirs
+-	${INSTALL_PROGRAM} dnssec-checkds@EXEEXT@ ${DESTDIR}${sbindir}
+-	${INSTALL_PROGRAM} dnssec-coverage@EXEEXT@ ${DESTDIR}${sbindir}
++	${INSTALL_SCRIPT} dnssec-checkds@EXEEXT@ ${DESTDIR}${sbindir}
++	${INSTALL_SCRIPT} dnssec-coverage@EXEEXT@ ${DESTDIR}${sbindir}
+ 	${INSTALL_DATA} ${srcdir}/dnssec-checkds.8 ${DESTDIR}${mandir}/man8
+ 	${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8
+ 
diff --git a/dns/bind910/pkg-plist b/dns/bind910/pkg-plist
index 8214c75d2dfe..0462324c1e77 100644
--- a/dns/bind910/pkg-plist
+++ b/dns/bind910/pkg-plist
@@ -351,6 +351,8 @@ 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
@@ -377,6 +379,8 @@ man/man8/rndc-confgen.8.gz
 man/man8/rndc.8.gz
 sbin/arpaname
 sbin/ddns-confgen
+%%PYTHON%%sbin/dnssec-checkds
+%%PYTHON%%sbin/dnssec-coverage
 sbin/dnssec-dsfromkey
 sbin/dnssec-importkey
 sbin/dnssec-keyfromlabel
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index 787e30a604c2..f81989711d13 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	99
@@ -24,15 +24,14 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
 		--with-randomdev=/dev/random \
-		--with-libxml2=${LOCALBASE} \
-		--without-python
+		--with-libxml2=${LOCALBASE}
 ETCDIR=		${PREFIX}/etc/namedb
 
 CONFLICTS=	bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.*
 
 OPTIONS_DEFAULT=	IPV6 SSL THREADS GSSAPI_NONE
 OPTIONS_DEFINE=		SSL IDN REPLACE_BASE LARGE_FILE FIXED_RRSET SIGCHASE \
-			IPV6 THREADS FILTER_AAAA GOST \
+			IPV6 THREADS FILTER_AAAA GOST PYTHON \
 			LINKS RPZ_NSIP RPZ_NSDNAME RRL DOCS RPZ_PATCH NEWSTATS
 OPTIONS_GROUP=		DLZ
 OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
@@ -40,6 +39,8 @@ OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 
+OPTIONS_SUB=	yes
+
 SSL_DESC=		Build with OpenSSL (Required for DNSSEC)
 REPLACE_BASE_DESC=	Replace base BIND (FreeBSD 9.x and earlier)
 LARGE_FILE_DESC=	64-bit file support
@@ -47,6 +48,7 @@ FIXED_RRSET_DESC=	Enable fixed rrset ordering
 SIGCHASE_DESC=		dig/host/nslookup will do DNSSEC validation
 FILTER_AAAA_DESC=	Enable filtering of AAAA records
 GOST_DESC=		Enable GOST ciphers, needs SSL (see help)
+PYTHON_DESC=		Build with Python utilities
 
 LINKS_DESC=		Create conf file symlinks in ${PREFIX}
 NEWSTATS_DESC=		Enable alternate xml statistics channel format
@@ -87,6 +89,10 @@ FILTER_AAAA_CONFIGURE_ENABLE=	filter-aaaa
 
 GOST_CONFIGURE_WITH=	gost
 
+PYTHON_CONFIGURE_WITH=	python
+PYTHON_USE=	PYTHON=yes
+PYTHON_USES=	gmake
+
 DLZ_POSTGRESQL_CONFIGURE_ON=	--with-dlz-postgres=yes
 DLZ_POSTGRESQL_USE=		pgsql=yes
 
diff --git a/dns/bind99/files/patch-bin__python__Makefile.in b/dns/bind99/files/patch-bin__python__Makefile.in
new file mode 100644
index 000000000000..34912063188a
--- /dev/null
+++ b/dns/bind99/files/patch-bin__python__Makefile.in
@@ -0,0 +1,13 @@
+--- ./bin/python/Makefile.in.orig	2014-05-23 15:42:39.000000000 +0200
++++ ./bin/python/Makefile.in	2014-06-24 14:12:26.000000000 +0200
+@@ -41,8 +41,8 @@
+ 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
+ 
+ install:: ${TARGETS} installdirs
+-	${INSTALL_PROGRAM} dnssec-checkds@EXEEXT@ ${DESTDIR}${sbindir}
+-	${INSTALL_PROGRAM} dnssec-coverage@EXEEXT@ ${DESTDIR}${sbindir}
++	${INSTALL_SCRIPT} dnssec-checkds@EXEEXT@ ${DESTDIR}${sbindir}
++	${INSTALL_SCRIPT} dnssec-coverage@EXEEXT@ ${DESTDIR}${sbindir}
+ 	${INSTALL_DATA} ${srcdir}/dnssec-checkds.8 ${DESTDIR}${mandir}/man8
+ 	${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8
+ 
diff --git a/dns/bind99/pkg-plist b/dns/bind99/pkg-plist
index 44cb7c525474..b1e83c7ec170 100644
--- a/dns/bind99/pkg-plist
+++ b/dns/bind99/pkg-plist
@@ -302,6 +302,8 @@ lib/liblwres.a
 %%SHARE_MAN%%man/man5/named.conf.5.gz
 %%SHARE_MAN%%man/man5/rndc.conf.5.gz
 %%SHARE_MAN%%man/man8/ddns-confgen.8.gz
+%%PYTHON%%%%SHARE_MAN%%man/man8/dnssec-checkds.8.gz
+%%PYTHON%%%%SHARE_MAN%%man/man8/dnssec-coverage.8.gz
 %%SHARE_MAN%%man/man8/dnssec-dsfromkey.8.gz
 %%SHARE_MAN%%man/man8/dnssec-importkey.8.gz
 %%SHARE_MAN%%man/man8/dnssec-keyfromlabel.8.gz
@@ -323,6 +325,8 @@ lib/liblwres.a
 %%SHARE_MAN%%man/man8/rndc.8.gz
 sbin/arpaname
 sbin/ddns-confgen
+%%PYTHON%%sbin/dnssec-checkds
+%%PYTHON%%sbin/dnssec-coverage
 sbin/dnssec-dsfromkey
 sbin/dnssec-importkey
 sbin/dnssec-keyfromlabel