Remove "bind9-current" packages after "bind9" package has been updated

to version 9.3.0.

19 files changed, 1 insertions, 819 deletions

diff --git a/net/Makefile b/net/Makefile
index b2ae96e4946..909fb4c0925 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.494 2004/09/30 13:02:27 salo Exp $
+# $NetBSD: Makefile,v 1.495 2004/10/03 09:26:12 tron Exp $
 #
 
 COMMENT=	Networking tools
@@ -27,7 +27,6 @@ SUBDIR+=	bftpd
 SUBDIR+=	bind4
 SUBDIR+=	bind8
 SUBDIR+=	bind9
-SUBDIR+=	bind9-current
 SUBDIR+=	bing
 SUBDIR+=	bittorrent
 SUBDIR+=	bittorrent-gui
diff --git a/net/bind9-current/DESCR b/net/bind9-current/DESCR
deleted file mode 100644
index c311081809b..00000000000
--- a/net/bind9-current/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-  BIND version 9 is a major rewrite of nearly all aspects of the
-underlying BIND architecture. This re-architecting of BIND was
-necessitated by the expected demands of:
-
-  - Domain name system growth, particularly in very large
-    zones such as .COM
-  - Protocol enhancements necessary to securely query and
-    update zones
-  - Protocol enhancements necessary to take advantage of
-    certain architectural features of IP version 6
-
-  The 9.0.0 release, and this release candidate, is aimed at
-early adopters and those who wish to make use of new 9.0
-features, such as IPv6 and DNSSEC secure resolution support.
diff --git a/net/bind9-current/Makefile b/net/bind9-current/Makefile
deleted file mode 100644
index 07db18b4ca7..00000000000
--- a/net/bind9-current/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-# $NetBSD: Makefile,v 1.47 2004/10/03 00:17:49 tv Exp $
-
-DISTNAME=	bind-${BIND_VERSION}
-PKGNAME=	bind-${BIND_VERSION}
-PKGREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
-
-MAINTAINER=	itojun@NetBSD.org
-HOMEPAGE=	http://www.isc.org/products/BIND/
-COMMENT=	Version 9 of the Berkeley Internet Name Daemon, implementation of DNS
-
-BIND_VERSION=	9.3.0beta3
-DIST_SUBDIR=	bind/${BIND_VERSION}
-
-# IPv6 ready, automatically detected
-.include "../../mk/bsd.prefs.mk"
-BUILD_DEFS+=	USE_INET6
-# No need to set USE_INET6, will auto-detect.
-
-USE_BUILDLINK3=		yes
-USE_LIBTOOL=		yes
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-libtool=yes \
-		--sysconfdir=/etc \
-		--localstatedir=/var
-#LDFLAGS+=	${COMPILER_RPATH_FLAG}${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib
-# use external OpenSSL.  comment out the following line and the buildlink
-# include at the bottom to use OpenSSL shipped with BIND9.
-CONFIGURE_ARGS+=--with-openssl=${SSLBASE}
-
-PTHREAD_OPTS+=	native
-
-post-build:
-	${SED} \
-		-e 's|@PREFIX@|${PREFIX}|' \
-		<${FILESDIR}/named.sh >${WRKDIR}/named
-	${SED} \
-		-e 's|@PREFIX@|${PREFIX}|' \
-		<${FILESDIR}/lwresd.sh >${WRKDIR}/lwresd
-
-# include/isc/ipv6.h is installed on non-ipv6 platforms
-.if defined(USE_INET6) && (${USE_INET6} == "YES")
-PLIST_SUBST+=	IPV6H="@comment "
-.else
-PLIST_SUBST+=	IPV6H=
-.endif
-
-PLIST_SRC=	${WRKDIR}/PLIST
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/arm
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/draft
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/misc
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind9/rfc
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bind9
-	${INSTALL_DATA} ${WRKSRC}/doc/arm/* ${PREFIX}/share/doc/bind9/arm
-	${INSTALL_DATA} ${WRKSRC}/doc/draft/* ${PREFIX}/share/doc/bind9/draft
-	${INSTALL_DATA} ${WRKSRC}/doc/misc/* ${PREFIX}/share/doc/bind9/misc
-	${INSTALL_DATA} ${WRKSRC}/doc/rfc/* ${PREFIX}/share/doc/bind9/rfc
-	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	(cd ${PREFIX}; ${FIND} share/doc/bind9 -type f -print ) >> ${PLIST_SRC}
-	(cd ${PREFIX}; ${FIND} share/doc/bind9 -type d -print ) | \
-		${SED} -e 's/^/@dirrm /' | ${SORT} -r >> ${PLIST_SRC}
-	${INSTALL_SCRIPT} ${WRKDIR}/named ${PREFIX}/etc/rc.d/named9
-	${INSTALL_SCRIPT} ${WRKDIR}/lwresd ${PREFIX}/etc/rc.d/lwresd
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
-CONFIGURE_ARGS+=	--disable-threads
-.else
-CONFIGURE_ARGS+=	--enable-threads
-.endif
diff --git a/net/bind9-current/PLIST b/net/bind9-current/PLIST
deleted file mode 100644
index 7b4b5a5d940..00000000000
--- a/net/bind9-current/PLIST
+++ /dev/null
@@ -1,324 +0,0 @@
-@comment $NetBSD: PLIST,v 1.13 2004/09/22 08:09:47 jlam Exp $
-bin/dig
-bin/host
-bin/isc-config.sh
-bin/nslookup
-bin/nsupdate
-etc/rc.d/lwresd
-etc/rc.d/named9
-${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/dns/acl.h
-include/dns/adb.h
-include/dns/byaddr.h
-include/dns/cache.h
-include/dns/callbacks.h
-include/dns/cert.h
-include/dns/compress.h
-include/dns/db.h
-include/dns/dbiterator.h
-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
-include/dns/fixedname.h
-include/dns/journal.h
-include/dns/keyflags.h
-include/dns/keytable.h
-include/dns/keyvalues.h
-include/dns/lib.h
-include/dns/log.h
-include/dns/master.h
-include/dns/masterdump.h
-include/dns/message.h
-include/dns/name.h
-include/dns/ncache.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
-include/dns/rdataclass.h
-include/dns/rdatalist.h
-include/dns/rdataset.h
-include/dns/rdatasetiter.h
-include/dns/rdataslab.h
-include/dns/rdatastruct.h
-include/dns/rdatatype.h
-include/dns/request.h
-include/dns/resolver.h
-include/dns/result.h
-include/dns/rootns.h
-include/dns/sdb.h
-include/dns/secalg.h
-include/dns/secproto.h
-include/dns/soa.h
-include/dns/ssu.h
-include/dns/tcpmsg.h
-include/dns/time.h
-include/dns/tkey.h
-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
-include/dns/zonekey.h
-include/dns/zt.h
-include/dst/dst.h
-include/dst/lib.h
-include/dst/result.h
-include/isc/app.h
-include/isc/assertions.h
-include/isc/base64.h
-include/isc/bitstring.h
-include/isc/boolean.h
-include/isc/buffer.h
-include/isc/bufferlist.h
-include/isc/commandline.h
-include/isc/condition.h
-include/isc/dir.h
-include/isc/entropy.h
-include/isc/error.h
-include/isc/event.h
-include/isc/eventclass.h
-include/isc/file.h
-include/isc/formatcheck.h
-include/isc/fsaccess.h
-include/isc/heap.h
-include/isc/hex.h
-include/isc/hmacmd5.h
-include/isc/int.h
-include/isc/interfaceiter.h
-include/isc/lang.h
-include/isc/lex.h
-include/isc/lfsr.h
-include/isc/lib.h
-include/isc/list.h
-include/isc/log.h
-include/isc/magic.h
-include/isc/md5.h
-include/isc/mem.h
-include/isc/msgcat.h
-include/isc/msgs.h
-include/isc/mutex.h
-include/isc/mutexblock.h
-include/isc/net.h
-include/isc/netaddr.h
-include/isc/netdb.h
-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
-include/isc/random.h
-include/isc/ratelimiter.h
-include/isc/refcount.h
-include/isc/region.h
-include/isc/resource.h
-include/isc/result.h
-include/isc/resultclass.h
-include/isc/rwlock.h
-include/isc/serial.h
-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
-include/isc/syslog.h
-include/isc/task.h
-include/isc/taskpool.h
-include/isc/thread.h
-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
-include/isccc/ccmsg.h
-include/isccc/events.h
-include/isccc/lib.h
-include/isccc/result.h
-include/isccc/sexpr.h
-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/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
-include/lwres/lang.h
-include/lwres/list.h
-include/lwres/lwbuffer.h
-include/lwres/lwpacket.h
-include/lwres/lwres.h
-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
-man/man1/dig.1
-man/man1/host.1
-man/man3/lwres.3
-man/man3/lwres_addr_parse.3
-man/man3/lwres_buffer.3
-man/man3/lwres_buffer_add.3
-man/man3/lwres_buffer_back.3
-man/man3/lwres_buffer_clear.3
-man/man3/lwres_buffer_first.3
-man/man3/lwres_buffer_forward.3
-man/man3/lwres_buffer_getmem.3
-man/man3/lwres_buffer_getuint16.3
-man/man3/lwres_buffer_getuint32.3
-man/man3/lwres_buffer_getuint8.3
-man/man3/lwres_buffer_init.3
-man/man3/lwres_buffer_invalidate.3
-man/man3/lwres_buffer_putmem.3
-man/man3/lwres_buffer_putuint16.3
-man/man3/lwres_buffer_putuint32.3
-man/man3/lwres_buffer_putuint8.3
-man/man3/lwres_buffer_subtract.3
-man/man3/lwres_conf_clear.3
-man/man3/lwres_conf_get.3
-man/man3/lwres_conf_init.3
-man/man3/lwres_conf_parse.3
-man/man3/lwres_conf_print.3
-man/man3/lwres_config.3
-man/man3/lwres_context.3
-man/man3/lwres_context_allocmem.3
-man/man3/lwres_context_create.3
-man/man3/lwres_context_destroy.3
-man/man3/lwres_context_freemem.3
-man/man3/lwres_context_initserial.3
-man/man3/lwres_context_nextserial.3
-man/man3/lwres_context_sendrecv.3
-man/man3/lwres_endhostent.3
-man/man3/lwres_endhostent_r.3
-man/man3/lwres_freeaddrinfo.3
-man/man3/lwres_freehostent.3
-man/man3/lwres_gabn.3
-man/man3/lwres_gabnrequest_free.3
-man/man3/lwres_gabnrequest_parse.3
-man/man3/lwres_gabnrequest_render.3
-man/man3/lwres_gabnresponse_free.3
-man/man3/lwres_gabnresponse_parse.3
-man/man3/lwres_gabnresponse_render.3
-man/man3/lwres_gai_strerror.3
-man/man3/lwres_getaddrinfo.3
-man/man3/lwres_getaddrsbyname.3
-man/man3/lwres_gethostbyaddr.3
-man/man3/lwres_gethostbyaddr_r.3
-man/man3/lwres_gethostbyname.3
-man/man3/lwres_gethostbyname2.3
-man/man3/lwres_gethostbyname_r.3
-man/man3/lwres_gethostent.3
-man/man3/lwres_gethostent_r.3
-man/man3/lwres_getipnode.3
-man/man3/lwres_getipnodebyaddr.3
-man/man3/lwres_getipnodebyname.3
-man/man3/lwres_getnamebyaddr.3
-man/man3/lwres_getnameinfo.3
-man/man3/lwres_getrrsetbyname.3
-man/man3/lwres_gnba.3
-man/man3/lwres_gnbarequest_free.3
-man/man3/lwres_gnbarequest_parse.3
-man/man3/lwres_gnbarequest_render.3
-man/man3/lwres_gnbaresponse_free.3
-man/man3/lwres_gnbaresponse_parse.3
-man/man3/lwres_gnbaresponse_render.3
-man/man3/lwres_herror.3
-man/man3/lwres_hstrerror.3
-man/man3/lwres_inetntop.3
-man/man3/lwres_lwpacket_parseheader.3
-man/man3/lwres_lwpacket_renderheader.3
-man/man3/lwres_net_ntop.3
-man/man3/lwres_noop.3
-man/man3/lwres_nooprequest_free.3
-man/man3/lwres_nooprequest_parse.3
-man/man3/lwres_nooprequest_render.3
-man/man3/lwres_noopresponse_free.3
-man/man3/lwres_noopresponse_parse.3
-man/man3/lwres_noopresponse_render.3
-man/man3/lwres_packet.3
-man/man3/lwres_resutil.3
-man/man3/lwres_sethostent.3
-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-signzone.8
-man/man8/lwresd.8
-man/man8/named-checkconf.8
-man/man8/named-checkzone.8
-man/man8/named.8
-man/man8/nsupdate.8
-man/man8/rndc-confgen.8
-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/bind/arpa
-@dirrm include/bind/isc
-@dirrm include/bind/sys
-@dirrm include/bind
-@dirrm include/dns
-@dirrm include/dst
-@dirrm include/isc
-@dirrm include/isccc
-@dirrm include/isccfg
-@dirrm include/lwres
diff --git a/net/bind9-current/distinfo b/net/bind9-current/distinfo
deleted file mode 100644
index 8567f7241a4..00000000000
--- a/net/bind9-current/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.26 2004/05/18 06:46:08 tron Exp $
-
-SHA1 (bind/9.3.0beta3/bind-9.3.0beta3.tar.gz) = d2cad92ffce472b1356ea5adae87ce18a2472a47
-Size (bind/9.3.0beta3/bind-9.3.0beta3.tar.gz) = 4629615 bytes
-SHA1 (patch-aa) = 959fe6c66d54fa93a0191065a5d54007065ca707
-SHA1 (patch-ab) = 44869e687f163fac7b8679dbaac6395120f9c8ef
-SHA1 (patch-ac) = 57f0fee92a6c84bf422c6b872eb327b755450557
-SHA1 (patch-ad) = 91fb539679a850f1b9ae4af5d6eb8f8ea740f3d9
-SHA1 (patch-ae) = 81b9d96b7c0b8da52ef8970113738d0d37483a5e
-SHA1 (patch-af) = 1f9058f0c6893a800d1af52b1daf35b45385a78e
-SHA1 (patch-ag) = f79fdb089dee45f474359efb414e9c2d70dbfd32
-SHA1 (patch-ah) = d3df97e984759914032c30b4f06f9c815eee3421
-SHA1 (patch-ai) = 60bd449ddfae8a266e09b85bcc832ff9c5da2544
-SHA1 (patch-aj) = 7422829ca0dc3d411f00628189f059e47350b524
-SHA1 (patch-ak) = 2a8325d212edbbb7624568cecceef3137ce705c0
-SHA1 (patch-al) = 606600d8bdb817688a5f3336a39b7348bca2c230
diff --git a/net/bind9-current/files/lwresd.sh b/net/bind9-current/files/lwresd.sh
deleted file mode 100644
index 38ebe333061..00000000000
--- a/net/bind9-current/files/lwresd.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: lwresd.sh,v 1.6 2004/05/15 21:00:58 itojun Exp $
-#
-# PROVIDE: lwresd
-# REQUIRE: SERVERS
-
-. /etc/rc.subr
-
-name="lwresd"
-rcvar=${name}
-command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-
-extra_commands="reload"
-
-load_rc_config ${name}		# check /etc/rc.conf.d/named9
-run_rc_command "$1"
diff --git a/net/bind9-current/files/named.sh b/net/bind9-current/files/named.sh
deleted file mode 100644
index 0299e436e1e..00000000000
--- a/net/bind9-current/files/named.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: named.sh,v 1.6 2004/05/15 21:00:58 itojun Exp $
-#
-# PROVIDE: named
-# REQUIRE: SERVERS
-
-. /etc/rc.subr
-
-name="named"
-rcvar=${name}9
-command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-
-extra_commands="reload"
-
-load_rc_config ${name}9		# check /etc/rc.conf.d/named9
-
-named_precmd()
-{
-	# Die if $named is also set (i.e. the system's named is not disabled
-	if checkyesno named ; then
-		warn \
-	"disable 'named' when setting 'named9'!"
-		return 1
-	fi
-}
-start_precmd="named_precmd"
-
-run_rc_command "$1"
diff --git a/net/bind9-current/patches/patch-aa b/net/bind9-current/patches/patch-aa
deleted file mode 100644
index bf694f76520..00000000000
--- a/net/bind9-current/patches/patch-aa
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/05/15 21:00:58 itojun Exp $
-
---- 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
-+						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-current/patches/patch-ab b/net/bind9-current/patches/patch-ab
deleted file mode 100644
index 49d8c09453b..00000000000
--- a/net/bind9-current/patches/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2004/05/15 21:00:58 itojun Exp $
-
---- lib/lwres/getnameinfo.c-	2004-05-16 05:01:45.000000000 +0900
-+++ lib/lwres/getnameinfo.c	2004-05-16 05:02:50.000000000 +0900
-@@ -62,6 +62,10 @@
- #include <lwres/net.h>
- #include <lwres/netdb.h>
- 
-+#ifdef __KAME__
-+#include <net/if.h>
-+#endif
-+
- #include "assert_p.h"
- 
- #define SUCCESS 0
-@@ -210,13 +214,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) {
--				/*
--				 * Vendors may want to add support for
--				 * non-numeric scope identifier.
--				 */
--				stringscope = foo;
-+				stringscope = if_indextoname(
-+				    ((const struct sockaddr_in6 *)sa)->sin6_scope_id);
- 			}
- #endif
- 			if (stringscope == NULL) {
diff --git a/net/bind9-current/patches/patch-ac b/net/bind9-current/patches/patch-ac
deleted file mode 100644
index d2e7a687b20..00000000000
--- a/net/bind9-current/patches/patch-ac
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2004/05/15 21:00:58 itojun Exp $
-
---- 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>
- 
-+#ifdef __KAME__
-+#include <net/if.h>
-+#endif
-+
- #define SA(addr)	((struct sockaddr *)(addr))
- #define SIN(addr)	((struct sockaddr_in *)(addr))
- #define SIN6(addr)	((struct sockaddr_in6 *)(addr))
-@@ -252,14 +256,22 @@
- 			p = strchr(ntmp, '%');
- 			ep = NULL;
- 
-+#ifdef __KAME__
-+			if (p != NULL) {
-+				scopeid = if_nametoindex(p + 1);
-+				if (scopeid)
-+					p = NULL;
-+			}
-+#endif
- 			/*
- 			 * Vendors may want to support non-numeric
- 			 * scopeid around here.
- 			 */
- 
--			if (p != NULL)
-+			if (p != NULL) {
- 				scopeid = (lwres_uint32_t)strtoul(p + 1,
- 								  &ep, 10);
-+			}
- 			if (p != NULL && ep != NULL && ep[0] == '\0')
- 				*p = '\0';
- 			else {
diff --git a/net/bind9-current/patches/patch-ad b/net/bind9-current/patches/patch-ad
deleted file mode 100644
index 33dbe0c9096..00000000000
--- a/net/bind9-current/patches/patch-ad
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2004/05/15 21:00:58 itojun Exp $
-
---- 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
--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-current/patches/patch-ae b/net/bind9-current/patches/patch-ae
deleted file mode 100644
index c67db4d2187..00000000000
--- a/net/bind9-current/patches/patch-ae
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/05/15 21:00:58 itojun Exp $
-
---- 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
--			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
-@@ -4506,14 +4507,23 @@
- 
- 			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
- 			fi
- 		fi
- 		;;
diff --git a/net/bind9-current/patches/patch-af b/net/bind9-current/patches/patch-af
deleted file mode 100644
index d9e81f0814c..00000000000
--- a/net/bind9-current/patches/patch-af
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-af,v 1.3 2004/05/15 21:00:58 itojun Exp $
-
---- 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
--			if test ! -d $LOCALBASE/pthreads
-+			if test ! -d $LOCALBASE/pthreads \
-+				-a ! -f /usr/include/pthread.h
- 			then
- 				AC_MSG_RESULT(none)
- 				use_threads=false
-@@ -375,13 +376,21 @@
- 
- 			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
- 			fi
- 		fi
- 		;;
diff --git a/net/bind9-current/patches/patch-ag b/net/bind9-current/patches/patch-ag
deleted file mode 100644
index e0936f7734e..00000000000
--- a/net/bind9-current/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2004/05/15 21:00:58 itojun 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-current/patches/patch-ah b/net/bind9-current/patches/patch-ah
deleted file mode 100644
index 56e0e8a3857..00000000000
--- a/net/bind9-current/patches/patch-ah
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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 @@
- # isc/list.h and others clash with the rest of BIND 9
- #
- case "$includedir" in
- 	'${prefix}/include')
--		includedir='${prefix}/bind/include'
--		;;
--esac
--case "$libdir" in
--	'${prefix}/lib')
--		libdir='${prefix}/bind/lib'
-+		includedir='${prefix}/include/bind'
- 		;;
- esac
-+#case "$libdir" in
-+#	'${prefix}/lib')
-+#		libdir='${prefix}/bind/lib'
-+#		;;
-+#esac
- 
- #
- # Make sure INSTALL uses an absolute path, else it will be wrong in all
- # Makefiles, since they use make/rules.in and INSTALL will be adjusted by
diff --git a/net/bind9-current/patches/patch-ai b/net/bind9-current/patches/patch-ai
deleted file mode 100644
index 1b96d17234e..00000000000
--- a/net/bind9-current/patches/patch-ai
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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 @@
- # isc/list.h and others clash with the rest of BIND 9
- #
- case "$includedir" in
- 	'${prefix}/include')
--		includedir='${prefix}/bind/include'
--		;;
--esac
--case "$libdir" in
--	'${prefix}/lib')
--		libdir='${prefix}/bind/lib'
-+		includedir='${prefix}/include/bind'
- 		;;
- esac
-+#case "$libdir" in
-+#	'${prefix}/lib')
-+#		libdir='${prefix}/bind/lib'
-+#		;;
-+#esac
- 
- #
- # Make sure INSTALL uses an absolute path, else it will be wrong in all
- # Makefiles, since they use make/rules.in and INSTALL will be adjusted by
diff --git a/net/bind9-current/patches/patch-aj b/net/bind9-current/patches/patch-aj
deleted file mode 100644
index 7cf3799c659..00000000000
--- a/net/bind9-current/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2004/05/15 21:00:58 itojun 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 bind9 lwres tests
-+SUBDIRS =	bind isc isccc dns isccfg bind9 lwres tests
- TARGETS =
- 
- @BIND9_MAKE_RULES@
diff --git a/net/bind9-current/patches/patch-ak b/net/bind9-current/patches/patch-ak
deleted file mode 100644
index 90fa832bea2..00000000000
--- a/net/bind9-current/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/05/15 21:00:58 itojun Exp $
-
---- bin/named/Makefile.in-	2004-05-16 05:30:38.000000000 +0900
-+++ bin/named/Makefile.in	2004-05-16 05:30:47.000000000 +0900
-@@ -126,6 +126,6 @@
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
- 
- install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
--	${LIBTOO_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
-+	${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
diff --git a/net/bind9-current/patches/patch-al b/net/bind9-current/patches/patch-al
deleted file mode 100644
index 814be9d61b5..00000000000
--- a/net/bind9-current/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2004/05/18 06:46:08 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:15:19.000000000 +0200
-@@ -361,7 +361,7 @@
- #define gettimeofday isc__gettimeofday
- #ifdef NEED_GETTIMEOFDAY
- int isc__gettimeofday(struct timeval *tvp, struct _TIMEZONE *tzp);
--#else
-+#elif !defined(__NetBSD__)
- int isc__gettimeofday(struct timeval *tp, struct timezone *tzp);
- #endif
-