Update "bind9" package to version 9.3.0. Changes since version 9.2.3:

- DNSSEC is now DS based (RFC 3658).
  See also RFC 3845, doc/draft/draft-ietf-dnsext-dnssec-*.
- DNSSEC lookaside validation.
- check-names is now implemented.
- rrset-order in more complete.
- IPv4/IPv6 transition support, dual-stack-servers.
- IXFR deltas can now be generated when loading master files,
  ixfr-from-differences.
- It is now possible to specify the size of a journal, max-journal-size.
- It is now possible to define a named set of master servers to be
  used in masters clause, masters.
- The advertised EDNS UDP size can now be set, edns-udp-size.
  allow-v6-synthesis has been obsoleted.
	NOTE:
	* Zones containing MD and MF will now be rejected.
	* dig, nslookup name. now report "Not Implemented" as
	  NOTIMP rather than NOTIMPL.  This will have impact on scripts
	  that are looking for NOTIMPL.
- libbind: corresponds to that from BIND 8.4.5.

14 files changed, 175 insertions, 194 deletions

diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 11312128eb7..6c39ff2c24a 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.61 2004/10/03 00:17:49 tv Exp $
+# $NetBSD: Makefile,v 1.62 2004/10/03 09:20:41 tron Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	bind-${BIND_VERSION}
-PKGREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 
-MAINTAINER=	hubertf@NetBSD.org
+MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://www.isc.org/products/BIND/
 COMMENT=	Version 9 of the Berkeley Internet Name Daemon, implementation of DNS
 
-BIND_VERSION=	9.2.3
+BIND_VERSION=	9.3.0
 DIST_SUBDIR=	bind/${BIND_VERSION}
 
 # IPv6 ready, automatically detected
diff --git a/net/bind9/PLIST b/net/bind9/PLIST
index 13dfb51fbc1..5fa41b3eb7c 100644
--- a/net/bind9/PLIST
+++ b/net/bind9/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2004/09/22 08:09:47 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/10/03 09:20:41 tron Exp $
 bin/dig
 bin/host
 bin/isc-config.sh
@@ -6,7 +6,33 @@ bin/nslookup
 bin/nsupdate
 etc/rc.d/lwresd
 etc/rc.d/named9
-include/dns/a6.h
+${IPV6H}include/isc/ipv6.h
+include/bind/arpa/inet.h
+include/bind/arpa/nameser.h
+include/bind/arpa/nameser_compat.h
+include/bind/fd_setsize.h
+include/bind/hesiod.h
+include/bind/irp.h
+include/bind/irs.h
+include/bind/isc/assertions.h
+include/bind/isc/ctl.h
+include/bind/isc/dst.h
+include/bind/isc/eventlib.h
+include/bind/isc/heap.h
+include/bind/isc/irpmarshall.h
+include/bind/isc/list.h
+include/bind/isc/logging.h
+include/bind/isc/memcluster.h
+include/bind/isc/misc.h
+include/bind/isc/tree.h
+include/bind/netdb.h
+include/bind/netgroup.h
+include/bind/res_update.h
+include/bind/resolv.h
+include/bind/sys/bitypes.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
@@ -20,6 +46,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
@@ -35,8 +62,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
@@ -63,6 +91,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
@@ -93,7 +122,6 @@ include/isc/hex.h
 include/isc/hmacmd5.h
 include/isc/int.h
 include/isc/interfaceiter.h
-${IPV6H}include/isc/ipv6.h
 include/isc/lang.h
 include/isc/lex.h
 include/isc/lfsr.h
@@ -114,6 +142,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
@@ -130,6 +159,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
@@ -141,6 +171,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
@@ -153,9 +184,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
@@ -168,30 +202,17 @@ include/lwres/net.h
 include/lwres/netdb.h
 include/lwres/platform.h
 include/lwres/result.h
+include/lwres/version.h
 lib/libbind.la
+lib/libbind9.la
 lib/libdns.la
 lib/libisc.la
 lib/libisccc.la
 lib/libisccfg.la
 lib/liblwres.la
