Update for 9.5.0

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 (AAAA)
     Experimental IPv6 Resolver Library
DNS Protocol Enhancements: IXFR, DDNS, Notify, EDNS0
     Improved standards conformance
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).

8 files changed, 114 insertions, 60 deletions

diff --git a/dns/bind95/Makefile b/dns/bind95/Makefile
index 8ca11e9dd10c..88e0d4e08a35 100644
--- a/dns/bind95/Makefile
+++ b/dns/bind95/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for:	BIND 9.4.x
-# Date created:				28 January 2007
+# New ports collection makefile for:	BIND 9.5.x
+# Date created:				2 July 2008
 # Whom:					dougb
 #
 # $FreeBSD$
@@ -11,9 +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=	bind94
-PORTVERSION=	9.4.2
-PORTREVISION=	1
+PORTNAME=	bind95
+PORTVERSION=	9.5.0
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		http://dougbarton.us/Downloads/%SUBDIR%/
@@ -26,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.4.2
+ISCVERSION=	9.5.0
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
@@ -34,21 +33,43 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 
 USE_OPENSSL=	yes
 
-CONFLICTS=	bind9-9.3.* bind9-dlz-* bind9-sdb-mysql-* host-*
+CONFLICTS=	bind9-9.3.* bind9-9.4.* bind9-dlz-* bind9-sdb-mysql-* host-*
 
-OPTIONS=	REPLACE_BASE "Replace base BIND with this version" off \
+OPTIONS=	XML "Support for xml statistics output" on \
+		IDN "Add IDN support to dig, host, etc." off \
+		REPLACE_BASE "Replace base BIND with this version" off \
 		LARGE_FILE "64-bit file support" off \
-		IPV6 "IPv6 Support (autodetected by default)" off \
-		THREADS	"Compile with thread support" on
+		IPV6 "IPv6 Support (autodetected by default)" off
 
 .include <bsd.port.pre.mk>
 
+# We are ok by default from 7.0-RELEASE on
+.if ${OSVERSION} >= 700055
+OPTIONS+=	THREADS	"Compile with thread support" on
+.else
+OPTIONS+=	THREADS	"Compile with thread support" off
+.endif
+
 .if defined(WITH_OPENSSL_PORT)
 CONFIGURE_ARGS+=	--with-openssl=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--with-openssl
 .endif
 
+.if !defined(WITHOUT_XML)
+CONFIGURE_ARGS+=	--with-libxml2=${LOCALBASE}
+LIB_DEPENDS+=		xml2.5:${PORTSDIR}/textproc/libxml2
+.else
+CONFIGURE_ARGS+=	--without-libxml2
+.endif
+
+.if defined(WITH_IDN)
+CONFIGURE_ARGS+=	--with-idn=${LOCALBASE} --with-libiconv=${LOCALBASE}
+BUILD_DEPENDS+=		runidn:${PORTSDIR}/dns/idnkit
+.else
+CONFIGURE_ARGS+=	--without-idn
+.endif
+
 .if defined(WITH_LARGE_FILE)
 CONFIGURE_ARGS+=	--enable-largefile
 .endif
@@ -135,7 +156,7 @@ 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 ${DOCSDIR}/
+		${WRKSRC}/README ${WRKSRC}/KNOWN-DEFECTS ${DOCSDIR}/
 .endif
 
 	@${CAT} ${PKGMESSAGE}
diff --git a/dns/bind95/distinfo b/dns/bind95/distinfo
index a500540e3783..d595a925efdd 100644
--- a/dns/bind95/distinfo
+++ b/dns/bind95/distinfo
@@ -1,6 +1,6 @@
-MD5 (bind-9.4.2.tar.gz) = 57953d7264139b9506b9d66174125179
-SHA256 (bind-9.4.2.tar.gz) = 5add82a67dc98b89b4a0f95a467480b0f6b7d3a6b563a13076d9f701286960bd
-SIZE (bind-9.4.2.tar.gz) = 6574042
-MD5 (bind-9.4.2.tar.gz.asc) = acbccd025da3e1b6b980ca2a023310b3
-SHA256 (bind-9.4.2.tar.gz.asc) = c6e43af53f0102b7db4f5c2d824f509587323884ecf984a4b2c0c66e510ded01
-SIZE (bind-9.4.2.tar.gz.asc) = 479
+MD5 (bind-9.5.0.tar.gz) = 066484717db1d1b1b4092ddcf5d0eb6e
+SHA256 (bind-9.5.0.tar.gz) = fbb4c02c792a5298f8c71d617dfbab2acebbbdd51ea1d1e94d1aa66de48ddd61
+SIZE (bind-9.5.0.tar.gz) = 6749437
+MD5 (bind-9.5.0.tar.gz.asc) = 36b1c6c37e047cb2c1214fdc74a62b30
+SHA256 (bind-9.5.0.tar.gz.asc) = 6d83c4a6c0bc67472e998bb260c1b0cfc55825c9b707da409c5a200c38119a64
+SIZE (bind-9.5.0.tar.gz.asc) = 486
diff --git a/dns/bind95/pkg-descr b/dns/bind95/pkg-descr
index ea4ae914f437..2ab004884cc7 100644
--- a/dns/bind95/pkg-descr
+++ b/dns/bind95/pkg-descr
@@ -1,23 +1,23 @@
 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 (AAAA)
