svn commit: r292280 - in stable/10: tools/build/mk tools/build/options usr.sbin

[Garrett Cooper]

Author: ngie
Date: Tue Dec 15 18:01:05 2015
New Revision: 292280
URL: https://svnweb.freebsd.org/changeset/base/292280

Log:
  MFC r271401:
  r271401 (by asomers):
  
  Conditionalize build of etcupdate(8) on MK_RCS. Since etcupdate calls
  merge(1), which is part of the RCS package, it must not be installed if
  WITHOUT_RCS update is set. Otherwise, it will produce confusing errors.
  
  CR:		https://reviews.freebsd.org/D691
  Sponsored by:	Spectra Logic

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

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Tue Dec 15 17:59:13 2015	(r292279)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Tue Dec 15 18:01:05 2015	(r292280)
@@ -4081,6 +4081,7 @@ OLD_FILES+=usr/bin/rcsdiff
 OLD_FILES+=usr/bin/rcsfreeze
 OLD_FILES+=usr/bin/rcsmerge
 OLD_FILES+=usr/bin/rlog
+OLD_FILES+=usr/sbin/etcupdate
 OLD_FILES+=usr/share/man/man1/ci.1.gz
 OLD_FILES+=usr/share/man/man1/co.1.gz
 OLD_FILES+=usr/share/man/man1/ident.1.gz
@@ -4093,6 +4094,7 @@ OLD_FILES+=usr/share/man/man1/rcsintro.1
 OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz
 OLD_FILES+=usr/share/man/man1/rlog.1.gz
 OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
+OLD_FILES+=usr/share/man/man8/etcupdate.8.gz
 .endif
 
 #.if ${MK_RESCUE} == no

Modified: stable/10/tools/build/options/WITHOUT_RCS
==============================================================================
--- stable/10/tools/build/options/WITHOUT_RCS	Tue Dec 15 17:59:13 2015	(r292279)
+++ stable/10/tools/build/options/WITHOUT_RCS	Tue Dec 15 18:01:05 2015	(r292280)
@@ -1,4 +1,6 @@
 .\" $FreeBSD$
 Set to not build
 .Xr rcs 1
-and related utilities.
+,
+.Xr etcupdate 8
+, and related utilities.

Modified: stable/10/usr.sbin/Makefile
==============================================================================
--- stable/10/usr.sbin/Makefile	Tue Dec 15 17:59:13 2015	(r292279)
+++ stable/10/usr.sbin/Makefile	Tue Dec 15 18:01:05 2015	(r292280)
@@ -23,7 +23,6 @@ SUBDIR=	adduser \
 	digictl \
 	diskinfo \
 	dumpcis \
-	etcupdate \
 	extattr \
 	extattrctl \
 	fifolog \
@@ -302,6 +301,10 @@ SUBDIR+=	repquota
 SUBDIR+=	rwhod
 .endif
 
+.if ${MK_RCS} != "no"
+SUBDIR+=	etcupdate
+.endif
+
 .if ${MK_SENDMAIL} != "no"
 SUBDIR+=	editmap
 SUBDIR+=	mailstats