From fa84bd8c2d31badab15b59bd8a45d6bd6c31d5b3 Mon Sep 17 00:00:00 2001
From: bapt <bapt@FreeBSD.org>
Date: Sun, 18 Sep 2016 15:01:11 +0000
Subject: [PATCH] Disable GNU rcs by default

All remaining tools using rcs has been switched to directly use diff3(1):
- etcupdate(8)
- freebsd-update(8)

Note that the ident(1) tool is been already replaced long ago with a BSD
licensed version, as such it remains installed.

GNU rcs is still available from ports:
- rcs: newer GPLv3 version
- rcs57: the latest version from base (GPLv2)
---
 UPDATING                        | 4 ++++
 share/mk/src.libnames.mk        | 4 ++--
 share/mk/src.opts.mk            | 2 +-
 tools/build/options/WITHOUT_RCS | 5 -----
 tools/build/options/WITH_RCS    | 4 ++++
 5 files changed, 11 insertions(+), 8 deletions(-)
 delete mode 100644 tools/build/options/WITHOUT_RCS
 create mode 100644 tools/build/options/WITH_RCS

diff --git a/UPDATING b/UPDATING
index 5c39f174700a..21038a51ab18 100644
--- a/UPDATING
+++ b/UPDATING
@@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20160918:
+	GNU rcs has been turned off by default. It can (temporary) be built
+	again by adding WITH_RCS knob in src.conf.
+
 20160918:
 	The backup_uses_rcs functionality has been removed from rc.subr.
 
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index f65ce01c0081..e1e52b5d8e06 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -490,8 +490,8 @@ LIBDIALOGDIR=	${OBJTOP}/gnu/lib/libdialog
 LIBGCOVDIR=	${OBJTOP}/gnu/lib/libgcov
 LIBGOMPDIR=	${OBJTOP}/gnu/lib/libgomp
 LIBGNUREGEXDIR=	${OBJTOP}/gnu/lib/libregex
-LIBSSPDIR=	${OBJTOP}/gnu/lib/libssp
-LIBSSP_NONSHAREDDIR=	${OBJTOP}/gnu/lib/libssp/libssp_nonshared
+LIBSSPDIR=	${OBJTOP}/lib/libssp
+LIBSSP_NONSHAREDDIR=	${OBJTOP}/lib/libssp/libssp_nonshared
 LIBSUPCPLUSPLUSDIR=	${OBJTOP}/gnu/lib/libsupc++
 LIBASN1DIR=	${OBJTOP}/kerberos5/lib/libasn1
 LIBGSSAPI_KRB5DIR=	${OBJTOP}/kerberos5/lib/libgssapi_krb5
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 06a9ac98c3c9..59f826cc9d1b 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -147,7 +147,6 @@ __DEFAULT_YES_OPTIONS = \
     RADIUS_SUPPORT \
     RCMDS \
     RBOOTD \
-    RCS \
     RESCUE \
     ROUTED \
     SENDMAIL \
@@ -187,6 +186,7 @@ __DEFAULT_NO_OPTIONS = \
     NAND \
     OFED \
     OPENLDAP \
+    RCS \
     SHARED_TOOLCHAIN \
     SORT_THREADS \
     SVN \
diff --git a/tools/build/options/WITHOUT_RCS b/tools/build/options/WITHOUT_RCS
deleted file mode 100644
index b4f89e162321..000000000000
--- a/tools/build/options/WITHOUT_RCS
+++ /dev/null
@@ -1,5 +0,0 @@
-.\" $FreeBSD$
-Set to not build
-.Xr rcs 1 ,
-.Xr etcupdate 8 ,
-and related utilities.
diff --git a/tools/build/options/WITH_RCS b/tools/build/options/WITH_RCS
new file mode 100644
index 000000000000..0765b995717d
--- /dev/null
+++ b/tools/build/options/WITH_RCS
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to build
+.Xr rcs 1
+and related utilities.