14 files changed, 228 insertions, 329 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index cdfd79e3c371..8f14162a2567 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -19,7 +19,7 @@ SUBDIR=	ac \
 	${_boot0cfg} \
 	${_boot98cfg} \
 	bootparamd \
-	bsnmpd \
+	${_bsnmpd} \
 	${_btxld} \
 	burncd \
 	cdcontrol \
@@ -36,6 +36,8 @@ SUBDIR=	ac \
 	devinfo \
 	digictl \
 	diskinfo \
+	${_dnssec-keygen} \
+	${_dnssec-signzone} \
 	${_editmap} \
 	edquota \
 	${_eeprom} \
@@ -94,8 +96,8 @@ SUBDIR=	ac \
 	mtree \
 	${_named} \
 	${_named.reload} \
-	${_named.restart} \
-	${_ndc} \
+	${_named-checkconf} \
+	${_named-checkzone} \
 	${_ndiscvt} \
 	ndp \
 	newsyslog \
@@ -129,6 +131,8 @@ SUBDIR=	ac \
 	repquota \
 	${_rip6query} \
 	rmt \
+	${_rndc} \
+	${_rndc-confgen} \
 	${_route6d} \
 	rpcbind \
 	rpc.lockd \
@@ -188,15 +192,18 @@ _sysinstall=	sysinstall
 
 .if !defined(NOATM)
 _atm=		atm
+#_bsnmpd=	bsnmpd
 .endif
 
 .if !defined(NO_BIND)
-_named=		named
-_named.reload=	named.reload
-_named.restart=	named.restart
-_ndc=		ndc
-_nslookup=	nslookup
-_nsupdate=	nsupdate
+#_dnssec-keygen=		dnssec-keygen
+#_dnssec-signzone=	dnssec-signzone
+_named=			named
+_named.reload=		named.reload
+_named-checkconf=	named-checkconf
+_named-checkzone=	named-checkzone
+_rndc=			rndc
+_rndc-confgen=		rndc-confgen
 .endif
 
 .if !defined(NO_BLUETOOTH)
diff --git a/usr.sbin/named-checkconf/Makefile b/usr.sbin/named-checkconf/Makefile
new file mode 100644
index 000000000000..957915942c80
--- /dev/null
+++ b/usr.sbin/named-checkconf/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+BIND_DIR=	${.CURDIR}/../../contrib/bind9
+LIB_BIND_DIR=	${.CURDIR}/../../lib/bind
+SRCDIR=		${BIND_DIR}/bin/check
+
+.include	"${LIB_BIND_DIR}/config.mk"
+
+PROG=		named-checkconf
+
+.PATH: ${SRCDIR}
+SRCS+=		named-checkconf.c check-tool.c
+
+CFLAGS+=	-I${LIB_BIND_DIR}
+
+DPADD+=		${BIND_DPADD}
+LDADD+=		${BIND_LDADD}
+
+MAN=		named-checkconf.8
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/named-checkzone/Makefile b/usr.sbin/named-checkzone/Makefile
new file mode 100644
index 000000000000..abde0cc83723
--- /dev/null
+++ b/usr.sbin/named-checkzone/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+BIND_DIR=	${.CURDIR}/../../contrib/bind9
+LIB_BIND_DIR=	${.CURDIR}/../../lib/bind
+SRCDIR=		${BIND_DIR}/bin/check
+
+.include	"${LIB_BIND_DIR}/config.mk"
+
+PROG=		named-checkzone
+
+.PATH: ${SRCDIR}
+SRCS+=		named-checkzone.c check-tool.c
+
+CFLAGS+=	-I${LIB_BIND_DIR}
+
+DPADD+=		${BIND_DPADD}
+LDADD+=		${BIND_LDADD}
+
+MAN=		named-checkzone.8
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/named.reload/Makefile b/usr.sbin/named.reload/Makefile
index 5cb467a19b4c..7ea9d0650964 100644
--- a/usr.sbin/named.reload/Makefile
+++ b/usr.sbin/named.reload/Makefile
@@ -1,15 +1,9 @@
 # $FreeBSD$
 
