Update the sample cvsupfiles to take advantage of the new "*default"

feature in CVSup-14.0.  You no longer need a 200-column window to look
at them.

Also did some general cleanups, and corrected some errors.

2.2 candidate.  These should be brought directly into 2.2 if at all
possible, since they correspond with the CVSup release whose port is
going to go into 2.2.

8 files changed, 451 insertions, 298 deletions

diff --git a/share/examples/cvsup/README b/share/examples/cvsup/README
index 76542e7..e16a067 100644
--- a/share/examples/cvsup/README
+++ b/share/examples/cvsup/README
@@ -1,11 +1,39 @@
-The example supfiles contained in this directory all obtain their sources 
-from cvsup.freebsd.org.  In order to reduce the load on that host, 
-please try and use one of the alternate sup servers listed below.
+# $Id$
 
-USA:
-	cvsup2.freebsd.org
+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.
+
+To maintain the sources for the FreeBSD-current release, use these files:
+
+    standard-supfile		Main source tree
+
+    secure-supfile		International secure distribution
+				(outside USA and Canada)
+
+    ports-supfile		Ports collection
+
+To maintain the sources for the FreeBSD-stable release, use these files:
 
+    stable-supfile		Main source tree
 
-The Netherlands:
+    secure-stable-supfile	International secure distribution
+				(outside USA and Canada)
+
+To maintain a copy of the CVS repository containing all versions of
+FreeBSD, use these files:
+
+    cvs-supfile			Main source tree and ports collection
+
+    secure-cvs-supfile		International secure distribution
+				(outside USA and Canada)
+
+The supfiles contained in this directory all obtain their updates
+from cvsup.freebsd.org.  In order to reduce the load on that host,
+please use one of the alternate CVSup servers listed below.
+
+    USA:
+	cvsup2.freebsd.org
 
+    The Netherlands:
 	cvsup.nl.freebsd.org
diff --git a/share/examples/cvsup/cvs-supfile b/share/examples/cvsup/cvs-supfile
index f377219..a93dae3 100644
--- a/share/examples/cvsup/cvs-supfile
+++ b/share/examples/cvsup/cvs-supfile
@@ -1,12 +1,14 @@
-# $Id: cvs-supfile,v 1.4 1996/11/10 21:51:23 jdp Exp $
+# $Id: cvs-supfile,v 1.5 1996/12/05 11:27:50 asami Exp $
 #
-# This file contains all of the "CVSup collections" that comprise the FreeBSD
-# cvs development tree.  CVSup (CVS Update Protocol) allows you to download
-# the latest cvs tree (or any branch of development therefrom) to your
-# system easily and efficiently (far more so than with sup, which CVSup
-# is aimed at replacing).  If you're running CVSup interactively, and are
-# currently using an X display server, you should run CVSup as follows to
-# keep your CVS tree up-to-date:
+# This file contains all of the "CVSup collections" that make up the
+# CVS development tree of the FreeBSD system.
+#
+# CVSup (CVS Update Protocol) allows you to download the latest CVS
+# tree (or any branch of development therefrom) to your system easily
+# and efficiently (far more so than with sup, which CVSup is aimed
+# at replacing).  If you're running CVSup interactively, and are
+# currently using an X display server, you should run CVSup as follows
+# to keep your CVS tree up-to-date:
 #
 #	cvsup cvs-supfile
 #
@@ -15,90 +17,112 @@
 #
 #	cvsup -g -L 2 cvs-supfile
 #
-# If your network link is ISDN or slower, you'll save time by using
-# compression.  Either add the "-z" option to the cvsup command line,
-# or add the "compress" keyword to each collection in this supfile.
-#
 # You may wish to change some of the settings in this file to better
 # suit your system:
 #
-# base=/usr	
-#		base specifies the root where CVSup will store information
+# host=cvsup.FreeBSD.org
+#		This specifies the server host which will supply the
+#		file updates.  Please change this to one of the mirror
+#		sites if possible.  (See the "README" file.)  You can
+#		override this setting on the command line with cvsup's
+#		"-h host" option.
+#
+# base=/usr
+#		This specifies the root where CVSup will store information
 #		about the collections you have transferred to your system.
 #		A setting of "/usr" will generate this information in
 #		/usr/sup.  Even if you are CVSupping a large number of
 #		collections, you will be hard pressed to generate more than