-sbin/dnssec-keygen
-sbin/dnssec-makekeyset
-sbin/dnssec-signkey
-sbin/dnssec-signzone
-sbin/lwresd
-sbin/named
-sbin/named-checkconf
-sbin/named-checkzone
-sbin/rndc
-sbin/rndc-confgen
-@dirrm include/lwres
-@dirrm include/isccc
-@dirrm include/isccfg
-@dirrm include/isc
-@dirrm include/dst
-@dirrm include/dns
 man/man1/dig.1
 man/man1/host.1
+man/man1/nslookup.1
 man/man3/lwres.3
 man/man3/lwres_addr_parse.3
 man/man3/lwres_buffer.3
@@ -279,40 +300,31 @@ man/man3/lwres_sethostent_r.3
 man/man3/lwres_string_parse.3
 man/man5/rndc.conf.5
 man/man8/dnssec-keygen.8
-man/man8/dnssec-makekeyset.8
-man/man8/dnssec-signkey.8
 man/man8/dnssec-signzone.8
 man/man8/lwresd.8
 man/man8/named-checkconf.8
 man/man8/named-checkzone.8
 man/man8/named.8
+man/man8/named.conf.5
 man/man8/nsupdate.8
-man/man8/rndc.8
 man/man8/rndc-confgen.8
-include/bind/arpa/nameser.h
-include/bind/arpa/inet.h
-include/bind/arpa/nameser_compat.h
+man/man8/rndc.8
+sbin/dnssec-keygen
+sbin/dnssec-signzone
+sbin/lwresd
+sbin/named
+sbin/named-checkconf
+sbin/named-checkzone
+sbin/rndc
+sbin/rndc-confgen
+@dirrm include/lwres
+@dirrm include/isccfg
+@dirrm include/isccc
+@dirrm include/isc
+@dirrm include/dst
+@dirrm include/dns
+@dirrm include/bind9
 @dirrm include/bind/arpa
-include/bind/fd_setsize.h
-include/bind/hesiod.h
-include/bind/irp.h
-include/bind/irs.h
-include/bind/netdb.h
-include/bind/netgroup.h
-include/bind/res_update.h
-include/bind/resolv.h
-include/bind/isc/assertions.h
-include/bind/isc/ctl.h
-include/bind/isc/dst.h
-include/bind/isc/eventlib.h
-include/bind/isc/heap.h
-include/bind/isc/irpmarshall.h
-include/bind/isc/list.h
-include/bind/isc/logging.h
-include/bind/isc/memcluster.h
-include/bind/isc/misc.h
-include/bind/isc/tree.h
 @dirrm include/bind/isc
-include/bind/sys/bitypes.h
 @dirrm include/bind/sys
 @dirrm include/bind
diff --git a/net/bind9/distinfo b/net/bind9/distinfo
index f8eaf8b557c..6ec69e3975d 100644
--- a/net/bind9/distinfo
+++ b/net/bind9/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.18 2004/05/18 07:05:34 tron Exp $
+$NetBSD: distinfo,v 1.19 2004/10/03 09:20:41 tron Exp $
 
