Update net/bind95 package to 9.5.2pl4(9.5.2-P4).

	--- 9.5.2-P4 released ---

2876.	[bug]		Named could return SERVFAIL for negative responses
			from unsigned zones. [RT #21131]

	--- 9.5.2-P3 released ---

2852.	[bug]		Handle broken DNSSEC trust chains better. [RT #15619]

9 files changed, 268 insertions, 54 deletions

diff --git a/net/bind95/Makefile b/net/bind95/Makefile
index 936added20b..87d44df04c4 100644
--- a/net/bind95/Makefile
+++ b/net/bind95/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/04/22 20:21:09 gls Exp $
+# $NetBSD: Makefile,v 1.18 2010/05/26 15:56:39 taca Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
 		http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
@@ -17,7 +16,7 @@ CONFLICTS+=	bind>=9.6.0
 PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=	no
 
-BIND_VERSION=	9.5.2-P2
+BIND_VERSION=	9.5.2-P4
 
 # IPv6 ready, automatically detected
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/bind95/PLIST b/net/bind95/PLIST
index f8def632ac4..c9cabdffd3b 100644
--- a/net/bind95/PLIST
+++ b/net/bind95/PLIST
@@ -1,10 +1,34 @@
-@comment $NetBSD: PLIST,v 1.4 2009/11/30 11:58:30 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/05/26 15:56:39 taca Exp $
 bin/dig
 bin/host
 bin/isc-config.sh
 bin/nslookup
 bin/nsupdate
 ${PLIST.inet6}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/platform.h.in
+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
@@ -286,8 +310,8 @@ 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/man5/named.conf.5
+man/man5/rndc.conf.5
 man/man8/dnssec-keygen.8
 man/man8/dnssec-signzone.8
 man/man8/lwresd.8
@@ -306,5 +330,196 @@ sbin/named-checkzone
 sbin/named-compilezone
 sbin/rndc
 sbin/rndc-confgen
+share/doc/bind9/README
+share/doc/bind9/arm/Bv9ARM-book.xml
+share/doc/bind9/arm/Bv9ARM.ch01.html
+share/doc/bind9/arm/Bv9ARM.ch02.html
+share/doc/bind9/arm/Bv9ARM.ch03.html
+share/doc/bind9/arm/Bv9ARM.ch04.html
+share/doc/bind9/arm/Bv9ARM.ch05.html
+share/doc/bind9/arm/Bv9ARM.ch06.html
+share/doc/bind9/arm/Bv9ARM.ch07.html
+share/doc/bind9/arm/Bv9ARM.ch08.html
+share/doc/bind9/arm/Bv9ARM.ch09.html
+share/doc/bind9/arm/Bv9ARM.ch10.html
+share/doc/bind9/arm/Bv9ARM.html
+share/doc/bind9/arm/Bv9ARM.pdf
+share/doc/bind9/arm/README-SGML
+share/doc/bind9/arm/isc-logo.eps
+share/doc/bind9/arm/isc-logo.pdf
+share/doc/bind9/arm/man.dig.html
+share/doc/bind9/arm/man.dnssec-keygen.html
+share/doc/bind9/arm/man.dnssec-signzone.html
+share/doc/bind9/arm/man.host.html
+share/doc/bind9/arm/man.named-checkconf.html
+share/doc/bind9/arm/man.named-checkzone.html
+share/doc/bind9/arm/man.named.html
+share/doc/bind9/arm/man.rndc-confgen.html
+share/doc/bind9/arm/man.rndc.conf.html
+share/doc/bind9/arm/man.rndc.html
+share/doc/bind9/doxygen/Doxyfile
+share/doc/bind9/doxygen/Doxyfile.in
+share/doc/bind9/doxygen/doxygen-input-filter
+share/doc/bind9/doxygen/doxygen-input-filter.in
+share/doc/bind9/doxygen/isc-footer.html
+share/doc/bind9/doxygen/isc-header.html
+share/doc/bind9/doxygen/mainpage
+share/doc/bind9/draft/draft-ietf-6man-text-addr-representation-01.txt
+share/doc/bind9/draft/draft-ietf-behave-dns64-01.txt
+share/doc/bind9/draft/draft-ietf-dnsext-axfr-clarify-12.txt
+share/doc/bind9/draft/draft-ietf-dnsext-dns-tcp-requirements-01.txt
+share/doc/bind9/draft/draft-ietf-dnsext-dnssec-bis-updates-09.txt
+share/doc/bind9/draft/draft-ietf-dnsext-dnssec-gost-05.txt
+share/doc/bind9/draft/draft-ietf-dnsext-ecc-key-07.txt
+share/doc/bind9/draft/draft-ietf-dnsext-interop3597-02.txt
+share/doc/bind9/draft/draft-ietf-dnsext-rfc2671bis-edns0-02.txt
+share/doc/bind9/draft/draft-ietf-dnsext-rfc2672bis-dname-18.txt
+share/doc/bind9/draft/draft-ietf-dnsext-rfc3597-bis-00.txt
+share/doc/bind9/draft/draft-ietf-dnsext-tsig-md5-deprecated-03.txt
+share/doc/bind9/draft/draft-ietf-dnsop-bad-dns-res-05.txt
+share/doc/bind9/draft/draft-ietf-dnsop-default-local-zones-09.txt
+share/doc/bind9/draft/draft-ietf-dnsop-inaddr-required-07.txt
+share/doc/bind9/draft/draft-ietf-dnsop-name-server-management-reqs-02.txt
+share/doc/bind9/draft/draft-ietf-dnsop-respsize-06.txt
+share/doc/bind9/draft/draft-kato-dnsop-local-zones-00.txt
+share/doc/bind9/draft/update
+share/doc/bind9/misc/dnssec
+share/doc/bind9/misc/ipv6
+share/doc/bind9/misc/migration
+share/doc/bind9/misc/migration-4to9
+share/doc/bind9/misc/options
+share/doc/bind9/misc/rfc-compliance
+share/doc/bind9/misc/roadmap
+share/doc/bind9/misc/sdb
+share/doc/bind9/rfc/fetch
+share/doc/bind9/rfc/index
+share/doc/bind9/rfc/rfc1032.txt
+share/doc/bind9/rfc/rfc1033.txt
+share/doc/bind9/rfc/rfc1034.txt
+share/doc/bind9/rfc/rfc1035.txt
+share/doc/bind9/rfc/rfc1101.txt
+share/doc/bind9/rfc/rfc1122.txt
+share/doc/bind9/rfc/rfc1123.txt
+share/doc/bind9/rfc/rfc1183.txt
+share/doc/bind9/rfc/rfc1348.txt
+share/doc/bind9/rfc/rfc1535.txt
+share/doc/bind9/rfc/rfc1536.txt
+share/doc/bind9/rfc/rfc1537.txt
+share/doc/bind9/rfc/rfc1591.txt
+share/doc/bind9/rfc/rfc1611.txt
+share/doc/bind9/rfc/rfc1612.txt
+share/doc/bind9/rfc/rfc1706.txt
+share/doc/bind9/rfc/rfc1712.txt
+share/doc/bind9/rfc/rfc1750.txt
+share/doc/bind9/rfc/rfc1876.txt
+share/doc/bind9/rfc/rfc1886.txt
+share/doc/bind9/rfc/rfc1912.txt
+share/doc/bind9/rfc/rfc1982.txt
+share/doc/bind9/rfc/rfc1995.txt
+share/doc/bind9/rfc/rfc1996.txt
+share/doc/bind9/rfc/rfc2052.txt
+share/doc/bind9/rfc/rfc2104.txt
+share/doc/bind9/rfc/rfc2119.txt
+share/doc/bind9/rfc/rfc2133.txt
+share/doc/bind9/rfc/rfc2136.txt
+share/doc/bind9/rfc/rfc2137.txt
+share/doc/bind9/rfc/rfc2163.txt
+share/doc/bind9/rfc/rfc2168.txt
+share/doc/bind9/rfc/rfc2181.txt
+share/doc/bind9/rfc/rfc2230.txt
+share/doc/bind9/rfc/rfc2308.txt
+share/doc/bind9/rfc/rfc2317.txt
+share/doc/bind9/rfc/rfc2373.txt
+share/doc/bind9/rfc/rfc2374.txt
+share/doc/bind9/rfc/rfc2375.txt
+share/doc/bind9/rfc/rfc2418.txt
+share/doc/bind9/rfc/rfc2535.txt
+share/doc/bind9/rfc/rfc2536.txt
+share/doc/bind9/rfc/rfc2537.txt
+share/doc/bind9/rfc/rfc2538.txt
+share/doc/bind9/rfc/rfc2539.txt
+share/doc/bind9/rfc/rfc2540.txt
+share/doc/bind9/rfc/rfc2541.txt
+share/doc/bind9/rfc/rfc2553.txt
+share/doc/bind9/rfc/rfc2671.txt
+share/doc/bind9/rfc/rfc2672.txt
+share/doc/bind9/rfc/rfc2673.txt
+share/doc/bind9/rfc/rfc2782.txt
+share/doc/bind9/rfc/rfc2825.txt
+share/doc/bind9/rfc/rfc2826.txt
+share/doc/bind9/rfc/rfc2845.txt
+share/doc/bind9/rfc/rfc2874.txt
+share/doc/bind9/rfc/rfc2915.txt
+share/doc/bind9/rfc/rfc2929.txt
+share/doc/bind9/rfc/rfc2930.txt
+share/doc/bind9/rfc/rfc2931.txt
+share/doc/bind9/rfc/rfc3007.txt
+share/doc/bind9/rfc/rfc3008.txt
+share/doc/bind9/rfc/rfc3071.txt
+share/doc/bind9/rfc/rfc3090.txt
+share/doc/bind9/rfc/rfc3110.txt
+share/doc/bind9/rfc/rfc3123.txt
+share/doc/bind9/rfc/rfc3152.txt
+share/doc/bind9/rfc/rfc3197.txt
+share/doc/bind9/rfc/rfc3225.txt
+share/doc/bind9/rfc/rfc3226.txt
+share/doc/bind9/rfc/rfc3258.txt
+share/doc/bind9/rfc/rfc3363.txt
+share/doc/bind9/rfc/rfc3364.txt
+share/doc/bind9/rfc/rfc3425.txt
+share/doc/bind9/rfc/rfc3445.txt
+share/doc/bind9/rfc/rfc3467.txt
+share/doc/bind9/rfc/rfc3490.txt
+share/doc/bind9/rfc/rfc3491.txt
+share/doc/bind9/rfc/rfc3492.txt
+share/doc/bind9/rfc/rfc3493.txt
+share/doc/bind9/rfc/rfc3513.txt
+share/doc/bind9/rfc/rfc3596.txt
+share/doc/bind9/rfc/rfc3597.txt
+share/doc/bind9/rfc/rfc3645.txt
+share/doc/bind9/rfc/rfc3655.txt
+share/doc/bind9/rfc/rfc3658.txt
+share/doc/bind9/rfc/rfc3755.txt
+share/doc/bind9/rfc/rfc3757.txt
+share/doc/bind9/rfc/rfc3833.txt
+share/doc/bind9/rfc/rfc3845.txt
+share/doc/bind9/rfc/rfc3901.txt
+share/doc/bind9/rfc/rfc4025.txt
+share/doc/bind9/rfc/rfc4033.txt
+share/doc/bind9/rfc/rfc4034.txt
+share/doc/bind9/rfc/rfc4035.txt
+share/doc/bind9/rfc/rfc4074.txt
+share/doc/bind9/rfc/rfc4159.txt
+share/doc/bind9/rfc/rfc4193.txt
+share/doc/bind9/rfc/rfc4255.txt
+share/doc/bind9/rfc/rfc4294.txt
+share/doc/bind9/rfc/rfc4339.txt
+share/doc/bind9/rfc/rfc4343.txt
+share/doc/bind9/rfc/rfc4367.txt
+share/doc/bind9/rfc/rfc4398.txt
+share/doc/bind9/rfc/rfc4408.txt
+share/doc/bind9/rfc/rfc4431.txt
+share/doc/bind9/rfc/rfc4470.txt
+share/doc/bind9/rfc/rfc4471.txt
+share/doc/bind9/rfc/rfc4472.txt
+share/doc/bind9/rfc/rfc4509.txt
+share/doc/bind9/rfc/rfc4634.txt
+share/doc/bind9/rfc/rfc4635.txt
+share/doc/bind9/rfc/rfc4641.txt
+share/doc/bind9/rfc/rfc4648.txt
+share/doc/bind9/rfc/rfc4697.txt
+share/doc/bind9/rfc/rfc4701.txt
+share/doc/bind9/rfc/rfc4892.txt
+share/doc/bind9/rfc/rfc4955.txt
+share/doc/bind9/rfc/rfc4956.txt
+share/doc/bind9/rfc/rfc5001.txt
+share/doc/bind9/rfc/rfc5011.txt
+share/doc/bind9/rfc/rfc5155.txt
+share/doc/bind9/rfc/rfc5205.txt
+share/doc/bind9/rfc/rfc5452.txt
+share/doc/bind9/rfc/rfc5507.txt
+share/doc/bind9/rfc/rfc5625.txt
+share/doc/bind9/rfc/rfc5702.txt
+share/doc/bind9/rfc/rfc952.txt
 share/examples/rc.d/lwresd
 share/examples/rc.d/named9
diff --git a/net/bind95/distinfo b/net/bind95/distinfo
index 866b2418704..efe238ac0b1 100644
--- a/net/bind95/distinfo
+++ b/net/bind95/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.12 2010/01/21 19:42:16 spz Exp $
+$NetBSD: distinfo,v 1.13 2010/05/26 15:56:39 taca Exp $
 
-SHA1 (bind-9.5.2-P2.tar.gz) = ffa6df6752976e6bdd05508c5cc5131ef9a097f1
-RMD160 (bind-9.5.2-P2.tar.gz) = a0864dadb1af7268a0c54fed3bc178bd17abb55c
-Size (bind-9.5.2-P2.tar.gz) = 6674868 bytes
-SHA1 (patch-ab) = dd12c457791a75a8b43d9dfd0c0b236dcdbe31a5
+SHA1 (bind-9.5.2-P4.tar.gz) = 0ae60e050339c7ad8be2b85a7baa76974db83e21
+RMD160 (bind-9.5.2-P4.tar.gz) = 82eadd8881a48fcef5155fa94566a09fa18e45e4
+Size (bind-9.5.2-P4.tar.gz) = 6678015 bytes
+SHA1 (patch-ab) = 6cec876c8caa7082f97365863f3f88c4f168da48
 SHA1 (patch-ac) = a2c24198044f8cf29198e08a1a10b7e4ea739c40
 SHA1 (patch-ad) = 5c8af5a826e4f6891dfdf949b8a541ee33e16c3e
-SHA1 (patch-af) = b21bb5195cdb4deec00e5abd39f5bf2137549c3f
-SHA1 (patch-ag) = 9d61e0f527a76977bf8457355997d201fa37dd4e
-SHA1 (patch-ai) = 15fb7b46d0c997a6abd60307f111848657a57412
+SHA1 (patch-af) = c4c59217c0a723e94ba7778f6677287e6a901298
+SHA1 (patch-ag) = 96adf9a83d2bf8785cb556d88a841002d72457f8
+SHA1 (patch-ai) = 7e9578f5b717c8a4a73fdb85a04f302808bff854
 SHA1 (patch-aj) = c3bbf84a8a735298552f918ac38331e06a1b68a1
-SHA1 (patch-al) = eb6a52d3f865639447ec6f9019c0ea1d2122b772
+SHA1 (patch-al) = 7f354078e737b66896cf54dbd4759ba5a76ab919
 SHA1 (patch-am) = bb267f13dbd30d492f4dfcf9c278b941efa97bed
 SHA1 (patch-an) = be808fcb6f2f9b88c6a0d94765bda4b5eb8a4c93
-SHA1 (patch-ao) = 9a1ed7b37befdd8e29d233fe55cd62362df3c50e
+SHA1 (patch-ao) = c7664bc8867541efc0457fac0dcf279abf0dc37e
diff --git a/net/bind95/patches/patch-ab b/net/bind95/patches/patch-ab
index 143ffca7f0a..b673140260f 100644
--- a/net/bind95/patches/patch-ab
+++ b/net/bind95/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
+$NetBSD: patch-ab,v 1.2 2010/05/26 15:56:39 taca Exp $
 
---- 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 @@
+--- lib/lwres/getnameinfo.c.orig	2007-06-19 23:47:22.000000000 +0000
++++ lib/lwres/getnameinfo.c
+@@ -121,6 +121,10 @@
  #include <lwres/netdb.h>
  #include "print_p.h"
  
@@ -13,7 +13,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
  #include "assert_p.h"
  
  #define SUCCESS 0
-@@ -211,13 +215,10 @@
+@@ -271,13 +275,10 @@ lwres_getnameinfo(const struct sockaddr 
  		    ((const struct sockaddr_in6 *)sa)->sin6_scope_id) {
  			char *p = numaddr + strlen(numaddr);
  			const char *stringscope = NULL;
diff --git a/net/bind95/patches/patch-af b/net/bind95/patches/patch-af
index 5d9c65e622b..9d555fa00bd 100644
--- a/net/bind95/patches/patch-af
+++ b/net/bind95/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
+$NetBSD: patch-af,v 1.2 2010/05/26 15:56:39 taca Exp $
 
---- lib/bind/configure.in.orig	2005-10-14 10:38:46.000000000 +0900
+--- lib/bind/configure.in.orig	2009-01-19 23:47:01.000000000 +0000
 +++ lib/bind/configure.in
 @@ -82,12 +82,7 @@ AC_SUBST(PERL)
  #
@@ -16,7 +16,7 @@ $NetBSD: patch-af,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
  		;;
  esac
  
-@@ -395,6 +390,10 @@ then
+@@ -327,6 +322,10 @@ then
  			CCOPT="$CCOPT -pthread"
  			STD_CDEFINES="$STD_CDEFINES -D_THREAD_SAFE"
  			;;
@@ -27,7 +27,7 @@ $NetBSD: patch-af,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
  		*-openbsd*)
  			CC="$CC -pthread"
  			CCOPT="$CCOPT -pthread"
-@@ -985,6 +984,7 @@ case "$host" in
+@@ -1019,6 +1018,7 @@ case "$host" in
  	*-bsdi[2345]*)	have_minimum_ifreq=yes;;
  	*-darwin*)	have_minimum_ifreq=yes;;
  	*-freebsd*)	have_minimum_ifreq=yes;;
