Direct cvsupd's stdout and stderr into "/var/tmp/cvsupd.out" for

better crash diagnosis.  May it never get tested, ha ha ha.

Eliminate the lite2 and smp releases of the src-sys collection.

Add the new mail-archive collection.

Run cvsup with the "-1" flag to disable automatic retries.  Let cron
take care of that.

State in DESCR that version 15.1 or later of CVSup is required.

5 files changed, 15 insertions, 16 deletions

diff --git a/net/cvsup-mirror/files/cvsupd.sh b/net/cvsup-mirror/files/cvsupd.sh
index 1190e591c685..ca4382e4eea1 100644
--- a/net/cvsup-mirror/files/cvsupd.sh
+++ b/net/cvsup-mirror/files/cvsupd.sh
@@ -5,6 +5,7 @@ if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/cvsupd\.sh\$"); then
     exit 1
 fi
 base=${PREFIX}/etc/cvsup
+out=/var/tmp/cvsupd.out
 
 export PATH=/bin:/usr/bin:${PREFIX}/sbin
 umask 2
@@ -13,4 +14,5 @@ test -x ${PREFIX}/sbin/cvsupd || exit 1
 echo -n " cvsupd"
 cd ${base} || exit
 . config.sh || exit
-su -m ${user} -c "cvsupd -C ${maxclients} -l @${facility}"
+su -m ${user} -c \
+    "cvsupd -e -C ${maxclients} -l @${facility}" >>${out} 2>&1
diff --git a/net/cvsup-mirror/files/supfile b/net/cvsup-mirror/files/supfile
index fb82b1916263..84d7fe39f9c6 100644
--- a/net/cvsup-mirror/files/supfile
+++ b/net/cvsup-mirror/files/supfile
@@ -2,10 +2,9 @@
 # Standard supfile for CVSup FreeBSD mirrors.
 #
 *default delete use-rel-suffix
-cvs-all    release=cvs     prefix=prefixes/FreeBSD.cvs           norsync
-cvs-crypto release=cvs     prefix=prefixes/FreeBSD-crypto.cvs
-src-sys    release=lite2   prefix=prefixes/FreeBSD.lite2         norsync
-src-sys    release=smp     prefix=prefixes/FreeBSD.smp           norsync
-gnats      release=current prefix=prefixes/FreeBSD-gnats.current
-www        release=current prefix=prefixes/FreeBSD-www.current
-distrib    release=self    prefix=prefixes/distrib.self
+cvs-all      release=cvs     prefix=prefixes/FreeBSD.cvs
+cvs-crypto   release=cvs     prefix=prefixes/FreeBSD-crypto.cvs
+gnats        release=current prefix=prefixes/FreeBSD-gnats.current
+www          release=current prefix=prefixes/FreeBSD-www.current
+mail-archive release=current prefix=prefixes/FreeBSD-mail.current
+distrib      release=self    prefix=prefixes/distrib.self
diff --git a/net/cvsup-mirror/files/update.sh b/net/cvsup-mirror/files/update.sh
index c6b73c474e91..c8f8c978f703 100644
--- a/net/cvsup-mirror/files/update.sh
+++ b/net/cvsup-mirror/files/update.sh
@@ -44,14 +44,14 @@ umask 2
 
 if [ ${host_crypto} = ${host} ]; then
     echo "Updating from ${host}"
-    cvsup -gL 1 -c ${colldir} -h ${host} supfile
+    cvsup -1gL 1 -c ${colldir} -h ${host} supfile
 else
     if [ -d prefixes/FreeBSD-crypto.cvs ]; then
 	echo "Updating from ${host_crypto}"
-	cvsup -gL 1 -c ${colldir} -h ${host_crypto} supfile.crypto
+	cvsup -1gL 1 -c ${colldir} -h ${host_crypto} supfile.crypto
     fi
     echo "Updating from ${host}"
-    cvsup -gL 1 -c ${colldir} -h ${host} supfile.non-crypto
+    cvsup -1gL 1 -c ${colldir} -h ${host} supfile.non-crypto
 fi
 
 if [ -f .start_server ]; then
diff --git a/net/cvsup-mirror/pkg-descr b/net/cvsup-mirror/pkg-descr
index d8dd415f0202..5b984082db8a 100644
--- a/net/cvsup-mirror/pkg-descr
+++ b/net/cvsup-mirror/pkg-descr
@@ -10,6 +10,6 @@ This kit is not for people who just want to keep their own files
 up to date with CVSup.  It is for people who wish to run servers
 that distribute the FreeBSD sources to others.
 
-This port requires CVSup version 14.1.1 or later.
+This port requires CVSup version 15.1 or later.
 
 jdp@FreeBSD.org
diff --git a/net/cvsup-mirror/scripts/configure b/net/cvsup-mirror/scripts/configure
index 58928c8a92ea..24bed7d35aed 100644
--- a/net/cvsup-mirror/scripts/configure
+++ b/net/cvsup-mirror/scripts/configure
@@ -133,14 +133,12 @@ ask_distrib FreeBSD.cvs /home/ncvs . \
     "main source tree, except crypto code (350 MB)"
 ask_distrib FreeBSD-crypto.cvs /home/ncvs . \
     "crypto code (7 MB)"
-ask_distrib FreeBSD.lite2 /home/lite2 . \
-    "BSD-4.4lite2 merge source tree (45 MB)"
-ask_distrib FreeBSD.smp /home/smp . \
-    "SMP support source tree (25 MB)"
 ask_distrib FreeBSD-www.current /usr/local/www . \
     "installed World Wide Web data (16 MB)"
 ask_distrib FreeBSD-gnats.current /home/gnats gnats \
     "GNATS bug tracking database (12 MB)"
+ask_distrib FreeBSD-mail.current /home/mail . \
+    "mailing list archive (150 MB)"
 
 cat <<EOF