Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 18 Sep 2016 15:01:11 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r305931 - in head: . share/mk tools/build/options
Message-ID:  <201609181501.u8IF1B4X064718@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sun Sep 18 15:01:11 2016
New Revision: 305931
URL: https://svnweb.freebsd.org/changeset/base/305931

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

Added:
  head/tools/build/options/WITH_RCS
     - copied, changed from r305930, head/tools/build/options/WITHOUT_RCS
Deleted:
  head/tools/build/options/WITHOUT_RCS
Modified:
  head/UPDATING
  head/share/mk/src.libnames.mk
  head/share/mk/src.opts.mk

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sun Sep 18 14:48:28 2016	(r305930)
+++ head/UPDATING	Sun Sep 18 15:01:11 2016	(r305931)
@@ -32,6 +32,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
 	"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.
 
 20160908:

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Sun Sep 18 14:48:28 2016	(r305930)
+++ head/share/mk/src.libnames.mk	Sun Sep 18 15:01:11 2016	(r305931)
@@ -490,8 +490,8 @@ LIBDIALOGDIR=	${OBJTOP}/gnu/lib/libdialo
 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

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Sun Sep 18 14:48:28 2016	(r305930)
+++ head/share/mk/src.opts.mk	Sun Sep 18 15:01:11 2016	(r305931)
@@ -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 \

Copied and modified: head/tools/build/options/WITH_RCS (from r305930, head/tools/build/options/WITHOUT_RCS)
==============================================================================
--- head/tools/build/options/WITHOUT_RCS	Sun Sep 18 14:48:28 2016	(r305930, copy source)
+++ head/tools/build/options/WITH_RCS	Sun Sep 18 15:01:11 2016	(r305931)
@@ -1,5 +1,4 @@
 .\" $FreeBSD$
-Set to not build
-.Xr rcs 1 ,
-.Xr etcupdate 8 ,
+Set to build
+.Xr rcs 1
 and related utilities.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609181501.u8IF1B4X064718>