Update to version 9.6-ESV-R6, the latest from ISC, which contains numerous bug fixes.

For the port, switch to using the PORTDOCS macro.
Also, switch to the (identical) pkg-message in ../bind97 which was apparently missed
when the other ports were converted.

Feature safe:   yes

4 files changed, 10 insertions, 78 deletions

diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile
index 96c2f545294a..c9c633c4553b 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=	bind96
-PORTVERSION=	9.6.3.1.ESV.R5.1
+PORTVERSION=	9.6.3.1.ESV.R6
 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.6-ESV-R5-P1
+ISCVERSION=	9.6-ESV-R6
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -200,21 +200,19 @@ post-patch:
 		${WRKSRC}/bin/${FILE}.Dist > ${WRKSRC}/bin/${FILE}
 .endfor
 
+PORTDOCS=	*
+PKGMESSAGE=	${.CURDIR}/../bind97/pkg-message
 PKGINSTALL=	${.CURDIR}/../bind97/pkg-install
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
 		${BIND_DESTETC}/rndc.conf.sample
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}/arm ${DOCSDIR}/misc
-	${INSTALL_DATA} ${WRKSRC}/RELEASE-NOTES-BIND-9.6-ESV.* ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/release-notes.css ${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DOCSDIR}/arm
 	${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}/NSEC3-NOTES ${WRKSRC}/README ${WRKSRC}/README.idnkit \
-	    ${WRKSRC}/README.pkcs11 \
-	    ${DOCSDIR}/
+	    ${WRKSRC}/NSEC3-NOTES ${WRKSRC}/README* ${DOCSDIR}/
 .endif
 .if !defined(WITHOUT_LINKS) && !defined(WITH_REPLACE_BASE)
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/dns/bind96/distinfo b/dns/bind96/distinfo
index 983c88e21fe9..a653504862d7 100644
--- a/dns/bind96/distinfo
+++ b/dns/bind96/distinfo
@@ -1,4 +1,4 @@
-SHA256 (bind-9.6-ESV-R5-P1.tar.gz) = 80e1ee926a49c2a787b4eb7c7516fbbe9fdac1f07f20c18fccfa6ce59196a6bc
-SIZE (bind-9.6-ESV-R5-P1.tar.gz) = 7886317
-SHA256 (bind-9.6-ESV-R5-P1.tar.gz.asc) = c1aca9de7814e688c295123b9141a6aa966524deb1be29fd154620850f0031df
-SIZE (bind-9.6-ESV-R5-P1.tar.gz.asc) = 481
+SHA256 (bind-9.6-ESV-R6.tar.gz) = c6b9a7559d562995468e433eda05161778db973b1ee25ec8e4ee213d6b74e492
+SIZE (bind-9.6-ESV-R6.tar.gz) = 6288288
+SHA256 (bind-9.6-ESV-R6.tar.gz.asc) = 9059f238e2f10338dea2c10bbf8a88db48a965590741b873247cfa37e37ee705
+SIZE (bind-9.6-ESV-R6.tar.gz.asc) = 481
diff --git a/dns/bind96/pkg-message b/dns/bind96/pkg-message
deleted file mode 100644
index bb713abdd1d3..000000000000
--- a/dns/bind96/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/bind96/pkg-plist b/dns/bind96/pkg-plist
index 16c494bc26af..7d47ffc1d772 100644
--- a/dns/bind96/pkg-plist
+++ b/dns/bind96/pkg-plist
@@ -101,6 +101,7 @@ include/isc/hash.h
 include/isc/heap.h
 include/isc/hex.h
 include/isc/hmacmd5.h
+include/isc/hmacsha.h
 include/isc/httpd.h
 include/isc/int.h
 include/isc/interfaceiter.h
@@ -207,55 +208,6 @@ sbin/named-checkzone
 sbin/named-compilezone
 sbin/rndc
 sbin/rndc-confgen
-%%PORTDOCS%%%%DOCSDIR%%/Bv9ARM.pdf
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/NSEC3-NOTES
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.idnkit
-%%PORTDOCS%%%%DOCSDIR%%/README.pkcs11
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE-NOTES-BIND-9.6-ESV.html
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE-NOTES-BIND-9.6-ESV.pdf
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE-NOTES-BIND-9.6-ESV.txt
-%%PORTDOCS%%%%DOCSDIR%%/release-notes.css
-%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch01.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch02.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch03.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch04.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch05.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch06.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch07.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch08.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch09.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch10.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.dig.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.dnssec-dsfromkey.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.dnssec-keyfromlabel.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.dnssec-keygen.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.dnssec-signzone.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.host.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.named-checkconf.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.named-checkzone.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.named.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.nsupdate.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.rndc-confgen.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.rndc.conf.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.rndc.html
-%%PORTDOCS%%%%DOCSDIR%%/misc/dnssec
-%%PORTDOCS%%%%DOCSDIR%%/misc/format-options.pl
-%%PORTDOCS%%%%DOCSDIR%%/misc/ipv6
-%%PORTDOCS%%%%DOCSDIR%%/misc/migration
-%%PORTDOCS%%%%DOCSDIR%%/misc/migration-4to9
-%%PORTDOCS%%%%DOCSDIR%%/misc/options
-%%PORTDOCS%%%%DOCSDIR%%/misc/rfc-compliance
-%%PORTDOCS%%%%DOCSDIR%%/misc/roadmap
-%%PORTDOCS%%%%DOCSDIR%%/misc/sdb
-%%PORTDOCS%%%%DOCSDIR%%/misc/sort-options.pl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/arm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/misc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%LINKS%%@unexec rm -f /var/named/%D/etc/named.conf
 %%LINKS%%@unexec rm -f /var/named/%D/etc/rndc.key
 %%LINKS%%@unexec rm -rf /var/named/%D