-#		~1MB of data in this directory.
+#		~1MB of data in this directory.  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
-#		prefix specifies where to place the requested files.  A
+#		This specifies where to place the requested files.  A
 #		setting of "/home/ncvs" will place all of the files
-#		requested in /home/ncvs (ie /home/ncvs/src/bin, 
-#		/home/ncvs/ports archivers). The directory that is the
-#		prefix must exist in order for CVSup to transfer files
-#		successfully.
+#		requested in /home/ncvs (e.g., "/home/ncvs/src/bin",
+#		"/home/ncvs/ports/archivers").  The prefix directory
+#		must exist in order to run CVSup.
 
-## Main Source Tree
-src-base    release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-src-bin     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-src-contrib release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
+# Defaults that apply to all the collections
+*default host=cvsup.FreeBSD.org
+*default base=/usr
+*default prefix=/home/ncvs
+*default release=cvs
+*default delete use-rel-suffix
 
-# Domestic users only please.  If you are outside of the U.S.A and Canada,
-# use the collections in secure-supfile.
-#src-eBones  release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-src-etc     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-src-games   release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-src-gnu     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-src-include release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-src-lib     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-src-libexec release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-src-sbin    release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
+# If your network link is a T1 or faster, comment out the following line.
+*default compress
 
-# Domestic users only please.  If you are outside of the U.S.A and Canada,
-# use the collections in secure-supfile.
-#src-secure  release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-src-share   release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-src-sys     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-src-usrbin  release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-src-usrsbin release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
+## 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,
+# except for "src-eBones" and "src-secure".
+src-all
+
+# These are the individual collections that make up "src-all".  If you
+# use these, be sure to comment out "src-all" above.
+#src-base
+#src-bin
+#src-contrib
+#src-etc
+#src-games
+#src-gnu
+#src-include
+#src-lib
+#src-libexec
+#src-sbin
+#src-share
+#src-sys
+#src-usrbin
+#src-usrsbin
 
-## Ports Collection
+## Export-restricted collections.
 #
-# There are two ways to CVSup the latest ports.  One is to use the individual
-# collections, and the other is to use the "ports-all" mega-collection,
-# which includes all the ports-* collections.
+# Only people in the USA and Canada may fetch these collections.  If
+# you are not in the USA or Canada, please use the collections in the
+# "secure-cvs-supfile" instead.
+#src-eBones
+#src-secure
 
-ports-all release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
+## Ports Collection.
+#
+# The easiest way to get the ports tree is to use the "ports-all"
+# mega-collection.  It includes all of the individual "ports-*"
+# collections,
+ports-all
 
-# If you want to specify individual collections, don't forget to comment
-# out ports-all above.
-#ports-base       release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-archivers  release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-benchmarks release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-audio      release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-cad        release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-chinese    release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-comms      release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-databases  release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-devel      release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-editors    release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix 
-#ports-emulators  release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix 
-#ports-games      release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-graphics   release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-japanese   release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-lang       release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix 
-#ports-mail       release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix 
-#ports-math       release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-mbone      release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-misc       release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix 
-#ports-net        release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix 
-#ports-news       release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-plan9      release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-print      release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-russian    release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix
-#ports-security   release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix 
-#ports-shells     release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix 
-#ports-sysutils   release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix 
-#ports-vietnamese   release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix 
-#ports-www        release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix 
-#ports-x11        release=cvs host=cvsup.FreeBSD.ORG hostbase=/home base=/usr prefix=/home/ncvs delete old use-rel-suffix 
+# These are the individual collections that make up "ports-all".  If you
+# use these, be sure to comment out "ports-all" above.
+#ports-archivers
+#ports-astro
+#ports-audio
+#ports-base
+#ports-benchmarks
+#ports-cad
+#ports-chinese
+#ports-comms
+#ports-databases
+#ports-devel
+#ports-editors
+#ports-emulators
+#ports-games
+#ports-graphics
+#ports-japanese
+#ports-lang
+#ports-mail
+#ports-math
+#ports-mbone
+#ports-misc
+#ports-net
+#ports-news
+#ports-plan9
+#ports-print
+#ports-russian
+#ports-security
+#ports-shells
+#ports-sysutils
+#ports-vietnamese
+#ports-www
+#ports-x11
diff --git a/share/examples/cvsup/ports-supfile b/share/examples/cvsup/ports-supfile
index b78540a..eb11438 100644
--- a/share/examples/cvsup/ports-supfile
+++ b/share/examples/cvsup/ports-supfile
@@ -1,12 +1,14 @@
-# $Id: ports-supfile,v 1.5 1996/11/10 21:51:25 jdp Exp $
+# $Id$
 #
