Seeing as I was elected without nomination to being SUP meister, update

these files a bit.  The entries for the International secure collections
don't match Freefall's naming conventions, but hopefully MarkM will fix that
soon.  Each file now has an extensive header describing what it is, how
to use it, and how you may want to customize it for a particular system.

5 files changed, 182 insertions, 31 deletions

diff --git a/share/examples/sup/ports-supfile b/share/examples/sup/ports-supfile
index b40173a..5f404b7 100644
--- a/share/examples/sup/ports-supfile
+++ b/share/examples/sup/ports-supfile
@@ -1,27 +1,54 @@
-ports-base release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-archivers release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-benchmarks release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-audio release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-cad release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-comms release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-databases release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-devel release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-editors release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old 
-ports-emulators release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old 
-ports-games release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-graphics release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-japanese release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-lang release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old 
-ports-mail release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old 
-ports-math release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-misc release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-net release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old 
-ports-news release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-plan9 release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-print release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-russian release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old
-ports-security release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old 
-ports-shells release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old 
-ports-sysutils release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old 
-ports-www release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old 
-ports-x11 release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old 
+# $Id$
+#
+# This file contains all of the "SUP collections" that comprise the FreeBSD
+# ports distribution.  SUP (Software Update Protocol) allows you to download
+# the latest ports collection to your system easily.  SUP, availible as a
+# FreeBSD package or in the ports collection, should be invoked as:
+#
+#	sup -v ports-supfile
+#
+# You may want to change some of the settings in this file to better
+# suit your system:
+#
+# base=/usr	
+#		base specifies the root where SUP will store information
+#		about the collections you have transfered to your system.
+#		A setting of "/usr" will generate this information in
+#		/usr/sup.  Even if you are SUPing a large number of
+#		collections, you will be hard pressed to generate more than
+#		~1MB of data in this directory.
+#
+# prefix=/usr/ports
+#		prefix specifies where to place the requested files.  A
+#		setting of "/usr/ports" will place the all of the files
+#		requested in /usr/ports (ie /usr/ports/devel, /usr/ports/cad).
+#		The directory that is the prefix must exist in order for
+#		SUP to transfer files successfully.
+
+ports-base release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-archivers release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-benchmarks release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-audio release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-cad release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-comms release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-databases release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-devel release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-editors release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix 
+ports-emulators release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix 
+ports-games release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-graphics release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-japanese release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-lang release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix 
+ports-mail release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix 
+ports-math release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-misc release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-net release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix 
+ports-news release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-plan9 release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-print release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-russian release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix
+ports-security release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix 
+ports-shells release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix 
+ports-sysutils release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix 
+ports-www release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix 
+ports-x11 release=current host=SUP.FreeBSD.ORG hostbase=/home base=/usr prefix=/usr/ports delete old use-rel-suffix 
diff --git a/share/examples/sup/secure-stable-supfile b/share/examples/sup/secure-stable-supfile
index 61ac7f0..d267589 100644
--- a/share/examples/sup/secure-stable-supfile
+++ b/share/examples/sup/secure-stable-supfile
@@ -1,2 +1,30 @@
-eBones release=stable host=sup.internat.freebsd.org hostbase=/home base=/usr prefix=/usr/src delete old compress
-secure release=stable host=sup.internat.freebsd.org hostbase=/home base=/usr prefix=/usr/src delete old compress
+# $Id$
+#
+# This file contains all of the "SUP collections" that comprise the FreeBSD
+# International secure distribution from the stable (bug-fix only) development
+# branch.  SUP (Software Update Protocol) allows you to download the latest
+# secure source distribution to your system easily.  SUP, availible as a
+# FreeBSD package or in the ports collection, should be invoked as:
+#
+#	sup -v secure-stable-supfile
+#
+# You may want to change some of the settings in this file to better
+# suit your system:
+#
+# base=/usr	
+#		base specifies the root where SUP will store information
+#		about the collections you have transfered to your system.
+#		A setting of "/usr" will generate this information in
+#		/usr/sup.  Even if you are SUPing a large number of
+#		collections, you will be hard pressed to generate more than
+#		~1MB of data in this directory.
+#
+# prefix=/usr/src
+#		prefix specifies where to place the requested files.  A
+#		setting of "/usr/src" 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
+#		SUP to transfer files successfully.
+
+eBones release=stable host=sup.internat.freebsd.org hostbase=/home base=/usr prefix=/usr/src delete old compress use-rel-suffix
+secure release=stable host=sup.internat.freebsd.org hostbase=/home base=/usr prefix=/usr/src delete old compress use-rel-suffix
diff --git a/share/examples/sup/secure-supfile b/share/examples/sup/secure-supfile
index 716f70c..2431afb 100644
--- a/share/examples/sup/secure-supfile
+++ b/share/examples/sup/secure-supfile
@@ -1,2 +1,30 @@
-eBones release=current host=sup.internat.freebsd.org hostbase=/home base=/usr prefix=/usr/src delete old compress
-secure release=current host=sup.internat.freebsd.org hostbase=/home base=/usr prefix=/usr/src delete old compress
+# $Id$
+#
+# This file contains all of the "SUP collections" that comprise the FreeBSD
+# International secure distribution from the current (new and experimental)
+# development branch.  SUP (Software Update Protocol) allows you to download
+# the latest secure source distribution to your system easily.  SUP, availible
+# as a FreeBSD package or in the ports collection, should be invoked as:
+#
+#	sup -v secure-supfile
+#
+# You may want to change some of the settings in this file to better
+# suit your system:
+#
+# base=/usr	
+#		base specifies the root where SUP will store information
+#		about the collections you have transfered to your system.
+#		A setting of "/usr" will generate this information in
+#		/usr/sup.  Even if you are SUPing a large number of
+#		collections, you will be hard pressed to generate more than
+#		~1MB of data in this directory.
+#
+# prefix=/usr/src
+#		prefix specifies where to place the requested files.  A
+#		setting of "/usr/src" 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
+#		SUP to transfer files successfully.
+
+eBones release=current host=sup.internat.freebsd.org hostbase=/home base=/usr prefix=/usr/src delete old compress use-rel-suffix
+secure release=current host=sup.internat.freebsd.org hostbase=/home base=/usr prefix=/usr/src delete old compress use-rel-suffix
diff --git a/share/examples/sup/stable-supfile b/share/examples/sup/stable-supfile
index 5ba1db8..e5af0e0 100644
--- a/share/examples/sup/stable-supfile
+++ b/share/examples/sup/stable-supfile
@@ -1,5 +1,36 @@
+# $Id$
+#
+# This file contains all of the "SUP collections" that comprise the FreeBSD
+# source distribution from the stable (bug-fix only) development branch.
+# SUP (Software Update Protocol) allows you to download the latest source
+# distribution to your system easily.  SUP, availible as a FreeBSD package
+# or in the ports collection, should be invoked as:
+#
+#	sup -v stable-supfile
+#
+# You may want to change some of the settings in this file to better
+# suit your system:
+#
+# base=/usr	
+#		base specifies the root where SUP will store information
+#		about the collections you have transfered to your system.
+#		A setting of "/usr" will generate this information in
+#		/usr/sup.  Even if you are SUPing a large number of
+#		collections, you will be hard pressed to generate more than
+#		~1MB of data in this directory.
+#
+# prefix=/usr/src
+#		prefix specifies where to place the requested files.  A
+#		setting of "/usr/src" 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
+#		SUP to transfer files successfully.
+
 src-base release=stable host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
 src-bin release=stable host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
