Update to 9.10.0.rc2

- Remove REPLACE_BASE option, I should have done so when adding 9.10.0.rc1
- Clean the Makefile a bit

Changes:	https://lists.isc.org/pipermail/bind-announce/2014-April/000907.html
Sponsored by:	Absolight

11 files changed, 328 insertions, 400 deletions

diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile
index 5ec60754ce84..4046f883ca39 100644
--- a/dns/bind910/Makefile
+++ b/dns/bind910/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bind
-PORTVERSION=	9.10.0rc1
-PORTREVISION=	3
+PORTVERSION=	9.10.0rc2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
@@ -15,7 +14,7 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	ISCL
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.10.0rc1
+ISCVERSION=	9.10.0rc2
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -31,9 +30,11 @@ ETCDIR=		${PREFIX}/etc/namedb
 
 CONFLICTS=	bind9*-9.[456789].* bind9*-sdb-9.[456789].* bind-tools-9.*
 
+SUB_FILES=	pkg-message
+
 OPTIONS_SUB=	yes
 OPTIONS_DEFAULT=	IPV6 SSL THREADS SIGCHASE IDN
-OPTIONS_DEFINE=		IDN REPLACE_BASE LARGE_FILE \
+OPTIONS_DEFINE=		IDN LARGE_FILE \
 			FIXED_RRSET SIGCHASE IPV6 THREADS GSSAPI FILTER_AAAA
 OPTIONS_RADIO=	CRYPTO
 OPTIONS_RADIO_CRYPTO=	SSL NATIVE_PKCS11
@@ -47,7 +48,6 @@ OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
 .endif	# BIND_TOOLS_SLAVE
 
 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
 FIXED_RRSET_DESC=	Enable fixed rrset ordering
 SIGCHASE_DESC=		dig/host/nslookup will do DNSSEC validation
@@ -134,7 +134,7 @@ GSSAPI_CONFIGURE_WITH=	gssapi
 ARCH=		x86_64
 .endif
 
-.if !${PORT_OPTIONS:MLINKS} || ${PORT_OPTIONS:MREPLACE_BASE}
+.if !${PORT_OPTIONS:MLINKS}
 PKGINSTALL=${NONEXISTENT}
 .endif
 
@@ -144,50 +144,33 @@ CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ARGS+=	--disable-threads
 .endif
 
-.if ${PORT_OPTIONS:MREPLACE_BASE}
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
-IGNORE=		REPLACE_BASE option is not supported on this release
-.endif
-PKGNAMESUFFIX=	-base
-PREFIX=		/usr
-PLIST_SUB+=	SHARE_MAN="share/"
-NO_MTREE=	yes
-BIND_DESTETC=	/etc/namedb
-.else
-PLIST_SUB+=	SHARE_MAN=""
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
-BIND_DESTETC=	${PREFIX}/etc/namedb
 PKGINSTALL=	${NONEXISTENT}
-.else
-BIND_DESTETC=	${PREFIX}/etc
-.endif
-.endif
-
-PKGDEINSTALL=	${PKGINSTALL}
-
-CONFIGURE_ARGS+=	--prefix=${PREFIX} \
-			--sysconfdir=${BIND_DESTETC}
-PLIST_SUB+=	BIND_DESTETC="${BIND_DESTETC}"
-SUB_LIST+=	BIND_DESTETC="${BIND_DESTETC}"
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
 PLIST_SUB+=	NOBASE="" BASE="@comment "
+SUB_LIST+=	NOBASE="" BASE="@comment "
 USE_RC_SUBR+=	named
 SUB_FILES+=	named.conf
 .else
+ETCDIR=		${PREFIX}/etc
 PLIST_SUB+=	NOBASE="@comment " BASE=""
+SUB_LIST+=	NOBASE="@comment " BASE=""
 .if ${PORT_OPTIONS:MSSL}
 WITH_OPENSSL_PORT=	yes
 .endif
 .endif
 
+PKGDEINSTALL=	${PKGINSTALL}
+
+CONFIGURE_ARGS+=	--prefix=${PREFIX} \
+			--sysconfdir=${ETCDIR}
+
 .if !defined(BIND_TOOLS_SLAVE)
 post-patch:
 .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
 	rndc/rndc.8
 	@${MV} ${WRKSRC}/bin/${FILE} ${WRKSRC}/bin/${FILE}.Dist