-SHA1 (bind/9.2.3/bind-9.2.3.tar.gz) = 670edd74685a1e7a784fae8532f6b79444bba5a6
-Size (bind/9.2.3/bind-9.2.3.tar.gz) = 4553260 bytes
-SHA1 (patch-aa) = 11690be2281bbf088f9ea2aa91863f5c1579054c
-SHA1 (patch-ab) = 1d3d82e3e01ac38e8a1b1d98e018849e8fe071bf
-SHA1 (patch-ac) = 1696adfab7392e0f150d34931b808e51ad017938
-SHA1 (patch-ad) = 3d566cc585f996ce36dbed4e8efdb2b6226aa58c
-SHA1 (patch-ae) = 089d51ae714447e9177aa49673223be29790f814
-SHA1 (patch-af) = 4a4cd41c2d5acee9428892f4bf7eb9ea7c6e4131
-SHA1 (patch-ag) = f79fdb089dee45f474359efb414e9c2d70dbfd32
+SHA1 (bind/9.3.0/bind-9.3.0.tar.gz) = 8186898daea3122180a0f0fc54cf4b4632d2270e
+Size (bind/9.3.0/bind-9.3.0.tar.gz) = 4730656 bytes
+SHA1 (patch-aa) = 959fe6c66d54fa93a0191065a5d54007065ca707
+SHA1 (patch-ab) = dd12c457791a75a8b43d9dfd0c0b236dcdbe31a5
+SHA1 (patch-ac) = 57f0fee92a6c84bf422c6b872eb327b755450557
+SHA1 (patch-ad) = 91fb539679a850f1b9ae4af5d6eb8f8ea740f3d9
+SHA1 (patch-ae) = 81b9d96b7c0b8da52ef8970113738d0d37483a5e
+SHA1 (patch-af) = 1f9058f0c6893a800d1af52b1daf35b45385a78e
 SHA1 (patch-ah) = d3df97e984759914032c30b4f06f9c815eee3421
 SHA1 (patch-ai) = 60bd449ddfae8a266e09b85bcc832ff9c5da2544
-SHA1 (patch-aj) = a3deeab87c2fccaa51fedae68b219ef875a95220
-SHA1 (patch-ak) = a556b01257809a77dc379649c2b7c3e13cd9c583
+SHA1 (patch-aj) = 7422829ca0dc3d411f00628189f059e47350b524
+SHA1 (patch-al) = 606600d8bdb817688a5f3336a39b7348bca2c230
diff --git a/net/bind9/patches/patch-aa b/net/bind9/patches/patch-aa
index abfb4a01ac0..f1f145e3abd 100644
--- a/net/bind9/patches/patch-aa
+++ b/net/bind9/patches/patch-aa
@@ -1,43 +1,41 @@
-$NetBSD: patch-aa,v 1.7 2003/03/10 02:47:37 hubertf Exp $
+$NetBSD: patch-aa,v 1.8 2004/10/03 09:20:41 tron Exp $
 
---- configure.in.orig	2003-03-10 00:19:25.000000000 +0000
-+++ configure.in
-@@ -586,7 +586,8 @@ then
- [linking with PTL2 is highly experimental and not expected to work])
- 			CC=ptlgcc
- 		else
--			if test ! -d $LOCALBASE/pthreads
-+			if test ! -d $LOCALBASE/pthreads \
-+				-a ! -f /usr/include/pthread.h
- 			then
- 				AC_MSG_RESULT(none)
- 				AC_MSG_ERROR("could not find thread libraries")
-@@ -594,13 +595,21 @@ then
+--- configure.in-	2004-05-16 04:58:44.000000000 +0900
++++ configure.in	2004-05-16 05:00:43.000000000 +0900
+@@ -684,7 +684,7 @@
+ 				AC_MSG_RESULT(native)
+ 				LIBS="-lpthread $LIBS"
+ 			else
+-				if test ! -d $LOCALBASE/pthreads
++				if test ! -d $LOCALBASE/pthreads -a ! -f /usr/include/pthread.h
+ 				then
+ 					AC_MSG_RESULT(none)
+ 					AC_MSG_ERROR("could not find thread libraries")
+@@ -692,13 +692,20 @@
  
