summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2016-02-17 11:36:45 +0000
committerdes <des@FreeBSD.org>2016-02-17 11:36:45 +0000
commit259061d27e79d47bb2bd63623dbbce072f9d28ed (patch)
treea8aaac3fc2cfc4db333d8afc4d28ef481b6bccdc
parent86fa46c15af5130b6272a694771c1e24b02bc890 (diff)
downloadFreeBSD-src-259061d27e79d47bb2bd63623dbbce072f9d28ed.zip
FreeBSD-src-259061d27e79d47bb2bd63623dbbce072f9d28ed.tar.gz
MFH (r295533): remove broken unbound-control-setup script
Approved by: re (glebius) Relnotes: yes
-rw-r--r--ObsoleteFiles.inc2
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc1
-rw-r--r--usr.sbin/unbound/control/Makefile1
3 files changed, 2 insertions, 2 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 069e115..52e9733 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20160216: Remove obsolete unbound-control-setup
+OLD_FILES+=usr/sbin/unbound-control-setup
# 20151222: liblzma header
OLD_FILES+=usr/include/lzma/lzma.h
# 20151115: added missing _test suffix on multiple tests in lib/libc
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index a682631..405e9e2 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -5010,7 +5010,6 @@ OLD_FILES+=usr/sbin/unbound
OLD_FILES+=usr/sbin/unbound-anchor
OLD_FILES+=usr/sbin/unbound-checkconf
OLD_FILES+=usr/sbin/unbound-control
-OLD_FILES+=usr/sbin/unbound-control-setup
.endif
.if ${MK_USB} == no
diff --git a/usr.sbin/unbound/control/Makefile b/usr.sbin/unbound/control/Makefile
index 7056a9e..32dbb56 100644
--- a/usr.sbin/unbound/control/Makefile
+++ b/usr.sbin/unbound/control/Makefile
@@ -7,7 +7,6 @@ UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc
PROG= unbound-control
-SCRIPTS= unbound-control-setup.sh
SRCS= unbound-control.c worker_cb.c
CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR}
DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD}
OpenPOWER on IntegriCloud