Upgrade to version 9.3.6.

Add a note to pkg-message indicating that ISC declared this version EOL
as of 1 December, but that we will support the port through the RELENG_6
lifetime.

3 files changed, 22 insertions, 15 deletions

diff --git a/dns/bind9/Makefile b/dns/bind9/Makefile
index 999c2aa2ffc0..b155c2e9085d 100644
--- a/dns/bind9/Makefile
+++ b/dns/bind9/Makefile
@@ -12,7 +12,7 @@
 # release you can generally build it cleanly from the source - Doug
 
 PORTNAME=	bind9
-PORTVERSION=	9.3.5.2
+PORTVERSION=	9.3.6
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		http://dougbarton.us/Downloads/%SUBDIR%/
@@ -25,7 +25,7 @@ MAINTAINER=	DougB@FreeBSD.org
 COMMENT=	Completely new version of the BIND DNS suite with updated DNSSEC
 
 # ISC releases things like 9.3.0rc1, which our versioning doesn't like
-ISCVERSION=	9.3.5-P2
+ISCVERSION=	9.3.6
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
@@ -66,7 +66,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 \
@@ -102,24 +102,24 @@ 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
 
 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' \
 		-e 's#/etc/rndc.conf#${BIND_DESTETC}/rndc.conf#g' \
 		${WRKSRC}/bin/${FILE}.Dist > ${WRKSRC}/bin/${FILE}
 .endfor
-	@${MV} ${WRKSRC}/bin/nsupdate/nsupdate.8 \
-	    ${WRKSRC}/bin/nsupdate/nsupdate.8.patched
+	@${MV} ${WRKSRC}/bin/nsupdate/nsupdate.1 \
+	    ${WRKSRC}/bin/nsupdate/nsupdate.1.patched
 	@${SED} -e "s@^\.HP [0-9]* @@" \
-	    ${WRKSRC}/bin/nsupdate/nsupdate.8.patched \
-	    > ${WRKSRC}/bin/nsupdate/nsupdate.8
+	    ${WRKSRC}/bin/nsupdate/nsupdate.1.patched \
+	    > ${WRKSRC}/bin/nsupdate/nsupdate.1
 	@${MV} ${WRKSRC}/bin/dig/nslookup.1 ${WRKSRC}/bin/dig/nslookup.1.Dist
 	@${SED} -e "s@^host \[server\]@\\\fBhost\\\fR \\\fI[server]\\\fR@" \
 	    ${WRKSRC}/bin/dig/nslookup.1.Dist > ${WRKSRC}/bin/dig/nslookup.1
diff --git a/dns/bind9/distinfo b/dns/bind9/distinfo
index 293de83c0a26..4baac53a7423 100644
--- a/dns/bind9/distinfo
+++ b/dns/bind9/distinfo
@@ -1,6 +1,6 @@
-MD5 (bind-9.3.5-P2.tar.gz) = cc84e5a34527d86cf59be1975fa8bf74
-SHA256 (bind-9.3.5-P2.tar.gz) = afb644b82fa981f8e8269af71a72493ea1bb472d70a2359bcfe8e24542d3ecb6
-SIZE (bind-9.3.5-P2.tar.gz) = 5631701
-MD5 (bind-9.3.5-P2.tar.gz.asc) = 90ed2fe99bd78ffe28dc0ddb0107e577
-SHA256 (bind-9.3.5-P2.tar.gz.asc) = 54fc2834563bc8c6754807561496bfbfab68857b6b0337b7717be981501be7b4
-SIZE (bind-9.3.5-P2.tar.gz.asc) = 486
+MD5 (bind-9.3.6.tar.gz) = 58ea86efa5d20ffc282ef2e1690dc484
+SHA256 (bind-9.3.6.tar.gz) = 275f4d19b8af8bbc93eda9d8532c21d32cd30195db82f15f10916c02416f9f03
+SIZE (bind-9.3.6.tar.gz) = 5717096
+MD5 (bind-9.3.6.tar.gz.asc) = 58a2244cf46d3b1b9caeef6e7c59883c
+SHA256 (bind-9.3.6.tar.gz.asc) = 87d0ea9bf6fa4576fbba198805a4d323c255ceddfed059898293ebec98be19de
+SIZE (bind-9.3.6.tar.gz.asc) = 479
diff --git a/dns/bind9/pkg-message b/dns/bind9/pkg-message
index bb713abdd1d3..c65d772d979e 100644
--- a/dns/bind9/pkg-message
+++ b/dns/bind9/pkg-message
@@ -16,3 +16,10 @@
 *	The /etc/rc.d/named script in the base will do both for you.    *
 *									*
 *************************************************************************
+*									*
+*	Please note: BIND 9.3.6 has been classified as "End of Life"	*
+*	as of 1 December 2008 by the ISC.  The port will be supported	*
+*	through the lifetime of the RELENG_6 branch, currently		*
+*	scheduled to be supported through 30 November 2010.		*
+*									*
+*************************************************************************