@@ -35,7 +35,7 @@ $NetBSD: patch-af,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
  	*-lynxos*)	have_minimum_ifreq=yes;;
  	*-netbsd*)	have_minimum_ifreq=yes;;
  	*-next*)	have_minimum_ifreq=yes;;
-@@ -1024,6 +1024,7 @@ case "$host" in
+@@ -1058,6 +1058,7 @@ case "$host" in
  	*-darwin*)	PORT_DIR="port/darwin";;
  	*-osf*)		PORT_DIR="port/decunix";;
  	*-freebsd*)	PORT_DIR="port/freebsd";;
diff --git a/net/bind95/patches/patch-ag b/net/bind95/patches/patch-ag
index e0e9561bc62..00d920f2cf9 100644
--- a/net/bind95/patches/patch-ag
+++ b/net/bind95/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
+$NetBSD: patch-ag,v 1.2 2010/05/26 15:56:39 taca Exp $
 
---- lib/dns/rbt.c.orig	2004-03-08 21:06:27.000000000 +0000
-+++ lib/dns/rbt.c	2005-03-16 13:45:23.000000000 +0000
-@@ -165,6 +165,10 @@
+--- lib/dns/rbt.c.orig	2009-01-19 23:47:02.000000000 +0000
++++ lib/dns/rbt.c
+@@ -167,6 +167,10 @@ Name(dns_rbtnode_t *node) {
  static void dns_rbt_printnodename(dns_rbtnode_t *node);
  #endif
  
diff --git a/net/bind95/patches/patch-ai b/net/bind95/patches/patch-ai
index 5d594aca499..510bbb78231 100644
--- a/net/bind95/patches/patch-ai
+++ b/net/bind95/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2009/11/30 11:58:30 tron Exp $
+$NetBSD: patch-ai,v 1.4 2010/05/26 15:56:39 taca Exp $
 
---- lib/bind/configure.orig	2009-01-19 01:59:36.000000000 +0000
-+++ lib/bind/configure	2009-11-30 11:18:36.000000000 +0000
-@@ -19651,12 +19651,7 @@
+--- lib/bind/configure.orig	2010-02-22 00:52:56.000000000 +0000
++++ lib/bind/configure
+@@ -19435,12 +19435,7 @@ done
  #
  case "$includedir" in
  	'${prefix}/include')
