svn commit: r307351 - in head: . etc/mtree gnu/usr.bin gnu/usr.bin/rcs share/doc/psd share/doc/psd/13.rcs tools/build/mk tools/build/options

[Baptiste Daroussin]

Author: bapt
Date: Sat Oct 15 12:07:37 2016
New Revision: 307351
URL: https://svnweb.freebsd.org/changeset/base/307351

Log:
  Remove GNU rcs from base.
  
  GNU rcs is still available as a package:
  - rcs: Latest GPLv3 GNU rcs version.
  - rcs57: Copy of the latest version of GNU rcs (GPLv2) from base.
  
  Relnotes:	yes

Deleted:
  head/gnu/usr.bin/rcs/
  head/share/doc/psd/13.rcs/
  head/tools/build/options/WITH_RCS
Modified:
  head/ObsoleteFiles.inc
  head/UPDATING
  head/etc/mtree/BSD.usr.dist
  head/gnu/usr.bin/Makefile
  head/share/doc/psd/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Sat Oct 15 10:29:33 2016	(r307350)
+++ head/ObsoleteFiles.inc	Sat Oct 15 12:07:37 2016	(r307351)
@@ -38,6 +38,30 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20161015: Remove GNU rcs
+OLD_FILES+=usr/bin/ci
+OLD_FILES+=usr/bin/co
+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/doc/psd/13.rcs/paper.ascii.gz
+OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/13.rcs
+OLD_FILES+=usr/share/man/man1/ci.1.gz
+OLD_FILES+=usr/share/man/man1/co.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
 # 20161010: remove link to removed m_getclr(9) macro
 OLD_FILES+=usr/share/man/man9/m_getclr.9.gz
 # 20161003: MK_ELFCOPY_AS_OBJCOPY option retired

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sat Oct 15 10:29:33 2016	(r307350)
+++ head/UPDATING	Sat Oct 15 12:07:37 2016	(r307351)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20161015:
+	GNU rcs has been removed rom base.  It is available as packages:
+	- rcs: Latest GPLv3 GNU rcs version.
+	- rcs57: Copy of the latest version of GNU rcs (GPLv2) from base.
+
 20161008:
 	Use of the cc_cdg, cc_chd, cc_hd, or cc_vegas congestion control
 	modules now requires that the kernel configuration contain the

Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist	Sat Oct 15 10:29:33 2016	(r307350)
+++ head/etc/mtree/BSD.usr.dist	Sat Oct 15 12:07:37 2016	(r307351)
@@ -228,8 +228,6 @@
                 ..
                 12.make
                 ..
-                13.rcs
-                ..
                 15.yacc
                 ..
                 16.lex

Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile	Sat Oct 15 10:29:33 2016	(r307350)
+++ head/gnu/usr.bin/Makefile	Sat Oct 15 12:07:37 2016	(r307351)
@@ -11,7 +11,6 @@ SUBDIR= ${_binutils} \
 	${_gperf} \
 	grep \
 	${_groff} \
-	${_rcs} \
 	${_tests}
 
 SUBDIR_DEPEND_gdb= ${_binutils}
@@ -29,10 +28,6 @@ _groff=		groff
 _dtc=		dtc
 .endif
 
-.if ${MK_RCS} != "no"
-_rcs=		rcs
-.endif
-
 .if ${MK_TESTS} != "no"
 _tests=		tests
 .endif

Modified: head/share/doc/psd/Makefile
==============================================================================
--- head/share/doc/psd/Makefile	Sat Oct 15 10:29:33 2016	(r307350)
+++ head/share/doc/psd/Makefile	Sat Oct 15 12:07:37 2016	(r307351)
@@ -20,7 +20,6 @@ SUBDIR=	title \
 	05.sysman \
 	06.Clang \
 	12.make \
-	13.rcs \
 	15.yacc \
 	16.lex \
 	17.m4 \

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Oct 15 10:29:33 2016	(r307350)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Oct 15 12:07:37 2016	(r307351)
@@ -6810,29 +6810,6 @@ 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/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/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