-# This file contains all of the "CVSup collections" that comprise the FreeBSD
-# ports collection tree.  CVSup (CVS Update Protocol) allows you to download
-# the latest cvs tree (or any branch of development therefrom) to your
-# system easily and efficiently (far more so than with sup, which CVSup
-# is aimed at replacing).  If you're running CVSup interactively, and are
-# currently using an X display server, you should run CVSup as follows to
-# keep your ports tree up-to-date:
+# This file contains all of the "CVSup collections" that make up the
+# FreeBSD-current ports collection.
+#
+# CVSup (CVS Update Protocol) allows you to download the latest CVS
+# tree (or any branch of development therefrom) to your system easily
+# and efficiently (far more so than with sup, which CVSup is aimed
+# at replacing).  If you're running CVSup interactively, and are
+# currently using an X display server, you should run CVSup as follows
+# to keep your CVS tree up-to-date:
 #
 #	cvsup ports-supfile
 #
@@ -15,66 +17,79 @@
 #
 #	cvsup -g -L 2 ports-supfile
 #
-# If your network link is ISDN or slower, you'll save time by using
-# compression.  Either add the "-z" option to the cvsup command line,
-# or add the "compress" keyword to each collection in this supfile.
-#
-# You may want to change some of the settings in this file to better
+# You may wish to change some of the settings in this file to better
 # suit your system:
 #
-# base=/usr	
-#		base specifies the root where CVSup will store information
+# host=cvsup.FreeBSD.org
+#		This specifies the server host which will supply the
+#		file updates.  Please change this to one of the mirror
+#		sites if possible.  (See the "README" file.)  You can
+#		override this setting on the command line with cvsup's
+#		"-h host" option.
+#
+# base=/usr
+#		This specifies the root where CVSup will store information
 #		about the collections you have transferred to your system.
 #		A setting of "/usr" will generate this information in
 #		/usr/sup.  Even if you are CVSupping a large number of
 #		collections, you will be hard pressed to generate more than
-#		~1MB of data in this directory.
+#		~1MB of data in this directory.  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
-#		prefix specifies where to place the requested files.  A
-#		setting of "/usr" will place the all of the files
-#		requested in /usr/ports (e.g., /usr/ports/devel, /usr/ports/cad).
-#		The directory that is the prefix must exist in order for
-#		CVSup to transfer files successfully.
+#		This specifies where to place the requested files.  A
+#		setting of "/usr" will place all of the files requested
+#		in "/usr/ports" (e.g., "/usr/ports/devel", "/usr/ports/lang").
+#		The prefix directory must exist in order to run CVSup.
 
-# There are two ways to CVSup the latest ports.  One is to use the individual
-# collections, and the other is to use the "ports-all" mega-collection,
-# which includes everything except ports-distfiles.
+# Defaults that apply to all the collections
+*default host=cvsup.FreeBSD.org
+*default base=/usr
+*default prefix=/usr
+*default release=cvs tag=.
+*default delete use-rel-suffix
 
-# ports-all.  Includes everything below.
+# If your network link is a T1 or faster, comment out the following line.
+*default compress
 