@@ -16,7 +16,7 @@ $NetBSD: patch-ai,v 1.3 2009/11/30 11:58:30 tron Exp $
  		;;
  esac
  
-@@ -22037,6 +22032,8 @@
+@@ -21508,6 +21503,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=false ;;
@@ -25,20 +25,20 @@ $NetBSD: patch-ai,v 1.3 2009/11/30 11:58:30 tron Exp $
  *-bsdi234*)
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;
-@@ -22125,7 +22122,7 @@
- $as_echo "native" >&6; }
+@@ -21596,7 +21593,7 @@ echo "$as_me: WARNING: linking with PTL2
+ echo "${ECHO_T}native" >&6; }
  				LIBS="-lpthread $LIBS"
  			else
 -				if test ! -d $LOCALBASE/pthreads
-+				if test ! -d $LOCALBASE/pthreads-a ! -f /usr/include/pthread.h
++				if test ! -d $LOCALBASE/pthreads -a ! -f /usr/include/pthread.h
  				then
- 					{ $as_echo "$as_me:$LINENO: result: none" >&5
- $as_echo "none" >&6; }
-@@ -22136,14 +22133,23 @@
+ 					{ echo "$as_me:$LINENO: result: none" >&5
+ echo "${ECHO_T}none" >&6; }
+@@ -21607,14 +21604,23 @@ echo "$as_me: error: \"could not find th
  
  				if $use_threads
  				then