+DNS Security: DNSSEC (signed zones), TSIG (signed DNS requests)
+IP version 6: Answers DNS queries on IPv6 sockets, IPv6 resource records (AAAA)
      Experimental IPv6 Resolver Library
-DNS Protocol Enhancements
-     IXFR, DDNS, Notify, EDNS0
+DNS Protocol Enhancements: IXFR, DDNS, Notify, EDNS0
      Improved standards conformance
-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.
-
+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). 
+
 WWW: http://www.isc.org/index.pl?/sw/bind/index.php
 
 - Doug Barton
diff --git a/dns/bind95/pkg-plist b/dns/bind95/pkg-plist
index 66bebaf33647..97e8bd9eb733 100644
--- a/dns/bind95/pkg-plist
+++ b/dns/bind95/pkg-plist
@@ -24,6 +24,7 @@ include/dns/enumclass.h
 include/dns/enumtype.h
 include/dns/events.h
 include/dns/fixedname.h
+include/dns/iptable.h
 include/dns/journal.h
 include/dns/keyflags.h
 include/dns/keytable.h
@@ -71,6 +72,7 @@ include/dns/zone.h
 include/dns/zonekey.h
 include/dns/zt.h
 include/dst/dst.h
+include/dst/gssapi.h
 include/dst/lib.h
 include/dst/result.h
 include/isc/app.h
@@ -95,6 +97,7 @@ include/isc/hash.h
 include/isc/heap.h
 include/isc/hex.h
 include/isc/hmacmd5.h
+include/isc/httpd.h
 include/isc/int.h
 include/isc/interfaceiter.h
 include/isc/lang.h
@@ -148,6 +151,7 @@ include/isc/timer.h
 include/isc/types.h
 include/isc/util.h
 include/isc/version.h
+include/isc/xml.h
 include/isccc/alist.h
 include/isccc/base64.h
 include/isccc/cc.h
@@ -199,6 +203,7 @@ sbin/rndc-confgen
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/KNOWN-DEFECTS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch01.html
 %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch02.html
@@ -230,6 +235,7 @@ sbin/rndc-confgen
 %%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%%
diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile
index 8ca11e9dd10c..88e0d4e08a35 100644
--- a/dns/bind96/Makefile
+++ b/dns/bind96/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for:	BIND 9.4.x
-# Date created:				28 January 2007
+# New ports collection makefile for:	BIND 9.5.x
+# Date created:				2 July 2008
 # Whom:					dougb
 #
 # $FreeBSD$
@@ -11,9 +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=	bind94
-PORTVERSION=	9.4.2
-PORTREVISION=	1
+PORTNAME=	bind95
+PORTVERSION=	9.5.0
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		http://dougbarton.us/Downloads/%SUBDIR%/
@@ -26,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.4.2
+ISCVERSION=	9.5.0
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
@@ -34,21 +33,43 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 
 USE_OPENSSL=	yes
 
-CONFLICTS=	bind9-9.3.* bind9-dlz-* bind9-sdb-mysql-* host-*
+CONFLICTS=	bind9-9.3.* bind9-9.4.* bind9-dlz-* bind9-sdb-mysql-* host-*
 
-OPTIONS=	REPLACE_BASE "Replace base BIND with this version" off \
+OPTIONS=	XML "Support for xml statistics output" on \
+		IDN "Add IDN support to dig, host, etc." off \
+		REPLACE_BASE "Replace base BIND with this version" off \
 		LARGE_FILE "64-bit file support" off \
-		IPV6 "IPv6 Support (autodetected by default)" off \
-		THREADS	"Compile with thread support" on
+		IPV6 "IPv6 Support (autodetected by default)" off
 
 .include <bsd.port.pre.mk>
 
+# We are ok by default from 7.0-RELEASE on
+.if ${OSVERSION} >= 700055
+OPTIONS+=	THREADS	"Compile with thread support" on
+.else
+OPTIONS+=	THREADS	"Compile with thread support" off
+.endif
+
 .if defined(WITH_OPENSSL_PORT)
 CONFIGURE_ARGS+=	--with-openssl=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--with-openssl
 .endif
 
