clean up and make this package hier(7) compliant.

3 files changed, 91 insertions, 200 deletions

diff --git a/net/bind8/patches/patch-aa b/net/bind8/patches/patch-aa
index 2eca10f4111..3db3223bd35 100644
--- a/net/bind8/patches/patch-aa
+++ b/net/bind8/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/11/12 18:23:53 rh Exp $
+$NetBSD: patch-aa,v 1.2 1999/11/13 10:02:38 rh Exp $
 
---- src/port/netbsd/Makefile.set.orig	Thu Mar 19 14:50:33 1998
-+++ src/port/netbsd/Makefile.set	Wed Jul 28 20:02:07 1999
+--- 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'
@@ -12,12 +12,12 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/11/12 18:23:53 rh Exp $
 -'DESTHELP=/usr/share/misc'
 -'DESTETC=/etc'
 +'DESTBIN=${PREFIX}/bin'
-+'DESTLIB=${PREFIX}/bind/lib'
-+'DESTINC=${PREFIX}/bind/include'
++'DESTLIB=${PREFIX}/lib'
++'DESTINC=${PREFIX}/include/bind'
 +'DESTSBIN=${PREFIX}/sbin'
 +'DESTEXEC=${PREFIX}/libexec'
 +'DESTMAN=${PREFIX}/share/man'
-+'DESTHELP=${PREFIX}/share/misc'
++'DESTHELP=${PREFIX}/share/doc/bind8'
 +'DESTETC=${PREFIX}/etc'
  'DESTRUN=/var/run'
  'LEX=lex -I'
diff --git a/net/bind8/patches/patch-ab b/net/bind8/patches/patch-ab
index 169cbd699f1..45801f1cd22 100644
--- a/net/bind8/patches/patch-ab
+++ b/net/bind8/patches/patch-ab
@@ -1,175 +1,74 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/11/12 18:23:53 rh Exp $
+$NetBSD: patch-ab,v 1.2 1999/11/13 10:02:38 rh Exp $
 
