aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2013-10-09 17:07:20 +0000
committerGlen Barber <gjb@FreeBSD.org>2013-10-09 17:07:20 +0000
commitc9fc60beee8b188b70894c502e2a9f2332eb0c89 (patch)
treeca04a5cf90c8299963a38ecf5beb3ec437b5f1b1 /tools
parent02147e9cd0495e296bc58d832309681b4fba42d6 (diff)
downloadsrc-c9fc60beee8b188b70894c502e2a9f2332eb0c89.tar.gz
src-c9fc60beee8b188b70894c502e2a9f2332eb0c89.zip
Revert r256095, r256120 (partial), r256121:
r256095: - Add gnu/usr.bin/rcs back to the base system. r256120: - Add WITHOUT_RCS back to src.conf.5. r256121: - Remove UPDATING entry regarding gnu/usr.bin/rcs removal. Requested by: many Approved by: re (marius) Discussed with: core
Notes
Notes: svn path=/head/; revision=256198
Diffstat (limited to 'tools')
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc25
-rw-r--r--tools/build/options/WITHOUT_RCS4
2 files changed, 29 insertions, 0 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 1c9fce0e8139..dada14d115b6 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -3859,6 +3859,31 @@ OLD_FILES+=usr/share/man/man8/rshd.8.gz
OLD_FILES+=usr/share/man/man8/rwhod.8.gz
.endif
+.if ${MK_RCS} == no
+OLD_FILES+=usr/bin/ci
+OLD_FILES+=usr/bin/co
+OLD_FILES+=usr/bin/ident
+OLD_FILES+=usr/bin/merge
+OLD_FILES+=usr/bin/rcs
+OLD_FILES+=usr/bin/rcsclean
+OLD_FILES+=usr/bin/rcsdiff
+OLD_FILES+=usr/bin/rcsfreeze
+OLD_FILES+=usr/bin/rcsmerge
+OLD_FILES+=usr/bin/rlog
+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
+OLD_FILES+=usr/share/man/man1/merge.1.gz
+OLD_FILES+=usr/share/man/man1/rcs.1.gz
+OLD_FILES+=usr/share/man/man1/rcsclean.1.gz
+OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz
+OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz
+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
+.endif
+
#.if ${MK_RESCUE} == no
# to be filled in or replaced with a special target
#.endif
diff --git a/tools/build/options/WITHOUT_RCS b/tools/build/options/WITHOUT_RCS
new file mode 100644
index 000000000000..2a4ddecab440
--- /dev/null
+++ b/tools/build/options/WITHOUT_RCS
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr rcs 1
+and related utilities.