Upgrade to version 9.5.1 which includes numerous bug fixes and performance

improvements, including, "Additional support for query port randomization
including performance improvement and port range specification."

When building on amd64 ports' configure doesn't properly recognize our
arch, so help it along a bit. [1]
Submitted by:	ivan jr sy <ivan_jr@yahoo.com> [1]

6 files changed, 38 insertions, 26 deletions

diff --git a/dns/bind95/Makefile b/dns/bind95/Makefile
index b7dc0dd99c1..3315e05a5be 100644
--- a/dns/bind95/Makefile
+++ b/dns/bind95/Makefile
@@ -12,7 +12,7 @@
 # release you can generally build it cleanly from the source - Doug
 
 PORTNAME=	bind95
-PORTVERSION=	9.5.0.2
+PORTVERSION=	9.5.1
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		http://dougbarton.us/Downloads/%SUBDIR%/
@@ -25,7 +25,7 @@ MAINTAINER=	dougb@FreeBSD.org
 COMMENT=	The BIND DNS suite with updated DNSSEC and threads
 
 # ISC releases things like 9.4.0b3, which our versioning doesn't like
-ISCVERSION=	9.5.0-P2
+ISCVERSION=	9.5.1
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
@@ -44,6 +44,10 @@ OPTIONS=	XML "Support for xml statistics output" on \
 
 .include <bsd.port.pre.mk>
 
+.if (${ARCH} == "amd64")
+ARCH=		x86_64
+.endif
+
 # We are ok by default from 7.0-RELEASE on
 .if ${OSVERSION} >= 700055
 OPTIONS+=	THREADS	"Compile with thread support" on
@@ -101,7 +105,7 @@ BIND_DESTETC=	${PREFIX}/etc
 
 PLIST_SUB=	BIND_DESTETC="${BIND_DESTETC}"
 
-MAN1=	dig.1 host.1 nslookup.1
+MAN1=	dig.1 host.1 nslookup.1 nsupdate.1
 MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
 	lwres_buffer_back.3 lwres_buffer_clear.3 lwres_buffer_first.3 \
 	lwres_buffer_forward.3 lwres_buffer_getmem.3 lwres_buffer_getuint16.3 \
@@ -137,14 +141,14 @@ MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
 	lwres_sethostent_r.3 lwres_string_parse.3
 MAN5=	named.conf.5 rndc.conf.5
 MAN8=	dnssec-keygen.8 dnssec-signzone.8 lwresd.8 named-checkconf.8 \
-	named-checkzone.8 named.8 nsupdate.8 rndc-confgen.8 rndc.8
+	named-checkzone.8 named.8 rndc-confgen.8 rndc.8
 MLINKS=	named-checkzone.8 named-compilezone.8
 
 verify:	checksum
 	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc
 
 post-patch:
-.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.8 \
+.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' \
@@ -161,7 +165,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/misc/[a-z]* ${DOCSDIR}/misc
 	${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \
-	${WRKSRC}/README ${WRKSRC}/README.idnkit ${WRKSRC}/KNOWN-DEFECTS \
+	${WRKSRC}/README ${WRKSRC}/README.idnkit \
 	    ${DOCSDIR}/
 .endif
 
diff --git a/dns/bind95/distinfo b/dns/bind95/distinfo
index 0798f39393d..f2809477287 100644
--- a/dns/bind95/distinfo
+++ b/dns/bind95/distinfo
@@ -1,6 +1,6 @@
-MD5 (bind-9.5.0-P2.tar.gz) = 16c893f73a394c8cc36d7900cb9bb801
-SHA256 (bind-9.5.0-P2.tar.gz) = e614450ddaa9ac9ad0138c4da536ea6443e70455f99ef3dcaca8067b5a846a3c
-SIZE (bind-9.5.0-P2.tar.gz) = 6627081
-MD5 (bind-9.5.0-P2.tar.gz.asc) = 5fffa21aa268938f1039ffc2f686bc4c
-SHA256 (bind-9.5.0-P2.tar.gz.asc) = 64cba2475ab3610f29ac933b3400a192d2dc1eba233d0e745b4b612af7e1dfa5
-SIZE (bind-9.5.0-P2.tar.gz.asc) = 486
+MD5 (bind-9.5.1.tar.gz) = 66e577d9729206cd7377d4f9cf6b565c
+SHA256 (bind-9.5.1.tar.gz) = 320441f4297e4c5cea0c6026afb98d5d9a3c2ccfe05e46d68279218f73867d9a
+SIZE (bind-9.5.1.tar.gz) = 6690642
+MD5 (bind-9.5.1.tar.gz.asc) = 64a53b60ad36a3e60d266346b6d576b7
+SHA256 (bind-9.5.1.tar.gz.asc) = 81d95e6070825e40f430df4b1806c07679e8f35f7214e2156b1c34c74fb97b50
+SIZE (bind-9.5.1.tar.gz.asc) = 479
diff --git a/dns/bind95/pkg-plist b/dns/bind95/pkg-plist
index fb5b1606df8..9e61d80fe9b 100644
--- a/dns/bind95/pkg-plist
+++ b/dns/bind95/pkg-plist
@@ -18,6 +18,7 @@ include/dns/dbiterator.h
 include/dns/dbtable.h
 include/dns/diff.h
 include/dns/dispatch.h
+include/dns/dlz.h
 include/dns/dnssec.h
 include/dns/ds.h
 include/dns/enumclass.h
@@ -49,6 +50,7 @@ include/dns/rdatasetiter.h
 include/dns/rdataslab.h
 include/dns/rdatastruct.h
 include/dns/rdatatype.h
+include/dns/sdlz.h
 include/dns/request.h
 include/dns/resolver.h
 include/dns/result.h
@@ -124,6 +126,7 @@ include/isc/parseint.h
 include/isc/platform.h
 include/isc/print.h
 include/isc/quota.h
+include/isc/radix.h
 include/isc/random.h
 include/isc/ratelimiter.h
 include/isc/refcount.h
@@ -203,7 +206,6 @@ sbin/rndc-confgen
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/KNOWN-DEFECTS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.idnkit
 %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch01.html
diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile
index b7dc0dd99c1..3315e05a5be 100644
--- a/dns/bind96/Makefile
+++ b/dns/bind96/Makefile
@@ -12,7 +12,7 @@
 # release you can generally build it cleanly from the source - Doug
 
 PORTNAME=	bind95
-PORTVERSION=	9.5.0.2
+PORTVERSION=	9.5.1
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		http://dougbarton.us/Downloads/%SUBDIR%/
@@ -25,7 +25,7 @@ MAINTAINER=	dougb@FreeBSD.org
 COMMENT=	The BIND DNS suite with updated DNSSEC and threads
 
 # ISC releases things like 9.4.0b3, which our versioning doesn't like
-ISCVERSION=	9.5.0-P2
+ISCVERSION=	9.5.1
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
@@ -44,6 +44,10 @@ OPTIONS=	XML "Support for xml statistics output" on \
 
 .include <bsd.port.pre.mk>
 
+.if (${ARCH} == "amd64")
+ARCH=		x86_64
+.endif
+
 # We are ok by default from 7.0-RELEASE on
 .if ${OSVERSION} >= 700055
 OPTIONS+=	THREADS	"Compile with thread support" on
@@ -101,7 +105,7 @@ BIND_DESTETC=	${PREFIX}/etc
 
 PLIST_SUB=	BIND_DESTETC="${BIND_DESTETC}"
 
-MAN1=	dig.1 host.1 nslookup.1
+MAN1=	dig.1 host.1 nslookup.1 nsupdate.1
 MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
 	lwres_buffer_back.3 lwres_buffer_clear.3 lwres_buffer_first.3 \
 	lwres_buffer_forward.3 lwres_buffer_getmem.3 lwres_buffer_getuint16.3 \
@@ -137,14 +141,14 @@ MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
 	lwres_sethostent_r.3 lwres_string_parse.3
 MAN5=	named.conf.5 rndc.conf.5
 MAN8=	dnssec-keygen.8 dnssec-signzone.8 lwresd.8 named-checkconf.8 \
-	named-checkzone.8 named.8 nsupdate.8 rndc-confgen.8 rndc.8
+	named-checkzone.8 named.8 rndc-confgen.8 rndc.8
 MLINKS=	named-checkzone.8 named-compilezone.8
 
 verify:	checksum
 	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc
 
 post-patch:
-.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.8 \
+.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' \
@@ -161,7 +165,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/misc/[a-z]* ${DOCSDIR}/misc
 	${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \
-	${WRKSRC}/README ${WRKSRC}/README.idnkit ${WRKSRC}/KNOWN-DEFECTS \
+	${WRKSRC}/README ${WRKSRC}/README.idnkit \
 	    ${DOCSDIR}/
 .endif
 
diff --git a/dns/bind96/distinfo b/dns/bind96/distinfo
index 0798f39393d..f2809477287 100644
--- a/dns/bind96/distinfo
+++ b/dns/bind96/distinfo
@@ -1,6 +1,6 @@
-MD5 (bind-9.5.0-P2.tar.gz) = 16c893f73a394c8cc36d7900cb9bb801
-SHA256 (bind-9.5.0-P2.tar.gz) = e614450ddaa9ac9ad0138c4da536ea6443e70455f99ef3dcaca8067b5a846a3c
-SIZE (bind-9.5.0-P2.tar.gz) = 6627081
-MD5 (bind-9.5.0-P2.tar.gz.asc) = 5fffa21aa268938f1039ffc2f686bc4c
-SHA256 (bind-9.5.0-P2.tar.gz.asc) = 64cba2475ab3610f29ac933b3400a192d2dc1eba233d0e745b4b612af7e1dfa5
-SIZE (bind-9.5.0-P2.tar.gz.asc) = 486
+MD5 (bind-9.5.1.tar.gz) = 66e577d9729206cd7377d4f9cf6b565c
+SHA256 (bind-9.5.1.tar.gz) = 320441f4297e4c5cea0c6026afb98d5d9a3c2ccfe05e46d68279218f73867d9a
+SIZE (bind-9.5.1.tar.gz) = 6690642
+MD5 (bind-9.5.1.tar.gz.asc) = 64a53b60ad36a3e60d266346b6d576b7
+SHA256 (bind-9.5.1.tar.gz.asc) = 81d95e6070825e40f430df4b1806c07679e8f35f7214e2156b1c34c74fb97b50
+SIZE (bind-9.5.1.tar.gz.asc) = 479
diff --git a/dns/bind96/pkg-plist b/dns/bind96/pkg-plist
index fb5b1606df8..9e61d80fe9b 100644
--- a/dns/bind96/pkg-plist
+++ b/dns/bind96/pkg-plist
@@ -18,6 +18,7 @@ include/dns/dbiterator.h
 include/dns/dbtable.h
 include/dns/diff.h
 include/dns/dispatch.h
+include/dns/dlz.h
 include/dns/dnssec.h
 include/dns/ds.h
 include/dns/enumclass.h
@@ -49,6 +50,7 @@ include/dns/rdatasetiter.h
 include/dns/rdataslab.h
 include/dns/rdatastruct.h
 include/dns/rdatatype.h
+include/dns/sdlz.h
 include/dns/request.h
 include/dns/resolver.h
 include/dns/result.h
@@ -124,6 +126,7 @@ include/isc/parseint.h
 include/isc/platform.h
 include/isc/print.h
 include/isc/quota.h
+include/isc/radix.h
 include/isc/random.h
 include/isc/ratelimiter.h
 include/isc/refcount.h
@@ -203,7 +206,6 @@ sbin/rndc-confgen
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/KNOWN-DEFECTS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.idnkit
 %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch01.html