From 98b9fabeed1622aa10f97d0e15396cab70b5a414 Mon Sep 17 00:00:00 2001 From: des Date: Wed, 17 Feb 2016 11:36:45 +0000 Subject: [PATCH] MFH (r295533): remove broken unbound-control-setup script Approved by: re (glebius) Relnotes: yes git-svn-id: svn://svn.freebsd.org/base/stable/10@295690 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- ObsoleteFiles.inc | 2 ++ tools/build/mk/OptionalObsoleteFiles.inc | 1 - usr.sbin/unbound/control/Makefile | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 069e11580..52e97332b 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 a6826317f..405e9e2a3 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 7056a9e24..32dbb56a9 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} -- 2.45.0