Pull up a bulk build fix to the pkgsrc-2004Q1 branch (and some fixes

for comments which were sandwiched in the middle).

Requested by hubertf in ticket pkgsrc-25.

"Deprecate RSYNC_DST_SPECIFIC and RSYNC_DST_OTHER and replace them
by RSYNC_DST. Warn if any of them is not set properly, and in
general adjust to the new layout on the FTP server."

2 files changed, 17 insertions, 28 deletions

diff --git a/mk/bulk/build.conf-example b/mk/bulk/build.conf-example
index 113c8f2279b..2c401eaef57 100644
--- a/mk/bulk/build.conf-example
+++ b/mk/bulk/build.conf-example
@@ -1,5 +1,5 @@
 # build.conf
-# $NetBSD: build.conf-example,v 1.18 2004/03/16 13:55:51 hubertf Exp $
+# $NetBSD: build.conf-example,v 1.18.2.1 2004/04/27 08:54:45 agc Exp $
 #
 # config file in /bin/sh syntax for {,pre,post}-build
 #
@@ -33,7 +33,7 @@ USR_PKGSRC="/usr/pkgsrc"
 CVS_USER="yourlogin"
 
 # Flags to pass to 'cvs update', e.g. to get a certain branch
-#CVS_FLAGS="-rnetbsd-1-6"
+#CVS_FLAGS="-rnetbsd-2004Q1"
 #CVS_FLAGS="-A"
 
 # prune distfiles to remove those which are out of date
@@ -50,13 +50,8 @@ PRUNEDISTFILES=no
 # can be set to 'yes' or 'no'.
 UPDATE_VULNERABILITY_LIST=yes
 
-# destination for packages with the OSVERSION_SPECIFIC flag set.  Needs major.minor.patch
-# version.
-RSYNC_DST_SPECIFIC=$CVS_USER@ftp.NetBSD.org:/pub/NetBSD/packages/x.y.z/arch
-
-# destination for packages without the OSVERSION_SPECIFIC flag set.  Needs major.minor
-# version.
-RSYNC_DST_OTHER=$CVS_USER@ftp.NetBSD.org:/pub/NetBSD/packages/x.y/arch
+# Destination for packages and rsync options 
+RSYNC_DST=$CVS_USER@ftp.NetBSD.org:/pub/NetBSD/packages/pkgsrc-200xQy/NetBSD-a.b.c/i386
 RSYNC_OPTS='-e ssh'
 
 ###########################################################################
diff --git a/mk/bulk/upload b/mk/bulk/upload
index 307991eb637..9f6686d5d5e 100644
--- a/mk/bulk/upload
+++ b/mk/bulk/upload
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: upload,v 1.16.2.1 2004/04/27 08:18:49 agc Exp $
+# $NetBSD: upload,v 1.16.2.2 2004/04/27 08:54:45 agc Exp $
 
 #
 # Upload non-restricted binary pkgs to ftp server
@@ -26,27 +26,21 @@ else
     . `dirname $0`/build.conf
 fi
 
-if [ -z "$RSYNC_DST_SPECIFIC" -o -z "$RSYNC_DST_OTHER" ]; then
-	echo "You must set the variables RSYNC_DST_SPECIFIC and RSYNC_DST_OTHER"
-	echo " "
-	echo "RSYNC_DST_SPECIFIC should be set to the destination for packages"
-	echo "which have the OSVERSION_SPECIFIC flag set.  I.e., the complete OS"
-	echo "version number is required.  For example:"
-	echo "  user@ftp.NetBSD.org:/pub/NetBSD/packages/1.5.1/alpha"
-	echo " "
-	echo "RSYNC_DST_OTHER should be set to the destination for packages"
-	echo "which do _not_ have the OSVERSION_SPECIFIC flag set.  I.e., only"
-	echo "the major.minor release string is used.  For example, on a 1.5.1"
-	echo "alpha system you would use:"
-	echo "  user@ftp.NetBSD.org:/pub/NetBSD/packages/1.5/alpha"
-	echo "If you are building from pkgsrc current, set the destination"
-	echo "to major.minor-latest. For example, on a 1.6.1 m68k system where"
-	echo "building pkgsrc current (assuming pkgsrc-1-6 is already built):"
-	echo "  user@ftp.NetBSD.org:/pub/NetBSD/packages/1.6-latest/m68k"
-	echo " "
+if [ "$RSYNC_DST_SPECIFIC" != "" -o "$RSYNC_DST_OTHER" != "" ]; then
+	echo Use of RSYNC_DST_SPECIFIC and RSYNC_DST_OTHER is deprecated.
+	echo Please just set RSYNC_DST in build.conf.
 	exit 1
 fi
 
+if [ -z "$RSYNC_DST" ]; then
+	echo "You must set the variable RSYNC_DST, see build.conf-example."
+	exit 1
+fi
+
+# Paths for both OS-version-specific and general pkgs:
+RSYNC_DST_SPECIFIC=${RSYNC_DST}
+RSYNC_DST_OTHER=${RSYNC_DST}
+
 #
 # Some temp files
 #