Make these scripts useful on platforms other than NetBSD by using a BMAKE

environment variable, which contains the name of the make(1) program to
invoke - suggestion by Julien Letessier some time ago, the confusion mine,
since I thought he was referring to something else completely.

Don't rely on there being a POSIX tr(1) in the path by default - test
explicitly for both "yes" and "YES".

Set the default for PRUNEDISTFILES to "no", since we can't assume that
the user wants us to delete something which he may have been keeping
around, and there are other ways of accomplishing this aim (lintpkgsrc
-o, for example).

Clean up some superfluous white space at the end of lines.

1 files changed, 12 insertions, 4 deletions

diff --git a/mk/bulk/upload b/mk/bulk/upload
index 7141a8d9d9e..4b5d9c41ad4 100644
--- a/mk/bulk/upload
+++ b/mk/bulk/upload
@@ -4,6 +4,14 @@
 # Must be called in /usr/pkgsrc
 #
 
+opsys=`uname -s`
+case "$opsys" in
+NetBSD)	BMAKE=make ;;
+*)	BMAKE=bmake ;;
+esac
+
+export BMAKE
+
 # Pull in RSYNC_DST, RSYNC_OPTS:
 if [ -f "$BULK_BUILD_CONF" ]; then
     . $BULK_BUILD_CONF
@@ -44,12 +52,12 @@ upload_specific=$TMP/upload_specific
 upload_others=$TMP/upload_others
 
 # May be different than $USR_PKGSRC:
-pkgsrcdir=`cd pkgtools/pkglint ; make show-var VARNAME=_PKGSRCDIR`
-packages=`cd pkgtools/pkglint ; make show-var VARNAME=PACKAGES`
+pkgsrcdir=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=_PKGSRCDIR`
+packages=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=PACKAGES`
 
 # Pull in some pkgs needed
-( cd pkgtools/pkglint ; make bulk-install )
-( cd net/rsync ;        make bulk-install )
+( cd pkgtools/pkglint ; ${BMAKE} bulk-install )
+( cd net/rsync ;        ${BMAKE} bulk-install )
 
 echo "Checking for restricted, out of date, and vulnerable packages:"
 # -p  =  report old versions of packages