-.include "${.CURDIR}/../named/Makefile.inc"
-
-SCRIPTS=	named.reload
+SCRIPTS=	named.reload.sh
 MAN=		named.reload.8
-CLEANFILES+=	${SCRIPTS}
-SCRIPTSNAME=	${SCRIPTS}
 
-named.reload:	named.reload.sh ${BIND_DIR}/Makefile
-	sed -e "s|%INDOT%|${INDOT}|" \
-	    -e "s|%DESTSBIN%|${DESTSBIN}|" \
-	    < ${.CURDIR}/named.reload.sh > ${.TARGET}
+LINKS=		${BINDIR}/named.reload ${BINDIR}/named.reconfig
+MLINKS=		named.reload.8 named.reconfig.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/named.reload/named.reload.8 b/usr.sbin/named.reload/named.reload.8
index b1e5c36ff292..64587742350e 100644
--- a/usr.sbin/named.reload/named.reload.8
+++ b/usr.sbin/named.reload/named.reload.8
@@ -1,66 +1,68 @@
-.\" ++Copyright++ 1987, 1993
-.\" -
-.\" Copyright (c) 1987, 1993
-.\"    The Regents of the University of California.  All rights reserved.
+.\"-
+.\" Copyright (c) 2004 Dag-Erling Co�dan Sm�rgrav
+.\" 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.
+.\"    notice, this list of conditions and the following disclaimer
+.\"    in this position and unchanged.
 .\" 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.
-.\" 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.
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
 .\"
-.\" 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--
-.\"
-.\"	from hostname.7	6.4 (Berkeley) 1/16/90
 .\" $FreeBSD$
 .\"
-.Dd June 26, 1993
-.Dt @INDOT_U@NAMED.RELOAD @SYS_OPS_EXT_U@
+.Dd September 21, 2004
+.Dt NAMED.RELOAD 8
 .Os
 .Sh NAME
-.Nm @INDOT@named.reload
-.Nd "cause the name server to synchronize its database"
+.Nm named.reconfig ,
+.Nm named.reload
+.Nd reload name server configuration
+.Sh SYNOPSIS
+.Nm named.reconfig
+.Op Fl V
+.Op Fl c config-file
+.Op Fl k key-file
+.Op Fl s server
+.Op Fl p port
+.Op Fl y keyid
+.Nm named.reload
+.Op Fl V
+.Op Fl c config-file
+.Op Fl k key-file
+.Op Fl s server
+.Op Fl p port
+.Op Fl y keyid
 .Sh DESCRIPTION
-This command runs
-.Xr ndc @SYS_OPS_EXT@
-which reloads the running name server.
+The
+.Nm named.reconfig
+command signals the name server to reload its configuration files and
+load any new zones.
+.Pp
+The
+.Nm named.reload
+command signals the name server to reload its configuration files and
+all zones.
+.Pp
+Both these commands take the same command-line arguments as
+.Xr rndc 8 ,
+except for the command argument, which is implied by the name.
 .Sh SEE ALSO
-.Xr @INDOT@named @SYS_OPS_EXT@ ,
-.Xr @INDOT@named.restart @SYS_OPS_EXT@ ,
-.Xr @INDOT@ndc @SYS_OPS_EXT@
+.Xr named.conf 5 ,
+.Xr rndc.conf 5 ,
+.Xr named 8 ,
+.Xr rndc 8
diff --git a/usr.sbin/named.reload/named.reload.sh b/usr.sbin/named.reload/named.reload.sh
index 4a657a720ae5..d1ee3afeda9a 100644
--- a/usr.sbin/named.reload/named.reload.sh
+++ b/usr.sbin/named.reload/named.reload.sh
@@ -1,7 +1,42 @@
-#!/bin/sh -
+#!/bin/sh
+#-
+# Copyright (c) 2004 Dag-Erling Co�dan Sm�rgrav
+# 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
+#    in this position and unchanged.
+# 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
 #