- 			if $use_threads
- 			then
--				AC_MSG_RESULT(mit-pthreads/unproven-pthreads)
--				pkg="$LOCALBASE/pthreads"
--				lib1="-L$pkg/lib -Wl,-R$pkg/lib"
--				lib2="-lpthread -lm -lgcc -lpthread"
--				LIBS="$lib1 $lib2 $LIBS"
--				CPPFLAGS="$CPPFLAGS -I$pkg/include"
--				STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
-+				if test -f /usr/include/pthread.h
-+				then
-+					AC_MSG_RESULT(native pthreads)
-+					LIBS="-lpthread $LIBS"
-+					CPPFLAGS="$CPPFLAGS -I/usr/include"
-+					STD_CINCLUDES="$STD_CINCLUDES -I/usr/include"
-+				else
-+					AC_MSG_RESULT(mit-pthreads/unproven-pthreads)
-+					pkg="$LOCALBASE/pthreads"
-+					lib1="-L$pkg/lib -Wl,-R$pkg/lib"
-+					lib2="-lpthread -lm -lgcc -lpthread"
-+					LIBS="$lib1 $lib2 $LIBS"
-+					CPPFLAGS="$CPPFLAGS -I$pkg/include"
-+					STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
-+				fi
+ 				if $use_threads
+ 				then
+-					AC_MSG_RESULT(mit-pthreads/unproven-pthreads)
+-					pkg="$LOCALBASE/pthreads"
+-					lib1="-L$pkg/lib -Wl,-R$pkg/lib"
+-					lib2="-lpthread -lm -lgcc -lpthread"
+-					LIBS="$lib1 $lib2 $LIBS"
+-					CPPFLAGS="$CPPFLAGS -I$pkg/include"
+-					STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
++					if test -f /usr/include/pthread.h
++						AC_MSG_RESULT(native pthreads)
++						LIBS="-lpthread $LIBS"
++						CPPFLAGS="$CPPFLAGS -I/usr/inclue"
++						STD_CINDLUES="$STD_CINDLUES -I/usr/include"
++					else
++						AC_MSG_RESULT(mit-pthreads/unproven-pthreads)
++						pkg="$LOCALBASE/pthreads"
++						lib1="-L$pkg/lib -Wl,-R$pkg/lib"
++						lib2="-lpthread -lm -lgcc -lpthread"
++						LIBS="$lib1 $lib2 $LIBS"
++						CPPFLAGS="$CPPFLAGS -I$pkg/include"
++						STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
++					fi
+ 				fi
  			fi
  		fi
- 		;;
diff --git a/net/bind9/patches/patch-ab b/net/bind9/patches/patch-ab
index 9b26c64ee4f..47027f84330 100644
--- a/net/bind9/patches/patch-ab
+++ b/net/bind9/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.7 2001/11/27 03:38:42 itojun Exp $
+$NetBSD: patch-ab,v 1.8 2004/10/03 09:20:41 tron Exp $
 
---- lib/lwres/getnameinfo.c.orig	Sat Jul 14 08:34:02 2001
-+++ lib/lwres/getnameinfo.c	Tue Jul 17 10:14:33 2001
-@@ -66,6 +66,10 @@
- #include <lwres/net.h>
+--- lib/lwres/getnameinfo.c.orig	2004-08-28 08:25:24.000000000 +0200
++++ lib/lwres/getnameinfo.c	2004-10-03 08:56:21.000000000 +0200
+@@ -63,6 +63,10 @@
  #include <lwres/netdb.h>
+ #include "print_p.h"
  
 +#ifdef __KAME__
 +#include <net/if.h>
@@ -13,12 +13,11 @@ $NetBSD: patch-ab,v 1.7 2001/11/27 03:38:42 itojun Exp $
  #include "assert_p.h"
  
  #define SUCCESS 0
