Updated bind8 to 8.2.4nb1:

    Include a basic rc.d script (based on apache), and fixup installed paths
    for Linux

8 files changed, 297 insertions, 71 deletions

diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index 5d22dbc3c8d..9839ef12c09 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -1,11 +1,12 @@
 #
-# $NetBSD: Makefile,v 1.8 2001/05/17 18:56:03 itojun Exp $
+# $NetBSD: Makefile,v 1.9 2001/12/24 14:10:54 abs Exp $
 #
 # FreeBSD Id: Makefile,v 1.12 1999/06/28 21:25:07 billf Exp
 #
 
 DISTNAME=	bind
 PKGNAME=	bind-8.2.4
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/src
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind/src/8.2.4/
@@ -20,12 +21,23 @@ Y2K=		http://www.isc.org/ISC/y2k.html
 DIST_SUBDIR=	bind/8.2.4
 EXTRACT_ONLY=	${DISTNAME}-src.tar.gz ${DISTNAME}-doc.tar.gz
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+PLIST_SRC=		${PKGDIR}/PLIST-Linux
+.endif
+
 post-build:
 	@(cd ${WRKDIR}/doc/man && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} clean all)
 
+pre-install:
+	${SED} ${FILES_SUBST_SED} ${FILESDIR}/named.sh > ${WRKDIR}/named.sh
+
 post-install:
 	@(cd ${WRKDIR}/doc/man && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind8
 	(cd ${WRKDIR}/doc/html/; tar Bpcf - .) | (cd ${PREFIX}/share/doc/bind8; tar Bpxf -)
+	${INSTALL_SCRIPT} ${WRKDIR}/named.sh ${PREFIX}/etc/rc.d/named
 
 .include "../../mk/bsd.pkg.mk"
+.include "../../mk/bsd.pkg.install.mk"
diff --git a/net/bind8/PLIST b/net/bind8/PLIST
index 38f42f91943..9ac843c8049 100644
--- a/net/bind8/PLIST
+++ b/net/bind8/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:53 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/24 14:10:54 abs Exp $
 bin/addr
 bin/dig
 bin/dnsquery
@@ -6,6 +6,7 @@ bin/host
 bin/mkservdb
 bin/nslookup
 bin/nsupdate
+etc/rc.d/named
 include/bind/arpa/inet.h
 include/bind/arpa/nameser.h
 include/bind/arpa/nameser_compat.h
diff --git a/net/bind8/PLIST-Linux b/net/bind8/PLIST-Linux
new file mode 100644
index 00000000000..fc983f26635
--- /dev/null
+++ b/net/bind8/PLIST-Linux
@@ -0,0 +1,87 @@
+@comment $NetBSD: PLIST-Linux,v 1.1 2001/12/24 14:10:54 abs Exp $
+bin/addr
+bin/dig
+bin/dnsquery
+bin/host
+bin/mkservdb
+bin/nslookup
+bin/nsupdate
+etc/rc.d/named
+include/bind/arpa/inet.h
+include/bind/arpa/nameser.h
+include/bind/arpa/nameser_compat.h
+include/bind/hesiod.h
+include/bind/irp.h
+include/bind/irs.h
+include/bind/isc/assertions.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/res_update.h
+include/bind/resolv.h
+lib/libbind.a
+lib/libbind_r.a
+libexec/dnskeygen
+libexec/named-xfer
+sbin/irpd
+sbin/named
+sbin/named-bootconf
+sbin/ndc
+share/doc/bind8/CVS/Entries
+share/doc/bind8/CVS/Repository
+share/doc/bind8/CVS/Root
+share/doc/bind8/CVS/Tag
+share/doc/bind8/acl.html
+share/doc/bind8/address_list.html
+share/doc/bind8/comments.html
+share/doc/bind8/config.html
+share/doc/bind8/controls.html
+share/doc/bind8/docdef.html
+share/doc/bind8/example.html
+share/doc/bind8/include.html
+share/doc/bind8/index.html
+share/doc/bind8/key.html
+share/doc/bind8/logging.html
+share/doc/bind8/master.html
+share/doc/bind8/nslookup.help
+share/doc/bind8/options.html
+share/doc/bind8/server.html
+share/doc/bind8/trusted-keys.html
+share/doc/bind8/zone.html
+man/cat1/dig.0
+man/cat1/dnsquery.0
+man/cat1/dnskeygen.0
+man/cat3/getaddrinfo.0
+man/cat3/gethostbyname.0
+man/cat3/getipnodebyname.0
+man/cat3/getnameinfo.0
+man/cat3/getnetent.0
+man/cat3/hesiod.0
+man/cat3/inet_cidr.0
+man/cat3/resolver.0
+man/cat3/tsig.0
+man/cat5/named.conf.0
+man/cat5/irs.conf.0
+man/cat5/resolver.0
+man/cat7/hostname.0
+man/cat7/mailaddr.0
+man/cat8/named.0
+man/cat8/named-bootconf.0
+man/cat8/named-xfer.0
+man/cat8/ndc.0
+man/cat8/nslookup.0
+man/cat8/nsupdate.0
+@dirrm include/bind/arpa
+@dirrm include/bind/isc
+@dirrm include/bind/net
+@dirrm include/bind/sys
+@dirrm include/bind
+@dirrm share/doc/bind8/CVS
+@dirrm share/doc/bind8
diff --git a/net/bind8/distinfo b/net/bind8/distinfo
index 474bfbe07c5..86ed8721b3c 100644
--- a/net/bind8/distinfo
+++ b/net/bind8/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/05/17 18:56:03 itojun Exp $
+$NetBSD: distinfo,v 1.4 2001/12/24 14:10:54 abs Exp $
 
 SHA1 (bind/8.2.4/bind-src.tar.gz) = 5ae40887c61be9cc070ad42b64427a0d696d2abc
 Size (bind/8.2.4/bind-src.tar.gz) = 1404935 bytes
 SHA1 (bind/8.2.4/bind-doc.tar.gz) = e22c2d34dd1c45fd08b9896aa41658f32f76a25c
 Size (bind/8.2.4/bind-doc.tar.gz) = 1488805 bytes
-SHA1 (patch-aa) = 765fec720b96cd31ff68f4c08b2e9b422cfb7c83
-SHA1 (patch-ab) = 1519393e4555e151cea1b0256362f76773157314
+SHA1 (patch-aa) = 6897694a7fa77bfb7c5da2d29a7537c948c669cb
+SHA1 (patch-ab) = 0d0e2e1a8cb58fc6c11b60fcc69fe496251f7659
+SHA1 (patch-ac) = 8177ac466079d1edfe0cd7522ba435735e88c32c
diff --git a/net/bind8/files/named.sh b/net/bind8/files/named.sh
new file mode 100644
index 00000000000..a8fc9a5e8f1
--- /dev/null
+++ b/net/bind8/files/named.sh
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# $NetBSD: named.sh,v 1.1 2001/12/24 14:10:54 abs Exp $
+#
+# PROVIDE: named
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# To start named at startup, copy this script to /etc/rc.d and set
+# named=YES in /etc/rc.conf.
+
+name="named"
+rcvar=$name
+command="@PREFIX@/sbin/ndc"
+
+named_start=start
+
+# set defaults
+if [ -r /etc/rc.conf ]
+then
+	. /etc/rc.conf
+else
+	eval ${rcvar}=YES
+fi
+
+# $flags from environment overrides ${rcvar}_flags
+if [ -n "${flags}" ]
+then
+	eval ${rcvar}_flags="${flags}"
+fi
+
+named_doit()
+{
+	action=$1
+
+	case ${action} in
+	start)		echo -n "Starting ${name}: "; action=${named_start} ;;
+	stop)		echo "Stopping ${name}" ;;
+	restart)	echo -n "Restarting ${name}: " ;;
+	esac
+
+	${command} ${named_flags} ${command_args} ${action}
+}
+
+checkyesno()
+{
+	eval _value=\$${1}
+	case $_value in
+	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)	return 0 ;;
+	[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)	return 1 ;;
+	*)
+		echo "\$${1} is not set properly."
+		return 1
+		;;
+	esac
+}
+
+cmd=${1:-start}
+case ${cmd} in
+force*)
+	cmd=${cmd#force}
+	eval ${rcvar}=YES
+	;;
+esac
+
+if checkyesno ${rcvar}
+then
+	if [ -x ${command} ]
+	then
+		case ${cmd} in
+		restart|start|stop|reload)
+			${rcvar}_doit ${cmd}
+			;;
+		*)
+			echo 1>&2 "Usage: $0 [restart|start|stop|reload]"
+			exit 1
+			;;
+		esac
+	fi
+fi
diff --git a/net/bind8/patches/patch-aa b/net/bind8/patches/patch-aa
index 3db3223bd35..aa1055e1ca5 100644
--- a/net/bind8/patches/patch-aa
+++ b/net/bind8/patches/patch-aa
@@ -1,24 +1,65 @@
-$NetBSD: patch-aa,v 1.2 1999/11/13 10:02:38 rh Exp $
+$NetBSD: patch-aa,v 1.3 2001/12/24 14:10:55 abs Exp $
 
