Merge r267867 from head:

  Remove example cvsup config files.

7 files changed, 5 insertions, 269 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 950e430..bce2d9f 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -45,6 +45,11 @@ OLD_FILES+=usr/share/examples/libusb20/aux.h
 OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz
+OLD_FILES+=usr/share/examples/cvsup/README
+OLD_FILES+=usr/share/examples/cvsup/cvs-supfile
+OLD_FILES+=usr/share/examples/cvsup/stable-supfile
+OLD_FILES+=usr/share/examples/cvsup/standard-supfile
+OLD_DIRS+=usr/share/examples/cvsup
 # 20140614: send-pr removal
 OLD_FILES+=usr/share/man/man1/send-pr.1.gz
 OLD_FILES+=etc/gnats/freefall
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index eee5442..2c40853 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -301,8 +301,6 @@
             ..
             csh
             ..
-            cvsup
-            ..
             diskless
             ..
             drivers
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 37f3d31..312a17f 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -10,7 +10,6 @@ LDIRS=	BSD_daemon \
 	bhyve \
 	bootforth \
 	csh \
-	cvsup \
 	diskless \
 	drivers \
 	etc \
@@ -52,10 +51,6 @@ XFILES=	BSD_daemon/FreeBSD.pfa \
 	bootforth/menuconf.4th \
 	bootforth/screen.4th \
 	csh/dot.cshrc \
-	cvsup/README \
-	cvsup/cvs-supfile \
-	cvsup/stable-supfile \
-	cvsup/standard-supfile \
 	diskless/ME \
 	diskless/README.BOOTP \
 	diskless/README.TEMPLATING \