-ports-all release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-
-# Individual collections.
+## Ports Collection.
+#
+# The easiest way to get the ports tree is to use the "ports-all"
+# mega-collection.  It includes all of the individual "ports-*"
+# collections,
+ports-all
 
-#ports-base       release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-archivers  release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-astro      release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-benchmarks release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-audio      release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-cad        release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-chinese    release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-comms      release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-databases  release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-devel      release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-editors    release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-emulators  release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-games      release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-graphics   release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-japanese   release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-lang       release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-mail       release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-math       release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-mbone      release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-misc       release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-net        release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-news       release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-plan9      release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-print      release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-russian    release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-security   release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-shells     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-sysutils   release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-vietnamese   release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-www        release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-#ports-x11        release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
+# These are the individual collections that make up "ports-all".  If you
+# use these, be sure to comment out "ports-all" above.
+#ports-archivers
+#ports-astro
+#ports-audio
+#ports-base
+#ports-benchmarks
+#ports-cad
+#ports-chinese
+#ports-comms
+#ports-databases
+#ports-devel
+#ports-editors
+#ports-emulators
+#ports-games
+#ports-graphics
+#ports-japanese
+#ports-lang
+#ports-mail
+#ports-math
+#ports-mbone
+#ports-misc
+#ports-net
+#ports-news
+#ports-plan9
+#ports-print
+#ports-russian
+#ports-security
+#ports-shells
+#ports-sysutils
+#ports-vietnamese
+#ports-www
+#ports-x11
diff --git a/share/examples/cvsup/secure-cvs-supfile b/share/examples/cvsup/secure-cvs-supfile
index 02ec559..bf9781b 100644
--- a/share/examples/cvsup/secure-cvs-supfile
+++ b/share/examples/cvsup/secure-cvs-supfile
@@ -1,12 +1,15 @@
-# $Id: secure-cvs-supfile,v 1.1 1996/09/29 11:26:26 markm Exp $
+# $Id$
 #
-# This file contains all of the "CVSup collections" that comprise the FreeBSD
-# cvs development tree.  CVSup (CVS Update Protocol) allows you to download
-# the latest cvs tree (or any branch of development therefrom) to your
-# system easily and efficiently (far more so than with sup, which CVSup
-# is aimed at replacing).  If you're running CVSup interactively, and are
-# currently using an X display server, you should run CVSup as follows to
-# keep your CVS tree up-to-date:
+# This file contains all of the "CVSup collections" that make up the CVS
+# development tree of the FreeBSD international secure distribution.  If
+# you are outside the USA or Canada, use this file.
+#
+# CVSup (CVS Update Protocol) allows you to download the latest CVS
+# tree (or any branch of development therefrom) to your system easily
+# and efficiently (far more so than with sup, which CVSup is aimed
+# at replacing).  If you're running CVSup interactively, and are
+# currently using an X display server, you should run CVSup as follows
+# to keep your CVS tree up-to-date:
 #
 #	cvsup secure-cvs-supfile
 #
@@ -15,27 +18,36 @@
 #
 #	cvsup -g -L 2 secure-cvs-supfile
 #
-# If your network link is ISDN or slower, you'll save time by using
-# compression.  Either add the "-z" option to the cvsup command line,
-# or add the "compress" keyword to each collection in this supfile.
-#
 # You may wish to change some of the settings in this file to better
 # suit your system:
 #
-# base=/usr	
-#		base specifies the root where CVSup will store information
+# base=/usr
+#		This specifies the root where CVSup will store information
 #		about the collections you have transferred to your system.
 #		A setting of "/usr" will generate this information in
 #		/usr/sup.  Even if you are CVSupping a large number of
 #		collections, you will be hard pressed to generate more than
