svn commit: r295690 - in stable/10: . tools/build/mk usr.sbin/unbound/control

[Dag-Erling Smørgrav]

Author: des
Date: Wed Feb 17 11:36:45 2016
New Revision: 295690
URL: https://svnweb.freebsd.org/changeset/base/295690

Log:
  MFH (r295533): remove broken unbound-control-setup script
  
  Approved by:	re (glebius)
  Relnotes:	yes

Modified:
  stable/10/ObsoleteFiles.inc
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
  stable/10/usr.sbin/unbound/control/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/ObsoleteFiles.inc
==============================================================================
--- stable/10/ObsoleteFiles.inc	Wed Feb 17 07:59:18 2016	(r295689)
+++ stable/10/ObsoleteFiles.inc	Wed Feb 17 11:36:45 2016	(r295690)
@@ -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

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb 17 07:59:18 2016	(r295689)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb 17 11:36:45 2016	(r295690)
@@ -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

Modified: stable/10/usr.sbin/unbound/control/Makefile
==============================================================================
--- stable/10/usr.sbin/unbound/control/Makefile	Wed Feb 17 07:59:18 2016	(r295689)
+++ stable/10/usr.sbin/unbound/control/Makefile	Wed Feb 17 11:36:45 2016	(r295690)
@@ -7,7 +7,6 @@ UNBOUNDDIR= ${.CURDIR}/../../../contrib/
 .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}