-	@${SED} -e 's#/etc/named.conf#${BIND_DESTETC}/named.conf#g' \
-		-e 's#/etc/rndc.conf#${BIND_DESTETC}/rndc.conf#g' \
+	@${SED} -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}.Dist > ${WRKSRC}/bin/${FILE}
 .endfor
@@ -213,18 +196,18 @@ post-install:
 .endif
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
-	${MKDIR} ${STAGEDIR}${BIND_DESTETC}
+	${MKDIR} ${STAGEDIR}${ETCDIR}
 .for i in dynamic master slave working
-	@${MKDIR} ${STAGEDIR}${BIND_DESTETC}/$i
+	@${MKDIR} ${STAGEDIR}${ETCDIR}/$i
 .endfor
-	${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${BIND_DESTETC}/named.conf.sample
-	${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${BIND_DESTETC}
-	${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${BIND_DESTETC}/master
-	${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${BIND_DESTETC}/master
-	${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${BIND_DESTETC}/master
+	${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample
+	${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master
+	${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master
+	${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master
 .endif
 	${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
-		${STAGEDIR}${BIND_DESTETC}/rndc.conf.sample
+		${STAGEDIR}${ETCDIR}/rndc.conf.sample
 
 .endif	# BIND_TOOLS_SLAVE
 
diff --git a/dns/bind910/distinfo b/dns/bind910/distinfo
index 690302701065..e6b65c5a4f4c 100644
--- a/dns/bind910/distinfo
+++ b/dns/bind910/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bind-9.10.0rc1.tar.gz) = a529d80d4ea474440f079a4f7407e37407387fcf06b81a534ebc9fb8d1c6019a
-SIZE (bind-9.10.0rc1.tar.gz) = 8285665
+SHA256 (bind-9.10.0rc2.tar.gz) = 1cc90f89ee4ba1ee7847067d4ce977c9a80874e6fc6edd438fcc07387b6aeccb
+SIZE (bind-9.10.0rc2.tar.gz) = 8335501
diff --git a/dns/bind910/files/named.conf.in b/dns/bind910/files/named.conf.in
index 6c3215883552..0215342d4cc4 100644
--- a/dns/bind910/files/named.conf.in
+++ b/dns/bind910/files/named.conf.in
@@ -11,7 +11,7 @@
 options {
 	// All file and path names are relative to the chroot directory,
 	// if any, and should be fully qualified.
-	directory	"%%BIND_DESTETC%%/working";
+	directory	"%%ETCDIR%%/working";
 	pid-file	"/var/run/named/pid";
 	dump-file	"/var/dump/named_dump.db";
 	statistics-file	"/var/stats/named.stats";
@@ -75,7 +75,7 @@ options {
 // Also, make sure to enable it in /etc/rc.conf.
 
 // The traditional root hints mechanism. Use this, OR the slave zones below.
-zone "." { type hint; file "%%BIND_DESTETC%%/named.root"; };
+zone "." { type hint; file "%%ETCDIR%%/named.root"; };
 
 /*	Slaving the following zones from the root name servers has some
 	significant advantages:
@@ -123,198 +123,198 @@ zone "arpa" {
 	2. No spurious traffic will be sent from your network to the roots
 */
 // RFCs 1912, 5735 and 6303 (and BCP 32 for localhost)
-zone "localhost"	{ type master; file "%%BIND_DESTETC%%/master/localhost-forward.db"; };
-zone "127.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/localhost-reverse.db"; };
-zone "255.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "localhost"	{ type master; file "%%ETCDIR%%/master/localhost-forward.db"; };
+zone "127.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/localhost-reverse.db"; };
+zone "255.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // RFC 1912-style zone for IPv6 localhost address (RFC 6303)
-zone "0.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/localhost-reverse.db"; };
+zone "0.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/localhost-reverse.db"; };
 
 // "This" Network (RFCs 1912, 5735 and 6303)
-zone "0.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "0.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // Private Use Networks (RFCs 1918, 5735 and 6303)
-zone "10.in-addr.arpa"	   { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "16.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "17.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "18.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "19.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "20.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "21.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "22.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "23.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "24.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "25.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "26.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "27.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "28.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "29.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "30.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "31.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "168.192.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "10.in-addr.arpa"	   { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "16.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "17.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "18.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "19.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "20.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "21.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "22.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "23.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "24.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "25.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "26.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "27.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "28.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "29.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "30.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "31.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "168.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // Shared Address Space (RFC 6598)
-zone "64.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "65.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "66.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "67.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "68.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "69.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "70.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "71.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "72.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "73.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "74.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "75.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "76.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "77.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "78.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "79.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "80.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "81.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "82.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "83.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "84.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "85.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "86.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "87.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "88.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "89.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "90.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "91.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "92.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "93.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "94.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "95.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "96.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "97.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "98.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "99.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "100.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "101.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "102.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "103.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "104.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "105.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "106.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "107.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "108.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "109.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "110.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "111.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "112.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "113.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "114.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "115.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "116.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "117.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "118.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "119.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "120.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "121.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "122.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "123.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "124.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "125.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "126.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "127.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "64.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "65.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "66.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "67.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "68.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "69.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "70.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "71.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "72.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "73.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "74.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "75.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "76.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "77.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "78.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "79.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "80.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "81.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "82.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "83.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "84.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "85.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "86.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "87.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "88.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "89.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "90.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "91.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "92.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "93.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "94.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "95.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "96.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "97.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "98.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "99.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "100.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "101.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "102.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "103.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "104.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "105.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "106.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "107.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "108.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "109.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "110.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "111.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "112.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "113.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "114.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "115.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "116.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "117.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "118.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "119.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "120.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "121.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "122.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "123.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "124.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "125.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "126.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "127.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // Link-local/APIPA (RFCs 3927, 5735 and 6303)
-zone "254.169.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "254.169.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // IETF protocol assignments (RFCs 5735 and 5736)
-zone "0.0.192.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "0.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // TEST-NET-[1-3] for Documentation (RFCs 5735, 5737 and 6303)
-zone "2.0.192.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "100.51.198.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "113.0.203.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "2.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "100.51.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "113.0.203.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // IPv6 Example Range for Documentation (RFCs 3849 and 6303)
-zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // Domain Names for Documentation and Testing (BCP 32)
-zone "test" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "example" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "invalid" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "example.com" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "example.net" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "example.org" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "test" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "example" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "invalid" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "example.com" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "example.net" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "example.org" { type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // Router Benchmark Testing (RFCs 2544 and 5735)
-zone "18.198.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "19.198.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "18.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "19.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // IANA Reserved - Old Class E Space (RFC 5735)
-zone "240.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "241.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "242.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "243.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "244.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "245.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "246.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "247.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "248.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "249.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "250.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "251.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "252.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "253.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "254.in-addr.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "240.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "241.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "242.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "243.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "244.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "245.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "246.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "247.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "248.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "249.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "250.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "251.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "252.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "253.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "254.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // IPv6 Unassigned Addresses (RFC 4291)
-zone "1.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "3.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "4.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "5.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "6.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "7.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "8.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "9.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "a.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "b.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "c.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "d.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "e.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "0.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "1.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "2.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "3.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "4.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "5.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "6.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "7.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "8.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "9.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "a.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "b.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "0.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "1.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "2.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "3.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "4.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "5.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "6.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "7.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "1.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "3.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "4.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "5.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "6.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "7.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "8.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "9.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "a.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "b.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "c.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "d.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "e.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "0.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "1.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "2.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "3.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "4.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "5.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "6.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "7.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "8.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "9.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "a.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "b.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "0.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "1.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "2.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "3.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "4.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "5.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "6.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "7.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // IPv6 ULA (RFCs 4193 and 6303)
-zone "c.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "d.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "c.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "d.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // IPv6 Link Local (RFCs 4291 and 6303)
-zone "8.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "9.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "a.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "b.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "8.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "9.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "a.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "b.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // IPv6 Deprecated Site-Local Addresses (RFCs 3879 and 6303)
-zone "c.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "d.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "e.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
-zone "f.e.f.ip6.arpa"	{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "c.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "d.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "e.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "f.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // IP6.INT is Deprecated (RFC 4159)
-zone "ip6.int"		{ type master; file "%%BIND_DESTETC%%/master/empty.db"; };
+zone "ip6.int"		{ type master; file "%%ETCDIR%%/master/empty.db"; };
 
 // NB: Do not use the IP addresses below, they are faked, and only
 // serve demonstration/documentation purposes!
diff --git a/dns/bind910/files/named.in b/dns/bind910/files/named.in
index 3207d3005f42..acaa4144524b 100644
--- a/dns/bind910/files/named.in
+++ b/dns/bind910/files/named.in
@@ -24,7 +24,7 @@ stop_cmd=named_stop
 
 named_enable=${named_enable:-"NO"}		# Run named, the DNS server (or NO).
 named_program=${named_program:-"%%PREFIX%%/sbin/named"}	# Path to named, if you want a different one.
-named_conf=${named_conf:-"%%BIND_DESTETC%%/named.conf"}	# Path to the configuration file
+named_conf=${named_conf:-"%%ETCDIR%%/named.conf"}	# Path to the configuration file
 named_flags=${named_flags:-""}			# Use this for flags OTHER than -u and -c
 named_uid=${named_uid:-"bind"}			# User to run named as
 named_wait=${named_wait:-"NO"}			# Wait for working name service before exiting
diff --git a/dns/bind910/files/patch-bin__dnssec__Makefile.in b/dns/bind910/files/patch-bin__dnssec__Makefile.in
deleted file mode 100644
index c7fc9367ad67..000000000000
--- a/dns/bind910/files/patch-bin__dnssec__Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./bin/dnssec/Makefile.in.orig	2014-04-08 00:02:19.000000000 +0200
-+++ ./bin/dnssec/Makefile.in	2014-04-10 15:49:49.000000000 +0200
-@@ -56,12 +56,12 @@
- 
- MANPAGES =	dnssec-dsfromkey.8 dnssec-keyfromlabel.8 dnssec-keygen.8 \
- 		dnssec-revoke.8 dnssec-settime.8 dnssec-signzone.8 \
--		dnssec-verify.8
-+		dnssec-verify.8 dnssec-importkey.8
- 
- HTMLPAGES =	dnssec-dsfromkey.html dnssec-keyfromlabel.html \
- 		dnssec-keygen.html dnssec-revoke.html \
- 		dnssec-settime.html dnssec-signzone.html \
--		dnssec-verify.html
-+		dnssec-verify.html dnssec-importkey.html
- 
- MANOBJS =	${MANPAGES} ${HTMLPAGES}
- 
diff --git a/dns/bind910/files/patch-lib__dns__include__dns__Makefile.in b/dns/bind910/files/patch-lib__dns__include__dns__Makefile.in
deleted file mode 100644
index 5c4f545d14f4..000000000000
--- a/dns/bind910/files/patch-lib__dns__include__dns__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/dns/include/dns/Makefile.in.orig	2014-04-08 00:02:19.000000000 +0200
-+++ ./lib/dns/include/dns/Makefile.in	2014-04-10 15:49:49.000000000 +0200
-@@ -28,7 +28,7 @@
- 		ecdb.h events.h fixedname.h forward.h geoip.h iptable.h \
- 		journal.h keydata.h keyflags.h keytable.h keyvalues.h \
- 		lib.h lookup.h log.h master.h masterdump.h message.h \
--		name.h nsec3.h ncache.h nsec.h opcode.h \
-+		name.h ncache.h nsec.h nsec3.h opcode.h order.h \
- 		peer.h portlist.h private.h \
- 		rbt.h rcode.h rdata.h rdataclass.h rdatalist.h \
- 		rdataset.h rdatasetiter.h rdataslab.h rdatatype.h request.h \
diff --git a/dns/bind910/files/patch-lib__isc__include__isc__Makefile.in b/dns/bind910/files/patch-lib__isc__include__isc__Makefile.in
deleted file mode 100644
index 27f7e0a9af56..000000000000
--- a/dns/bind910/files/patch-lib__isc__include__isc__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/isc/include/isc/Makefile.in.orig	2014-04-08 00:02:19.000000000 +0200
-+++ ./lib/isc/include/isc/Makefile.in	2014-04-10 15:49:49.000000000 +0200
-@@ -32,7 +32,7 @@
- 		eventclass.h file.h formatcheck.h fsaccess.h \
- 		hash.h heap.h hex.h hmacmd5.h hmacsha.h httpd.h \
- 		interfaceiter.h @ISC_IPV6_H@ iterated_hash.h json.h \
--		keyboard.h lang.h lex.h lfsr.h lib.h list.h log.h \
-+		lang.h lex.h lfsr.h lib.h list.h log.h \
- 		magic.h md5.h mem.h msgcat.h msgs.h mutexblock.h \
- 		netaddr.h netscope.h ondestroy.h os.h parseint.h \
- 		pool.h portset.h print.h queue.h quota.h \
diff --git a/dns/bind910/files/patch-lib__isc__unix__include__isc__Makefile.in b/dns/bind910/files/patch-lib__isc__unix__include__isc__Makefile.in
deleted file mode 100644
index 31ae1a8aeb84..000000000000
--- a/dns/bind910/files/patch-lib__isc__unix__include__isc__Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./lib/isc/unix/include/isc/Makefile.in.orig	2014-04-08 00:02:19.000000000 +0200
-+++ ./lib/isc/unix/include/isc/Makefile.in	2014-04-10 15:49:49.000000000 +0200
-@@ -21,8 +21,8 @@
- 
- @BIND9_VERSION@
- 
--HEADERS =	dir.h int.h net.h netdb.h offset.h stat.h stdtime.h \
--		strerror.h syslog.h time.h
-+HEADERS =	dir.h int.h keyboard.h net.h netdb.h offset.h stat.h \
-+		stdtime.h strerror.h syslog.h time.h
- 
- SUBDIRS =
- TARGETS =
diff --git a/dns/bind910/files/pkg-message.in b/dns/bind910/files/pkg-message.in
new file mode 100644
index 000000000000..d428cb4738cf
--- /dev/null
+++ b/dns/bind910/files/pkg-message.in
@@ -0,0 +1,16 @@
+**********************************************************************
+*            _  _____ _____ _____ _   _ _____ ___ ___  _   _         *
+*           / \|_   _|_   _| ____| \ | |_   _|_ _/ _ \| \ | |        *
+*          / _ \ | |   | | |  _| |  \| | | |  | | | | |  \| |        *
+*         / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |        *
+*        /_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|        *
+*                                                                    *
+*   BIND requires configuration of rndc, including a "secret" key.   *
+*    The easiest, and most secure way to configure rndc is to run    *
+*   'rndc-confgen -a' to generate the proper conf file, with a new   *
+*            random key, and appropriate file permissions.           *
+*                                                                    *
+%%BASE%%*    The /etc/rc.d/named script in the base will do that for you.    *
+%%NOBASE%%*     The %%PREFIX%%/etc/rc.d/named script will do that for you.     *
+*                                                                    *
+**********************************************************************
diff --git a/dns/bind910/pkg-message b/dns/bind910/pkg-message
deleted file mode 100644
index bb713abdd1d3..000000000000
--- a/dns/bind910/pkg-message
+++ /dev/null
@@ -1,18 +0,0 @@
-*************************************************************************
-*           _  _____ _____ _____ _   _ _____ ___ ___  _   _ 		*
-*	   / \|_   _|_   _| ____| \ | |_   _|_ _/ _ \| \ | |		*
-*	  / _ \ | |   | | |  _| |  \| | | |  | | | | |  \| |		*
-*	 / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |		*
-*	/_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|		*
-*									*
-*	If you are running BIND 9 in a chroot environment, make		*
-*	sure that there is a /dev/random device	in the chroot.		*
-*									*
-*	BIND 9 also requires configuration of rndc, including a		*
-*	"secret" key.  The easiest, and most secure way to configure	*
-*	rndc is to run 'rndc-confgen -a' to generate the proper	conf	*
-*	file, with a new random key, and appropriate file permissions.	*
-*									*
-*	The /etc/rc.d/named script in the base will do both for you.    *
-*									*
-*************************************************************************
diff --git a/dns/bind910/pkg-plist b/dns/bind910/pkg-plist
index 00f92bfa90c4..3c842606393b 100644
--- a/dns/bind910/pkg-plist
+++ b/dns/bind910/pkg-plist
@@ -1,5 +1,5 @@
 bin/bind9-config
-bin/delve
+bin/delv
 bin/dig
 bin/host
 bin/isc-config.sh
@@ -254,127 +254,127 @@ lib/libisc.a
 lib/libisccc.a
 lib/libisccfg.a
 lib/liblwres.a
-%%SHARE_MAN%%man/man1/arpaname.1.gz
-%%SHARE_MAN%%man/man1/bind9-config.1.gz
-%%SHARE_MAN%%man/man1/delve.1.gz
-%%SHARE_MAN%%man/man1/dig.1.gz
-%%SHARE_MAN%%man/man1/host.1.gz
-%%SHARE_MAN%%man/man1/isc-config.sh.1.gz
-%%SHARE_MAN%%man/man1/named-rrchecker.1.gz
-%%SHARE_MAN%%man/man1/nslookup.1.gz
-%%SHARE_MAN%%man/man1/nsupdate.1.gz
-%%SHARE_MAN%%man/man3/lwres.3.gz
-%%SHARE_MAN%%man/man3/lwres_addr_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_add.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_back.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_clear.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_first.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_forward.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_getmem.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_getuint16.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_getuint32.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_getuint8.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_init.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_invalidate.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_putmem.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_putuint16.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_putuint32.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_putuint8.3.gz
-%%SHARE_MAN%%man/man3/lwres_buffer_subtract.3.gz
-%%SHARE_MAN%%man/man3/lwres_conf_clear.3.gz
-%%SHARE_MAN%%man/man3/lwres_conf_get.3.gz
-%%SHARE_MAN%%man/man3/lwres_conf_init.3.gz
-%%SHARE_MAN%%man/man3/lwres_conf_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_conf_print.3.gz
-%%SHARE_MAN%%man/man3/lwres_config.3.gz
-%%SHARE_MAN%%man/man3/lwres_context.3.gz
-%%SHARE_MAN%%man/man3/lwres_context_allocmem.3.gz
-%%SHARE_MAN%%man/man3/lwres_context_create.3.gz
-%%SHARE_MAN%%man/man3/lwres_context_destroy.3.gz
-%%SHARE_MAN%%man/man3/lwres_context_freemem.3.gz
-%%SHARE_MAN%%man/man3/lwres_context_initserial.3.gz
-%%SHARE_MAN%%man/man3/lwres_context_nextserial.3.gz
-%%SHARE_MAN%%man/man3/lwres_context_sendrecv.3.gz
-%%SHARE_MAN%%man/man3/lwres_endhostent.3.gz
-%%SHARE_MAN%%man/man3/lwres_endhostent_r.3.gz
-%%SHARE_MAN%%man/man3/lwres_freeaddrinfo.3.gz
-%%SHARE_MAN%%man/man3/lwres_freehostent.3.gz
-%%SHARE_MAN%%man/man3/lwres_gabn.3.gz
-%%SHARE_MAN%%man/man3/lwres_gabnrequest_free.3.gz
-%%SHARE_MAN%%man/man3/lwres_gabnrequest_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_gabnrequest_render.3.gz
-%%SHARE_MAN%%man/man3/lwres_gabnresponse_free.3.gz
-%%SHARE_MAN%%man/man3/lwres_gabnresponse_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_gabnresponse_render.3.gz
-%%SHARE_MAN%%man/man3/lwres_gai_strerror.3.gz
-%%SHARE_MAN%%man/man3/lwres_getaddrinfo.3.gz
-%%SHARE_MAN%%man/man3/lwres_getaddrsbyname.3.gz
-%%SHARE_MAN%%man/man3/lwres_gethostbyaddr.3.gz
-%%SHARE_MAN%%man/man3/lwres_gethostbyaddr_r.3.gz
-%%SHARE_MAN%%man/man3/lwres_gethostbyname.3.gz
-%%SHARE_MAN%%man/man3/lwres_gethostbyname2.3.gz
-%%SHARE_MAN%%man/man3/lwres_gethostbyname_r.3.gz
-%%SHARE_MAN%%man/man3/lwres_gethostent.3.gz
-%%SHARE_MAN%%man/man3/lwres_gethostent_r.3.gz
-%%SHARE_MAN%%man/man3/lwres_getipnode.3.gz
-%%SHARE_MAN%%man/man3/lwres_getipnodebyaddr.3.gz
-%%SHARE_MAN%%man/man3/lwres_getipnodebyname.3.gz
-%%SHARE_MAN%%man/man3/lwres_getnamebyaddr.3.gz
-%%SHARE_MAN%%man/man3/lwres_getnameinfo.3.gz
-%%SHARE_MAN%%man/man3/lwres_getrrsetbyname.3.gz
-%%SHARE_MAN%%man/man3/lwres_gnba.3.gz
-%%SHARE_MAN%%man/man3/lwres_gnbarequest_free.3.gz
-%%SHARE_MAN%%man/man3/lwres_gnbarequest_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_gnbarequest_render.3.gz
-%%SHARE_MAN%%man/man3/lwres_gnbaresponse_free.3.gz
-%%SHARE_MAN%%man/man3/lwres_gnbaresponse_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_gnbaresponse_render.3.gz
-%%SHARE_MAN%%man/man3/lwres_herror.3.gz
-%%SHARE_MAN%%man/man3/lwres_hstrerror.3.gz
-%%SHARE_MAN%%man/man3/lwres_inetntop.3.gz
-%%SHARE_MAN%%man/man3/lwres_lwpacket_parseheader.3.gz
-%%SHARE_MAN%%man/man3/lwres_lwpacket_renderheader.3.gz
-%%SHARE_MAN%%man/man3/lwres_net_ntop.3.gz
-%%SHARE_MAN%%man/man3/lwres_noop.3.gz
-%%SHARE_MAN%%man/man3/lwres_nooprequest_free.3.gz
-%%SHARE_MAN%%man/man3/lwres_nooprequest_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_nooprequest_render.3.gz
-%%SHARE_MAN%%man/man3/lwres_noopresponse_free.3.gz
-%%SHARE_MAN%%man/man3/lwres_noopresponse_parse.3.gz
-%%SHARE_MAN%%man/man3/lwres_noopresponse_render.3.gz
-%%SHARE_MAN%%man/man3/lwres_packet.3.gz
-%%SHARE_MAN%%man/man3/lwres_resutil.3.gz
-%%SHARE_MAN%%man/man3/lwres_sethostent.3.gz
-%%SHARE_MAN%%man/man3/lwres_sethostent_r.3.gz
-%%SHARE_MAN%%man/man3/lwres_string_parse.3.gz
-%%SHARE_MAN%%man/man5/named.conf.5.gz
-%%SHARE_MAN%%man/man5/rndc.conf.5.gz
-%%SHARE_MAN%%man/man8/ddns-confgen.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
-%%SHARE_MAN%%man/man8/dnssec-keygen.8.gz
-%%SHARE_MAN%%man/man8/dnssec-revoke.8.gz
-%%SHARE_MAN%%man/man8/dnssec-settime.8.gz
-%%SHARE_MAN%%man/man8/dnssec-signzone.8.gz
-%%SHARE_MAN%%man/man8/dnssec-verify.8.gz
-%%SHARE_MAN%%man/man8/genrandom.8.gz
-%%SHARE_MAN%%man/man8/isc-hmac-fixup.8.gz
-%%SHARE_MAN%%man/man8/lwresd.8.gz
-%%SHARE_MAN%%man/man8/named-checkconf.8.gz
-%%SHARE_MAN%%man/man8/named-checkzone.8.gz
-%%SHARE_MAN%%man/man8/named-compilezone.8.gz
-%%SHARE_MAN%%man/man8/named-journalprint.8.gz
-%%SHARE_MAN%%man/man8/named.8.gz
-%%SHARE_MAN%%man/man8/nsec3hash.8.gz
-%%SHARE_MAN%%man/man8/tsig-keygen.8.gz
-%%NATIVE_PKCS11%%%%SHARE_MAN%%man/man8/pkcs11-destroy.8.gz
-%%NATIVE_PKCS11%%%%SHARE_MAN%%man/man8/pkcs11-keygen.8.gz
-%%NATIVE_PKCS11%%%%SHARE_MAN%%man/man8/pkcs11-list.8.gz
-%%NATIVE_PKCS11%%%%SHARE_MAN%%man/man8/pkcs11-tokens.8.gz
-%%SHARE_MAN%%man/man8/rndc-confgen.8.gz
-%%SHARE_MAN%%man/man8/rndc.8.gz
+man/man1/arpaname.1.gz
+man/man1/bind9-config.1.gz
+man/man1/delv.1.gz
+man/man1/dig.1.gz
+man/man1/host.1.gz
+man/man1/isc-config.sh.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
+man/man3/lwres_buffer_add.3.gz
+man/man3/lwres_buffer_back.3.gz
+man/man3/lwres_buffer_clear.3.gz
+man/man3/lwres_buffer_first.3.gz
+man/man3/lwres_buffer_forward.3.gz
+man/man3/lwres_buffer_getmem.3.gz
+man/man3/lwres_buffer_getuint16.3.gz
+man/man3/lwres_buffer_getuint32.3.gz
+man/man3/lwres_buffer_getuint8.3.gz
+man/man3/lwres_buffer_init.3.gz
+man/man3/lwres_buffer_invalidate.3.gz
+man/man3/lwres_buffer_putmem.3.gz
+man/man3/lwres_buffer_putuint16.3.gz
+man/man3/lwres_buffer_putuint32.3.gz
+man/man3/lwres_buffer_putuint8.3.gz
+man/man3/lwres_buffer_subtract.3.gz
+man/man3/lwres_conf_clear.3.gz
+man/man3/lwres_conf_get.3.gz
+man/man3/lwres_conf_init.3.gz
+man/man3/lwres_conf_parse.3.gz
+man/man3/lwres_conf_print.3.gz
+man/man3/lwres_config.3.gz
+man/man3/lwres_context.3.gz
+man/man3/lwres_context_allocmem.3.gz
+man/man3/lwres_context_create.3.gz
+man/man3/lwres_context_destroy.3.gz
+man/man3/lwres_context_freemem.3.gz
+man/man3/lwres_context_initserial.3.gz
+man/man3/lwres_context_nextserial.3.gz
+man/man3/lwres_context_sendrecv.3.gz
+man/man3/lwres_endhostent.3.gz
+man/man3/lwres_endhostent_r.3.gz
+man/man3/lwres_freeaddrinfo.3.gz
+man/man3/lwres_freehostent.3.gz
+man/man3/lwres_gabn.3.gz
+man/man3/lwres_gabnrequest_free.3.gz
+man/man3/lwres_gabnrequest_parse.3.gz
+man/man3/lwres_gabnrequest_render.3.gz
+man/man3/lwres_gabnresponse_free.3.gz
+man/man3/lwres_gabnresponse_parse.3.gz
+man/man3/lwres_gabnresponse_render.3.gz
+man/man3/lwres_gai_strerror.3.gz
+man/man3/lwres_getaddrinfo.3.gz
+man/man3/lwres_getaddrsbyname.3.gz
+man/man3/lwres_gethostbyaddr.3.gz
+man/man3/lwres_gethostbyaddr_r.3.gz
+man/man3/lwres_gethostbyname.3.gz
+man/man3/lwres_gethostbyname2.3.gz
+man/man3/lwres_gethostbyname_r.3.gz
+man/man3/lwres_gethostent.3.gz
+man/man3/lwres_gethostent_r.3.gz
+man/man3/lwres_getipnode.3.gz
+man/man3/lwres_getipnodebyaddr.3.gz
+man/man3/lwres_getipnodebyname.3.gz
+man/man3/lwres_getnamebyaddr.3.gz
+man/man3/lwres_getnameinfo.3.gz
+man/man3/lwres_getrrsetbyname.3.gz
+man/man3/lwres_gnba.3.gz
+man/man3/lwres_gnbarequest_free.3.gz
+man/man3/lwres_gnbarequest_parse.3.gz
+man/man3/lwres_gnbarequest_render.3.gz
+man/man3/lwres_gnbaresponse_free.3.gz
+man/man3/lwres_gnbaresponse_parse.3.gz
+man/man3/lwres_gnbaresponse_render.3.gz
+man/man3/lwres_herror.3.gz
+man/man3/lwres_hstrerror.3.gz
+man/man3/lwres_inetntop.3.gz
+man/man3/lwres_lwpacket_parseheader.3.gz
+man/man3/lwres_lwpacket_renderheader.3.gz
+man/man3/lwres_net_ntop.3.gz
+man/man3/lwres_noop.3.gz
+man/man3/lwres_nooprequest_free.3.gz
+man/man3/lwres_nooprequest_parse.3.gz
+man/man3/lwres_nooprequest_render.3.gz
+man/man3/lwres_noopresponse_free.3.gz
+man/man3/lwres_noopresponse_parse.3.gz
+man/man3/lwres_noopresponse_render.3.gz
+man/man3/lwres_packet.3.gz
+man/man3/lwres_resutil.3.gz
+man/man3/lwres_sethostent.3.gz
+man/man3/lwres_sethostent_r.3.gz
+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
+man/man8/dnssec-dsfromkey.8.gz
+man/man8/dnssec-importkey.8.gz
+man/man8/dnssec-keyfromlabel.8.gz
+man/man8/dnssec-keygen.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
+man/man8/named.8.gz
+man/man8/nsec3hash.8.gz
+man/man8/tsig-keygen.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
+%%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz
+man/man8/rndc-confgen.8.gz
+man/man8/rndc.8.gz
 sbin/arpaname
 sbin/ddns-confgen
 sbin/dnssec-dsfromkey
@@ -402,8 +402,7 @@ sbin/nsec3hash
 sbin/rndc
 sbin/rndc-confgen
 sbin/tsig-keygen
-%%BASE%%@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
-%%NOBASE%%@sample %%ETCDIR%%/rndc.conf.sample
+@sample %%ETCDIR%%/rndc.conf.sample
 %%NOBASE%%@sample %%ETCDIR%%/named.conf.sample
 %%NOBASE%%%%ETCDIR%%/named.root
 %%NOBASE%%%%ETCDIR%%/master/empty.db