-#	from named.reload	5.2 (Berkeley) 6/27/89
 # $FreeBSD$
 #
 
-exec %DESTSBIN%/%INDOT%ndc reload
+rndc=/usr/sbin/rndc
+me=$(basename $0)
+cmd=${me#named.}
+cmd=${cmd%.sh}
+
+args=$(getopt "c:k:s:p:Vy:" "$@")
+if [ $? -ne 0 -o $# -ne 0 ] ; then
+	echo "usage: ${me} [-V] [-c config-file] [-k key-file]" 1>&2
+	echo "    [-s server] [-p port] [-y keyid]" 1>&2
+	exit 1
+fi
+
+exec "${rndc}" "$@" "${cmd}"
diff --git a/usr.sbin/named.restart/Makefile b/usr.sbin/named.restart/Makefile
deleted file mode 100644
index e974bf8ae0ce..000000000000
--- a/usr.sbin/named.restart/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include "${.CURDIR}/../named/Makefile.inc"
-
-SCRIPTS=	named.restart
-MAN=		named.restart.8
-CLEANFILES+=	${SCRIPTS}
-SCRIPTSNAME=	${SCRIPTS}
-
-named.restart:	named.restart.sh ${BIND_DIR}/Makefile
-	sed -e "s|%INDOT%|${INDOT}|" \
-	    -e "s|%DESTSBIN%|${DESTSBIN}|" \
-	    < ${.CURDIR}/named.restart.sh > named.restart
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/named.restart/named.restart.8 b/usr.sbin/named.restart/named.restart.8
deleted file mode 100644
index 64f6ec274f60..000000000000
--- a/usr.sbin/named.restart/named.restart.8
+++ /dev/null
@@ -1,73 +0,0 @@
-.\" ++Copyright++ 1987, 1993
-.\" -
-.\" Copyright (c) 1987, 1993
-.\"    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.
-.\" 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--
-.\"
-.\"	from hostname.7	6.4 (Berkeley) 1/16/90
-.\" $FreeBSD$
-.\"
-.Dd June 26, 1993
-.Dt @INDOT_U@NAMED.RESTART @SYS_OPS_EXT_U@
-.Os
-.Sh NAME
-.Nm @INDOT@named.restart
-.Nd "stop and restart the name server"
-.Sh DESCRIPTION
-This command runs
-.Xr ndc @SYS_OPS_EXT@
-which restarts the running name server with the command line options
-specified in
-.Xr rc.conf 5 .
-.Sh BUGS
-Does not wait after killing the old server before starting a new one; since
-the server could take some time to die and the new one will experience a
-fatal error if the old one isn't gone by the time it starts, you can be left
-in a situation where you have no name server at all.
-.Sh SEE ALSO
-.Xr @INDOT@named @SYS_OPS_EXT@ ,
-.Xr @INDOT@named.reload @SYS_OPS_EXT@ ,
-.Xr @INDOT@ndc @SYS_OPS_EXT@
diff --git a/usr.sbin/named.restart/named.restart.sh b/usr.sbin/named.restart/named.restart.sh
deleted file mode 100644
index 1fa6cf886997..000000000000
--- a/usr.sbin/named.restart/named.restart.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -
-#
-#	from named.restart	5.4 (Berkeley) 6/27/89
-# $FreeBSD$
-#
-
-if [ -r /etc/defaults/rc.conf ]; then
-        . /etc/defaults/rc.conf
-        source_rc_confs
-elif [ -r /etc/rc.conf ]; then
-        . /etc/rc.conf
-fi
-exec %DESTSBIN%/%INDOT%ndc -n ${named_program} restart ${named_flags}
diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile
index 4913c16f3fe7..9976151206d1 100644
--- a/usr.sbin/named/Makefile
+++ b/usr.sbin/named/Makefile
@@ -1,44 +1,33 @@
 # $FreeBSD$
 
-USE_LIBBIND=	true
-.include "${.CURDIR}/Makefile.inc"
-
-.PATH: ${BIND_DIR}/bin/named ${BIND_DIR}/doc/man
-
-PROG=	named
-MAN=	named.conf.5 named.8 named-bootconf.8 nsupdate.8
-SRCS=	tmp_version.c pathnames.h \
-	db_dump.c db_load.c db_lookup.c db_save.c db_update.c \
-	db_glue.c db_ixfr.c db_sec.c db_tsig.c \
-	ns_parser.y ns_lexer.c ns_parseutil.c ns_ctl.c \
-	ns_forw.c ns_init.c ns_main.c ns_maint.c ns_req.c \
-	ns_resp.c ns_stats.c ns_ncache.c ns_xfr.c ns_glue.c \
-	ns_udp.c ns_config.c ns_update.c ns_ixfr.c ns_signal.c \
-	ns_sort.c ns_notify.c
-
-.if exists(${.OBJDIR}/../../lib/libisc)
-LIBISCDIR:=	${.OBJDIR}/../../lib/libisc
-.else
-LIBISCDIR!=	cd ${.CURDIR}/../../lib/libisc; make -V .OBJDIR
-.endif
-LIBISC:=	${LIBISCDIR}/libisc.a
-
-DPADD+=	${LIBISC}
-LDADD+=	${LIBISC}
-
-HTMLS=	acl.html address_list.html comments.html config.html controls.html \
-	docdef.html example.html include.html index.html key.html \
-	logging.html master.html options.html server.html trusted-keys.html \
-	zone.html
-MISCS=	DynamicUpdate FAQ.1of2 FAQ.2of2 rfc2317-notes.txt style.txt
-FILES=	${HTMLS} ${MISCS}
-.PATH: ${BIND_DIR}/doc/html ${BIND_DIR}/doc/misc
-
-.for file in ${HTMLS}
-FILESDIR_${file}=	${DOCDIR}/bind/html
-.endfor
-.for file in ${MISCS}
-FILESDIR_${file}=	${DOCDIR}/bind/misc
-.endfor
+BIND_DIR=	${.CURDIR}/../../contrib/bind9
+LIB_BIND_DIR=	${.CURDIR}/../../lib/bind
+SRCDIR=		${BIND_DIR}/bin/named
+
+.include	"${LIB_BIND_DIR}/config.mk"
+
+PROG=		named
+
+.PATH: ${SRCDIR}/unix
+SRCS+=		os.c
+
+.PATH: ${SRCDIR}
+SRCS+=		aclconf.c builtin.c client.c config.c control.c \
+		controlconf.c interfacemgr.c \
+		listenlist.c log.c logconf.c main.c notify.c \
+		query.c server.c sortlist.c \
+		tkeyconf.c tsigconf.c update.c xfrout.c \
+		zoneconf.c \
+		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
+		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
+
+CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR}
+
+DPADD+=		${BIND_DPADD}
+LDADD+=		${BIND_LDADD}
+
+MAN=		named.8 lwresd.8 named.conf.5
+
+LINKS=		${BINDIR}/named ${BINDIR}/lwresd
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/named/Makefile.inc b/usr.sbin/named/Makefile.inc
deleted file mode 100644
index 30e1d2a11de1..000000000000
--- a/usr.sbin/named/Makefile.inc
+++ /dev/null
@@ -1,59 +0,0 @@
-# From: Id: Makefile.inc,v 8.4 1996/03/03 17:42:43 vixie Exp
-# $FreeBSD$
-
-.ifndef (Mk.Inc)
-Mk.Inc?=defined
-
-BIND_DIR=	${.CURDIR}/../../contrib/bind
-
-VER!=		cat ${BIND_DIR}/Version
-
-PS=		ps
-PIDDIR=		/var/run
-DESTETC=	/etc/namedb
-DESTEXEC=	/usr/libexec
-DESTRUN=	/var/run
-DESTSBIN=	/usr/sbin
-DESTHELP=	/usr/share/misc
-
-CFLAGS+=	-I${BIND_DIR}/port/freebsd/include \
-		-I${.CURDIR}/../../contrib/bind/bin/named
-
-# This is mostly for named and named-xfer
-.if defined(USE_LIBBIND)
-# Sadly, mkdep doesn't know about -idirafter, which would be ideal here.
-#CFLAGS+=	-I${.CURDIR}/../../include -I${BIND_DIR}/include
-CFLAGS+=	-I${BIND_DIR}/include
-
-.if exists(${.OBJDIR}/../../lib/libbind)
-LIBBINDDIR:=	${.OBJDIR}/../../lib/libbind
-.else
-LIBBINDDIR!=	cd ${.CURDIR}/../../lib/libbind; make -V .OBJDIR
-.endif
-LIBBIND:=	${LIBBINDDIR}/libbind.a
-
-DPADD+=		${LIBBIND}
-LDADD+=		${LIBBIND}
-
-CLEANFILES+=	tmp_version.c pathnames.h
-CFLAGS+=	-I.
-
-tmp_version.c:	version.c ${BIND_DIR}/Version
-	(u=$${USER-root} d=`pwd` h=`hostname` t=`LC_ALL=C date`; \
-	sed -e "s|%WHEN%|$${t}|" -e "s|%VERSION%|"${VER}"|" \
-	    -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	    < ${BIND_DIR}/bin/named/version.c > tmp_version.c)
-	
-pathnames.h:	${BIND_DIR}/bin/named/pathtemplate.h \
-		${.CURDIR}/../../usr.sbin/named/Makefile.inc
-	rm -f pathnames.h
-	sed -e "s|%DESTSBIN%|${DESTSBIN}|" \
-	    -e "s|%DESTEXEC%|${DESTEXEC}|" \
-	    -e "s|%DESTETC%|${DESTETC}|" \
-	    -e "s|%DESTRUN%|${DESTRUN}|" \
-	    < ${BIND_DIR}/bin/named/pathtemplate.h > pathnames.h
-
-.endif
-
-.include "Makefile.maninc"
-.endif
diff --git a/usr.sbin/named/Makefile.maninc b/usr.sbin/named/Makefile.maninc
deleted file mode 100644
index ee91be38257d..000000000000
--- a/usr.sbin/named/Makefile.maninc
+++ /dev/null
@@ -1,58 +0,0 @@
-# From: Id: Makefile.maninc,v 8.1 1994/12/15 06:23:43 vixie Exp
-# $FreeBSD$
-
-# (the BIND kit's man page Makefile has gotten bad and crazy over the years.
-#  this file has to be included AFTER bsd.prog.mk (which includes bsd.man.mk))
-CMD_EXT=	1
-SYSCALL_EXT=	2
-BSD_SYSCALL_EXT=2
-LIB_C_EXT=	3
-LIB_NETWORK_EXT=3
-FORMAT_EXT=	5
-DESC_EXT=	7
-SYS_OPS_EXT=	8
-
-EXT_SED_CMD =   INDOT_U=`echo "${INDOT}"|LC_ALL=C tr "a-z" "A-Z"`; \
-		export INDOT_U; \
-		XFER_INDOT_U=`echo "${XFER_INDOT}"|LC_ALL=C tr "a-z" "A-Z"`; \
-		export XFER_INDOT_U; \
-		CMD_EXT_U=`echo "${CMD_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \
-		export CMD_EXT_U; \
-		SYS_OPS_EXT_U=`echo "${SYS_OPS_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \
-		export SYS_OPS_EXT_U; \
-		LIB_NETWORK_EXT_U=`echo "${LIB_NETWORK_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \
-		export LIB_NETWORK_EXT_U; \
-		FORMAT_EXT_U=`echo "${FORMAT_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \
-		export FORMAT_EXT_U; \
-		DESC_EXT_U=`echo "${DESC_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \
-		export DESC_EXT_U; \
-		SYSCALL_EXT_U=`echo "${SYSCALL_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \
-		export SYSCALL_EXT_U; \
-		BSD_SYSCALL_EXT_U=`echo "${BSD_SYSCALL_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \
-		export BSD_SYSCALL_EXT_U; \
-		LIB_C_EXT_U=`echo "${LIB_C_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \
-		export LIB_C_EXT_U; \
-		sed -e "s/@INDOT@/${INDOT}/g" \
-		-e "s/@INDOT_U@/$${INDOT_U}/g" \
-		-e "s/@XFER_INDOT@/${XFER_INDOT}/g" \
-		-e "s/@XFER_INDOT_U@/$${XFER_INDOT_U}/g" \
-		-e "s/@CMD_EXT@/${CMD_EXT}/g" \
-		-e "s/@CMD_EXT_U@/$${CMD_EXT_U}/g" \
-		-e "s/@LIB_NETWORK_EXT@/${LIB_NETWORK_EXT}/g" \
-		-e "s/@LIB_NETWORK_EXT_U@/$${LIB_NETWORK_EXT_U}/g" \
-		-e "s/@FORMAT_EXT@/${FORMAT_EXT}/g" \
-		-e "s/@FORMAT_EXT_U@/$${FORMAT_EXT_U}/g" \
-		-e "s/@DESC_EXT@/${DESC_EXT}/g" \
-		-e "s/@DESC_EXT_U@/$${DESC_EXT_U}/g" \
-		-e "s/@SYS_OPS_EXT@/${SYS_OPS_EXT}/g" \
-		-e "s/@SYS_OPS_EXT_U@/$${SYS_OPS_EXT_U}/g" \
-		-e "s/@SYSCALL_EXT@/${SYSCALL_EXT}/g" \
-		-e "s/@SYSCALL_EXT_U@/$${SYSCALL_EXT_U}/g" \
-		-e "s/@BSD_SYSCALL_EXT@/${BSD_SYSCALL_EXT}/g" \
-		-e "s/@BSD_SYSCALL_EXT_U@/$${BSD_SYSCALL_EXT_U}/g" \
-		-e "s/@LIB_C_EXT@/${LIB_C_EXT}/g" \
-		-e "s/@LIB_C_EXT_U@/$${LIB_C_EXT_U}/g" \
-		-e "s@/etc/named\.conf@/etc/namedb/named.conf@g" \
-		-e "s/^ *$$/.Pp/"
-
-MANFILTER=	${EXT_SED_CMD}
diff --git a/usr.sbin/rndc-confgen/Makefile b/usr.sbin/rndc-confgen/Makefile
new file mode 100644
index 000000000000..ae91ecf2ac36
--- /dev/null
+++ b/usr.sbin/rndc-confgen/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+BIND_DIR=	${.CURDIR}/../../contrib/bind9
+LIB_BIND_DIR=	${.CURDIR}/../../lib/bind
+SRCDIR=		${BIND_DIR}/bin/rndc
+
+.include	"${LIB_BIND_DIR}/config.mk"
+
+PROG=		rndc-confgen
+
+.PATH: ${SRCDIR}/unix
+SRCS+=		os.c
+
+.PATH: ${SRCDIR}
+SRCS+=		rndc-confgen.c util.c
+
+CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR}
+
+DPADD+=		${BIND_DPADD}
+LDADD+=		${BIND_LDADD}
+
+MAN=		rndc-confgen.8
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/rndc/Makefile b/usr.sbin/rndc/Makefile
new file mode 100644
index 000000000000..b4e801b3c5b1
--- /dev/null
+++ b/usr.sbin/rndc/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+BIND_DIR=	${.CURDIR}/../../contrib/bind9
+LIB_BIND_DIR=	${.CURDIR}/../../lib/bind
+SRCDIR=		${BIND_DIR}/bin/rndc
+
+.include	"${LIB_BIND_DIR}/config.mk"
+
+PROG=		rndc
+
+.PATH: ${SRCDIR}/unix
+SRCS+=		os.c
+
+.PATH: ${SRCDIR}
+SRCS+=		rndc.c util.c
+
+CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR}
+
+DPADD+=		${BIND_DPADD}
+LDADD+=		${BIND_LDADD}
+
+MAN=		rndc.8 rndc.conf.5
+
+.include <bsd.prog.mk>