-#		~1MB of data in this directory.
-#
-# prefix=/home/cvs.crypt
-#		prefix specifies where to place the requested files.  A
-#		setting of "/home/cvs.crypt" will place all of the files
-#		requested in /home/cvs.crypt (ie /home/cvs.crypt/src/secure, 
-#		/home/cvs.crypt/eBones). The directory that is the prefix
-#		must exist in order for CVSup to transfer files successfully.
+#		~1MB of data in this directory.  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",
+#		"/home/ncvs/ports/archivers").  The prefix directory
+#		must exist in order to run CVSup.
+
+# Defaults that apply to all the collections
+*default host=cvsup.internat.FreeBSD.org
+*default base=/usr
+*default prefix=/home/ncvs
+*default release=cvs
+*default delete use-rel-suffix
+
+# If your network link is a T1 or faster, comment out the following line.
+*default compress
 
-src-eBones release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/cvs.crypt delete old use-rel-suffix
-src-secure release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/home/cvs.crypt delete old use-rel-suffix
+## The international secure collections.
+src-eBones
+src-secure
diff --git a/share/examples/cvsup/secure-stable-supfile b/share/examples/cvsup/secure-stable-supfile
index 6101cb3..1f930fe 100644
--- a/share/examples/cvsup/secure-stable-supfile
+++ b/share/examples/cvsup/secure-stable-supfile
@@ -1,12 +1,15 @@
-# $Id: secure-stable-supfile,v 1.2 1996/09/29 11:26:28 markm Exp $
+# $Id$
 #
-# This file contains all of the "CVSup collections" that comprise the FreeBSD
-# International secure distribution from the stable (bug-fix only) development
-# branch.  CVSup (CVS Update Protocol) allows you to syncronize your system
-# sources with the latest version of this branch easily and efficiently (far
-# more so than with sup, which CVSup is aimed at replacing).  If you're
-# running CVSup interactively, and are currently using an X display server,
-# you should run CVSup as follows to keep your stable tree up-to-date:
+# This file contains all of the "CVSup collections" that make up the
+# source tree of the FreeBSD-stable international secure distribution.
+# If you are outside the USA or Canada, use this file.
+#
+# CVSup (CVS Update Protocol) allows you to download the latest CVS
+# tree (or any branch of development therefrom) to your system easily
+# and efficiently (far more so than with sup, which CVSup is aimed
+# at replacing).  If you're running CVSup interactively, and are
+# currently using an X display server, you should run CVSup as follows
+# to keep your CVS tree up-to-date:
 #
 #	cvsup secure-stable-supfile
 #
@@ -15,27 +18,35 @@
 #
 #	cvsup -g -L 2 secure-stable-supfile
 #
-# If your network link is ISDN or slower, you'll save time by using
-# compression.  Either add the "-z" option to the cvsup command line,
-# or add the "compress" keyword to each collection in this supfile.
-# 
-# You may want to change some of the settings in this file to better
+# You may wish to change some of the settings in this file to better
 # suit your system:
 #
-# base=/usr	
-#		base specifies the root where CVSup will store information
+# base=/usr
+#		This specifies the root where CVSup will store information
 #		about the collections you have transferred to your system.
 #		A setting of "/usr" will generate this information in
 #		/usr/sup.  Even if you are CVSupping a large number of
 #		collections, you will be hard pressed to generate more than
-#		~1MB of data in this directory.
+#		~1MB of data in this directory.  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
-#		prefix specifies where to place the requested files.  A
-#		setting of "/usr" will place the all of the files
-#		requested in /usr/src (ie /usr/src/eBones, /usr/src/secure).
-#		The directory that is the prefix must exist in order for
-#		CVSup to transfer files successfully.
+#		This specifies where to place the requested files.  A
+#		setting of "/usr" will place all of the files requested
+#		in "/usr/src" (i.e., "/usr/src/eBones" and "/usr/src/secure").
+#		The prefix directory must exist in order to run CVSup.
+
+# Defaults that apply to all the collections
+*default host=cvsup.internat.FreeBSD.org
+*default base=/usr
+*default prefix=/usr
+*default release=cvs tag=RELENG_2_1_0
+*default delete use-rel-suffix
+
+# If your network link is a T1 or faster, comment out the following line.
+*default compress
 
