Date: Wed, 10 Sep 2014 19:00:17 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r271401 - in head: tools/build/mk tools/build/options usr.sbin Message-ID: <201409101900.s8AJ0Huo025529@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Wed Sep 10 19:00:17 2014 New Revision: 271401 URL: http://svnweb.freebsd.org/changeset/base/271401 Log: 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 MFC after: 1 week Sponsored by: Spectra Logic Modified: head/tools/build/mk/OptionalObsoleteFiles.inc head/tools/build/options/WITHOUT_RCS head/usr.sbin/Makefile Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Wed Sep 10 16:26:18 2014 (r271400) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Wed Sep 10 19:00:17 2014 (r271401) @@ -3797,6 +3797,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 @@ -3809,6 +3810,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: head/tools/build/options/WITHOUT_RCS ============================================================================== --- head/tools/build/options/WITHOUT_RCS Wed Sep 10 16:26:18 2014 (r271400) +++ head/tools/build/options/WITHOUT_RCS Wed Sep 10 19:00:17 2014 (r271401) @@ -1,4 +1,6 @@ .\" $FreeBSD$ Set to not build .Xr rcs 1 -and related utilities. +, +.Xr etcupdate 8 +, and related utilities. Modified: head/usr.sbin/Makefile ============================================================================== --- head/usr.sbin/Makefile Wed Sep 10 16:26:18 2014 (r271400) +++ head/usr.sbin/Makefile Wed Sep 10 19:00:17 2014 (r271401) @@ -26,7 +26,6 @@ SUBDIR= adduser \ digictl \ diskinfo \ dumpcis \ - etcupdate \ extattr \ extattrctl \ fifolog \ @@ -278,6 +277,10 @@ SUBDIR+= repquota SUBDIR+= rwhod .endif +.if ${MK_RCS} != "no" +SUBDIR+= etcupdate +.endif + .if ${MK_SENDMAIL} != "no" SUBDIR+= editmap SUBDIR+= mailstats
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409101900.s8AJ0Huo025529>