Complete the update for bind94 after the repocopy, and hook it up.

13 files changed, 148 insertions, 96 deletions

diff --git a/dns/Makefile b/dns/Makefile
index a93d98a995a6..1ba0d504b9d2 100644
--- a/dns/Makefile
+++ b/dns/Makefile
@@ -8,6 +8,7 @@
     SUBDIR += bind8
     SUBDIR += bind84
     SUBDIR += bind9
+    SUBDIR += bind94
     SUBDIR += bind9-dlz
     SUBDIR += bind9-sdb-ldap
     SUBDIR += c-ares
diff --git a/dns/bind94/Makefile b/dns/bind94/Makefile
index 2081f7580636..0299ef54979e 100644
--- a/dns/bind94/Makefile
+++ b/dns/bind94/Makefile
@@ -1,6 +1,6 @@
-# New ports collection makefile for:	bind
-# Date created:				6 October 2000
-# Whom:					will
+# New ports collection makefile for:	BIND 9.4.x
+# Date created:				28 January 2007
+# 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=	bind9
-PORTVERSION=	9.3.4
+PORTNAME=	bind94
+PORTVERSION=	9.4.0.rc2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		http://dougbarton.us/Downloads/%SUBDIR%/
@@ -21,11 +21,11 @@ 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 suite with updated DNSSEC
+MAINTAINER=	dougb@FreeBSD.org
+COMMENT=	The BIND DNS suite with updated DNSSEC and threads
 
-# ISC releases things like 9.3.0rc1, which our versioning doesn't like
-ISCVERSION=	9.3.4
+# ISC releases things like 9.4.0b3, which our versioning doesn't like
+ISCVERSION=	9.4.0rc2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
@@ -33,10 +33,12 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 
 USE_OPENSSL=	yes
 
-CONFLICTS=	bind-8.* bind84-8.* bind9-dlz-* bind9-sdb-mysql-* host-* zh-bind-8.*
+CONFLICTS=	bind-8.* bind84-8.* bind9-9.3.* bind9-dlz-* bind9-sdb-mysql-* host-* zh-bind-8.*
 
 OPTIONS=	REPLACE_BASE "Replace base BIND with this version" off \
-		THREADS	"Compile with thread support (NOT RECOMMENDED!)" off
+		LARGE_FILE "64-bit file support" off \
+		IPV6 "IPv6 Support (autodetected by default)" off \
+		THREADS	"Compile with thread support" on
 
 .include <bsd.port.pre.mk>
 
@@ -46,9 +48,15 @@ CONFIGURE_ARGS+=	--with-openssl=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-openssl
 .endif
 
