bump

16 files changed, 51 insertions, 850 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 86bd8032480c..6816431d93f9 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.6 2003/02/27 12:01:02 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.7 2003/03/04 17:51:41 lostlogic Exp $
+
+*bind-tools-9.2.2 (04 Mar 2002)
+
+  04 Mar 2003; Brandon Low <lostlogic@gentoo.org> bind-tools-9.2.2.ebuild:
+  Version bump, marked unstable.  Cleaned up unneeded ebuilds.
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *bind-tools-9.2.2_rc1 (16 Aug 2002)
 
   27 Feb 2003; Guy Martin <gmsoft@gentoo.org> bind-tools-9.2.2_rc1.ebuild :
diff --git a/net-dns/bind-tools/bind-tools-9.2.1.ebuild b/net-dns/bind-tools/bind-tools-9.2.2.ebuild
index 4beaa501b806..cd0984768ecb 100644
--- a/net-dns/bind-tools/bind-tools-9.2.1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.2.2.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.2.1.ebuild,v 1.11 2003/02/13 13:56:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.2.2.ebuild,v 1.1 2003/03/04 17:51:41 lostlogic Exp $
 
 MY_P=${P//-tools}
+MY_P=${MY_P/_}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="bind tools: dig, nslookup, and host"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
-HOMEPAGE="http://www.isc.org/BIND/bind9.html"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV/_}/${MY_P}.tar.gz"
+HOMEPAGE="http://www.isc.org/products/BIND/bind9-beta.html"
 
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="~x86 ~ppc ~alpha ~hppa"
 LICENSE="as-is"
 SLOT="0"
 
diff --git a/net-dns/bind-tools/files/digest-bind-tools-9.2.1 b/net-dns/bind-tools/files/digest-bind-tools-9.2.1
deleted file mode 100644
index 77883cdb7ef5..000000000000
--- a/net-dns/bind-tools/files/digest-bind-tools-9.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 692cff6f44e006ce6984b2c286949dd1 bind-9.2.1.tar.gz 5021044
diff --git a/net-dns/bind-tools/files/digest-bind-tools-9.2.2 b/net-dns/bind-tools/files/digest-bind-tools-9.2.2
new file mode 100644
index 000000000000..a11f05a79883
--- /dev/null
+++ b/net-dns/bind-tools/files/digest-bind-tools-9.2.2
@@ -0,0 +1 @@
+MD5 6ea7d64a0856893ab3eb541ab7bbc725 bind-9.2.2.tar.gz 5054652
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index b04b35a2331f..7dc138c17bf1 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.18 2003/02/15 05:43:14 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.19 2003/03/04 17:51:45 lostlogic Exp $
+
+*bind-9.2.2 (04 Mar 2003)
+
+  04 Mar 2003; Brandon Low <lostlogic@gentoo.org> bind-9.2.2.ebuild, 
+  files/10bind.env:
+  Update to latest version, and add /var/bind to env.d, this should make 
+  it behave nicer when merging and no clobber config files.
 
 *bind-9.2.2_rc1-r2 (14 Feb 2003)
 
