Date: Tue, 15 Dec 2015 18:02:57 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r292281 - in stable/9: tools/build/mk tools/build/options usr.sbin Message-ID: <201512151802.tBFI2vox032267@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Tue Dec 15 18:02:56 2015 New Revision: 292281 URL: https://svnweb.freebsd.org/changeset/base/292281 Log: MFstable/10 r292280: 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/9/tools/build/mk/OptionalObsoleteFiles.inc stable/9/tools/build/options/WITHOUT_RCS stable/9/usr.sbin/Makefile (contents, props changed) Directory Properties: stable/9/ (props changed) stable/9/tools/ (props changed) stable/9/tools/build/ (props changed) stable/9/tools/build/options/ (props changed) stable/9/usr.sbin/ (props changed) Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 15 18:01:05 2015 (r292280) +++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 15 18:02:56 2015 (r292281) @@ -3697,6 +3697,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 @@ -3709,6 +3710,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/9/tools/build/options/WITHOUT_RCS ============================================================================== --- stable/9/tools/build/options/WITHOUT_RCS Tue Dec 15 18:01:05 2015 (r292280) +++ stable/9/tools/build/options/WITHOUT_RCS Tue Dec 15 18:02:56 2015 (r292281) @@ -1,4 +1,6 @@ .\" $FreeBSD$ Set to not build .Xr rcs 1 -and related utilities. +, +.Xr etcupdate 8 +, and related utilities. Modified: stable/9/usr.sbin/Makefile ============================================================================== --- stable/9/usr.sbin/Makefile Tue Dec 15 18:01:05 2015 (r292280) +++ stable/9/usr.sbin/Makefile Tue Dec 15 18:02:56 2015 (r292281) @@ -22,7 +22,6 @@ SUBDIR= adduser \ digictl \ diskinfo \ dumpcis \ - etcupdate \ extattr \ extattrctl \ fifolog \ @@ -304,6 +303,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?201512151802.tBFI2vox032267>