Update to BIND 9.3.0, the latest from ISC. This version has several

significant updates, not the least of which is the new and improved
DNSSEC code based on the latest standards (including DS).

Various updates to the port, including:
1. Download the PGP signature
2. If running on ${OSVERSION} >= 503000, configure with threads
3. Update pkg-descr re IPv6 RRs
4. Update pkg-message to reflect a world with 6-current

There is also a patch to correct a man page installation error.
This problem should be fixed in the next release.

Approved by:	portmgr (marcus)

6 files changed, 59 insertions, 27 deletions

diff --git a/dns/bind94/Makefile b/dns/bind94/Makefile
index d797e7ce8f1a..c908e5b242d7 100644
--- a/dns/bind94/Makefile
+++ b/dns/bind94/Makefile
@@ -12,24 +12,34 @@
 # release you can generally build it cleanly from the source - Doug
 
 PORTNAME=	bind9
-PORTVERSION=	9.2.3
+PORTVERSION=	9.3.0
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
 DISTNAME=	bind-${ISCVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	DougB@FreeBSD.org
-COMMENT=	Completely new version of the BIND DNS server
+COMMENT=	Completely new version of the BIND DNS suite with updated DNSSEC
 
-# ISC releases things like 9.2.2rc1, which our versioning doesn't like
-ISCVERSION=	9.2.3
+# ISC releases things like 9.3.0rc1, which our versioning doesn't like
+ISCVERSION=	9.3.0
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps --disable-threads \
-		--with-randomdev=/dev/random --with-openssl
+CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps --with-openssl \
+		--with-randomdev=/dev/random
 
 USE_OPENSSL=	yes
 
+.include <bsd.port.pre.mk>
+
+.if (${OSVERSION} >= 503000)
+CONFIGURE_ARGS+=	--enable-threads
+.else
+CONFIGURE_ARGS+=	--disable-threads
+.endif
+
 .if defined(PORT_REPLACES_BASE_BIND9)
 PKGNAMESUFFIX=	-base
 PREFIX=		/usr
@@ -43,7 +53,7 @@ BIND_DESTETC=	${PREFIX}/etc
 
 PLIST_SUB=	BIND_DESTETC="${BIND_DESTETC}"
 
-MAN1=	dig.1 host.1
+MAN1=	dig.1 host.1 nslookup.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 \
@@ -77,16 +87,15 @@ MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
 	lwres_noopresponse_parse.3 lwres_noopresponse_render.3 \
 	lwres_packet.3 lwres_resutil.3 lwres_sethostent.3 \
 	lwres_sethostent_r.3 lwres_string_parse.3
-MAN5=	rndc.conf.5
-MAN8=	dnssec-keygen.8 dnssec-makekeyset.8 dnssec-signkey.8 dnssec-signzone.8 \
-	lwresd.8 named-checkconf.8 named-checkzone.8 named.8 nsupdate.8 \
-	rndc-confgen.8 rndc.8
+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
 
 post-patch:
 .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.8 \
 	rndc/rndc.8
-	@ ${MV} ${WRKSRC}/bin/${FILE} ${WRKSRC}/bin/${FILE}.Dist
-	@ ${SED} -e 's#/etc/named.conf#${BIND_DESTETC}/named.conf#g' \
+	@${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
@@ -104,4 +113,4 @@ post-install:
 
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/dns/bind94/distinfo b/dns/bind94/distinfo
index 362dedd72bba..dd09fb5d019f 100644
--- a/dns/bind94/distinfo
+++ b/dns/bind94/distinfo
@@ -1,2 +1,4 @@
-MD5 (bind-9.2.3.tar.gz) = 94ae7b0f20dc406fdbbf6fac5d57b32f
-SIZE (bind-9.2.3.tar.gz) = 4553260
+MD5 (bind-9.3.0.tar.gz) = fdb42fff7e345372ac52a4493b77b694
+SIZE (bind-9.3.0.tar.gz) = 4730656
+MD5 (bind-9.3.0.tar.gz.asc) = 131e73f617c649652c6218826bdc92f8
+SIZE (bind-9.3.0.tar.gz.asc) = 186
diff --git a/dns/bind94/files/patch-bin_named_Makefile.in b/dns/bind94/files/patch-bin_named_Makefile.in
new file mode 100644
index 000000000000..dad8893552e2
--- /dev/null
+++ b/dns/bind94/files/patch-bin_named_Makefile.in
@@ -0,0 +1,10 @@
+--- bin/named/Makefile.in.orig	Sat Aug 21 07:22:40 2004
++++ bin/named/Makefile.in	Fri Sep 24 04:04:57 2004
+@@ -128,4 +128,6 @@
+ install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
+ 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
+ 	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
+-	for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done
++	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
++	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
++	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
diff --git a/dns/bind94/pkg-descr b/dns/bind94/pkg-descr
index 48d21f563d09..4f63a1ebef03 100644
--- a/dns/bind94/pkg-descr
+++ b/dns/bind94/pkg-descr
@@ -1,13 +1,12 @@
-BIND version 9 is a major rewrite of nearly all aspects of the underlying
-BIND architecture.  Some of the important features of BIND 9 are:
+BIND version 9 is a major rewrite of nearly all aspects of the underlying BIND
+architecture.  Some of the important features of BIND 9 are:
 
 DNS Security
      DNSSEC (signed zones)
      TSIG (signed DNS requests)
 IP version 6
      Answers DNS queries on IPv6 sockets
-     IPv6 resource records (A6, DNAME, etc.)
-     Bitstring Labels
+     IPv6 resource records (AAAA)
      Experimental IPv6 Resolver Library
 DNS Protocol Enhancements
      IXFR, DDNS, Notify, EDNS0
@@ -19,7 +18,7 @@ Views
 Multiprocessor Support
 Improved Portability Architecture
 
-WWW: http://www.isc.org/products/BIND/bind9.html
+WWW: http://www.isc.org/index.pl?/sw/bind/bind9.3.php
 
 - Doug Barton
 DougB@FreeBSD.org
diff --git a/dns/bind94/pkg-message b/dns/bind94/pkg-message
index 54d97173c4ea..8dd5f7e54f92 100644
--- a/dns/bind94/pkg-message
+++ b/dns/bind94/pkg-message
@@ -10,7 +10,7 @@
 *	"secret" key.  If you are using FreeBSD 4.x, visit		*
 *	http://people.freebsd.org/~dougb/randomness.html for		*
 *	information on how to set up entropy gathering. Users		*
-*	of FreeBSD 5.x do not need to perform this step. If		*
+*	of FreeBSD 5.x or later do not need to do this step. If		*
 *	you are running BIND 9 in a chroot environment, make		*
 *	sure that there is a /dev/random device in the chroot.		*
 *									*
diff --git a/dns/bind94/pkg-plist b/dns/bind94/pkg-plist
index e544b5abe5e5..4a8755f67d6c 100644
--- a/dns/bind94/pkg-plist
+++ b/dns/bind94/pkg-plist
@@ -3,7 +3,9 @@ bin/host
 bin/isc-config.sh
 bin/nslookup
 bin/nsupdate
-include/dns/a6.h
+include/bind9/check.h
+include/bind9/getaddresses.h
+include/bind9/version.h
 include/dns/acl.h
 include/dns/adb.h
 include/dns/byaddr.h
@@ -17,6 +19,7 @@ include/dns/dbtable.h
 include/dns/diff.h
 include/dns/dispatch.h
 include/dns/dnssec.h
+include/dns/ds.h
 include/dns/enumclass.h
 include/dns/enumtype.h
 include/dns/events.h
@@ -32,8 +35,9 @@ include/dns/masterdump.h
 include/dns/message.h
 include/dns/name.h
 include/dns/ncache.h
-include/dns/nxt.h
+include/dns/nsec.h
 include/dns/peer.h
+include/dns/portlist.h
 include/dns/rbt.h
 include/dns/rcode.h
 include/dns/rdata.h
@@ -60,6 +64,7 @@ include/dns/tsig.h
 include/dns/ttl.h
 include/dns/types.h
 include/dns/validator.h
+include/dns/version.h
 include/dns/view.h
 include/dns/xfrin.h
 include/dns/zone.h
@@ -110,6 +115,7 @@ include/isc/offset.h
 include/isc/once.h
 include/isc/ondestroy.h
 include/isc/os.h
+include/isc/parseint.h
 include/isc/platform.h
 include/isc/print.h
 include/isc/quota.h
@@ -126,6 +132,7 @@ include/isc/sha1.h
 include/isc/sockaddr.h
 include/isc/socket.h
 include/isc/stdio.h
+include/isc/stdlib.h
 include/isc/stdtime.h
 include/isc/string.h
 include/isc/symtab.h
@@ -137,6 +144,7 @@ include/isc/time.h
 include/isc/timer.h
 include/isc/types.h
 include/isc/util.h
+include/isc/version.h
 include/isccc/alist.h
 include/isccc/base64.h
 include/isccc/cc.h
@@ -149,9 +157,12 @@ include/isccc/symtab.h
 include/isccc/symtype.h
 include/isccc/types.h
 include/isccc/util.h
+include/isccc/version.h
 include/isccfg/cfg.h
-include/isccfg/check.h
+include/isccfg/grammar.h
 include/isccfg/log.h
+include/isccfg/namedconf.h
+include/isccfg/version.h
 include/lwres/context.h
 include/lwres/int.h
 include/lwres/ipv6.h
@@ -164,14 +175,14 @@ include/lwres/net.h
 include/lwres/netdb.h
 include/lwres/platform.h
 include/lwres/result.h
+include/lwres/version.h
+lib/libbind9.a
 lib/libdns.a
 lib/libisc.a
 lib/libisccc.a
 lib/libisccfg.a
 lib/liblwres.a
 sbin/dnssec-keygen
-sbin/dnssec-makekeyset
-sbin/dnssec-signkey
 sbin/dnssec-signzone
 sbin/lwresd
 sbin/named
@@ -206,6 +217,7 @@ sbin/rndc-confgen
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/misc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
+@dirrm include/bind9
 @dirrm include/dns
 @dirrm include/dst
 @unexec rmdir %D/include/isc 2>/dev/null || true