6 files changed, 39 insertions, 41 deletions

diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 450110d9e15d..a4cc991ee095 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -44,8 +44,6 @@ SUBDIR=	alias \
 	cut \
 	${_dig} \
 	dirname \
-	${_dnskeygen} \
-	${_dnsquery} \
 	du \
 	ee \
 	elf2aout \
@@ -130,6 +128,8 @@ SUBDIR=	alias \
 	nice \
 	nl \
 	nohup \
+	${_nslookup} \
+	${_nsupdate} \
 	objformat \
 	opieinfo \
 	opiekey \
@@ -235,9 +235,9 @@ _atm=		atm
 
 .if !defined(NO_BIND)
 _dig=		dig
-_dnskeygen=	dnskeygen
-_dnsquery=	dnsquery
 _host=		host
+_nslookup=	nslookup
+_nsupdate=	nsupdate
 .endif
 
 .if !defined(NO_BLUETOOTH)
diff --git a/usr.bin/atm/sscop/Makefile b/usr.bin/atm/sscop/Makefile
index 25d1b770d2ac..16703bb35bd6 100644
--- a/usr.bin/atm/sscop/Makefile
+++ b/usr.bin/atm/sscop/Makefile
@@ -7,9 +7,9 @@ CONTRIB= ${.CURDIR}/../../../contrib/ngatm/sscop
 PROG=	sscop
 SRCS=	common.c sscop_main.c
 WARNS?=	6
-CFLAGS+= -I${CONTRIB}
+CFLAGS+= -I${CONTRIB} -DUSE_LIBBEGEMOT
 
-DPADD=	${LIBISC} ${LIBNETGRAPH} ${LIBNGATM}
-LDADD=	${LIBISC} ${LIBNETGRAPH} ${LIBNGATM}
+DPADD=	${LIBBEGEMOT} ${LIBNETGRAPH} ${LIBNGATM}
+LDADD=	-lbegemot -lnetgraph -lngatm
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index c2c9b2269049..2f52015460d5 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -1,13 +1,22 @@
 # $FreeBSD$
 
-USE_LIBBIND=	yes
-.include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
+BIND_DIR=	${.CURDIR}/../../contrib/bind9
+LIB_BIND_REL=	../../lib/bind
+LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
+SRCDIR=		${BIND_DIR}/bin/dig
 
-.PATH:	${BIND_DIR}/bin/dig
-.PATH:	${BIND_DIR}/bin/nslookup
-.PATH:	${BIND_DIR}/doc/man
+.include	"${LIB_BIND_DIR}/config.mk"
 
-PROG=	dig
-SRCS=	dig.c list.c subr.c debug.c send.c
+PROG=		dig
+
+.PATH: ${SRCDIR}
+SRCS+=		dig.c dighost.c
+
+CFLAGS+=	-I${SRCDIR}/include
+
+DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
+LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
+
+MAN=		dig.1
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/dnskeygen/Makefile b/usr.bin/dnskeygen/Makefile
deleted file mode 100644
index fce2a92f714a..000000000000
--- a/usr.bin/dnskeygen/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-USE_LIBBIND=	true
-.include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
-
-.PATH:	${BIND_DIR}/bin/dnskeygen
-.PATH:	${BIND_DIR}/doc/man
-
-PROG=	dnskeygen
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/dnsquery/Makefile b/usr.bin/dnsquery/Makefile
deleted file mode 100644
index 915f3ea828b9..000000000000
--- a/usr.bin/dnsquery/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-USE_LIBBIND=	yes
-.include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
-
-.PATH:	${BIND_DIR}/bin/dnsquery
-.PATH:	${BIND_DIR}/doc/man
-
-PROG=	dnsquery
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index a81d9e7562a4..e39b93c5f28a 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -1,11 +1,22 @@
 # $FreeBSD$
 
-USE_LIBBIND=	yes
-.include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
+BIND_DIR=	${.CURDIR}/../../contrib/bind9
+LIB_BIND_REL=	../../lib/bind
+LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
+SRCDIR=		${BIND_DIR}/bin/dig
 
-.PATH:	${BIND_DIR}/bin/host
-.PATH:	${BIND_DIR}/doc/man
+.include	"${LIB_BIND_DIR}/config.mk"
 
-PROG=	host
+PROG=		host
+
+.PATH: ${SRCDIR}
+SRCS+=		dighost.c host.c
+
+CFLAGS+=	-I${SRCDIR}/include
+
+DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
+LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
+
+MAN=		host.1
 
 .include <bsd.prog.mk>