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.

1 files changed, 71 insertions, 46 deletions

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