-@@ -214,13 +218,11 @@
+@@ -211,13 +215,10 @@
  		    ((const struct sockaddr_in6 *)sa)->sin6_scope_id) {
  			char *p = numaddr + strlen(numaddr);
  			const char *stringscope = NULL;
 -#if 0
-+
 +#ifdef __KAME__
  			if ((flags & NI_NUMERICSCOPE) == 0) {
 -				/*
diff --git a/net/bind9/patches/patch-ac b/net/bind9/patches/patch-ac
index 7b864fbbb16..005d46c74af 100644
--- a/net/bind9/patches/patch-ac
+++ b/net/bind9/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2001/11/27 03:38:42 itojun Exp $
+$NetBSD: patch-ac,v 1.5 2004/10/03 09:20:41 tron Exp $
 
---- lib/lwres/getaddrinfo.c.orig	Sat Jul 14 08:34:01 2001
-+++ lib/lwres/getaddrinfo.c	Tue Jul 17 10:15:03 2001
-@@ -31,6 +31,10 @@
+--- lib/lwres/getaddrinfo.c-	2004-05-16 05:03:22.000000000 +0900
++++ lib/lwres/getaddrinfo.c	2004-05-16 05:04:33.000000000 +0900
+@@ -30,6 +30,10 @@
  #include <lwres/net.h>
  #include <lwres/netdb.h>
  
@@ -13,14 +13,10 @@ $NetBSD: patch-ac,v 1.4 2001/11/27 03:38:42 itojun Exp $
  #define SA(addr)	((struct sockaddr *)(addr))
  #define SIN(addr)	((struct sockaddr_in *)(addr))
  #define SIN6(addr)	((struct sockaddr_in6 *)(addr))
-@@ -253,14 +257,18 @@
+@@ -252,14 +256,22 @@
  			p = strchr(ntmp, '%');
  			ep = NULL;
  
--			/*
--			 * Vendors may want to support non-numeric
--			 * scopeid around here.
--			 */
 +#ifdef __KAME__
 +			if (p != NULL) {
 +				scopeid = if_nametoindex(p + 1);
@@ -28,6 +24,10 @@ $NetBSD: patch-ac,v 1.4 2001/11/27 03:38:42 itojun Exp $
 +					p = NULL;
 +			}
 +#endif
+ 			/*
+ 			 * Vendors may want to support non-numeric
+ 			 * scopeid around here.
+ 			 */
  
 -			if (p != NULL)
 +			if (p != NULL) {
diff --git a/net/bind9/patches/patch-ad b/net/bind9/patches/patch-ad
index b0f460ea2d2..23107d8446d 100644
--- a/net/bind9/patches/patch-ad
+++ b/net/bind9/patches/patch-ad
@@ -1,45 +1,35 @@
-$NetBSD: patch-ad,v 1.3 2003/03/10 02:47:38 hubertf Exp $
+$NetBSD: patch-ad,v 1.4 2004/10/03 09:20:41 tron Exp $
 
---- configure.orig	2003-02-18 04:16:23.000000000 +0000
-+++ configure
-@@ -4739,7 +4924,8 @@ echo "${ECHO_T}PTL2" >&6
- echo "$as_me: WARNING: linking with PTL2 is highly experimental and not expected to work" >&2;}
- 			CC=ptlgcc
- 		else
--			if test ! -d $LOCALBASE/pthreads
-+			if test ! -d $LOCALBASE/pthreads \
-+				-a ! -f /usr/include/pthread.h
- 			then
- 				echo "$as_me:$LINENO: result: none" >&5
- echo "${ECHO_T}none" >&6
-@@ -4750,14 +4936,23 @@ echo "$as_me: error: \"could not find th
+--- configure-	2004-05-16 05:05:10.000000000 +0900
++++ configure	2004-05-16 05:08:20.000000000 +0900
+@@ -5416,14 +5416,22 @@
  
- 			if $use_threads
- 			then
--				echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
-+				if test -f /usr/include/pthread.h
-+				then
-+					echo "$as_me:$LINENO: result: native pthreads" >&5
-+echo "${ECHO_T}native pthreads" >&6
-+					LIBS="-lpthread $LIBS"
-+					CPPFLAGS="$CPPFLAGS -I/usr/include"
-+					STD_CINCLUDES="$STD_CINCLUDES -I/usr/include"
-+				else
-+					echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
- echo "${ECHO_T}mit-pthreads/unproven-pthreads" >&6
--				pkg="$LOCALBASE/pthreads"
--				lib1="-L$pkg/lib -Wl,-R$pkg/lib"
--				lib2="-lpthread -lm -lgcc -lpthread"
--				LIBS="$lib1 $lib2 $LIBS"
--				CPPFLAGS="$CPPFLAGS -I$pkg/include"
--				STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
-+					pkg="$LOCALBASE/pthreads"
-+					lib1="-L$pkg/lib -Wl,-R$pkg/lib"
-+					lib2="-lpthread -lm -lgcc -lpthread"
-+					LIBS="$lib1 $lib2 $LIBS"
-+					CPPFLAGS="$CPPFLAGS -I$pkg/include"
-+					STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
-+				fi
+ 				if $use_threads
+ 				then
+-					echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
+-echo "${ECHO_T}mit-pthreads/unproven-pthreads" >&6
+-					pkg="$LOCALBASE/pthreads"
+-					lib1="-L$pkg/lib -Wl,-R$pkg/lib"
+-					lib2="-lpthread -lm -lgcc -lpthread"
+-					LIBS="$lib1 $lib2 $LIBS"
+-					CPPFLAGS="$CPPFLAGS -I$pkg/include"
+-					STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
++					if test -f /usr/include/pthreads.h
++					then
++						echo "$as_me:$LINENO: result: native pthreads" >&5
++						LIBS="-lpthread $LIBS"
++						CPPFLAGS="$CPPFLAGS -I/usr/include"
++						STD_CINCLUDES="$STD_CINCLUDES -I/usr/include"
++					else
++						echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
++	echo "${ECHO_T}mit-pthreads/unproven-pthreads" >&6
++						pkg="$LOCALBASE/pthreads"
++						lib1="-L$pkg/lib -Wl,-R$pkg/lib"
++						lib2="-lpthread -lm -lgcc -lpthread"
++						LIBS="$lib1 $lib2 $LIBS"
++						CPPFLAGS="$CPPFLAGS -I$pkg/include"
++						STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
++					fi
+ 				fi
  			fi
  		fi
- 		;;
diff --git a/net/bind9/patches/patch-ae b/net/bind9/patches/patch-ae
index c892ef414ca..91d93957993 100644
--- a/net/bind9/patches/patch-ae
+++ b/net/bind9/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2003/03/10 02:47:38 hubertf Exp $
+$NetBSD: patch-ae,v 1.4 2004/10/03 09:20:41 tron Exp $
 
---- lib/bind/configure.orig	2003-03-10 01:09:39.000000000 +0000
-+++ lib/bind/configure
-@@ -4076,7 +4076,8 @@ echo "${ECHO_T}PTL2" >&6
+--- lib/bind/configure.orig	2004-02-24 11:32:40.000000000 +0900
++++ lib/bind/configure	2004-05-16 05:09:21.000000000 +0900
+@@ -4497,7 +4497,8 @@
  echo "$as_me: WARNING: linking with PTL2 is highly experimental and not expected to work" >&2;}
  			CC=ptlgcc
  		else
@@ -12,7 +12,7 @@ $NetBSD: patch-ae,v 1.3 2003/03/10 02:47:38 hubertf Exp $
  			then
  				echo "$as_me:$LINENO: result: none" >&5
  echo "${ECHO_T}none" >&6
-@@ -4085,14 +4086,23 @@ echo "${ECHO_T}none" >&6
+@@ -4506,14 +4507,23 @@
  
  			if $use_threads
  			then
diff --git a/net/bind9/patches/patch-af b/net/bind9/patches/patch-af
index 22186601f33..d2f645435f5 100644
--- a/net/bind9/patches/patch-af
+++ b/net/bind9/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2003/03/10 02:47:38 hubertf Exp $
+$NetBSD: patch-af,v 1.5 2004/10/03 09:20:41 tron Exp $
 
---- lib/bind/configure.in.orig	2003-03-10 01:09:39.000000000 +0000
-+++ lib/bind/configure.in
-@@ -367,7 +367,8 @@ then
+--- lib/bind/configure.in.orig	2004-03-15 10:02:44.000000000 +0900
++++ lib/bind/configure.in	2004-05-16 05:09:55.000000000 +0900
+@@ -367,7 +367,8 @@
  [linking with PTL2 is highly experimental and not expected to work])
  			CC=ptlgcc
  		else