+.if !defined(WITHOUT_XML)
+CONFIGURE_ARGS+=	--with-libxml2=${LOCALBASE}
+LIB_DEPENDS+=		xml2.5:${PORTSDIR}/textproc/libxml2
+.else
+CONFIGURE_ARGS+=	--without-libxml2
+.endif
+
+.if defined(WITH_IDN)
+CONFIGURE_ARGS+=	--with-idn=${LOCALBASE} --with-libiconv=${LOCALBASE}
+BUILD_DEPENDS+=		runidn:${PORTSDIR}/dns/idnkit
+.else
+CONFIGURE_ARGS+=	--without-idn
+.endif
+
 .if defined(WITH_LARGE_FILE)
 CONFIGURE_ARGS+=	--enable-largefile
 .endif
@@ -135,7 +156,7 @@ 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 ${DOCSDIR}/
+		${WRKSRC}/README ${WRKSRC}/KNOWN-DEFECTS ${DOCSDIR}/
 .endif
 
 	@${CAT} ${PKGMESSAGE}
diff --git a/dns/bind96/distinfo b/dns/bind96/distinfo
index a500540e3783..d595a925efdd 100644
--- a/dns/bind96/distinfo
+++ b/dns/bind96/distinfo
@@ -1,6 +1,6 @@
-MD5 (bind-9.4.2.tar.gz) = 57953d7264139b9506b9d66174125179
-SHA256 (bind-9.4.2.tar.gz) = 5add82a67dc98b89b4a0f95a467480b0f6b7d3a6b563a13076d9f701286960bd
-SIZE (bind-9.4.2.tar.gz) = 6574042
-MD5 (bind-9.4.2.tar.gz.asc) = acbccd025da3e1b6b980ca2a023310b3
-SHA256 (bind-9.4.2.tar.gz.asc) = c6e43af53f0102b7db4f5c2d824f509587323884ecf984a4b2c0c66e510ded01
-SIZE (bind-9.4.2.tar.gz.asc) = 479
+MD5 (bind-9.5.0.tar.gz) = 066484717db1d1b1b4092ddcf5d0eb6e
+SHA256 (bind-9.5.0.tar.gz) = fbb4c02c792a5298f8c71d617dfbab2acebbbdd51ea1d1e94d1aa66de48ddd61
+SIZE (bind-9.5.0.tar.gz) = 6749437
+MD5 (bind-9.5.0.tar.gz.asc) = 36b1c6c37e047cb2c1214fdc74a62b30
+SHA256 (bind-9.5.0.tar.gz.asc) = 6d83c4a6c0bc67472e998bb260c1b0cfc55825c9b707da409c5a200c38119a64
+SIZE (bind-9.5.0.tar.gz.asc) = 486
diff --git a/dns/bind96/pkg-descr b/dns/bind96/pkg-descr
index ea4ae914f437..2ab004884cc7 100644
--- a/dns/bind96/pkg-descr
+++ b/dns/bind96/pkg-descr
@@ -1,23 +1,23 @@
 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 (AAAA)
+DNS Security: DNSSEC (signed zones), TSIG (signed DNS requests)
+IP version 6: Answers DNS queries on IPv6 sockets, IPv6 resource records (AAAA)
      Experimental IPv6 Resolver Library
-DNS Protocol Enhancements
-     IXFR, DDNS, Notify, EDNS0
+DNS Protocol Enhancements: IXFR, DDNS, Notify, EDNS0
      Improved standards conformance
-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.
-
+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). 
+
 WWW: http://www.isc.org/index.pl?/sw/bind/index.php
 
 - Doug Barton
diff --git a/dns/bind96/pkg-plist b/dns/bind96/pkg-plist
index 66bebaf33647..97e8bd9eb733 100644
--- a/dns/bind96/pkg-plist
+++ b/dns/bind96/pkg-plist
@@ -24,6 +24,7 @@ include/dns/enumclass.h
 include/dns/enumtype.h
 include/dns/events.h
 include/dns/fixedname.h
+include/dns/iptable.h
 include/dns/journal.h
 include/dns/keyflags.h
 include/dns/keytable.h
@@ -71,6 +72,7 @@ include/dns/zone.h
 include/dns/zonekey.h
 include/dns/zt.h
 include/dst/dst.h
+include/dst/gssapi.h
 include/dst/lib.h
 include/dst/result.h
 include/isc/app.h
@@ -95,6 +97,7 @@ include/isc/hash.h
 include/isc/heap.h
 include/isc/hex.h
 include/isc/hmacmd5.h
+include/isc/httpd.h
 include/isc/int.h
 include/isc/interfaceiter.h
 include/isc/lang.h
@@ -148,6 +151,7 @@ include/isc/timer.h
 include/isc/types.h
 include/isc/util.h
 include/isc/version.h
+include/isc/xml.h
 include/isccc/alist.h
 include/isccc/base64.h
 include/isccc/cc.h
@@ -199,6 +203,7 @@ sbin/rndc-confgen
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/KNOWN-DEFECTS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch01.html
 %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch02.html
@@ -230,6 +235,7 @@ sbin/rndc-confgen
 %%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%%