d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r271401:

Browse Source 
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
This commit is contained in:
ngie 2015-12-15 18:01:05 +00:00
parent 73da3a2835
commit 6d12e854a1
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -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.gz
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

4
tools/build/options/WITHOUT_RCS
View File

@ -1,4 +1,6 @@
.\" $FreeBSD$
Set to not build
.Xr rcs 1
and related utilities.
,
.Xr etcupdate 8
, and related utilities.

5
usr.sbin/Makefile
View File

@ -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