-src-eBones release=cvs host=cvsup.internat.freebsd.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
-src-secure release=cvs host=cvsup.internat.freebsd.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
+## The international secure collections.
+src-eBones
+src-secure
diff --git a/share/examples/cvsup/secure-supfile b/share/examples/cvsup/secure-supfile
index 0ffb669..c98a5ec 100644
--- a/share/examples/cvsup/secure-supfile
+++ b/share/examples/cvsup/secure-supfile
@@ -1,12 +1,15 @@
-# $Id: secure-supfile,v 1.2 1996/09/29 11:26:32 markm Exp $
+# $Id$
 #
-# This file contains all of the "CVSup collections" that comprise the FreeBSD
-# International secure distribution from the current (new and experimental)
-# branch.  CVSup (CVS Update Protocol) allows you to syncronize your system
-# sources with the latest secure source distribution easily and efficiently
-# (far more so than with sup, which CVSup is aimed at replacing).  If you're
-# running CVSup interactively, and are currently using an X display server,
-# you should run CVSup as follows to keep your secure source tree up-to-date:
+# This file contains all of the "CVSup collections" that make up the
+# source tree of the FreeBSD-current international secure distribution.
+# If you are outside the USA or Canada, use this file.
+#
+# CVSup (CVS Update Protocol) allows you to download the latest CVS
+# tree (or any branch of development therefrom) to your system easily
+# and efficiently (far more so than with sup, which CVSup is aimed
+# at replacing).  If you're running CVSup interactively, and are
+# currently using an X display server, you should run CVSup as follows
+# to keep your CVS tree up-to-date:
 #
 #	cvsup secure-supfile
 #
@@ -15,27 +18,35 @@
 #
 #	cvsup -g -L 2 secure-supfile
 #
-# If your network link is ISDN or slower, you'll save time by using
-# compression.  Either add the "-z" option to the cvsup command line,
-# or add the "compress" keyword to each collection in this supfile.
-#
-# You may want to change some of the settings in this file to better
+# You may wish to change some of the settings in this file to better
 # suit your system:
 #
-# base=/usr	
-#		base specifies the root where CVSup will store information
+# base=/usr
+#		This specifies the root where CVSup will store information
 #		about the collections you have transferred to your system.
 #		A setting of "/usr" will generate this information in
 #		/usr/sup.  Even if you are CVSupping a large number of
 #		collections, you will be hard pressed to generate more than
-#		~1MB of data in this directory.
+#		~1MB of data in this directory.  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
-#		prefix specifies where to place the requested files.  A
-#		setting of "/usr" will place the all of the files
-#		requested in /usr/src (ie /usr/src/eBones, /usr/src/secure).
-#		The directory that is the prefix must exist in order for
-#		CVSup to transfer files successfully.
+#		This specifies where to place the requested files.  A
+#		setting of "/usr" will place all of the files requested
+#		in "/usr/src" (i.e., "/usr/src/eBones" and "/usr/src/secure").
+#		The prefix directory must exist in order to run CVSup.
+
+# Defaults that apply to all the collections
+*default host=cvsup.internat.FreeBSD.org
+*default base=/usr
+*default prefix=/usr
+*default release=cvs tag=.
+*default delete use-rel-suffix
+
+# If your network link is a T1 or faster, comment out the following line.
+*default compress
 
-src-eBones release=cvs host=cvsup.internat.freebsd.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-src-secure release=cvs host=cvsup.internat.freebsd.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
+## The international secure collections.
+src-eBones
+src-secure
diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile
index dcd23db..38819a5 100644
--- a/share/examples/cvsup/stable-supfile
+++ b/share/examples/cvsup/stable-supfile
@@ -1,11 +1,14 @@
-# $Id: stable-supfile,v 1.2 1996/08/21 00:26:26 jkh Exp $
+# $Id$
 #
