summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2013-10-01 07:19:23 +0000
committerdes <des@FreeBSD.org>2013-10-01 07:19:23 +0000
commit122944f492c2782240c7218579bf9c0e127f9a06 (patch)
treed2d0f769950e4fd6137dcf9a8ce70de0b2f0850e
parent3eb829aa660cdaac8377df01c012c5c0e7736b53 (diff)
downloadFreeBSD-src-122944f492c2782240c7218579bf9c0e127f9a06.zip
FreeBSD-src-122944f492c2782240c7218579bf9c0e127f9a06.tar.gz
Odds and ends left over from BIND and unnoticed because they didn't
affect 'make universe'. Approved by: re (gjb)
-rw-r--r--etc/mtree/Makefile10
-rw-r--r--etc/periodic/daily/Makefile4
-rw-r--r--usr.bin/dig/Makefile28
3 files changed, 1 insertions, 41 deletions
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index 06aeb19..3cea0f8 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -2,20 +2,12 @@
.include <bsd.own.mk>
-FILES= ${_BIND.chroot.dist} \
- ${_BIND.include.dist} \
- ${_BSD.debug.dist} \
- BSD.include.dist \
+FILES= BSD.include.dist \
BSD.root.dist \
${_BSD.sendmail.dist} \
BSD.usr.dist \
BSD.var.dist
-.if ${MK_BIND} != "no"
-_BIND.chroot.dist= BIND.chroot.dist
-.if ${MK_BIND_LIBS} != "no"
-_BIND.include.dist= BIND.include.dist
-.endif
.endif
.if ${MK_DEBUG_FILES} != "no"
_BSD.debug.dist= BSD.debug.dist
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index 5a4e2d2..6909e30 100644
--- a/etc/periodic/daily/Makefile
+++ b/etc/periodic/daily/Makefile
@@ -24,10 +24,6 @@ FILES= 100.clean-disks \
FILES+= 310.accounting
.endif
-.if ${MK_BIND_NAMED} != "no"
-FILES+= 470.status-named
-.endif
-
.if ${MK_CALENDAR} != "no"
FILES+= 300.calendar
.endif
diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
deleted file mode 100644
index b76a0ca..0000000
--- a/usr.bin/dig/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $FreeBSD$
-
-BIND_DIR= ${.CURDIR}/../../contrib/bind9
-LIB_BIND_REL= ../../lib/bind
-LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL}
-SRCDIR= ${BIND_DIR}/bin/dig
-
-.include "${LIB_BIND_DIR}/config.mk"
-
-PROG= dig
-
-.PATH: ${SRCDIR}
-SRCS+= dig.c dighost.c
-
-CFLAGS+= -I${SRCDIR}/include
-CFLAGS+= -I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include
-
-.if ${MK_BIND_IDN} == "yes"
-CFLAGS+= -DWITH_IDN -I/usr/local/include
-CFLAGS+= -L/usr/local/lib -lidnkit -R/usr/local/lib -liconv
-.endif
-
-WARNS?= 0
-
-DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
-LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
-
-.include <bsd.prog.mk>
OpenPOWER on IntegriCloud