--					{ $as_echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
+-					{ echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
 +					if test -f /usr/include/pthread.h
 +					then
 +                                               { $as_echo "$as_me:$LINENO: result: native pthreads" >&5
@@ -47,8 +47,8 @@ $NetBSD: patch-ai,v 1.3 2009/11/30 11:58:30 tron Exp $
 +						CPPFLAGS="$CPPFLAGS -I/usr/include"
 +						STD_CINDLUES="$STD_CINDLUES -I/usr/include"
 +					else
-+						{ $as_echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
- $as_echo "mit-pthreads/unproven-pthreads" >&6; }
++						{ 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"
@@ -65,7 +65,7 @@ $NetBSD: patch-ai,v 1.3 2009/11/30 11:58:30 tron Exp $
  				fi
  			fi
  		fi
-@@ -22918,6 +22924,10 @@
+@@ -22349,6 +22355,10 @@ then
  			CCOPT="$CCOPT -pthread"
  			STD_CDEFINES="$STD_CDEFINES -D_THREAD_SAFE"
  			;;
@@ -76,7 +76,7 @@ $NetBSD: patch-ai,v 1.3 2009/11/30 11:58:30 tron Exp $
  		*-openbsd*)
  			CC="$CC -pthread"
  			CCOPT="$CCOPT -pthread"
-@@ -25391,9 +25401,9 @@
+@@ -24725,9 +24735,9 @@ case $use_libtool in
  		O=lo
  		A=la
  		LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
@@ -88,7 +88,7 @@ $NetBSD: patch-ai,v 1.3 2009/11/30 11:58:30 tron Exp $
  		;;
  	*)
  		O=o
-@@ -26169,6 +26179,7 @@
+@@ -25481,6 +25491,7 @@ case "$host" in
  	*-bsdi2345*)	have_minimum_ifreq=yes;;
  	*-darwin*)	have_minimum_ifreq=yes;;
  	*-freebsd*)	have_minimum_ifreq=yes;;
