svn commit: r275116 - in projects/building-blocks: etc/rc.d share/mk tools/build/mk tools/build/options usr.sbin

[Garrett Cooper]

Author: ngie
Date: Wed Nov 26 13:25:09 2014
New Revision: 275116
URL: https://svnweb.freebsd.org/changeset/base/275116

Log:
  Add MK_TIMED option for optionally building usr.sbin/timed, et al

Added:
  projects/building-blocks/tools/build/options/WITHOUT_TIMED   (contents, props changed)
Modified:
  projects/building-blocks/etc/rc.d/Makefile
  projects/building-blocks/share/mk/src.opts.mk
  projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
  projects/building-blocks/usr.sbin/Makefile

Modified: projects/building-blocks/etc/rc.d/Makefile
==============================================================================
--- projects/building-blocks/etc/rc.d/Makefile	Wed Nov 26 12:54:58 2014	(r275115)
+++ projects/building-blocks/etc/rc.d/Makefile	Wed Nov 26 13:25:09 2014	(r275116)
@@ -137,7 +137,6 @@ FILES=	DAEMON \
 	syscons \
 	sysctl \
 	syslogd \
-	timed \
 	tmp \
 	${_ubthidhci} \
 	ugidfw \
@@ -236,6 +235,10 @@ FILES+=		ftp-proxy
 FILES+=		rwho
 .endif
 
+.if ${MK_TIMED} != "no"
+FILES+=		timed
+.endif
+
 .if ${MK_UNBOUND} != "no"
 _unbound=	local_unbound
 .endif

Modified: projects/building-blocks/share/mk/src.opts.mk
==============================================================================
--- projects/building-blocks/share/mk/src.opts.mk	Wed Nov 26 12:54:58 2014	(r275115)
+++ projects/building-blocks/share/mk/src.opts.mk	Wed Nov 26 13:25:09 2014	(r275116)
@@ -157,6 +157,7 @@ __DEFAULT_YES_OPTIONS = \
     TESTS \
     TEXTPROC \
     TFTP \
+    TIMED \
     UNBOUND \
     USB \
     UTMPX \

Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Wed Nov 26 12:54:58 2014	(r275115)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Wed Nov 26 13:25:09 2014	(r275116)
@@ -4911,6 +4911,14 @@ OLD_FILES+=${TESTS_FILES}
 . endif
 .endif	# Test suite.
 
+.if ${MK_TIMED} == no
+OLD_FILES+=etc/rc.d/timed
+OLD_FILES+=usr/sbin/timed
+OLD_FILES+=usr/sbin/timedc
+OLD_FILES+=usr/share/man/man8/timed.8.gz
+OLD_FILES+=usr/share/man/man8/timedc.8.gz
+.endif
+
 #.if ${MK_TOOLCHAIN} == no
 # to be filled in
 #.endif

Added: projects/building-blocks/tools/build/options/WITHOUT_TIMED
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/building-blocks/tools/build/options/WITHOUT_TIMED	Wed Nov 26 13:25:09 2014	(r275116)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr timed 8 .

Modified: projects/building-blocks/usr.sbin/Makefile
==============================================================================
--- projects/building-blocks/usr.sbin/Makefile	Wed Nov 26 12:54:58 2014	(r275115)
+++ projects/building-blocks/usr.sbin/Makefile	Wed Nov 26 13:25:09 2014	(r275116)
@@ -82,7 +82,6 @@ SUBDIR=	adduser \
 	sysrc \
 	tcpdrop \
 	tcpdump \
-	timed \
 	traceroute \
 	trpt \
 	tzsetup \
@@ -307,6 +306,10 @@ SUBDIR+=	tcpdmatch
 SUBDIR+=	tests
 .endif
 
+.if ${MK_TIMED} != "no"
+SUBDIR+=	timed
+.endif
+
 .if ${MK_TOOLCHAIN} != "no"
 SUBDIR+=	config
 SUBDIR+=	crunch