-# ISC staff has informed me that for 9.3.x, threads are always a bad idea.
-# Leave the affirmative option for those that want to experiment.
-.if defined(WITH_THREADS)
+.if defined(WITH_LARGE_FILE)
+CONFIGURE_ARGS+=	--enable-largefile
+.endif
+
+.if defined(WITH_IPV6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+.if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--enable-threads
 .else
 CONFIGURE_ARGS+=	--disable-threads
@@ -104,6 +112,7 @@ MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.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
+MLINKS=	named-checkzone.8 named-compilezone.8
 
 verify:	checksum
 	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc
@@ -116,21 +125,14 @@ post-patch:
 		-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
-	@${SED} -e "s@^\.HP [0-9]* @@" \
-	    ${WRKSRC}/bin/nsupdate/nsupdate.8.patched \
-	    > ${WRKSRC}/bin/nsupdate/nsupdate.8
-	@${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
 
 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}/doc/arm/Bv9ARM*html ${DOCSDIR}/arm
+	${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}/
diff --git a/dns/bind94/distinfo b/dns/bind94/distinfo
index 8670fdffc30e..01f281f51ce7 100644
--- a/dns/bind94/distinfo
+++ b/dns/bind94/distinfo
@@ -1,6 +1,6 @@
-MD5 (bind-9.3.4.tar.gz) = df5417e7e7cf017fa28b65d0a3d6e999
-SHA256 (bind-9.3.4.tar.gz) = 40152026af715b15ac958f374394e5189a099b562eb913470ccc43f6fbd19c21
-SIZE (bind-9.3.4.tar.gz) = 5405022
-MD5 (bind-9.3.4.tar.gz.asc) = ee4dd1a52b6285627cd33f16cfbb194f
-SHA256 (bind-9.3.4.tar.gz.asc) = 33440701c93495c58cf0b696f19ea767f3d23d7f9e655e7bd41345438081b189
-SIZE (bind-9.3.4.tar.gz.asc) = 479
+MD5 (bind-9.4.0rc2.tar.gz) = 95daa3e6f70c979d8a64282011bb3419
+SHA256 (bind-9.4.0rc2.tar.gz) = ab269867dd2c74cf6b20241457892960a8f106b873d34b80bcce126f3cf6ea23
+SIZE (bind-9.4.0rc2.tar.gz) = 6328614
+MD5 (bind-9.4.0rc2.tar.gz.asc) = bbc61939f0295b1f9dcf58bccb50127a
+SHA256 (bind-9.4.0rc2.tar.gz.asc) = e32db66998be81fb922bc14fc74f721d4369b88e99e1be97201598595d435d6e
+SIZE (bind-9.4.0rc2.tar.gz.asc) = 479
diff --git a/dns/bind94/pkg-descr b/dns/bind94/pkg-descr
index 4f63a1ebef03..b0233dd7eb19 100644
--- a/dns/bind94/pkg-descr
+++ b/dns/bind94/pkg-descr
@@ -15,10 +15,10 @@ 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
-Improved Portability Architecture
 
-WWW: http://www.isc.org/index.pl?/sw/bind/bind9.3.php
+Multiprocessor Support, including working threads in this version
+
+WWW: http://www.isc.org/index.pl?/sw/bind/bind9.4-beta.php
 
 - Doug Barton
 DougB@FreeBSD.org
diff --git a/dns/bind94/pkg-plist b/dns/bind94/pkg-plist
index 3bafa4d5e1a1..aba77800d8a3 100644
--- a/dns/bind94/pkg-plist
+++ b/dns/bind94/pkg-plist
@@ -130,6 +130,7 @@ include/isc/resultclass.h
 include/isc/rwlock.h
 include/isc/serial.h
 include/isc/sha1.h
+include/isc/sha2.h
 include/isc/sockaddr.h
 include/isc/socket.h
 include/isc/stdio.h
@@ -159,6 +160,7 @@ include/isccc/symtype.h
 include/isccc/types.h
 include/isccc/util.h
 include/isccc/version.h
+include/isccfg/aclconf.h
 include/isccfg/cfg.h
 include/isccfg/grammar.h
 include/isccfg/log.h
@@ -189,8 +191,10 @@ sbin/lwresd
 sbin/named
 sbin/named-checkconf
 sbin/named-checkzone
+sbin/named-compilezone
 sbin/rndc
 sbin/rndc-confgen
+%%PORTDOCS%%%%DOCSDIR%%/Bv9ARM.pdf
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
@@ -204,7 +208,18 @@ sbin/rndc-confgen
 %%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.dig.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.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
diff --git a/dns/bind95/Makefile b/dns/bind95/Makefile
index 2081f7580636..0299ef54979e 100644
--- a/dns/bind95/Makefile
+++ b/dns/bind95/Makefile
@@ -1,6 +1,6 @@
-# New ports collection makefile for:	bind
-# Date created:				6 October 2000
-# Whom:					will
+# New ports collection makefile for:	BIND 9.4.x
+# Date created:				28 January 2007
+# 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=	bind9
-PORTVERSION=	9.3.4
+PORTNAME=	bind94
+PORTVERSION=	9.4.0.rc2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		http://dougbarton.us/Downloads/%SUBDIR%/
@@ -21,11 +21,11 @@ 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 suite with updated DNSSEC
+MAINTAINER=	dougb@FreeBSD.org
+COMMENT=	The BIND DNS suite with updated DNSSEC and threads
 
-# ISC releases things like 9.3.0rc1, which our versioning doesn't like
-ISCVERSION=	9.3.4
+# ISC releases things like 9.4.0b3, which our versioning doesn't like
+ISCVERSION=	9.4.0rc2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
@@ -33,10 +33,12 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 
 USE_OPENSSL=	yes
 
-CONFLICTS=	bind-8.* bind84-8.* bind9-dlz-* bind9-sdb-mysql-* host-* zh-bind-8.*
+CONFLICTS=	bind-8.* bind84-8.* bind9-9.3.* bind9-dlz-* bind9-sdb-mysql-* host-* zh-bind-8.*
 
 OPTIONS=	REPLACE_BASE "Replace base BIND with this version" off \
-		THREADS	"Compile with thread support (NOT RECOMMENDED!)" off
+		LARGE_FILE "64-bit file support" off \
+		IPV6 "IPv6 Support (autodetected by default)" off \
+		THREADS	"Compile with thread support" on
 
 .include <bsd.port.pre.mk>
 
@@ -46,9 +48,15 @@ CONFIGURE_ARGS+=	--with-openssl=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-openssl
 .endif
 
-# ISC staff has informed me that for 9.3.x, threads are always a bad idea.
-# Leave the affirmative option for those that want to experiment.
-.if defined(WITH_THREADS)
+.if defined(WITH_LARGE_FILE)
+CONFIGURE_ARGS+=	--enable-largefile
+.endif
+
+.if defined(WITH_IPV6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+.if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--enable-threads
 .else
 CONFIGURE_ARGS+=	--disable-threads
@@ -104,6 +112,7 @@ MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.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
+MLINKS=	named-checkzone.8 named-compilezone.8
 
 verify:	checksum
 	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc
@@ -116,21 +125,14 @@ post-patch:
 		-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
-	@${SED} -e "s@^\.HP [0-9]* @@" \
-	    ${WRKSRC}/bin/nsupdate/nsupdate.8.patched \
-	    > ${WRKSRC}/bin/nsupdate/nsupdate.8
-	@${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
 
 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}/doc/arm/Bv9ARM*html ${DOCSDIR}/arm
+	${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}/
diff --git a/dns/bind95/distinfo b/dns/bind95/distinfo
index 8670fdffc30e..01f281f51ce7 100644
--- a/dns/bind95/distinfo
+++ b/dns/bind95/distinfo
@@ -1,6 +1,6 @@
-MD5 (bind-9.3.4.tar.gz) = df5417e7e7cf017fa28b65d0a3d6e999
-SHA256 (bind-9.3.4.tar.gz) = 40152026af715b15ac958f374394e5189a099b562eb913470ccc43f6fbd19c21
-SIZE (bind-9.3.4.tar.gz) = 5405022
-MD5 (bind-9.3.4.tar.gz.asc) = ee4dd1a52b6285627cd33f16cfbb194f
-SHA256 (bind-9.3.4.tar.gz.asc) = 33440701c93495c58cf0b696f19ea767f3d23d7f9e655e7bd41345438081b189
-SIZE (bind-9.3.4.tar.gz.asc) = 479
+MD5 (bind-9.4.0rc2.tar.gz) = 95daa3e6f70c979d8a64282011bb3419
+SHA256 (bind-9.4.0rc2.tar.gz) = ab269867dd2c74cf6b20241457892960a8f106b873d34b80bcce126f3cf6ea23
+SIZE (bind-9.4.0rc2.tar.gz) = 6328614
+MD5 (bind-9.4.0rc2.tar.gz.asc) = bbc61939f0295b1f9dcf58bccb50127a
+SHA256 (bind-9.4.0rc2.tar.gz.asc) = e32db66998be81fb922bc14fc74f721d4369b88e99e1be97201598595d435d6e
+SIZE (bind-9.4.0rc2.tar.gz.asc) = 479
diff --git a/dns/bind95/pkg-descr b/dns/bind95/pkg-descr
index 4f63a1ebef03..b0233dd7eb19 100644
--- a/dns/bind95/pkg-descr
+++ b/dns/bind95/pkg-descr
@@ -15,10 +15,10 @@ 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
-Improved Portability Architecture
 
-WWW: http://www.isc.org/index.pl?/sw/bind/bind9.3.php
+Multiprocessor Support, including working threads in this version
+
+WWW: http://www.isc.org/index.pl?/sw/bind/bind9.4-beta.php
 
 - Doug Barton
 DougB@FreeBSD.org
diff --git a/dns/bind95/pkg-plist b/dns/bind95/pkg-plist
index 3bafa4d5e1a1..aba77800d8a3 100644
--- a/dns/bind95/pkg-plist
+++ b/dns/bind95/pkg-plist
@@ -130,6 +130,7 @@ include/isc/resultclass.h
 include/isc/rwlock.h
 include/isc/serial.h
 include/isc/sha1.h
+include/isc/sha2.h
 include/isc/sockaddr.h
 include/isc/socket.h
 include/isc/stdio.h
@@ -159,6 +160,7 @@ include/isccc/symtype.h
 include/isccc/types.h
 include/isccc/util.h
 include/isccc/version.h
+include/isccfg/aclconf.h
 include/isccfg/cfg.h
 include/isccfg/grammar.h
 include/isccfg/log.h
@@ -189,8 +191,10 @@ sbin/lwresd
 sbin/named
 sbin/named-checkconf
 sbin/named-checkzone
+sbin/named-compilezone
 sbin/rndc
 sbin/rndc-confgen
+%%PORTDOCS%%%%DOCSDIR%%/Bv9ARM.pdf
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
@@ -204,7 +208,18 @@ sbin/rndc-confgen
 %%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.dig.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.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
diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile
index 2081f7580636..0299ef54979e 100644
--- a/dns/bind96/Makefile
+++ b/dns/bind96/Makefile
@@ -1,6 +1,6 @@
-# New ports collection makefile for:	bind
-# Date created:				6 October 2000
-# Whom:					will
+# New ports collection makefile for:	BIND 9.4.x
+# Date created:				28 January 2007
+# 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=	bind9
-PORTVERSION=	9.3.4
+PORTNAME=	bind94
+PORTVERSION=	9.4.0.rc2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		http://dougbarton.us/Downloads/%SUBDIR%/
@@ -21,11 +21,11 @@ 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 suite with updated DNSSEC
+MAINTAINER=	dougb@FreeBSD.org
+COMMENT=	The BIND DNS suite with updated DNSSEC and threads
 
-# ISC releases things like 9.3.0rc1, which our versioning doesn't like
-ISCVERSION=	9.3.4
+# ISC releases things like 9.4.0b3, which our versioning doesn't like
+ISCVERSION=	9.4.0rc2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
@@ -33,10 +33,12 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 
 USE_OPENSSL=	yes
 
-CONFLICTS=	bind-8.* bind84-8.* bind9-dlz-* bind9-sdb-mysql-* host-* zh-bind-8.*
+CONFLICTS=	bind-8.* bind84-8.* bind9-9.3.* bind9-dlz-* bind9-sdb-mysql-* host-* zh-bind-8.*
 
 OPTIONS=	REPLACE_BASE "Replace base BIND with this version" off \
-		THREADS	"Compile with thread support (NOT RECOMMENDED!)" off
+		LARGE_FILE "64-bit file support" off \
+		IPV6 "IPv6 Support (autodetected by default)" off \
+		THREADS	"Compile with thread support" on
 
 .include <bsd.port.pre.mk>
 
@@ -46,9 +48,15 @@ CONFIGURE_ARGS+=	--with-openssl=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-openssl
 .endif
 
-# ISC staff has informed me that for 9.3.x, threads are always a bad idea.
-# Leave the affirmative option for those that want to experiment.
-.if defined(WITH_THREADS)
+.if defined(WITH_LARGE_FILE)
+CONFIGURE_ARGS+=	--enable-largefile
+.endif
+
+.if defined(WITH_IPV6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+.if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--enable-threads
 .else
 CONFIGURE_ARGS+=	--disable-threads
@@ -104,6 +112,7 @@ MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.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
+MLINKS=	named-checkzone.8 named-compilezone.8
 
 verify:	checksum
 	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc
@@ -116,21 +125,14 @@ post-patch:
 		-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
-	@${SED} -e "s@^\.HP [0-9]* @@" \
-	    ${WRKSRC}/bin/nsupdate/nsupdate.8.patched \
-	    > ${WRKSRC}/bin/nsupdate/nsupdate.8
-	@${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
 
 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}/doc/arm/Bv9ARM*html ${DOCSDIR}/arm
+	${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}/
diff --git a/dns/bind96/distinfo b/dns/bind96/distinfo
index 8670fdffc30e..01f281f51ce7 100644
--- a/dns/bind96/distinfo
+++ b/dns/bind96/distinfo
@@ -1,6 +1,6 @@
-MD5 (bind-9.3.4.tar.gz) = df5417e7e7cf017fa28b65d0a3d6e999
-SHA256 (bind-9.3.4.tar.gz) = 40152026af715b15ac958f374394e5189a099b562eb913470ccc43f6fbd19c21
-SIZE (bind-9.3.4.tar.gz) = 5405022
-MD5 (bind-9.3.4.tar.gz.asc) = ee4dd1a52b6285627cd33f16cfbb194f
-SHA256 (bind-9.3.4.tar.gz.asc) = 33440701c93495c58cf0b696f19ea767f3d23d7f9e655e7bd41345438081b189
-SIZE (bind-9.3.4.tar.gz.asc) = 479
+MD5 (bind-9.4.0rc2.tar.gz) = 95daa3e6f70c979d8a64282011bb3419
+SHA256 (bind-9.4.0rc2.tar.gz) = ab269867dd2c74cf6b20241457892960a8f106b873d34b80bcce126f3cf6ea23
+SIZE (bind-9.4.0rc2.tar.gz) = 6328614
+MD5 (bind-9.4.0rc2.tar.gz.asc) = bbc61939f0295b1f9dcf58bccb50127a
+SHA256 (bind-9.4.0rc2.tar.gz.asc) = e32db66998be81fb922bc14fc74f721d4369b88e99e1be97201598595d435d6e
+SIZE (bind-9.4.0rc2.tar.gz.asc) = 479
diff --git a/dns/bind96/pkg-descr b/dns/bind96/pkg-descr
index 4f63a1ebef03..b0233dd7eb19 100644
--- a/dns/bind96/pkg-descr
+++ b/dns/bind96/pkg-descr
@@ -15,10 +15,10 @@ 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
-Improved Portability Architecture
 
-WWW: http://www.isc.org/index.pl?/sw/bind/bind9.3.php
+Multiprocessor Support, including working threads in this version
+
+WWW: http://www.isc.org/index.pl?/sw/bind/bind9.4-beta.php
 
 - Doug Barton
 DougB@FreeBSD.org
diff --git a/dns/bind96/pkg-plist b/dns/bind96/pkg-plist
index 3bafa4d5e1a1..aba77800d8a3 100644
--- a/dns/bind96/pkg-plist
+++ b/dns/bind96/pkg-plist
@@ -130,6 +130,7 @@ include/isc/resultclass.h
 include/isc/rwlock.h
 include/isc/serial.h
 include/isc/sha1.h
+include/isc/sha2.h
 include/isc/sockaddr.h
 include/isc/socket.h
 include/isc/stdio.h
@@ -159,6 +160,7 @@ include/isccc/symtype.h
 include/isccc/types.h
 include/isccc/util.h
 include/isccc/version.h
+include/isccfg/aclconf.h
 include/isccfg/cfg.h
 include/isccfg/grammar.h
 include/isccfg/log.h
@@ -189,8 +191,10 @@ sbin/lwresd
 sbin/named
 sbin/named-checkconf
 sbin/named-checkzone
+sbin/named-compilezone
 sbin/rndc
 sbin/rndc-confgen
+%%PORTDOCS%%%%DOCSDIR%%/Bv9ARM.pdf
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
@@ -204,7 +208,18 @@ sbin/rndc-confgen
 %%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.dig.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.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