---- port/netbsd/Makefile.set.orig	Thu Mar 19 20:50:33 1998
-+++ port/netbsd/Makefile.set	Sat Nov 13 10:04:08 1999
-@@ -1,11 +1,13 @@
- 'CC=cc'
- 'CDEBUG=-O2 -g'
--'DESTBIN=/usr/bin'
--'DESTSBIN=/usr/sbin'
--'DESTEXEC=/usr/libexec'
--'DESTMAN=/usr/share/man'
--'DESTHELP=/usr/share/misc'
--'DESTETC=/etc'
-+'DESTBIN=${PREFIX}/bin'
-+'DESTLIB=${PREFIX}/lib'
-+'DESTINC=${PREFIX}/include/bind'
-+'DESTSBIN=${PREFIX}/sbin'
-+'DESTEXEC=${PREFIX}/libexec'
-+'DESTMAN=${PREFIX}/share/man'
-+'DESTHELP=${PREFIX}/share/doc/bind8'
-+'DESTETC=${PREFIX}/etc'
- 'DESTRUN=/var/run'
- 'LEX=lex -I'
- 'YACC=yacc -d'
+--- ../doc/man/Makefile.orig	Mon Nov 29 19:22:07 1999
++++ ../doc/man/Makefile
+@@ -52,12 +52,12 @@
+ # Target directory for the manual directory tree. Eg., may be used to 
+ # specify the path of an NFS-mounted directory for common files.
+ #
+-DESTDIR=
++DESTDIR= ${PREFIX}
+ 
+ #
+ # Default location for manual section directories.
+ #
+-DESTMAN= /usr/share/man
++DESTMAN= /man
+ 
+ #
+ # Install manuals in ${MANDIR}N. For systems that generate catable manual 
+@@ -228,14 +228,12 @@
+ #
+ # User command manual entries
+ #
+-CMD_BASE = 	dig host dnsquery dnskeygen
++CMD_BASE = 	dig dnsquery dnskeygen
+ CMD_SRC_EXT = 	1
+ CMD_SRC = 	dig.${CMD_SRC_EXT} \
+-		host.${CMD_SRC_EXT} \
+ 		dnsquery.${CMD_SRC_EXT} \
+ 		dnskeygen.${CMD_SRC_EXT}
+ CMD_OUT =	dig.${CMD_OUT_EXT} \
+-		host.${CMD_OUT_EXT} \
+ 		dnsquery.${CMD_OUT_EXT} \
+ 		dnskeygen.${CMD_OUT_EXT}
+ 
+@@ -303,7 +301,8 @@
+ #
+ # File format manual entries
+ #
+-FORMAT_BASE =	resolver irs.conf named.conf
++FORMAT_MAIN_BASE =	named.conf
++FORMAT_BASE =	resolver irs.conf
+ FORMAT_SRC_EXT = 5
+ FORMAT_SRC = 	resolver.${FORMAT_SRC_EXT} \
+ 		irs.conf.${FORMAT_SRC_EXT} \
+@@ -393,6 +392,10 @@
+ 		$${f}.${LIB_NETWORK_OUT_EXT} \
+ 		${DESTDIR}${DESTMAN}/${MANDIR}${LIB_NETWORK_EXT_DIR}/$${f}.${CATEXT}; \
+ 	done
++	@set -x; N=${FORMAT_EXT}; for f in ${FORMAT_MAIN_BASE}; do \
++		${INSTALL} -c -m 444 ${MAN_OWNER} ${MAN_GROUP} $${f}.${FORMAT_OUT_EXT} \
++			${DESTDIR}${DESTMAN}/${MANDIR}${FORMAT_EXT_DIR}/$${f}.${CATEXT}; \
++	done
+ 	@set -x; N=${FORMAT_EXT}; for f in ${FORMAT_BASE}; do \
+ 		${INSTALL} -c -m 444 ${MAN_OWNER} ${MAN_GROUP} \
+ 		$${f}.${FORMAT_OUT_EXT} \
+@@ -409,7 +412,7 @@
+ ${DESTDIR}${DESTMAN}/${MANDIR}${LIB_NETWORK_EXT_DIR} \
+ ${DESTDIR}${DESTMAN}/${MANDIR}${FORMAT_EXT_DIR} \
+ ${DESTDIR}${DESTMAN}/${MANDIR}${DESC_EXT_DIR}:
+-	mkdir $@
++	mkdir -p $@
+ 
+ links: FRC
+ 	@set -ex; ln -s SRC/*.[0-9] .
diff --git a/net/bind8/patches/patch-ab b/net/bind8/patches/patch-ab
index 93b1e6b7592..64643d5680d 100644
--- a/net/bind8/patches/patch-ab
+++ b/net/bind8/patches/patch-ab
@@ -1,44 +1,24 @@
-$NetBSD: patch-ab,v 1.3 2001/01/27 07:33:22 itojun Exp $
+$NetBSD: patch-ab,v 1.4 2001/12/24 14:10:55 abs Exp $
 
---- ../doc/man/Makefile.orig	Tue Nov 30 04:22:07 1999
-+++ ../doc/man/Makefile	Sat Jan 27 15:51:16 2001
-@@ -54,3 +54,3 @@
- #
--DESTDIR=
-+DESTDIR= ${PREFIX}
- 
-@@ -59,3 +59,3 @@
- #
--DESTMAN= /usr/share/man
-+DESTMAN= /man
- 
-@@ -230,6 +230,5 @@
- #
--CMD_BASE = 	dig host dnsquery dnskeygen
-+CMD_BASE = 	dig dnsquery dnskeygen
- CMD_SRC_EXT = 	1
- CMD_SRC = 	dig.${CMD_SRC_EXT} \
--		host.${CMD_SRC_EXT} \
- 		dnsquery.${CMD_SRC_EXT} \
-@@ -237,3 +236,2 @@
- CMD_OUT =	dig.${CMD_OUT_EXT} \
--		host.${CMD_OUT_EXT} \
- 		dnsquery.${CMD_OUT_EXT} \
-@@ -305,3 +303,4 @@
- #
--FORMAT_BASE =	resolver irs.conf named.conf
-+FORMAT_MAIN_BASE =	named.conf
-+FORMAT_BASE =	resolver irs.conf
- FORMAT_SRC_EXT = 5
-@@ -395,2 +394,6 @@
- 	done
-+	@set -x; N=${FORMAT_EXT}; for f in ${FORMAT_MAIN_BASE}; do \
-+		${INSTALL} -c -m 444 ${MAN_OWNER} ${MAN_GROUP} $${f}.${FORMAT_OUT_EXT} \
-+			${DESTDIR}${DESTMAN}/${MANDIR}${FORMAT_EXT_DIR}/$${f}.${CATEXT}; \
-+	done
- 	@set -x; N=${FORMAT_EXT}; for f in ${FORMAT_BASE}; do \
-@@ -411,3 +414,3 @@
- ${DESTDIR}${DESTMAN}/${MANDIR}${DESC_EXT_DIR}:
--	mkdir $@
-+	mkdir -p $@
- 
+--- port/linux/Makefile.set.orig	Fri Jun 11 07:01:35 1999
++++ port/linux/Makefile.set
+@@ -1,11 +1,13 @@
+ 'CC=gcc -D_GNU_SOURCE'
+ 'CDEBUG=-O -g'
+-'DESTBIN=/usr/bin'
+-'DESTSBIN=/usr/sbin'
+-'DESTEXEC=/usr/sbin'
+-'DESTMAN=/usr/man'
+-'DESTHELP=/usr/lib'
+-'DESTETC=/etc'
++'DESTBIN=${PREFIX}/bin'
++'DESTLIB=${PREFIX}/lib'
++'DESTINC=${PREFIX}/include/bind'
++'DESTSBIN=${PREFIX}/sbin'
++'DESTEXEC=${PREFIX}/libexec'
++'DESTMAN=${PREFIX}/share/man'
++'DESTHELP=${PREFIX}/share/doc/bind8'
++'DESTETC=${PREFIX}/etc'
+ 'DESTRUN=/var/run'
+ 'LEX=flex -8 -I'
+ 'YACC=yacc -d'
diff --git a/net/bind8/patches/patch-ac b/net/bind8/patches/patch-ac
new file mode 100644
index 00000000000..0a298f62e76
--- /dev/null
+++ b/net/bind8/patches/patch-ac
@@ -0,0 +1,24 @@
+$NetBSD: patch-ac,v 1.4 2001/12/24 14:10:55 abs Exp $
+
+--- port/netbsd/Makefile.set.orig	Thu Mar 19 19:50:33 1998
++++ port/netbsd/Makefile.set
+@@ -1,11 +1,13 @@
+ 'CC=cc'
+ 'CDEBUG=-O2 -g'
+-'DESTBIN=/usr/bin'
+-'DESTSBIN=/usr/sbin'
+-'DESTEXEC=/usr/libexec'
+-'DESTMAN=/usr/share/man'
+-'DESTHELP=/usr/share/misc'
+-'DESTETC=/etc'
++'DESTBIN=${PREFIX}/bin'
++'DESTLIB=${PREFIX}/lib'
++'DESTINC=${PREFIX}/include/bind'
++'DESTSBIN=${PREFIX}/sbin'
++'DESTEXEC=${PREFIX}/libexec'
++'DESTMAN=${PREFIX}/share/man'
++'DESTHELP=${PREFIX}/share/doc/bind8'
++'DESTETC=${PREFIX}/etc'
+ 'DESTRUN=/var/run'
+ 'LEX=lex -I'
+ 'YACC=yacc -d'