-*** doc/man/Makefile.orig	Sat Sep 18 02:23:44 1999
---- doc/man/Makefile	Fri Nov 12 01:43:05 1999
-***************
-*** 52,63 ****
-  # Target directory for the manual directory tree. Eg., may be used to 
-  # specify the path of an NFS-mounted directory for common files.
-  #
-! DESTDIR=
-  
-  #
-  # Default location for manual section directories.
-  #
-! DESTMAN= /usr/share/man
-  
-  #
-  # Install manuals in ${MANDIR}N. For systems that generate catable manual 
---- 52,63 ----
-  # Target directory for the manual directory tree. Eg., may be used to 
-  # specify the path of an NFS-mounted directory for common files.
-  #
-! DESTDIR= ${PREFIX}
-  
-  #
-  # Default location for manual section directories.
-  #
-! DESTMAN= /share/man
-  
-  #
-  # Install manuals in ${MANDIR}N. For systems that generate catable manual 
-***************
-*** 228,241 ****
-  #
-  # User command manual entries
-  #
-! CMD_BASE = 	dig host 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}
-  
---- 228,239 ----
-  #
-  # User command manual entries
-  #
-! CMD_BASE = 	dig dnsquery dnskeygen
-  CMD_SRC_EXT = 	1
-  CMD_SRC = 	dig.${CMD_SRC_EXT} \
-  		dnsquery.${CMD_SRC_EXT} \
-  		dnskeygen.${CMD_SRC_EXT}
-  CMD_OUT =	dig.${CMD_OUT_EXT} \
-  		dnsquery.${CMD_OUT_EXT} \
-  		dnskeygen.${CMD_OUT_EXT}
-  
-***************
-*** 279,285 ****
-  # Network library routines manual entries
-  #
-  LIB_NETWORK_BASE =	gethostbyname inet_cidr resolver hesiod getnetent \
-! 			tsig getaddrinfo inet_cidr getipnodebyname
-  LIB_NETWORK_SRC_EXT =	3
-  LIB_NETWORK_SRC = 	gethostbyname.${LIB_NETWORK_SRC_EXT} \
-  			inet_cidr.${LIB_NETWORK_SRC_EXT} \
---- 277,283 ----
-  # Network library routines manual entries
-  #
-  LIB_NETWORK_BASE =	gethostbyname inet_cidr resolver hesiod getnetent \
-! 			tsig getaddrinfo getipnodebyname
-  LIB_NETWORK_SRC_EXT =	3
-  LIB_NETWORK_SRC = 	gethostbyname.${LIB_NETWORK_SRC_EXT} \
-  			inet_cidr.${LIB_NETWORK_SRC_EXT} \
-***************
-*** 303,309 ****
-  #
-  # File format manual entries
-  #
-! FORMAT_BASE =	resolver irs.conf named.conf
-  FORMAT_SRC_EXT = 5
-  FORMAT_SRC = 	resolver.${FORMAT_SRC_EXT} \
-  		irs.conf.${FORMAT_SRC_EXT} \
---- 301,308 ----
-  #
-  # File format manual entries
-  #
-! 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} \
-***************
-*** 355,363 ****
-  install:	${OUTFILES} \
-  		${DESTDIR}${DESTMAN}/${MANDIR}${CMD_EXT_DIR} \
-  		${DESTDIR}${DESTMAN}/${MANDIR}${SYS_OPS_EXT_DIR} \
-! 		${DESTDIR}${DESTMAN}/${MANDIR}${LIB_NETWORK_EXT_DIR} \
-  		${DESTDIR}${DESTMAN}/${MANDIR}${FORMAT_EXT_DIR} \
-! 		${DESTDIR}${DESTMAN}/${MANDIR}${DESC_EXT_DIR}
-  	@set -x; N=${CMD_EXT}; for f in ${CMD_BASE}; do \
-  		${INSTALL} -c -m 444 ${MAN_OWNER} ${MAN_GROUP} \
-  		$${f}.${CMD_OUT_EXT} \
---- 354,363 ----
-  install:	${OUTFILES} \
-  		${DESTDIR}${DESTMAN}/${MANDIR}${CMD_EXT_DIR} \
-  		${DESTDIR}${DESTMAN}/${MANDIR}${SYS_OPS_EXT_DIR} \
-! 		${DESTDIR}/bind${DESTMAN}/${MANDIR}${LIB_NETWORK_EXT_DIR} \
-  		${DESTDIR}${DESTMAN}/${MANDIR}${FORMAT_EXT_DIR} \
-! 		${DESTDIR}/bind${DESTMAN}/${MANDIR}${FORMAT_EXT_DIR} \
-! 		${DESTDIR}/bind${DESTMAN}/${MANDIR}${DESC_EXT_DIR}
-  	@set -x; N=${CMD_EXT}; for f in ${CMD_BASE}; do \
-  		${INSTALL} -c -m 444 ${MAN_OWNER} ${MAN_GROUP} \
-  		$${f}.${CMD_OUT_EXT} \
-***************
-*** 391,415 ****
-  	@set -x; N=${LIB_NETWORK_EXT}; for f in ${LIB_NETWORK_BASE}; do \
-  		${INSTALL} -c -m 444 ${MAN_OWNER} ${MAN_GROUP} \
-  		$${f}.${LIB_NETWORK_OUT_EXT} \
-! 		${DESTDIR}${DESTMAN}/${MANDIR}${LIB_NETWORK_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} \
-! 		${DESTDIR}${DESTMAN}/${MANDIR}${FORMAT_EXT_DIR}/$${f}.${CATEXT}; \
-  	done
-  	@set -x; N=${DESC_EXT}; for f in ${DESC_BASE}; do \
-  		${INSTALL} -c -m 444 ${MAN_OWNER} ${MAN_GROUP} \
-  		$${f}.${DESC_OUT_EXT} \
-! 		${DESTDIR}${DESTMAN}/${MANDIR}${DESC_EXT_DIR}/$${f}.${CATEXT}; \
-  	done
-  
-  ${DESTDIR}${DESTMAN}/${MANDIR}${CMD_EXT_DIR} \
-  ${DESTDIR}${DESTMAN}/${MANDIR}${SYS_OPS_EXT_DIR} \
-! ${DESTDIR}${DESTMAN}/${MANDIR}${LIB_NETWORK_EXT_DIR} \
-  ${DESTDIR}${DESTMAN}/${MANDIR}${FORMAT_EXT_DIR} \
-! ${DESTDIR}${DESTMAN}/${MANDIR}${DESC_EXT_DIR}:
-! 	mkdir $@
-  
-  links: FRC
-  	@set -ex; ln -s SRC/*.[0-9] .
---- 391,420 ----
-  	@set -x; N=${LIB_NETWORK_EXT}; for f in ${LIB_NETWORK_BASE}; do \
-  		${INSTALL} -c -m 444 ${MAN_OWNER} ${MAN_GROUP} \
-  		$${f}.${LIB_NETWORK_OUT_EXT} \
-! 		${DESTDIR}/bind${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} \
-! 		${DESTDIR}/bind${DESTMAN}/${MANDIR}${FORMAT_EXT_DIR}/$${f}.${CATEXT}; \
-  	done
-  	@set -x; N=${DESC_EXT}; for f in ${DESC_BASE}; do \
-  		${INSTALL} -c -m 444 ${MAN_OWNER} ${MAN_GROUP} \
-  		$${f}.${DESC_OUT_EXT} \
-! 		${DESTDIR}/bind${DESTMAN}/${MANDIR}${DESC_EXT_DIR}/$${f}.${CATEXT}; \
-  	done
-  
-  ${DESTDIR}${DESTMAN}/${MANDIR}${CMD_EXT_DIR} \
-  ${DESTDIR}${DESTMAN}/${MANDIR}${SYS_OPS_EXT_DIR} \
-! ${DESTDIR}/bind${DESTMAN}/${MANDIR}${LIB_NETWORK_EXT_DIR} \
-  ${DESTDIR}${DESTMAN}/${MANDIR}${FORMAT_EXT_DIR} \
-! ${DESTDIR}/bind${DESTMAN}/${MANDIR}${FORMAT_EXT_DIR} \
-! ${DESTDIR}/bind${DESTMAN}/${MANDIR}${DESC_EXT_DIR}:
-! 	mkdir -p $@
-  
-  links: FRC
-  	@set -ex; ln -s SRC/*.[0-9] .
+--- ../doc/man/Makefile.orig	Sat Sep 18 08:23:44 1999
++++ ../doc/man/Makefile	Sat Nov 13 09:45:50 1999
+@@ -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}
+ 
+@@ -279,7 +277,7 @@
+ # Network library routines manual entries
+ #
+ LIB_NETWORK_BASE =	gethostbyname inet_cidr resolver hesiod getnetent \
+-			tsig getaddrinfo inet_cidr getipnodebyname
++			tsig getaddrinfo getipnodebyname
+ LIB_NETWORK_SRC_EXT =	3
+ LIB_NETWORK_SRC = 	gethostbyname.${LIB_NETWORK_SRC_EXT} \
+ 			inet_cidr.${LIB_NETWORK_SRC_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-ac b/net/bind8/patches/patch-ac
index b5c5ad1c18c..12f37ba3ea3 100644
--- a/net/bind8/patches/patch-ac
+++ b/net/bind8/patches/patch-ac
@@ -1,21 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/11/12 18:23:53 rh Exp $
+$NetBSD: patch-ac,v 1.2 1999/11/13 10:02:38 rh Exp $
 
-*** src/bin/Makefile.orig	Sun Aug  8 13:13:24 1999
---- src/bin/Makefile	Fri Nov 12 01:49:34 1999
-***************
-*** 60,66 ****
-  
-  CFLAGS=	${CDEBUG} -I${PORTINCL} -I${INCL}
-  
-! SUBDIRS = addr nslookup dig dnsquery host named named-xfer ndc nsupdate \
-  	mkservdb irpd dnskeygen named-bootconf
-  
-  all: ${SUBDIRS}
---- 60,66 ----
-  
-  CFLAGS=	${CDEBUG} -I${PORTINCL} -I${INCL}
-  
-! SUBDIRS = addr nslookup dig dnsquery named named-xfer ndc nsupdate \
-  	mkservdb irpd dnskeygen named-bootconf
-  
-  all: ${SUBDIRS}
+--- bin/Makefile.orig	Sun Aug  8 19:13:24 1999
++++ bin/Makefile	Sat Nov 13 09:40:26 1999
+@@ -60,7 +60,7 @@
+ 
+ CFLAGS=	${CDEBUG} -I${PORTINCL} -I${INCL}
+ 
+-SUBDIRS = addr nslookup dig dnsquery host named named-xfer ndc nsupdate \
++SUBDIRS = addr nslookup dig dnsquery named named-xfer ndc nsupdate \
+ 	mkservdb irpd dnskeygen named-bootconf
+ 
+ all: ${SUBDIRS}