Pullup ticket 1809 - requested by bouyer

fix the upload script

Revisions pulled up:
- pkgsrc/mk/bulk/sort-packages				1.2-1.3
- pkgsrc/mk/bulk/upload					1.34

   Module Name:	pkgsrc
   Committed By:	rillig
   Date:		Tue Aug  1 06:10:44 UTC 2006

   Modified Files:
	pkgsrc/mk/bulk: sort-packages

   Log Message:
   Oops, fixed a typo and tested it again. Now it works.
---
   Module Name:	pkgsrc
   Committed By:	rillig
   Date:		Tue Aug  1 07:50:04 UTC 2006

   Modified Files:
	pkgsrc/mk/bulk: sort-packages

   Log Message:
   Always create the files for the lists, even if they would end up empty.
---
   Module Name:	pkgsrc
   Committed By:	rillig
   Date:		Thu Aug 10 17:58:10 UTC 2006

   Modified Files:
	pkgsrc/mk/bulk: upload

   Log Message:
   When installing packages, first "cd $USR_PKGSRC" to be independent of
   the current working directory.

   See http://mail-index.netbsd.org/tech-pkg/2006/08/08/0006.html

2 files changed, 11 insertions, 9 deletions

diff --git a/mk/bulk/sort-packages b/mk/bulk/sort-packages
index fe54e1bf835..93654d79790 100644
--- a/mk/bulk/sort-packages
+++ b/mk/bulk/sort-packages
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $NetBSD: sort-packages,v 1.3.2.2 2006/08/02 15:56:15 salo Exp $
+# $NetBSD: sort-packages,v 1.3.2.3 2006/08/27 11:33:17 ghen Exp $
 
 # This program scans all binary packages in the current directory and
 # creates three lists of files in OUTDIR:
@@ -20,7 +20,7 @@ set -eu
 : ${OUTDIR="/tmp"}
 : ${PKG_SUFX=".tgz"}
 : ${AUDIT_PACKAGES="audit-packages"}
-: ${PKG_INFO_CMD="pkg_info"}
+: ${PKG_INFO="pkg_info"}
 
 regular_packages="${OUTDIR}/regular_packages"
 restricted_packages="${OUTDIR}/restricted_packages"
@@ -28,17 +28,19 @@ vulnerable_packages="${OUTDIR}/vulnerable_packages"
 newline="
 "
 
-rm -f "${regular_packages}" "${restricted_packages}" "${vulnerable_packages}"
+: > "${regular_packages}"
+: > "${restricted_packages}"
+: > "${vulnerable_packages}"
 
 for pkg in *${PKG_SUFX}; do
-	build_info=`${pkg_info_cmd} -B "${pkg}"`
+	build_info=`${PKG_INFO} -B "${pkg}"`
 
 	# Note: this code needs to be that complicated because licensing
 	# issues are critical to pkgsrc, and we really don't want
 	# anything unexpected to happen here. The worst case would be
-	# some file is sorted wrongly because some change in the output
-	# of pkg_info which had not been foreseen. Therefore it is
-	# better to check as strictly as possible to make those
+	# that some file is sorted wrongly because some change in the
+	# output of pkg_info which had not been foreseen. Therefore it
+	# is better to check as strictly as possible to make those
 	# changes immediately visible.
 
 	no_bin_on_ftp="unknown"
diff --git a/mk/bulk/upload b/mk/bulk/upload
index 9237da530d2..0eebae98939 100644
--- a/mk/bulk/upload
+++ b/mk/bulk/upload
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: upload,v 1.30.2.1 2006/08/02 15:59:40 salo Exp $
+# $NetBSD: upload,v 1.30.2.2 2006/08/27 11:33:17 ghen Exp $
 
 #
 # Upload non-restricted binary pkgs to ftp server
@@ -118,7 +118,7 @@ install_required()
 	if [ "${verbose}" = "yes" ]; then
 		echo "upload> Installing ${pkg}"
 	fi
-	( cd "$pkg" && ${BMAKE} bulk-install) \
+	(cd "$USR_PKGSRC" && cd "$pkg" && ${BMAKE} bulk-install) \
 	|| {
 		echo "upload> ERROR: Unable to install required package $pkg!" 1>&2
 		echo "        Bailing out -- you're on your own." 1>&2