4 files changed, 31 insertions, 22 deletions

diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile
index 3315e05a5be5..77259f37b141 100644
--- a/dns/bind96/Makefile
+++ b/dns/bind96/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for:	BIND 9.5.x
-# Date created:				2 July 2008
+# New ports collection makefile for:	BIND 9.6.x
+# Date created:				3 January 2009
 # Whom:					dougb
 #
 # $FreeBSD$
@@ -11,8 +11,8 @@
 # version. If you are concerned about using the most recent ISC
 # release you can generally build it cleanly from the source - Doug
 
-PORTNAME=	bind95
-PORTVERSION=	9.5.1
+PORTNAME=	bind96
+PORTVERSION=	9.6.0
 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.1
+ISCVERSION=	9.6.0
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 
 USE_OPENSSL=	yes
 
-CONFLICTS=	bind9-9.[34].* bind9-dlz-* bind9-sdb-ldap-* host-*
+CONFLICTS=	bind9-9.[345].* bind9-dlz-* bind9-sdb-ldap-* host-*
 
 OPTIONS=	XML "Support for xml statistics output" on \
 		IDN "Add IDN support to dig, host, etc." off \
@@ -140,8 +140,9 @@ MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
 	lwres_packet.3 lwres_resutil.3 lwres_sethostent.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 rndc-confgen.8 rndc.8
+MAN8=	dnssec-dsfromkey.8 dnssec-keyfromlabel.8 dnssec-keygen.8 \
+	dnssec-signzone.8 lwresd.8 named-checkconf.8 named-checkzone.8 \
+	named.8 rndc-confgen.8 rndc.8
 MLINKS=	named-checkzone.8 named-compilezone.8
 
 verify:	checksum
@@ -165,7 +166,8 @@ 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}/NSEC3-NOTES ${WRKSRC}/README ${WRKSRC}/README.idnkit \
+	    ${WRKSRC}/README.pkcs11 \
 	    ${DOCSDIR}/
 .endif
 
diff --git a/dns/bind96/distinfo b/dns/bind96/distinfo
index f28094772877..bad825742ce7 100644
--- a/dns/bind96/distinfo
+++ b/dns/bind96/distinfo
@@ -1,6 +1,6 @@
-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
+MD5 (bind-9.6.0.tar.gz) = 287231d759ad83ed51f60f8a9f8176b9
+SHA256 (bind-9.6.0.tar.gz) = 2b13953224a066aa41797bbaace921f622f627184dca0360d662f9418a1acebb
+SIZE (bind-9.6.0.tar.gz) = 6525672
+MD5 (bind-9.6.0.tar.gz.asc) = c4b5eb7959d3d9a50084d47093a41334
+SHA256 (bind-9.6.0.tar.gz.asc) = 451e3dd1ef45b2a5e9c314ea1954facc2209ce110267ad3a11b2c10d0538f1e8
+SIZE (bind-9.6.0.tar.gz.asc) = 479
diff --git a/dns/bind96/pkg-descr b/dns/bind96/pkg-descr
index af6efda7eb13..6eb6aa87fc79 100644
--- a/dns/bind96/pkg-descr
+++ b/dns/bind96/pkg-descr
@@ -10,13 +10,13 @@ Views: One server process can provide multiple "views" of the DNS namespace,
      e.g. an "inside" view to certain clients, and an "outside" view to others.
 Multiprocessor Support, including working threads in this version
 
-BIND 9.5 has a number of new features over previous versions, including:
-GSS-TSIG support (RFC 3645), DHCID support
-Experimental http server and statistics support for named via xml
-More detailed statistics counters, compatible with the ones supported in BIND 8
-Faster ACL processing
-Efficient LRU cache cleaning mechanism.
-NSID support (RFC 5001). 
+BIND 9.6.0 includes a number of changes from BIND 9.5 and earlier releases,
+including:
+	Full NSEC3 support
+	Automatic zone re-signing
+	New update-policy methods tcp-self and 6to4-self
+
+See the CHANGES file for more information on features.
 
 WWW: https://www.isc.org/software/bind
 
diff --git a/dns/bind96/pkg-plist b/dns/bind96/pkg-plist
index 9e61d80fe9b9..5fabec9ba096 100644
--- a/dns/bind96/pkg-plist
+++ b/dns/bind96/pkg-plist
@@ -193,6 +193,8 @@ lib/libisc.a
 lib/libisccc.a
 lib/libisccfg.a
 lib/liblwres.a
+sbin/dnssec-dsfromkey
+sbin/dnssec-keyfromlabel
 sbin/dnssec-keygen
 sbin/dnssec-signzone
 sbin/lwresd
@@ -206,8 +208,10 @@ sbin/rndc-confgen
 %%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%%/arm/Bv9ARM.ch01.html
 %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch02.html
 %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch03.html
@@ -220,12 +224,15 @@ sbin/rndc-confgen
 %%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