svn commit: r256198 - in head: . gnu/usr.bin gnu/usr.bin/rcs share/doc/psd share/doc/psd/13.rcs share/man/man5 share/mk tools/build/mk tools/build/options

Glen Barber gjb at FreeBSD.org
Wed Oct 9 17:07:22 UTC 2013 

Author: gjb
Date: Wed Oct  9 17:07:20 2013
New Revision: 256198
URL: http://svnweb.freebsd.org/changeset/base/256198

Log:
  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

Added:
  head/gnu/usr.bin/rcs/
     - copied from r256094, head/gnu/usr.bin/rcs/
  head/share/doc/psd/13.rcs/
     - copied from r256094, head/share/doc/psd/13.rcs/
  head/tools/build/options/WITHOUT_RCS
     - copied unchanged from r256094, head/tools/build/options/WITHOUT_RCS
Modified:
  head/ObsoleteFiles.inc
  head/UPDATING
  head/gnu/usr.bin/Makefile
  head/share/doc/psd/Makefile
  head/share/man/man5/src.conf.5
  head/share/mk/bsd.own.mk
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Wed Oct  9 17:06:03 2013	(r256197)
+++ head/ObsoleteFiles.inc	Wed Oct  9 17:07:20 2013	(r256198)
@@ -38,29 +38,6 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
-# 20131015: removal of RCS from base
-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
 # 20131001: ar and ranlib from binutils not used
 OLD_FILES+=usr/bin/gnu-ar
 OLD_FILES+=usr/bin/gnu-ranlib

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Oct  9 17:06:03 2013	(r256197)
+++ head/UPDATING	Wed Oct  9 17:07:20 2013	(r256198)
@@ -31,10 +31,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
-20131006:
-	RCS has been removed from the base system.  If you need RCS
-	install either devel/rcs or devel/rcs57.
-
 20130930:
 	BIND has been removed from the base system.  If all you need
 	is a local resolver, simply enable and start the local_unbound

Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile	Wed Oct  9 17:06:03 2013	(r256197)
+++ head/gnu/usr.bin/Makefile	Wed Oct  9 17:07:20 2013	(r256198)
@@ -12,6 +12,7 @@ SUBDIR= ${_binutils} \
 	${_gperf} \
 	grep \
 	${_groff} \
+	${_rcs} \
 	sdiff \
 	send-pr \
 	${_texinfo}
@@ -31,6 +32,10 @@ _dtc=		dtc
 _texinfo=	texinfo
 .endif
 
+.if ${MK_RCS} != "no"
+_rcs=		rcs
+.endif
+
 .if ${MK_BINUTILS} != "no"
 _binutils=	binutils
 .endif

Modified: head/share/doc/psd/Makefile
==============================================================================
--- head/share/doc/psd/Makefile	Wed Oct  9 17:06:03 2013	(r256197)
+++ head/share/doc/psd/Makefile	Wed Oct  9 17:07:20 2013	(r256198)
@@ -20,6 +20,7 @@ SUBDIR=	title \
 	05.sysman \
 	06.Clang \
 	12.make \
+	13.rcs \
 	15.yacc \
 	16.lex \
 	17.m4 \

Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5	Wed Oct  9 17:06:03 2013	(r256197)
+++ head/share/man/man5/src.conf.5	Wed Oct  9 17:07:20 2013	(r256198)
@@ -909,6 +909,11 @@ This includes
 .Xr rlogin 1 ,
 .Xr rsh 1 ,
 etc.
+.It Va WITHOUT_RCS
+.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 156932 2006-03-21 07:50:50Z ru
+Set to not build
+.Xr rcs 1
+and related utilities.
 .It Va WITHOUT_RESCUE
 .\" from FreeBSD: head/tools/build/options/WITHOUT_RESCUE 156932 2006-03-21 07:50:50Z ru
 Set to not build

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Wed Oct  9 17:06:03 2013	(r256197)
+++ head/share/mk/bsd.own.mk	Wed Oct  9 17:07:20 2013	(r256198)
@@ -334,6 +334,7 @@ __DEFAULT_YES_OPTIONS = \
     PROFILE \
     QUOTAS \
     RCMDS \
+    RCS \
     RESCUE \
     ROUTED \
     SENDMAIL \

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Wed Oct  9 17:06:03 2013	(r256197)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Wed Oct  9 17:07:20 2013	(r256198)
@@ -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

Copied: head/tools/build/options/WITHOUT_RCS (from r256094, head/tools/build/options/WITHOUT_RCS)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_RCS	Wed Oct  9 17:07:20 2013	(r256198, copy of r256094, head/tools/build/options/WITHOUT_RCS)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr rcs 1
+and related utilities.

More information about the svn-src-head mailing list