@@ -96,7 +96,7 @@ $NetBSD: patch-ai,v 1.3 2009/11/30 11:58:30 tron Exp $
  	*-lynxos*)	have_minimum_ifreq=yes;;
  	*-netbsd*)	have_minimum_ifreq=yes;;
  	*-next*)	have_minimum_ifreq=yes;;
-@@ -26208,6 +26219,7 @@
+@@ -25520,6 +25531,7 @@ case "$host" in
  	*-darwin*)	PORT_DIR="port/darwin";;
  	*-osf*)		PORT_DIR="port/decunix";;
  	*-freebsd*)	PORT_DIR="port/freebsd";;
diff --git a/net/bind95/patches/patch-al b/net/bind95/patches/patch-al
index 3bdbab9408c..c61e05dde12 100644
--- a/net/bind95/patches/patch-al
+++ b/net/bind95/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
+$NetBSD: patch-al,v 1.2 2010/05/26 15:56:39 taca Exp $
 
---- lib/bind/port_after.h.in.orig	2005-10-11 09:48:14.000000000 +0900
+--- lib/bind/port_after.h.in.orig	2008-02-28 05:46:12.000000000 +0000
 +++ lib/bind/port_after.h.in
-@@ -376,7 +376,7 @@ int setpassent(int stayopen);
+@@ -413,7 +413,7 @@ int setpassent(int stayopen);
  #define gettimeofday isc__gettimeofday
  #ifdef NEED_GETTIMEOFDAY
  int isc__gettimeofday(struct timeval *tvp, struct _TIMEZONE *tzp);
