Build and install BIND9 resolver in ${prefix}/include/bind/ and

${prefix}/lib/libbind.a , just like the BIND8 package does.

5 files changed, 83 insertions, 5 deletions

diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index ea52858f39e..7ce042e104f 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.56 2004/03/26 02:27:47 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2004/04/06 14:54:17 manu Exp $
 #
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	bind-${BIND_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 
diff --git a/net/bind9/PLIST b/net/bind9/PLIST
index 95291841324..3f004de1b79 100644
--- a/net/bind9/PLIST
+++ b/net/bind9/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/10/27 03:56:03 itojun Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/04/06 14:54:17 manu Exp $
 bin/dig
 bin/host
 bin/isc-config.sh
@@ -308,3 +308,29 @@ man/man8/named.8
 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
+@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
+@dirrm include/bind
+lib/libbind.a
diff --git a/net/bind9/distinfo b/net/bind9/distinfo
index a56042c3454..919ffcff9c5 100644
--- a/net/bind9/distinfo
+++ b/net/bind9/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2004/04/01 20:29:53 tron Exp $
+$NetBSD: distinfo,v 1.16 2004/04/06 14:54:17 manu 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
@@ -8,4 +8,6 @@ SHA1 (patch-ac) = 1696adfab7392e0f150d34931b808e51ad017938
 SHA1 (patch-ad) = 3d566cc585f996ce36dbed4e8efdb2b6226aa58c
 SHA1 (patch-ae) = 089d51ae714447e9177aa49673223be29790f814
 SHA1 (patch-af) = 4a4cd41c2d5acee9428892f4bf7eb9ea7c6e4131
-SHA1 (patch-ag) = f79fdb089dee45f474359efb414e9c2d70dbfd32
+SHA1 (patch-ag) = 5cc69ba0b3ea527450fcb0903e85a31d38bdb4f0
+SHA1 (patch-ah) = d3df97e984759914032c30b4f06f9c815eee3421
+SHA1 (patch-ai) = 60bd449ddfae8a266e09b85bcc832ff9c5da2544
diff --git a/net/bind9/patches/patch-ah b/net/bind9/patches/patch-ah
new file mode 100644
index 00000000000..56e0e8a3857
--- /dev/null
+++ b/net/bind9/patches/patch-ah
@@ -0,0 +1,25 @@
+--- 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/patches/patch-ai b/net/bind9/patches/patch-ai
new file mode 100644
index 00000000000..1b96d17234e
--- /dev/null
+++ b/net/bind9/patches/patch-ai
@@ -0,0 +1,25 @@
+--- 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