+
+# Doesmestic 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=stable host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
 src-etc release=stable host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
 src-games release=stable host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
@@ -8,6 +39,9 @@ src-include release=stable host=sup.FreeBSD.org hostbase=/home base=/usr prefix=
 src-lib release=stable host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
 src-libexec release=stable host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
 src-sbin release=stable host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
+
+# Doesmestic 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=stable host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
 src-share release=stable host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
 src-sys release=stable host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
diff --git a/share/examples/sup/standard-supfile b/share/examples/sup/standard-supfile
index 6d0ed19..cf0e24b 100644
--- a/share/examples/sup/standard-supfile
+++ b/share/examples/sup/standard-supfile
@@ -1,5 +1,36 @@
+# $Id$
+#
+# This file contains all of the "SUP collections" that comprise the FreeBSD
+# source distribution from the current (new and experimental) development
+# branch.  SUP (Software Update Protocol) allows you to download the latest
+# source distribution to your system easily.  SUP, availible as a FreeBSD
+# package or in the ports collection, should be invoked as:
+#
+#	sup -v standard-supfile
+#
+# You may want to change some of the settings in this file to better
+# suit your system:
+#
+# base=/usr	
+#		base specifies the root where SUP will store information
+#		about the collections you have transfered to your system.
+#		A setting of "/usr" will generate this information in
+#		/usr/sup.  Even if you are SUPing a large number of
+#		collections, you will be hard pressed to generate more than
+#		~1MB of data in this directory.
+#
+# prefix=/usr/src
+#		prefix specifies where to place the requested files.  A
+#		setting of "/usr/src" 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
+#		SUP to transfer files successfully.
+
 src-base release=current host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
 src-bin release=current host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
+
+# Doemenstic users only please.  If you are outside of the U.S.A and Canada,
+# use the collections in secure-supfile.
 #src-eBones release=current host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
 src-etc release=current host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
 src-games release=current host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
@@ -8,6 +39,9 @@ src-include release=current host=sup.FreeBSD.org hostbase=/home base=/usr prefix
 src-lib release=current host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
 src-libexec release=current host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
 src-sbin release=current host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
+
+# Doemenstic users only please.  If you are outside of the U.S.A and Canada,
+# use the collections in secure-supfile.
 #src-secure release=current host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
 src-share release=current host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix
 src-sys release=current host=sup.FreeBSD.org hostbase=/home base=/usr prefix=/usr/src delete old use-rel-suffix