-# This file contains all of the "CVSup collections" that comprise the FreeBSD
-# stable branch.  CVSup (CVS Update Protocol) allows you to syncronize your
-# system sources with the latest version of this branch easily and efficiently
-# (far more so than with sup, which CVSup is aimed at replacing).  If you're
-# running CVSup interactively, and are currently using an X display server,
-# you should run CVSup as follows to keep your -stable tree up-to-date:
+# This file contains all of the "CVSup collections" that make up the
+# FreeBSD-stable source tree.
+#
+# CVSup (CVS Update Protocol) allows you to download the latest CVS
+# tree (or any branch of development therefrom) to your system easily
+# and efficiently (far more so than with sup, which CVSup is aimed
+# at replacing).  If you're running CVSup interactively, and are
+# currently using an X display server, you should run CVSup as follows
+# to keep your CVS tree up-to-date:
 #
 #	cvsup stable-supfile
 #
@@ -14,46 +17,70 @@
 #
 #	cvsup -g -L 2 stable-supfile
 #
-# If your network link is ISDN or slower, you'll save time by using
-# compression.  Either add the "-z" option to the cvsup command line,
-# or add the "compress" keyword to each collection in this supfile.
-#
-# You may want to change some of the settings in this file to better
+# You may wish to change some of the settings in this file to better
 # suit your system:
 #
-# base=/usr	
-#		base specifies the root where CVSup will store information
+# host=cvsup.FreeBSD.org
+#		This specifies the server host which will supply the
+#		file updates.  Please change this to one of the mirror
+#		sites if possible.  (See the "README" file.)  You can
+#		override this setting on the command line with cvsup's
+#		"-h host" option.
+#
+# base=/usr
+#		This specifies the root where CVSup will store information
 #		about the collections you have transferred to your system.
 #		A setting of "/usr" will generate this information in
 #		/usr/sup.  Even if you are CVSupping a large number of
 #		collections, you will be hard pressed to generate more than
-#		~1MB of data in this directory.
+#		~1MB of data in this directory.  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
-#		prefix specifies where to place the requested files.  A
-#		setting of "/usr" will place the all of the files
-#		requested in /usr/src (ie /usr/src/bin, /usr/src/share).
-#		The directory that is the prefix must exist in order for
-#		CVSup to transfer files successfully.
+#		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.
 
-src-base    release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
-src-bin     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
+# Defaults that apply to all the collections
+*default host=cvsup.FreeBSD.org
+*default base=/usr
+*default prefix=/usr
+*default release=cvs tag=RELENG_2_1_0
+*default delete use-rel-suffix
 
-# Domestic users only please.  If you live outside of the U.S.A and Canada
-# please use the collections in the secure-stable-supfile.
-#src-eBones  release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
-src-etc     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
-src-games   release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
-src-gnu     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
-src-include release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
-src-lib     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
-src-libexec release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
-src-sbin    release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
+# If your network link is a T1 or faster, comment out the following line.
+*default compress
 
-# Domestic users only please.  If you live outside of the U.S.A and Canada
-# please use the collections in the secure-stable-supfile.
-#src-secure  release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
-src-share   release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
-src-sys     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
-src-usrbin  release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
-src-usrsbin release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=RELENG_2_1_0
+## 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,
+# except for "src-eBones" and "src-secure".
+src-all
+
+# These are the individual collections that make up "src-all".  If you
+# use these, be sure to comment out "src-all" above.
+#src-base
+#src-bin
+#src-contrib
+#src-etc
+#src-games
+#src-gnu
+#src-include
+#src-lib
+#src-libexec
+#src-sbin
+#src-share
+#src-sys
+#src-usrbin
+#src-usrsbin
+
+## Export-restricted collections.
+#
+# Only people in the USA and Canada may fetch these collections.  If
+# you are not in the USA or Canada, please use the collections in the
+# "secure-supfile" instead.
+#src-eBones
+#src-secure
diff --git a/share/examples/cvsup/standard-supfile b/share/examples/cvsup/standard-supfile
index 53377b5..b68432d 100644
--- a/share/examples/cvsup/standard-supfile
+++ b/share/examples/cvsup/standard-supfile
@@ -1,61 +1,86 @@
-# $Id: standard-supfile,v 1.4 1996/08/28 18:54:32 ache Exp $
-#
-# This file contains all of the "CVSup collections" that comprise the FreeBSD
-# source distribution from the current (new and experimental) development
-# branch.  CVSup (CVS Update Protocol) allows you to syncronize your system
-# sources with the latest version of this branch easily and efficiently (far
-# more so than with sup, which CVSup is aimed at replacing).  If you're
-# running CVSup interactively, and are currently using an X display server,
-# you should run CVSup as follows to keep your -current tree up-to-date:
-# 
-#       cvsup standard-supfile
-#               
+# $Id$
+#
+# This file contains all of the "CVSup collections" that make up the
+# FreeBSD-current source tree.
+#
+# CVSup (CVS Update Protocol) allows you to download the latest CVS
+# tree (or any branch of development therefrom) to your system easily
+# and efficiently (far more so than with sup, which CVSup is aimed
+# at replacing).  If you're running CVSup interactively, and are
+# currently using an X display server, you should run CVSup as follows
+# to keep your CVS tree up-to-date:
+#
+#	cvsup standard-supfile
+#
 # If not running X, or invoking cvsup from a non-interactive script, then
 # run it as follows:
 #