diff --git a/net-dns/bind/bind-9.2.1-r2.ebuild b/net-dns/bind/bind-9.2.1-r2.ebuild
deleted file mode 100644
index 7294d11cf934..000000000000
--- a/net-dns/bind/bind-9.2.1-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.1-r2.ebuild,v 1.16 2003/02/13 13:56:27 vapier Exp $
-
-IUSE="ssl ipv6"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="BIND - Name Server"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.isc.org/products/BIND"
-
-KEYWORDS="x86 ppc sparc ~alpha"
-LICENSE="as-is"
-SLOT="0"
-
-DEPEND="sys-apps/groff
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-
-src_compile() {
-	local myconf
-
-	use ssl && myconf="${myconf} --with-openssl"
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-
-	./configure \
-		--prefix=/usr \
-		--host=${CHOST} \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--enable-threads \
-		--with-libtool \
-		${myconf} || die "failed to configure bind"
-
-	make || die "failed to compile bind"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "failed to install bind"
-	
-	for x in `grep -l -d recurse -e '/etc/named.conf' -e '/etc/rndc.conf' -e '/etc/rndc.key' ${D}/usr/man`; do
-		cp ${x} ${x}.orig
-		sed -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' ${x}.orig > ${x}
-		rm ${x}.orig
-	done
-	
-	find ${D}/usr/man ! -name "*[1-8]gz" -type f -exec gzip -f "{}" \;
-	insinto /usr/man/man5 ; doins ${FILESDIR}/named.conf.5.gz
-	
-	dodoc CHANGES COPYRIGHT FAQ README
-	docinto misc ; dodoc doc/misc/*
-	docinto html ; dodoc doc/arm/*
-	docinto contrib ; dodoc contrib/named-bootconf/named-bootconf.sh \
-		contrib/nanny/nanny.pl
-
-	# some handy-dandy dynamic dns examples
-	cd ${D}/usr/share/doc/${PF}
-	tar pjxf ${FILESDIR}/dyndns-samples.tbz2
-
-	dodir /etc/bind /var/bind /var/bind/pri /var/bind/sec
-
-	insinto /etc/bind ; doins ${FILESDIR}/named.conf
-	# ftp://ftp.rs.internic.net/domain/named.ca:
-	insinto /var/bind ; doins ${FILESDIR}/named.ca
-	insinto /var/bind/pri ; doins ${FILESDIR}/127.0.0
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/named.rc6 named
-	insinto /etc/conf.d ; newins ${FILESDIR}/named.confd named
-	
-	dosym /var/bind/named.ca /var/bind/root.cache 
-	dosym /var/bind/pri /etc/bind/pri
-	dosym /var/bind/sec	/etc/bind/sec
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		/usr/sbin/rndc-confgen -a -u named
-	fi
-
-	install -d -o named -g named ${ROOT}/var/run/named \
-		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
-	chown -R named:named ${ROOT}/var/bind
-
-	echo
-	einfo "Bind-9.2.1-r2 version and higher now include chroot support."
-	einfo "If you would like to run bind in chroot, run:"
-	einfo "\`ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\`"
-	echo
-}
-
-pkg_config() {
-	# chroot concept contributed by j2ee (kevin@aptbasilicata.it)
-
-	mkdir -p /chroot/{dns/{dev,etc,var/run/named}}
-	chown -R named:named /chroot/dns/var/run/named
-	cp -R /etc/bind /chroot/dns/etc/
-	cp /etc/localtime /chroot/dns/etc/localtime
-	chown named:named /chroot/dns/etc/bind/rndc.key
-	chgrp named	/chroot/dns/etc/bind/named.conf
-	cp -R /var/bind /chroot/dns/var/
-	chown -R named:named /chroot/dns/var/bind/{pri,sec}
-	mknod /chroot/dns/dev/zero c 1 5
-	mknod /chroot/dns/dev/random c 1 8
-	chmod 666 /chroot/dns/dev/{random,zero}
-	cp -a /dev/log /chroot/dns/dev/log
-
-	chmod 700 /{chroot,chroot/dns}
-	chown named:named /chroot/dns
-
-	cp /etc/conf.d/named /etc/conf.d/named.orig
-	sed -e 's:^#CHROOT="/chroot/dns"$:CHROOT="/chroot/dns":' \
-		/etc/conf.d/named.orig > /etc/conf.d/named
-	rm -f /etc/conf.d/named.orig
-
-	einfo "Check your config files in /chroot/dns"
-	einfo "Add the following to your root .bashrc or .bash_profile: "
-	einfo "   alias rndc='rndc -k /chroot/dns/etc/bind/rndc.key'"
-	einfo "Then do the following: "
-	einfo "   source /root/.bashrc or .bash_profile"
-	echo
-}
diff --git a/net-dns/bind/bind-9.2.2_rc1-r1.ebuild b/net-dns/bind/bind-9.2.2.ebuild
index ebf6dec13be0..8a0dd46e20ba 100644
--- a/net-dns/bind/bind-9.2.2_rc1-r1.ebuild
+++ b/net-dns/bind/bind-9.2.2.ebuild
@@ -1,16 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.2_rc1-r1.ebuild,v 1.11 2003/02/13 13:56:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.2.ebuild,v 1.1 2003/03/04 17:51:45 lostlogic Exp $
 
 IUSE="ssl ipv6 doc"
 
-MY_P=${P/_}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV/_}/${MY_P}.tar.gz"
-HOMEPAGE="http://www.isc.org/products/BIND/bind9-beta.html"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz"
+HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
 
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 LICENSE="as-is"
 SLOT="0"
 
@@ -19,13 +17,15 @@ DEPEND="sys-apps/groff
 
 
 src_unpack() {
-	unpack ${MY_P}.tar.gz && cd ${S}
+	unpack ${A} && cd ${S}
 
 	# Adjusting PATHs in manpages
 	for i in `echo bin/{named/named.8,check/named-checkconf.8,nsupdate/nsupdate.8,rndc/rndc.8}`; do
-	sed -e 's:/etc/named.conf:/etc/bind/named.conf:g' -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-	-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' < ${i} > ${i}.new
-	mv --force ${i}.new ${i} ; done
+		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+		       -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+		       -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+		       ${i}
+	done
 }
 
 src_compile() {
@@ -40,33 +40,36 @@ src_compile() {
 		--with-libtool \
 		${myconf}
 
-	make || die "failed to compile bind"
+	MAKEOPTS="${MAKEOPTS} -j1" emake || die "failed to compile bind"
 }
 
 src_install() {
-	einstall
+	einstall || die "failed to install bind"
 	
 	dodoc CHANGES COPYRIGHT FAQ README
 
 	use doc && {
-	docinto misc ; dodoc doc/misc/*
-	docinto html ; dodoc doc/arm/*
-	docinto	draft ; dodoc doc/draft/*
-	docinto rfc ; dodoc doc/rfc/*
-	docinto contrib ; dodoc contrib/named-bootconf/named-bootconf.sh \
-	contrib/nanny/nanny.pl
+		docinto misc ; dodoc doc/misc/*
+		docinto html ; dodoc doc/arm/*
+		docinto	draft ; dodoc doc/draft/*
+		docinto rfc ; dodoc doc/rfc/*
+		docinto contrib ; dodoc contrib/named-bootconf/named-bootconf.sh \
+		contrib/nanny/nanny.pl
 	}
 
+	insinto /etc/env.d
+	newins ${FILESDIR}/10bind.env 10bind
+
 	# some handy-dandy dynamic dns examples
 	cd ${D}/usr/share/doc/${PF}
 	tar pjxf ${FILESDIR}/dyndns-samples.tbz2
 
 	dodir /etc/bind /var/bind/{pri,sec}
 
-	insinto /etc/bind ; doins ${FILESDIR}/named.conf
+	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r1 named.conf
 	# ftp://ftp.rs.internic.net/domain/named.ca:
 	insinto /var/bind ; doins ${FILESDIR}/named.ca
-	insinto /var/bind/pri ; doins ${FILESDIR}/{127.0.0,localhost}
+	insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost}
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/named.rc6 named
 	insinto /etc/conf.d ; newins ${FILESDIR}/named.confd named
@@ -91,16 +94,16 @@ pkg_postinst() {
 		${ROOT}/var/bind/pri ${ROOT}/var/bind/sec
 	chown -R named:named ${ROOT}/var/bind
 
-	echo
+	einfo
 	einfo "You can edit /etc/conf.d/named to customize named settings"
-	echo
+	einfo
 	einfo "The BIND ebuild now includes chroot support."
 	einfo "If you like to run bind in chroot AND this is a new install OR"
 	einfo "your bind doesn't already run in chroot, simply run:"
 	einfo "\`ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\`"
 	einfo "Before running the above command you might want to change the chroot"
 	einfo "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used."
-	echo
+	einfo
 }
 
 pkg_config() {
@@ -114,7 +117,7 @@ pkg_config() {
 	fi
 
 	if [ ! "$EXISTS" = yes ]; then
-		echo ; einfon "Setting up the chroot directory..."
+		einfo ; einfon "Setting up the chroot directory..."
 		mkdir -m 700 -p ${CHROOT}
 		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
 		chown -R named:named ${CHROOT}/var/run/named
@@ -135,11 +138,11 @@ pkg_config() {
 		fi
 
 		sleep 1; echo " Done."; sleep 1
-		echo
+		einfo
 		einfo "Add the following to your root .bashrc or .bash_profile: "
 		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
 		einfo "Then do the following: "
 		einfo "   source /root/.bashrc or .bash_profile"
-		echo
+		einfo
 	fi
 }
diff --git a/net-dns/bind/files/10bind.env b/net-dns/bind/files/10bind.env
new file mode 100644
index 000000000000..13c7910b2c61
--- /dev/null
+++ b/net-dns/bind/files/10bind.env
@@ -0,0 +1 @@
+CONFIG_PROTECT="/var/bind"
diff --git a/net-dns/bind/files/digest-bind-9.2.1-r2 b/net-dns/bind/files/digest-bind-9.2.1-r2
deleted file mode 100644
index 77883cdb7ef5..000000000000
--- a/net-dns/bind/files/digest-bind-9.2.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 692cff6f44e006ce6984b2c286949dd1 bind-9.2.1.tar.gz 5021044
diff --git a/net-dns/bind/files/digest-bind-9.2.2 b/net-dns/bind/files/digest-bind-9.2.2
new file mode 100644
index 000000000000..a11f05a79883
--- /dev/null
+++ b/net-dns/bind/files/digest-bind-9.2.2
@@ -0,0 +1 @@
+MD5 6ea7d64a0856893ab3eb541ab7bbc725 bind-9.2.2.tar.gz 5054652
diff --git a/net-dns/bind/files/digest-bind-9.2.2_rc1-r1 b/net-dns/bind/files/digest-bind-9.2.2_rc1-r1
deleted file mode 100644
index f599f5e0e918..000000000000
--- a/net-dns/bind/files/digest-bind-9.2.2_rc1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e591be8890c53845133577ac7e042fb6 bind-9.2.2rc1.tar.gz 5049320
diff --git a/net-dns/bind/files/named.conf b/net-dns/bind/files/named.conf
deleted file mode 100644
index eda1564a4c11..000000000000
--- a/net-dns/bind/files/named.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-options {
-	directory "/var/bind";
-
-	// uncomment the following lines to turn on DNS forwarding,
-	// and change the forwarind ip address(es) :
-	//forward first;
-	//forwarders {
-	//	123.123.123.123
-	//	123,123.123.123;
-	//};
-
-	listen-on-v6 { none; };
-        listen-on { 127.0.0.1; };
-
-	// to allow only specific hosts to use the DNS server:
-	//allow-query {
-	//	127.0.0.1;
-	//};
-
-	// if you have problems and are behind a firewall:
-	//query-source address * port 53;
-	pid-file "/var/run/named/named.pid";
-};
-
-zone "." IN {
-	type hint;
-	file "named.ca";
-};
-
-zone "localhost" IN {
-	type master;
-	file "pri/localhost";
-	allow-update { none; };
-	notify no;
-};
-
-zone "127.0.0.in-addr.arpa" IN {
-	type master;
-	file "pri/127.0.0";
-	allow-update { none; };
-	notify no;
-};
diff --git a/net-dns/bind/files/named.conf.5.gz b/net-dns/bind/files/named.conf.5.gz
deleted file mode 100644
index 9d850b74b0c1..000000000000
--- a/net-dns/bind/files/named.conf.5.gz
+++ /dev/null
diff --git a/net-dns/bind/files/named.rc5 b/net-dns/bind/files/named.rc5
deleted file mode 100644
index 73ff66b4c5c3..000000000000
--- a/net-dns/bind/files/named.rc5
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#RCUPDATE:2 3 4:75:This line is required for script management
-
-. /etc/rc.d/config/functions
-
-SERVICE=named
-opts="start stop restart"
-
-PIDFILE=/var/run/named.pid
-EXE=/usr/sbin/named
-
-start() {
-		ebegin "Starting $SERVICE..."
-     		start-stop-daemon --start --quiet --exec $EXE -u named
-		eend $? "Started $SERVICE." "Error Starting $SERVICE."
-}
-
-stop() {
-		ebegin "Stopping $SERVICE..."
-		start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $EXE
-		eend $? "Stopped $SERVICE." "Error Stopping $SERVICE."
-}
-
-restart() {
-		svc_stop
-		svc_start
-}
-
-doservice ${@}
-
-
diff --git a/net-dns/bind/files/nslookup.8 b/net-dns/bind/files/nslookup.8
deleted file mode 100644
index 5f449dd2d3ed..000000000000
--- a/net-dns/bind/files/nslookup.8
+++ /dev/null
@@ -1,534 +0,0 @@
-.\"
-.\" ++Copyright++ 1985, 1989
-.\" -
-.\" Copyright (c) 1985, 1989
-.\"    The Regents of the University of California.  All rights reserved.
-.\" 
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\" 	This product includes software developed by the University of
-.\" 	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\" 
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\" -
-.\" Portions Copyright (c) 1993 by Digital Equipment Corporation.
-.\" 
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies, and that
-.\" the name of Digital Equipment Corporation not be used in advertising or
-.\" publicity pertaining to distribution of the document or software without
-.\" specific, written prior permission.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
-.\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
-.\" CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-.\" DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-.\" PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-.\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-.\" SOFTWARE.
-.\" -
-.\" --Copyright--
-.\"
-.\"	@(#)nslookup.8	5.3 (Berkeley) 6/24/90
-.\"
-.Dd June 24, 1990
-.Dt NSLOOKUP 8 
-.Os BSD 4
-.Sh NAME
-.Nm nslookup 
-.Nd query Internet name servers interactively
-.Sh SYNOPSIS
-.Nm nslookup
-.Op Fl option Ar ...
-.Op Ar host-to-find | Fl Op Ar server
-.Sh DESCRIPTION
-.Ic Nslookup
-is a program to query Internet domain name servers. 
-.Ic Nslookup 
-has two modes: interactive and non-interactive.
-Interactive mode allows the user to query name servers for
-information about various hosts and domains or to print a list of hosts 
-in a domain. 
-Non-interactive mode is used to print just the name and requested information
-for a host or domain.
-.Sh ARGUMENTS
-Interactive mode is entered in the following cases:
-.Bl -tag -width "a)  " 
-.It a)
-when no arguments are given (the default name server will be used),
-.It b)
-when the first argument is a hyphen (-) and the second argument
-is the host name or Internet address of a name server.
-.El
-.Pp
-Non-interactive mode is used when the name or Internet address 
-of the host to be looked up
-is given as the first argument. The optional second argument specifies
-the host name or address of a name server.
-.Pp
-The options listed under the 
-.Dq Li set 
-command below can be specified in
-the 
-.Pa .nslookuprc 
-file in the user's home directory if they are listed 
-one per line.  Options can also be specified
-on the command line if they precede the arguments and are prefixed with
-a hyphen.  For example, to change the default query type to host information,
-and the initial timeout to 10 seconds, type:
-.Bd -literal -offset indent
-	nslookup -query=hinfo  -timeout=10
-.Ed
-.Sh INTERACTIVE COMMANDS
-Commands may be interrupted at any time by typing a control-C.
-To exit, type a control-D 
-.Pq Dv EOF 
-or type 
-.Li exit .
-The command line length must be less than 256 characters.
-To treat a built-in command as a host name, 
-precede it with an escape character 
-.Pq .&\\ . 
-.Sy N.B.:  An unrecognized command will be interpreted as a host name.
-.Bl -tag -width "lserver" 
-.It Ar host Op Ar server
-Look up information for 
-.Ar host 
-using the current default server or using 
-.Ar server , 
-if specified.
-If 
-.Ar host 
-is an Internet address and the query type is 
-.Dv A 
-or 
-.Dv PTR , 
-the name of the host is returned.
-If 
-.Ar host 
-is a name and does not have a trailing period, the default 
-domain name is appended to the name.  (This behavior depends on the state of the
-.Ic set
-options 
-.Ic domain , srchlist , defname , 
-and 
-.Ic search . )
-.Pp
-To look up a host not in the current domain, append a period to 
-the name.
-.It Ic server Ar domain
-.It Ic lserver Ar domain
-Change the default server to 
-.Ar domain ; 
-.Ic lserver 
-uses the initial server to look up information about 
-.Ar domain ,
-while 
-.Ic server
-uses the current default server. 
-If an authoritative answer can't be found, the names of servers
-that might have the answer are returned.
-.It Ic root
-Changes the default server to the server for the root of the domain name space.
-Currently, the host 
-.Li ns.internic.net 
-is used.
-(This command is a synonym for 
-.Dq Ic lserver ns.internic.net . )
-The name of the root server can be changed with the 
-.Dq Ic set root 
-command.
-.It Xo Ic finger Op Ar name 
-.Op Ic > Ar filename
-.Xc
-.It Xo Ic finger Op Ar name 
-.Op Ic >> Ar filename
-.Xc
-Connects with the finger server on the current host. 
-The current host is defined when a previous lookup for a host
-was successful and returned address information (see the 
-.Dq Ic set querytype=A 
-command).
-The 
-.Ar name 
-is optional. 
-.Ic > 
-and 
-.Ic >> 
-can be used to redirect output in the usual manner.
-.It Xo Ic ls Op Ar option 
-.Ar domain Op Ic > Ar filename
-.Xc
-.It Xo Ic ls Op Ar option 
-.Ar domain Op Ic >> Ar filename
-.Xc
-List the information available for 
-.Ar domain , 
-optionally creating or appending to 
-.Ar filename .
-The default output contains host names and their Internet addresses. 
-.Ar Option 
-can be one of the following:
-.Bl -tag -width "-a  "
-.It Fl t Ar querytype
-lists all records of the specified type (see 
-.Ar querytype 
-below).
-.It Fl a
-lists aliases of hosts in the domain;
-synonym for 
-.Dq Fl t Dv CNAME .
-.It Fl d
-lists all records for the domain;
-synonym for 
-.Dq Fl t Dv ANY .
-.It Fl h
-lists CPU and operating system information for the domain;
-synonym for 
-.Dq Fl t Dv HINFO .
-.It Fl s
-lists well-known services of hosts in the domain;
-synonym for 
-.Dq Fl t Dv WKS .
-.El
-.Pp
-When output is directed to a file, hash marks are printed for every
-50 records received from the server.
-.It Ic view Ar filename
-Sorts and lists the output of previous 
-.Ic ls 
-command(s) with 
-.Xr more 1 .
-.It Ic help
-.It Ic ?
-Prints a brief summary of commands.
-.It Ic exit
-Exits the program.
-.It Xo Ic set Ar keyword 
-.Ns Op = Ns Ar value
-.Xc
-This command is used to change state information that affects the lookups.
-Valid keywords are:
-.Bl -tag -width "class=v"
-.It Ic all
-Prints the current values of the frequently-used options to 
-.Ic set .
-Information about the  current default server and host is also printed.
-.It Ic class= Ns Ar value
-Change the query class to one of:
-.Bl -tag -width "HESIOD  "
-.It Dv IN
-the Internet class
-.It Dv CHAOS
-the Chaos class
-.It Dv HESIOD
-the MIT Athena Hesiod class
-.It Dv ANY
-wildcard (any of the above)
-.El
-.Pp
-The class specifies the protocol group of the information.
-.Pp
-(Default = 
-.Dv IN ; 
-abbreviation = 
-.Ic cl )
-.It Xo Op Ic no 
-.Ns Ic debug
-.Xc
-Turn debugging mode on.  A lot more information is printed about the
-packet sent to the server and the resulting answer.
-.Pp
-(Default = 
-.Ic nodebug ; 
-abbreviation = 
-.Xo Op Ic no
-.Ns Ic deb )
-.Xc
-.It Xo Op Ic no 
-.Ns Ic d2
-.Xc
-Turn exhaustive debugging mode on.
-Essentially all fields of every packet are printed.
-.Pp
-(Default = 
-.Ic nod2 )
-.It Ic domain= Ns Ar name
-Change the default domain name to 
-.Ar name . 
-The default domain name is appended to a lookup request depending on the
-state of the 
-.Ic defname 
-and 
-.Ic search 
-options.
-The domain search list contains the parents of the default domain if it has 
-at least two components in its name. 
-For example, if the default domain
-is CC.Berkeley.EDU, the search list is CC.Berkeley.EDU and Berkeley.EDU.
-Use the 
-.Dq Ic set srchlist 
-command to specify a different list.
-Use the 
-.Dq Ic set all 
-command to display the list.
-.Pp
-(Default = value from 
-.Xr hostname 1 , 
-.Pa /etc/resolv.conf ,
-or 
-.Ev LOCALDOMAIN;
-abbreviation = 
-.Ic do )
-.It Ic srchlist= Ns Ar name1/name2/...
-Change the default domain name to 
-.Ar name1 
-and the domain search list
-to 
-.Ar name1 , name2 , 
-etc.  A maximum of 6 names separated by slashes (/)
-can be specified.
-For example,
-.Bd -literal -offset indent
-set srchlist=lcs.MIT.EDU/ai.MIT.EDU/MIT.EDU
-.Ed
-.Pp
-sets the domain to lcs.MIT.EDU and the search list to the three names.
-This command overrides the
-default domain name and search list of the 
-.Dq Ic set domain 
-command.
-Use the 
-.Dq Ic set all 
-command to display the list.
-.Pp
-(Default = value based on 
-.Xr hostname 1 , 
-.Pa /etc/resolv.conf ,
-or 
-.Ev LOCALDOMAIN;
-abbreviation = 
-.Ic srchl )
-.It Xo Op Ic no
-.Ns Ic defname
-.Xc
-If set, append the default domain name to a single-component lookup request 
-(i.e., one that does not contain a period).
-.Pp
-(Default = 
-.Ic defname ; 
-abbreviation = 
-.Xo Op Ic no
-.Ns Ic defname )
-.Xc
-.It Xo Op Ic no 
-.Ns Ic search
-.Xc
-If the lookup request contains at least one period but 
-.Em doesn't 
-end with a trailing period, append the domain names in the domain search list
-to the request until an answer is received.
-.Pp
-(Default = 
-.Ic search ; 
-abbreviation = 
-.Xo Op Ic no 
-.Ns Ic sea )
-.Xc
-.It Ic port= Ns Ar value
-Change the default TCP/UDP name server port to 
-.Ar value .
-.Pp
-(Default = 53; 
-abbreviation = 
-.Ic \&po )
-.It Ic querytype= Ns Ar value
-.It Ic type= Ns Ar value
-Change the type of information query to one of:
-.Bl -tag -width "HINFO   "
-.It Dv A
-the host's Internet address.
-.It Dv CNAME
-the canonical name for an alias.
-.It Dv HINFO
-the host CPU and operating system type.
-.It Dv MINFO
-the mailbox or mail list information.
-.It Dv MX
-the mail exchanger.
-.It Dv NS
-the name server for the named zone.
-.It Dv PTR
-the host name if the query is an Internet address;
-otherwise, the pointer to other information.
-.It Dv SOA
-the domain's 
-.Dq start-of-authority 
-information.
-.It Dv TXT
-the text information.
-.It Dv UINFO
-the user information.
-.It Dv WKS
-the supported well-known services.
-.El
-.Pp
-Other types 
-.Pq Dv ANY, AXFR, MB, MD, MF, NULL 
-are described in the RFC-1035 document.
-.Pp
-(Default = 
-.Dv A ; 
-abbreviations = 
-.Ic q , ty )
-.It Xo Op Ic no
-.Ns Ic recurse
-.Xc
-Tell the name server to query other servers if it does not have the
-information.
-.Pp
-(Default = 
-.Ic recurse ; 
-abbreviation =
-.Xo Op Ic no
-.Ns Ic rec )
-.Xc
-.It Ic retry= Ns Ar number
-Set the number of retries to 
-.Ar number .
-When a reply to a request is not received within a certain 
-amount of time (changed with 
-.Dq Ic set timeout ) , 
-the timeout period is doubled and the request is resent. 
-The retry value controls how many times a request is resent before giving up.
-.Pp
-(Default = 4, abbreviation = 
-.Ic ret )
-.It Ic root= Ns Ar host
-Change the name of the root server to 
-.Ar host . 
-This affects the 
-.Dq Ic root 
-command. 
-.Pp
-(Default = 
-.Ic ns.internic.net. ;
-abbreviation = 
-.Ic ro )
-.It Ic timeout= Ns Ar number
-Change the initial timeout interval for waiting for a reply to 
-.Ar number 
-seconds. Each retry doubles the timeout period.
-.Pp
-(Default = 5 seconds; abbreviation = 
-.Ic ti )
-.It Xo Op Ic no
-.Ns Ic vc
-.Xc
-Always use a virtual circuit when sending requests to the server.
-.Pp
-(Default = 
-.Ic novc ; 
-abbreviation = 
-.Xo Op Ic no
-.Ns Ic v )
-.Xc
-.It Xo Op Ic no
-.Ns Ic ignoretc
-.Xc 
-Ignore packet truncation errors.
-.Pp
-(Default = 
-.Ic noignoretc ; 
-abbreviation = 
-.Xo Op Ic no
-.Ns Ic ig )
-.Xc 
-.El
-.El
-.Sh DIAGNOSTICS
-If the lookup request was not successful, an error message is printed.
-Possible errors are:
-.Bl -tag -width "Timed"
-.It Li Timed out
-The server did not respond to a request after a certain amount of
-time (changed with 
-.Dq Ic set timeout= Ns Ar value ) 
-and a certain number of retries (changed with 
-.Dq Ic set retry= Ns Ar value ) .
-.It Li \&No response from server
-No name server is running on the server machine.
-.It Li \&No records
-The server does not have resource records of the current query type for the
-host, although the host name is valid.
-The query type is specified with the 
-.Dq Ic set querytype 
-command.
-.It Li Non-existent domain
-The host or domain name does not exist.
-.It Li Connection refused
-.It Li Network is unreachable
-The connection to the name or finger server could not be made 
-at the current time.
-This error commonly occurs with 
-.Ic ls 
-and 
-.Ic finger 
-requests. 
-.It Li Server failure
-The name server found an internal inconsistency in its database
-and could not return a valid answer.
-.It Li Refused
-The name server refused to service the request.
-.It Li Format error
-The name server found that the request packet was not in the proper format.
-It may indicate an error in 
-.Nm nslookup .
-.El
-.Sh FILES
-.Bl -tag -width "/usr/share/misc/nslookup.helpXXX" -compact
-.It Pa /etc/resolv.conf
-initial domain name and name server addresses
-.It Pa $HOME/.nslookuprc
-user's initial options
-.It Pa /usr/share/misc/nslookup.help
-summary of commands
-.Sh ENVIRONMENT
-.Bl -tag -width "HOSTALIASESXXXX" -compact
-.It Ev HOSTALIASES
-file containing host aliases
-.It Ev LOCALDOMAIN
-overrides default domain
-.Sh SEE ALSO
-.Xr named 8 ,
-.Xr resolver 3 , 
-.Xr resolver 5 ;
-RFC-1034,
-.Dq Domain Names - Concepts and Facilities ;
-RFC-1035,
-.Dq Domain Names - Implementation and Specification .
-.Sh AUTHOR
-Andrew Cherenson
diff --git a/net-dns/bind/files/root.cache b/net-dns/bind/files/root.cache
deleted file mode 100644
index a20028e3d847..000000000000
--- a/net-dns/bind/files/root.cache
+++ /dev/null
@@ -1,83 +0,0 @@
-;       This file holds the information on root name servers needed to
-;       initialize cache of Internet domain name servers
-;       (e.g. reference this file in the "cache  .  <file>"
-;       configuration file of BIND domain name servers).
-;
-;       This file is made available by InterNIC registration services
-;       under anonymous FTP as
-;           file                /domain/named.root
-;           on server           FTP.RS.INTERNIC.NET
-;       -OR- under Gopher at    RS.INTERNIC.NET
-;           under menu          InterNIC Registration Services (NSI)
-;              submenu          InterNIC Registration Archives
-;           file                named.root
-;
-;       last update:    Aug 22, 1997
-;       related version of root zone:   1997082200
-;
-;
-; formerly NS.INTERNIC.NET
-;
-.                        3600000  IN  NS    A.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
-;
-; formerly NS1.ISI.EDU
-;
-.                        3600000      NS    B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.      3600000      A     128.9.0.107
-;
-; formerly C.PSI.NET
-;
-.                        3600000      NS    C.ROOT-SERVERS.NET.
-C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
-;
-; formerly TERP.UMD.EDU
-;
-.                        3600000      NS    D.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET.      3600000      A     128.8.10.90
-;
-; formerly NS.NASA.GOV
-;
-.                        3600000      NS    E.ROOT-SERVERS.NET.
-E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
-;
-; formerly NS.ISC.ORG
-;
-.                        3600000      NS    F.ROOT-SERVERS.NET.
-F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
-;
-; formerly NS.NIC.DDN.MIL
-;
-.                        3600000      NS    G.ROOT-SERVERS.NET.
-G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
-;
-; formerly AOS.ARL.ARMY.MIL
-;
-.                        3600000      NS    H.ROOT-SERVERS.NET.
-H.ROOT-SERVERS.NET.      3600000      A     128.63.2.53
-;
-; formerly NIC.NORDU.NET
-;
-.                        3600000      NS    I.ROOT-SERVERS.NET.
-I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
-;
-; temporarily housed at NSI (InterNIC)
-;
-.                        3600000      NS    J.ROOT-SERVERS.NET.
-J.ROOT-SERVERS.NET.      3600000      A     198.41.0.10
-;
-; housed in LINX, operated by RIPE NCC
-;
-.                        3600000      NS    K.ROOT-SERVERS.NET.
-K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129 
-;
-; temporarily housed at ISI (IANA)
-;
-.                        3600000      NS    L.ROOT-SERVERS.NET.
-L.ROOT-SERVERS.NET.      3600000      A     198.32.64.12
-;
-; housed in Japan, operated by WIDE
-;
-.                        3600000      NS    M.ROOT-SERVERS.NET.
-M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
-; End of File