Update to version 9.7.5, the latest from ISC, which contains numerous bug fixes.

For the port, switch to using the PORTDOCS macro.

Feature safe:   yes

3 files changed, 10 insertions, 64 deletions

diff --git a/dns/bind97/Makefile b/dns/bind97/Makefile
index e1983eda7372..8564ce02832c 100644
--- a/dns/bind97/Makefile
+++ b/dns/bind97/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	bind97
-PORTVERSION=	9.7.4.1
+PORTVERSION=	9.7.5
 PORTREVISION?=	0
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
@@ -20,7 +20,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.7.4-P1
+ISCVERSION=	9.7.5
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -211,18 +211,18 @@ post-patch:
 		${WRKSRC}/bin/named/Makefile.in.Dist > \
 		${WRKSRC}/bin/named/Makefile.in
 
+PORTDOCS=	*
+
 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.7.4.* ${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}/README* ${DOCSDIR}/
+	    ${WRKSRC}/README ${DOCSDIR}/
 .endif
 .if !defined(WITHOUT_LINKS) && !defined(WITH_REPLACE_BASE)
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/dns/bind97/distinfo b/dns/bind97/distinfo
index dc57f0db658e..f9a5649a6e23 100644
--- a/dns/bind97/distinfo
+++ b/dns/bind97/distinfo
@@ -1,4 +1,4 @@
-SHA256 (bind-9.7.4-P1.tar.gz) = e23ca1af22424d512094da2a175d8f9500e8b0b10cbd332714d211ea1abdd55d
-SIZE (bind-9.7.4-P1.tar.gz) = 8317704
-SHA256 (bind-9.7.4-P1.tar.gz.asc) = d8340759f6ef0c74e256b05842bb12d4b163c8e081ed6f227cce947aa15f58cd
-SIZE (bind-9.7.4-P1.tar.gz.asc) = 481
+SHA256 (bind-9.7.5.tar.gz) = f9e9346fcec7ada761386c5976de33c09e02d290d8658ec90f96cee894795955
+SIZE (bind-9.7.5.tar.gz) = 6848848
+SHA256 (bind-9.7.5.tar.gz.asc) = 0f7c6251c6db8c13a5f5f72d7efb42e7672ce807c5d15bdae8d55a48f824fbe9
+SIZE (bind-9.7.5.tar.gz.asc) = 481
diff --git a/dns/bind97/pkg-plist b/dns/bind97/pkg-plist
index 122057f80969..345078f933b7 100644
--- a/dns/bind97/pkg-plist
+++ b/dns/bind97/pkg-plist
@@ -103,6 +103,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
@@ -218,61 +219,6 @@ sbin/named-journalprint
 sbin/nsec3hash
 sbin/rndc
 sbin/rndc-confgen
-%%PORTDOCS%%%%DOCSDIR%%/Bv9ARM.pdf
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.xml
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE-NOTES-BIND-9.7.4.html
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE-NOTES-BIND-9.7.4.pdf
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE-NOTES-BIND-9.7.4.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.arpaname.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.ddns-confgen.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-revoke.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.dnssec-settime.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.dnssec-signzone.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.genrandom.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.host.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.isc-hmac-fixup.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.named-checkconf.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.named-checkzone.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.named-journalprint.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.named.html
-%%PORTDOCS%%%%DOCSDIR%%/arm/man.nsec3hash.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