diff --git a/net/bind95/patches/patch-ao b/net/bind95/patches/patch-ao
index 48b268613c2..62b8ea4f592 100644
--- a/net/bind95/patches/patch-ao
+++ b/net/bind95/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
+$NetBSD: patch-ao,v 1.2 2010/05/26 15:56:39 taca Exp $
 
---- lib/bind/irs/getaddrinfo.c.orig	2006-11-13 05:04:49.000000000 +0000
+--- lib/bind/irs/getaddrinfo.c.orig	2006-11-13 05:00:56.000000000 +0000
 +++ lib/bind/irs/getaddrinfo.c
-@@ -332,7 +332,8 @@ getaddrinfo(hostname, servname, hints, r
+@@ -336,7 +336,8 @@ getaddrinfo(hostname, servname, hints, r
  	pai->ai_family = PF_UNSPEC;
  	pai->ai_socktype = ANY;
  	pai->ai_protocol = ANY;
@@ -12,7 +12,7 @@ $NetBSD: patch-ao,v 1.1.1.1 2008/06/21 23:15:28 adrianp Exp $
  	/*
  	 * clear _ai_pad to preserve binary
  	 * compatibility with previously compiled 64-bit
-@@ -365,7 +366,7 @@ getaddrinfo(hostname, servname, hints, r
+@@ -369,7 +370,7 @@ getaddrinfo(hostname, servname, hints, r
  		}
  		memcpy(pai, hints, sizeof(*pai));