@@ -12,7 +12,7 @@ $NetBSD: patch-af,v 1.4 2003/03/10 02:47:38 hubertf Exp $
  			then
  				AC_MSG_RESULT(none)
  				use_threads=false
-@@ -375,13 +376,21 @@ then
+@@ -375,13 +376,21 @@
  
  			if $use_threads
  			then
diff --git a/net/bind9/patches/patch-ag b/net/bind9/patches/patch-ag
deleted file mode 100644
index 9ae6db9c339..00000000000
--- a/net/bind9/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2004/04/01 20:29:53 tron Exp $
-
---- lib/isc/unix/os.c.orig	2001-08-16 08:19:58.000000000 +0200
-+++ lib/isc/unix/os.c	2004-04-01 22:22:25.000000000 +0200
-@@ -56,6 +56,9 @@
- 
- #if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTLBYNAME)
- #include <sys/types.h>
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#endif
- #include <sys/sysctl.h>
- 
- static int
diff --git a/net/bind9/patches/patch-ah b/net/bind9/patches/patch-ah
index de6e95fe383..56e0e8a3857 100644
--- a/net/bind9/patches/patch-ah
+++ b/net/bind9/patches/patch-ah
@@ -1,4 +1,3 @@
-$NetBSD: patch-ah,v 1.4 2004/05/07 12:06:47 cjep Exp $
 --- lib/bind/configure.in.orig	Tue Apr  6 15:49:26 2004
 +++ lib/bind/configure.in	Tue Apr  6 15:50:11 2004
 @@ -81,16 +81,16 @@
