6 files changed, 22 insertions, 64 deletions
diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index dd4f05072b2..2cd27f76084 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -1,14 +1,14 @@
 #
-# $NetBSD: Makefile,v 1.4 2000/11/10 07:38:22 itojun Exp $
+# $NetBSD: Makefile,v 1.5 2001/01/27 07:33:21 itojun Exp $
 #
 # FreeBSD Id: Makefile,v 1.12 1999/06/28 21:25:07 billf Exp
 #
 
 DISTNAME=	bind
-PKGNAME=	bind-8.2.2p7
+PKGNAME=	bind-8.2.3
 WRKSRC=		${WRKDIR}/src
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/bind/src/8.2.2-P7/
+MASTER_SITES=	ftp://ftp.isc.org/isc/bind/src/8.2.3/
 DISTFILES=	${DISTNAME}-src.tar.gz ${DISTNAME}-doc.tar.gz
 
 MAINTAINER=	packages@NetBSD.org
@@ -16,7 +16,7 @@ HOMEPAGE=	http://www.isc.org/products/BIND/
 
 Y2K=		http://www.isc.org/ISC/y2k.html
 
-DIST_SUBDIR=	bind/8.2.2-P7
+DIST_SUBDIR=	bind/8.2.3
 EXTRACT_ONLY=	${DISTNAME}-src.tar.gz ${DISTNAME}-doc.tar.gz
 
 post-build:
diff --git a/net/bind8/files/md5 b/net/bind8/files/md5
index 7ba275cfac2..f638ffb0368 100644
--- a/net/bind8/files/md5
+++ b/net/bind8/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.3 2000/11/10 07:38:22 itojun Exp $
+$NetBSD: md5,v 1.4 2001/01/27 07:33:22 itojun Exp $
 
-MD5 (bind/8.2.2-P7/bind-src.tar.gz) = 832669455e70a4b58e635b6b02e87910
-MD5 (bind/8.2.2-P7/bind-doc.tar.gz) = 6f26254fdd43e3d4b8b42062bb9766db
+MD5 (bind/8.2.3/bind-src.tar.gz) = e21e2854d72afd2ffbee17cfe8caa581
+MD5 (bind/8.2.3/bind-doc.tar.gz) = c26474bb791552cc0cbc5af72190a772
diff --git a/net/bind8/files/patch-sum b/net/bind8/files/patch-sum
index 66c6e3065ab..0aa71bc534f 100644
--- a/net/bind8/files/patch-sum
+++ b/net/bind8/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/11/13 10:02:37 rh Exp $
+$NetBSD: patch-sum,v 1.3 2001/01/27 07:33:22 itojun Exp $
 
 MD5 (patch-aa) = 06916aaac3bd1830531e05155910e8e5
-MD5 (patch-ab) = 199be4bbf1ea9f189ccb20af4843acb3
-MD5 (patch-ac) = 0f6243fd6f55943a0122d8daa6d50124
+MD5 (patch-ab) = 10a1ecfa8c04c5fb6310cf69da988c5f
diff --git a/net/bind8/patches/patch-ab b/net/bind8/patches/patch-ab
index 45801f1cd22..93b1e6b7592 100644
--- a/net/bind8/patches/patch-ab
+++ b/net/bind8/patches/patch-ab
@@ -1,25 +1,18 @@
-$NetBSD: patch-ab,v 1.2 1999/11/13 10:02:38 rh Exp $
+$NetBSD: patch-ab,v 1.3 2001/01/27 07:33:22 itojun Exp $
 
---- ../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.
+--- ../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}
  
- #
- # Default location for manual section directories.
+@@ -59,3 +59,3 @@
  #
 -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
+@@ -230,6 +230,5 @@
  #
 -CMD_BASE = 	dig host dnsquery dnskeygen
 +CMD_BASE = 	dig dnsquery dnskeygen
@@ -27,48 +20,25 @@ $NetBSD: patch-ab,v 1.2 1999/11/13 10:02:38 rh Exp $
  CMD_SRC = 	dig.${CMD_SRC_EXT} \
 -		host.${CMD_SRC_EXT} \
  		dnsquery.${CMD_SRC_EXT} \
- 		dnskeygen.${CMD_SRC_EXT}
+@@ -237,3 +236,2 @@
  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
+@@ -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
- 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}; \
+@@ -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 \
- 		${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} \
+@@ -411,3 +414,3 @@
  ${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
deleted file mode 100644
index 12f37ba3ea3..00000000000
--- a/net/bind8/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/11/13 10:02:38 rh Exp $
-
---- 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}
diff --git a/net/bind8/pkg/PLIST b/net/bind8/pkg/PLIST
index b639896f877..8b2a0ff54cb 100644
--- a/net/bind8/pkg/PLIST
+++ b/net/bind8/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 1999/11/13 10:02:38 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/27 07:33:23 itojun Exp $
 bin/addr
 bin/dig
 bin/dnsquery
+bin/host
 bin/mkservdb
 bin/nslookup
 bin/nsupdate
@@ -56,6 +57,7 @@ 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