-#       cvsup -g -L 2 standard-supfile
-#
-# If your network link is ISDN or slower, you'll save time by using
-# compression.  Either add the "-z" option to the cvsup command line,
-# or add the "compress" keyword to each collection in this supfile.
+#	cvsup -g -L 2 standard-supfile
 #
-# You may want to change some of the settings in this file to better
+# You may wish to change some of the settings in this file to better
 # suit your system:
 #
-# base=/usr	
-#		base specifies the root where CVSup will store information
+# host=cvsup.FreeBSD.org
+#		This specifies the server host which will supply the
+#		file updates.  Please change this to one of the mirror
+#		sites if possible.  (See the "README" file.)  You can
+#		override this setting on the command line with cvsup's
+#		"-h host" option.
+#
+# base=/usr
+#		This specifies the root where CVSup will store information
 #		about the collections you have transferred to your system.
 #		A setting of "/usr" will generate this information in
 #		/usr/sup.  Even if you are CVSupping a large number of
 #		collections, you will be hard pressed to generate more than
-#		~1MB of data in this directory.
+#		~1MB of data in this directory.  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
-#		prefix specifies where to place the requested files.  A
-#		setting of "/usr" will place the all of the files
-#		requested in /usr/src (ie /usr/src/bin, /usr/src/share).
-#		The directory that is the prefix must exist in order for
-#		CVSup to transfer files successfully.
+#		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
+*default host=cvsup.FreeBSD.org
+*default base=/usr
+*default prefix=/usr
+*default release=cvs tag=.
+*default delete use-rel-suffix
 
-src-base    release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-src-bin     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-src-contrib release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
+# If your network link is a T1 or faster, comment out the following line.
+*default compress
 
-# Domestic users only please.  If you are outside of the U.S.A and Canada,
-# use the collections in secure-supfile.
-#src-eBones  release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-src-etc     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-src-games   release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-src-gnu     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-src-include release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-src-lib     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-src-libexec release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-src-sbin    release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
+## 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,
+# except for "src-eBones" and "src-secure".
+src-all
 
-# Domestic users only please.  If you are outside of the U.S.A and Canada,
-# use the collections in secure-supfile.
-#src-secure  release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-src-share   release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-src-sys     release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-src-usrbin  release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
-src-usrsbin release=cvs host=cvsup.FreeBSD.org hostbase=/home base=/usr prefix=/usr delete old use-rel-suffix tag=.
+# These are the individual collections that make up "src-all".  If you
+# use these, be sure to comment out "src-all" above.
+#src-base
+#src-bin
+#src-contrib
+#src-etc
+#src-games
+#src-gnu
+#src-include
+#src-lib
+#src-libexec
+#src-sbin
+#src-share
+#src-sys
+#src-usrbin
+#src-usrsbin
+
+## Export-restricted collections.
+#
+# Only people in the USA and Canada may fetch these collections.  If
+# you are not in the USA or Canada, please use the collections in the
+# "secure-supfile" instead.
+#src-eBones
+#src-secure