aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/Makefile7
-rw-r--r--usr.sbin/dnssec-keygen/Makefile21
-rw-r--r--usr.sbin/dnssec-signzone/Makefile21
-rw-r--r--usr.sbin/named-checkconf/Makefile4
-rw-r--r--usr.sbin/named-checkzone/Makefile4
-rw-r--r--usr.sbin/named/Makefile4
-rw-r--r--usr.sbin/rndc-confgen/Makefile4
-rw-r--r--usr.sbin/rndc/Makefile4
8 files changed, 57 insertions, 12 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 8f14162a2567..bcc25b8c66d0 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -195,9 +195,12 @@ _atm= atm
#_bsnmpd= bsnmpd
.endif
+.if !defined(NO_BIND) && !defined(NOCRYPT)
+_dnssec-keygen= dnssec-keygen
+_dnssec-signzone= dnssec-signzone
+.endif
+
.if !defined(NO_BIND)
-#_dnssec-keygen= dnssec-keygen
-#_dnssec-signzone= dnssec-signzone
_named= named
_named.reload= named.reload
_named-checkconf= named-checkconf
diff --git a/usr.sbin/dnssec-keygen/Makefile b/usr.sbin/dnssec-keygen/Makefile
new file mode 100644
index 000000000000..0c357dfc0a85
--- /dev/null
+++ b/usr.sbin/dnssec-keygen/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+BIND_DIR= ${.CURDIR}/../../contrib/bind9
+LIB_BIND_DIR= ${.CURDIR}/../../lib/bind
+SRCDIR= ${BIND_DIR}/bin/dnssec
+
+.include "${LIB_BIND_DIR}/config.mk"
+
+PROG= dnssec-keygen
+
+.PATH: ${SRCDIR}
+SRCS+= dnssec-keygen.c dnssectool.c
+
+CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include
+
+DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
+LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
+
+MAN= dnssec-keygen.8
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/dnssec-signzone/Makefile b/usr.sbin/dnssec-signzone/Makefile
new file mode 100644
index 000000000000..c8dd6a946759
--- /dev/null
+++ b/usr.sbin/dnssec-signzone/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+BIND_DIR= ${.CURDIR}/../../contrib/bind9
+LIB_BIND_DIR= ${.CURDIR}/../../lib/bind
+SRCDIR= ${BIND_DIR}/bin/dnssec
+
+.include "${LIB_BIND_DIR}/config.mk"
+
+PROG= dnssec-signzone
+
+.PATH: ${SRCDIR}
+SRCS+= dnssec-signzone.c dnssectool.c
+
+CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include
+
+DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
+LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
+
+MAN= dnssec-signzone.8
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/named-checkconf/Makefile b/usr.sbin/named-checkconf/Makefile
index 957915942c80..a478ba038284 100644
--- a/usr.sbin/named-checkconf/Makefile
+++ b/usr.sbin/named-checkconf/Makefile
@@ -13,8 +13,8 @@ SRCS+= named-checkconf.c check-tool.c
CFLAGS+= -I${LIB_BIND_DIR}
-DPADD+= ${BIND_DPADD}
-LDADD+= ${BIND_LDADD}
+DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
+LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
MAN= named-checkconf.8
diff --git a/usr.sbin/named-checkzone/Makefile b/usr.sbin/named-checkzone/Makefile
index abde0cc83723..0531457aa62f 100644
--- a/usr.sbin/named-checkzone/Makefile
+++ b/usr.sbin/named-checkzone/Makefile
@@ -13,8 +13,8 @@ SRCS+= named-checkzone.c check-tool.c
CFLAGS+= -I${LIB_BIND_DIR}
-DPADD+= ${BIND_DPADD}
-LDADD+= ${BIND_LDADD}
+DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
+LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
MAN= named-checkzone.8
diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile
index 9976151206d1..12c7c8f8787f 100644
--- a/usr.sbin/named/Makefile
+++ b/usr.sbin/named/Makefile
@@ -23,8 +23,8 @@ SRCS+= aclconf.c builtin.c client.c config.c control.c \
CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR}
-DPADD+= ${BIND_DPADD}
-LDADD+= ${BIND_LDADD}
+DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
+LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
MAN= named.8 lwresd.8 named.conf.5
diff --git a/usr.sbin/rndc-confgen/Makefile b/usr.sbin/rndc-confgen/Makefile
index ae91ecf2ac36..e69cb46b908d 100644
--- a/usr.sbin/rndc-confgen/Makefile
+++ b/usr.sbin/rndc-confgen/Makefile
@@ -16,8 +16,8 @@ SRCS+= rndc-confgen.c util.c
CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR}
-DPADD+= ${BIND_DPADD}
-LDADD+= ${BIND_LDADD}
+DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
+LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
MAN= rndc-confgen.8
diff --git a/usr.sbin/rndc/Makefile b/usr.sbin/rndc/Makefile
index b4e801b3c5b1..0fd49c15f1a0 100644
--- a/usr.sbin/rndc/Makefile
+++ b/usr.sbin/rndc/Makefile
@@ -16,8 +16,8 @@ SRCS+= rndc.c util.c
CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR}
-DPADD+= ${BIND_DPADD}
-LDADD+= ${BIND_LDADD}
+DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
+LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
MAN= rndc.8 rndc.conf.5