Update the cvsup-mirror port to reflect the fact that crypto isn't

a special case any more.

5 files changed, 9 insertions, 52 deletions

diff --git a/net/cvsup-mirror/Makefile b/net/cvsup-mirror/Makefile
index 5bac3d15a7f3..77b427903aed 100644
--- a/net/cvsup-mirror/Makefile
+++ b/net/cvsup-mirror/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cvsup-mirror
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	net
 DISTFILES=
 
@@ -36,8 +36,6 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/cvsupd.access ${base}
 	@${INSTALL_SCRIPT} ${FILESDIR}/update.sh ${base}
 	@${INSTALL_DATA} ${FILESDIR}/supfile ${base}
-	@${INSTALL_DATA} ${FILESDIR}/supfile.crypto ${base}
-	@${INSTALL_DATA} ${FILESDIR}/supfile.non-crypto ${base}
 	@${INSTALL_DATA} ${FILESDIR}/refuse.self ${distrib}
 	@${INSTALL_SCRIPT} ${FILESDIR}/cvsupd.sh ${rc}
 	@${CP} /dev/null ${base}/.start_server
diff --git a/net/cvsup-mirror/files/supfile b/net/cvsup-mirror/files/supfile
index 84d7fe39f9c6..08aba1016441 100644
--- a/net/cvsup-mirror/files/supfile
+++ b/net/cvsup-mirror/files/supfile
@@ -3,7 +3,6 @@
 #
 *default delete use-rel-suffix
 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
diff --git a/net/cvsup-mirror/files/update.sh b/net/cvsup-mirror/files/update.sh
index 9227683642a7..eeea8891cc22 100644
--- a/net/cvsup-mirror/files/update.sh
+++ b/net/cvsup-mirror/files/update.sh
@@ -47,21 +47,10 @@ options="-1gL 1 -b ${base} -c ${colldir} ${CVSUP_ARGS}"
 
 umask 2
 ok=yes
-if [ ${host_crypto} = ${host} ]; then
-    echo "Updating from ${host}"
-    su -f -m ${cuser} -c \
-	"${cmd} ${options} -h ${host} ${base}/supfile" || ok=no
-else
-    if [ -d ${base}/prefixes/FreeBSD-crypto.cvs ]; then
-	echo "Updating from ${host_crypto}"
-	su -f -m ${cuser} -c \
-	    "${cmd} ${options} -h ${host_crypto} ${base}/supfile.crypto" ||\
-		ok=no
-    fi
-    echo "Updating from ${host}"
-    su -f -m ${cuser} -c \
-	"${cmd} ${options} -h ${host} ${base}/supfile.non-crypto" || ok=no
-fi
+
+echo "Updating from ${host}"
+su -f -m ${cuser} -c \
+    "${cmd} ${options} -h ${host} ${base}/supfile" || ok=no
 
 if [ ${ok} = yes ]; then
     if [ -f ${base}/.start_server ]; then
diff --git a/net/cvsup-mirror/pkg-plist b/net/cvsup-mirror/pkg-plist
index ebd0672c2845..af30ff53e792 100644
--- a/net/cvsup-mirror/pkg-plist
+++ b/net/cvsup-mirror/pkg-plist
@@ -2,7 +2,5 @@ etc/cvsup/config.sh
 etc/cvsup/cvsupd.access
 etc/cvsup/sup.client/distrib/refuse.self
 etc/cvsup/supfile
-etc/cvsup/supfile.crypto
-etc/cvsup/supfile.non-crypto
 etc/cvsup/update.sh
 etc/rc.d/cvsupd.sh
diff --git a/net/cvsup-mirror/scripts/configure b/net/cvsup-mirror/scripts/configure
index 2732d12bdf84..12d6cf1a12b9 100644
--- a/net/cvsup-mirror/scripts/configure
+++ b/net/cvsup-mirror/scripts/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 base=${PREFIX}/etc/cvsup
-variables="user group cuser cgroup host host_crypto interval \
+variables="user group cuser cgroup host interval \
     maxclients facility distribs"
 
 ask() {
@@ -87,34 +87,9 @@ your system until you type "make install".
 
 EOF
 
-if [ x${USA_RESIDENT} = xYES ]; then
-    dflt_domestic=y
-else
-    dflt_domestic=n
-fi
-if yesno "Is this host in the USA or Canada" ${dflt_domestic}; then
-    domestic=yes
-else
-    domestic=no
-fi
-
-host=$(ask "Master site for your non-crypto updates" cvsup-master.freebsd.org)
-if [ ${domestic} = yes ]; then
-    dflt_host_crypto=${host}
-else
-    dflt_host_crypto=cvsup.internat.freebsd.org
-fi
-
-cat <<EOF
-
-If you are not planning to mirror the crypto files, just accept
-the default answer for the next question.
-
-EOF
-host_crypto=$(ask "Master site for your crypto updates" ${dflt_host_crypto})
+host=$(ask "Master site for your updates" cvsup-master.freebsd.org)
 
 host=$(canonicalize ${host})
-host_crypto=$(canonicalize ${host_crypto})
 
 while :; do
     interval=$(ask "How many hours between updates of your files" 1)
@@ -130,15 +105,13 @@ Now you must decide which sets of files you wish to make available
 from your mirror site.  You can choose any combination, and you
 can put each set anywhere you want to on your disks.  Although each
 set is optional, we strongly encourage every mirror site to carry
-at least the main source tree.
+at least the main source repository.
 
 EOF
 
 distribs="distrib.self .. ."
 ask_distrib FreeBSD.cvs /home/ncvs . \
-    "main source tree, except crypto code"
-ask_distrib FreeBSD-crypto.cvs /home/ncvs . \
-    "crypto code"
+    "main source repository"
 ask_distrib FreeBSD-www.current /usr/local/www . \
     "installed World Wide Web data"
 ask_distrib FreeBSD-gnats.current /home/gnats gnats \