diff --git a/net/bind9/patches/patch-ai b/net/bind9/patches/patch-ai
index e1679e637f0..1b96d17234e 100644
--- a/net/bind9/patches/patch-ai
+++ b/net/bind9/patches/patch-ai
@@ -1,4 +1,3 @@
-$NetBSD: patch-ai,v 1.4 2004/05/07 12:06:47 cjep Exp $
 --- lib/bind/configure.orig	Tue Apr  6 16:25:51 2004
 +++ lib/bind/configure	Tue Apr  6 16:26:15 2004
 @@ -1822,16 +1822,16 @@
diff --git a/net/bind9/patches/patch-aj b/net/bind9/patches/patch-aj
index e61d727f540..420f304ffc7 100644
--- a/net/bind9/patches/patch-aj
+++ b/net/bind9/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.2 2004/05/07 12:06:47 cjep Exp $
---- lib/Makefile.in.orig	Tue Apr  6 18:29:00 2004
-+++ lib/Makefile.in	Tue Apr  6 18:29:01 2004
-@@ -22,8 +22,8 @@
- # Note: the order of SUBDIRS is important.
+$NetBSD: patch-aj,v 1.3 2004/10/03 09:20:41 tron Exp $
+
+--- lib/Makefile.in.orig	2004-03-08 18:04:25.000000000 +0900
++++ lib/Makefile.in	2004-05-16 05:11:57.000000000 +0900
+@@ -23,7 +23,7 @@
  # Attempt to disable parallel processing.
  .NOTPARALLEL:
  .NO_PARALLEL:
--SUBDIRS =	isc isccc dns isccfg lwres tests
-+SUBDIRS =	bind isc isccc dns isccfg lwres tests
+-SUBDIRS =	isc isccc dns isccfg bind9 lwres tests
++SUBDIRS =	bind isc isccc dns isccfg bind9 lwres tests
  TARGETS =
  
  @BIND9_MAKE_RULES@
diff --git a/net/bind9/patches/patch-ak b/net/bind9/patches/patch-al
index 3b5dd0f12ae..b2b2ce15d8b 100644
--- a/net/bind9/patches/patch-ak
+++ b/net/bind9/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.1 2004/05/18 07:05:34 tron Exp $
+$NetBSD: patch-al,v 1.1 2004/10/03 09:20:41 tron Exp $
 
 --- lib/bind/port_after.h.in.orig	2003-06-27 05:51:35.000000000 +0200
-+++ lib/bind/port_after.h.in	2004-05-18 08:47:05.000000000 +0200
++++ lib/bind/port_after.h.in	2004-05-18 08:15:19.000000000 +0200
 @@ -361,7 +361,7 @@
  #define gettimeofday isc__gettimeofday
  #ifdef NEED_GETTIMEOFDAY