diff --git a/share/examples/cvsup/README b/share/examples/cvsup/README
deleted file mode 100644
index 0bf2932..0000000
--- a/share/examples/cvsup/README
+++ /dev/null
@@ -1,41 +0,0 @@
-# $FreeBSD$
-
-BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
-
-The primary development work happens in Subversion and is temporarily
-exported to the legacy CVS system with significant time delays.
-
-You should NOT set up a new consumer of FreeBSD source code via CVS.
-Please see:
-http://www.freebsd.org/doc/handbook/svn.html
-http://www.freebsd.org/doc/handbook/svn-mirrors.html
-
-This directory contains sample "supfiles" for obtaining and updating
-the FreeBSD sources via the Internet.  These supfiles will work
-with CVSup version 14.0 or later.  For general information on CVSup
-itself, please see http://www.freebsd.org/doc/handbook/cvsup.html
-
-To maintain the sources for the FreeBSD-current release, use:
-
-    standard-supfile		Main source tree
-
-To maintain the sources for the FreeBSD-stable release, use:
-
-    stable-supfile		Main source tree
-
-To maintain a copy of the CVS repository containing all versions of
-FreeBSD, use:
-
-    cvs-supfile			Main source tree collection
-
-IMPORTANT: Before you use any of the supfiles in this directory,
-you will need to edit in an appropriate "host" setting.  See:
-
-    http://www.freebsd.org/doc/handbook/mirrors.html
-
-for an up-to-date list of public CVSup mirror sites.
-
-To prevent CVSup from updating particular directories and files, use
-this file:
-
-    refuse
diff --git a/share/examples/cvsup/cvs-supfile b/share/examples/cvsup/cvs-supfile
deleted file mode 100644
index b501272..0000000
--- a/share/examples/cvsup/cvs-supfile
+++ /dev/null
@@ -1,79 +0,0 @@
-# $FreeBSD$
-#
-# BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
-#
-# The primary development work happens in Subversion and is temporarily
-# exported to the legacy CVS system with significant time delays.
-#
-# You should NOT set up a new consumer of FreeBSD source code via CVS.
-# Please see:
-# http://www.freebsd.org/doc/handbook/svn.html
-# http://www.freebsd.org/doc/handbook/svn-mirrors.html
-#
-# csup (CVS Update Protocol) allows you to download the latest CVS
-# tree (or any branch of development therefrom) to your system easily
-# and efficiently
-#
-# To keep your CVS tree up-to-date run:
-#
-#	csup cvs-supfile
-#
-# Note that this only updates the tree contents and does not
-# update what is actually installed.
-#
-# You may wish to change some of the settings in this file to better
-# suit your system:
-#
-# host=CHANGE_THIS.FreeBSD.org
-#		This specifies the server host which will supply the
-#		file updates.  You must change it to one of the CVSup
-#		mirror sites listed in the FreeBSD Handbook at
-#		http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS.
-#		You can	override this setting on the command line
-#		with cvsup's "-h host" option.
-#
-# base=/var/db
-#		This specifies the root where csup will store information
-#		about the collections you have transferred to your system.
-#		A setting of "/var/db" will generate this information in
-#		/var/db/sup.  You can override the "base" setting on the
-#		command line with cvsup's "-b base" option.  This directory
-#		must exist in order to run CVSup.
-#
-# prefix=/home/ncvs
-#		This specifies where to place the requested files.  A
-#		setting of "/home/ncvs" will place all of the files
-#		requested in /home/ncvs (e.g., "/home/ncvs/src/bin").
-#		The prefix directory must exist in order to run CVSup.
-
-# Defaults that apply to all the collections
-#
-# IMPORTANT: Change the next line to use one of the CVSup mirror sites
-# listed at http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS.
-*default host=CHANGE_THIS.FreeBSD.org
-*default base=/var/db
-*default prefix=/home/ncvs
-*default release=cvs
-*default delete use-rel-suffix
-
-# If you seem to be limited by CPU rather than network or disk bandwidth, try
-# commenting out the following line.  (Normally, today's CPUs are fast enough
-# that you want to run compression.)
-*default compress
-
-## Main Source Tree.
-#
-# The easiest way to get the main source tree is to use the "src-all"
-# mega-collection.  It includes all of the individual "src-*" collections.
-src-all
-
-## Projects
-#
-# This collection retrieves the projects tree of the FreeBSD
-# repository
-projects-all
-
-## CVSROOT control files
-#
-# This is to get the control files that cvs(1) needs and the commit logs.
-cvsroot-all
diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile
deleted file mode 100644
index b520f8d..0000000
--- a/share/examples/cvsup/stable-supfile
+++ /dev/null
@@ -1,74 +0,0 @@
-# $FreeBSD$
-#
-# BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
-#
-# The primary development work happens in Subversion and is temporarily
-# exported to the legacy CVS system with significant time delays.
-#
-# You should NOT set up a new consumer of FreeBSD source code via CVS.
-# Please see:
-# http://www.freebsd.org/doc/handbook/svn.html
-# http://www.freebsd.org/doc/handbook/svn-mirrors.html
-#
-# csup (CVS Update Protocol) allows you to download the latest CVS
-# tree (or any branch of development therefrom) to your system easily
-# and efficiently
-#
-# To keep your CVS tree up-to-date run:
-#
-#	csup stable-supfile
-#
-# Note that this only updates the tree contents and does not
-# update what is actually installed.
-#
-# You may wish to change some of the settings in this file to better
-# suit your system:
-#
-# host=CHANGE_THIS.FreeBSD.org
-#		This specifies the server host which will supply the
-#		file updates.  You must change it to one of the CVSup
-#		mirror sites listed in the FreeBSD Handbook at
-#		http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS.
-#		You can	override this setting on the command line
-#		with cvsup's "-h host" option.
-#
-# base=/var/db
-#		This specifies the root where csup will store information
-#		about the collections you have transferred to your system.
-#		A setting of "/var/db" will generate this information in
-#		/var/db/sup.  You can override the "base" setting on the
-#		command line with cvsup's "-b base" option.  This directory
-#		must exist in order to run CVSup.
-#
-# prefix=/usr
-#		This specifies where to place the requested files.  A
-#		setting of "/usr" will place all of the files requested
-#		in "/usr/src" (e.g., "/usr/src/bin", "/usr/src/lib").
-#		The prefix directory must exist in order to run CVSup.
-#
-
-# Defaults that apply to all the collections
-#
-# IMPORTANT: Change the next line to use one of the CVSup mirror sites
-# listed at http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS.
-*default host=CHANGE_THIS.FreeBSD.org
-*default base=/var/db
-*default prefix=/usr
-# The following line is for 9-stable.  If you want 8-stable, 7-stable,
-# 6-stable, 5-stable, 4-stable, 3-stable, or 2.2-stable, change to "RELENG_8",
-# "RELENG_7", "RELENG_6", "RELENG_5", "RELENG_4", "RELENG_3", or
-# "RELENG_2_2" respectively.
-*default release=cvs tag=RELENG_9
-*default delete use-rel-suffix
-
-# If you seem to be limited by CPU rather than network or disk bandwidth, try
-# commenting out the following line.  (Normally, today's CPUs are fast enough
-# that you want to run compression.)
-*default compress
-
-## Main Source Tree.
-#
-# The easiest way to get the main source tree is to use the "src-all"
-# mega-collection.  It includes all of the individual "src-*" collections.
-# Please note:  If you want to track -STABLE, leave this uncommented.
-src-all
diff --git a/share/examples/cvsup/standard-supfile b/share/examples/cvsup/standard-supfile
deleted file mode 100644
index 94eec5e..0000000
--- a/share/examples/cvsup/standard-supfile
+++ /dev/null
@@ -1,68 +0,0 @@
-# $FreeBSD$
-#
-# BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
-#
-# The primary development work happens in Subversion and is temporarily
-# exported to the legacy CVS system with significant time delays.
-#
-# You should NOT set up a new consumer of FreeBSD source code via CVS.
-# Please see:
-# http://www.freebsd.org/doc/handbook/svn.html
-# http://www.freebsd.org/doc/handbook/svn-mirrors.html
-#
-# csup (CVS Update Protocol) allows you to download the latest CVS
-# tree (or any branch of development therefrom) to your system easily
-# and efficiently
-#
-# To keep your CVS tree up-to-date run:
-#
-#	csup standard-supfile
-#
-# Note that this only updates the tree contents and does not
-# update what is actually installed.
-#
-# You may wish to change some of the settings in this file to better
-# suit your system:
-#
-# host=CHANGE_THIS.FreeBSD.org
-#		This specifies the server host which will supply the
-#		file updates.  You must change it to one of the CVSup
-#		mirror sites listed in the FreeBSD Handbook at
-#		http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS.
-#		You can	override this setting on the command line
-#		with cvsup's "-h host" option.
-#
-# base=/var/db
-#		This specifies the root where csup will store information
-#		about the collections you have transferred to your system.
-#		A setting of "/var/db" will generate this information in
-#		/var/db/sup.  You can override the "base" setting on the
-#		command line with cvsup's "-b base" option.  This directory
-#		must exist in order to run CVSup.
-#
-# prefix=/usr
-#		This specifies where to place the requested files.  A
-#		setting of "/usr" will place all of the files requested
-#		in "/usr/src" (e.g., "/usr/src/bin", "/usr/src/lib").
-#		The prefix directory must exist in order to run CVSup.
-
-# Defaults that apply to all the collections
-#
-# IMPORTANT: Change the next line to use one of the CVSup mirror sites
-# listed at http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS.
-*default host=CHANGE_THIS.FreeBSD.org
-*default base=/var/db
-*default prefix=/usr
-*default release=cvs tag=.
-*default delete use-rel-suffix
-
-# If you seem to be limited by CPU rather than network or disk bandwidth, try
-# commenting out the following line.  (Normally, today's CPUs are fast enough
-# that you want to run compression.)
-*default compress
-
-## Main Source Tree.
-#
-# The easiest way to get the main source tree is to use the "src-all"
-# mega-collection.  It includes all of the individual "src-*" collections.
-src-all