don't hard code the start time stamp file as .start.${arch} but allow

OBJMACHINE and OBJHOSTNAME to work.  Also don't hardcode /usr/pkg and
/usr/X11R6 for LOCALBASE and X11BASE.  Finally, fix a few typos in messages
while here.

4 files changed, 27 insertions, 10 deletions

diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index 99e70b9bae4..4b0a0568cac 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.bulk-pkg.mk,v 1.37 2002/03/04 21:10:47 hubertf Exp $
+#	$NetBSD: bsd.bulk-pkg.mk,v 1.38 2002/06/29 03:33:34 dmcmahill Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org>
@@ -103,6 +103,10 @@ INDEXFILE?=	${_PKGSRCDIR}/.index${BULK_ID}
 # before the packages which require them.
 ORDERFILE?=	${_PKGSRCDIR}/.order${BULK_ID}
 
+# file which is used as a timestamp for when the build started.  This is used eventually
+# for looking for leftover files (files not properly deinstalled)
+STARTFILE?=	${_PKGSRCDIR}/.start${BULK_ID}
+
 # a list of pkgs which we should _never_ delete during a build.  The primary use is for digest
 # and also for xpkgwedge.  Add pkgtools/xpkgwedge in /etc/mk.conf to do an xpkgwedged bulk build.
 BULK_PREREQ+=		pkgtools/digest
diff --git a/mk/bulk/build b/mk/bulk/build
index b374d79d7fa..2c6172fa3ad 100644
--- a/mk/bulk/build
+++ b/mk/bulk/build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: build,v 1.20 2001/12/17 02:32:23 dmcmahill Exp $
+# $NetBSD: build,v 1.21 2002/06/29 03:33:34 dmcmahill Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org>
@@ -85,6 +85,7 @@ if [ -d pkgtools/pkglint ]; then
 	ORDERFILE=`make show-var VARNAME=ORDERFILE` || fail=yes
 	BROKENFILE=`make show-var VARNAME=BROKENFILE` || fail=yes
 	BUILDLOG=`make show-var VARNAME=BUILDLOG` || fail=yes
+	STARTFILE=`make show-var VARNAME=STARTFILE` || fail=yes
 else
 	echo "The pkgtools/pkglint directory does not exist.  Please update"
 	echo "your pkgsrc tree in ${USR_PKGSRC}"
@@ -101,6 +102,7 @@ echo "INDEXFILE       = $INDEXFILE"
 echo "ORDERFILE       = $ORDERFILE"
 echo "BROKENFILE      = $BROKENFILE"
 echo "BUILDLOG        = $BUILDLOG"
+echo "STARTFILE       = $STARTFILE"
 echo "----------------------------------"
 
 # make sure we have values for these very important
@@ -113,6 +115,7 @@ if [ $fail = "yes" -o \
 	-z "$ORDERFILE" -o \
 	-z "$BROKENFILE" -o \
 	-z "$BUILDLOG" \
+	-z "$STARTFILE" \
 	]; then
 	echo "ERROR:  build failed to extract certain key variables."
 	echo "        please examine the above list and correct the"
diff --git a/mk/bulk/post-build b/mk/bulk/post-build
index c5caf09ac1e..006c3c0b4fe 100644
--- a/mk/bulk/post-build
+++ b/mk/bulk/post-build
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.17 2001/10/16 20:50:54 hubertf Exp $
+# $NetBSD: post-build,v 1.18 2002/06/29 03:33:34 dmcmahill Exp $
 #
 # Collect stuff after a pkg bulk build
 #
@@ -49,11 +49,15 @@ chomp($DEPENDSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; make show-var VARNAME=DE
 chomp($SUPPORTSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; make show-var VARNAME=SUPPORTSFILE )`); 
 chomp($INDEXFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; make show-var VARNAME=INDEXFILE )`); 
 chomp($ORDERFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; make show-var VARNAME=ORDERFILE )`); 
+chomp($STARTFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; make show-var VARNAME=STARTFILE )`); 
+chomp($LOCALBASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; make show-var VARNAME=LOCALBASE )`); 
+chomp($X11BASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; make show-var VARNAME=X11BASE )`); 
 $dtfile=basename($DEPENDSTREEFILE);
 $depfile=basename($DEPENDSFILE);
 $supfile=basename($SUPPORTSFILE);
 $indfile=basename($INDEXFILE);
 $ordfile=basename($ORDERFILE);
+$startfile=basename($STARTFILE);
 
 $verbose=1;
 
@@ -235,8 +239,8 @@ close(HTML);
 	system("mkdir -p leftovers-${arch}");
 
 	# Find files since last build:
-	system("find /usr/pkg   -newer ${USR_PKGSRC}/.start.${arch} -type f >>leftovers-${arch}.txt");
-	system("find /usr/X11R6 -newer ${USR_PKGSRC}/.start.${arch} -type f >>leftovers-${arch}.txt");
+	system("find ${LOCALBASE} -newer ${USR_PKGSRC}/${startfile} -type f >>leftovers-${arch}.txt");
+	system("find ${X11BASE} -newer ${USR_PKGSRC}/${startfile} -type f >>leftovers-${arch}.txt");
 
 	# Strip perl-files:
 	system("pkg_info -qL perl > .p.${arch}");
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index 4a6d031c277..1a153a71f2c 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-build,v 1.20 2002/06/28 08:46:38 agc Exp $
+# $NetBSD: pre-build,v 1.21 2002/06/29 03:33:35 dmcmahill Exp $
 #
 # Clean up system to be ready for bulk pkg build
 #
@@ -28,12 +28,17 @@ PKGLINT_PKG_DIR=${USR_PKGSRC}/pkgtools/pkglint
 # these have defaults set by bsd.bulk-pkg.mk and may be overridden in /etc/mk.conf
 export BROKENF=`( cd ${PKGLINT_PKG_DIR} ; make show-var VARNAME=BROKENFILE )`;
 if [ "$BROKENF" = "" ]; then
-	echo "Had problems determining the name of the .broken.files"
+	echo "Had problems determining the name of the .broken files"
 	exit 1
 fi
 BLDLOG=`( cd ${PKGLINT_PKG_DIR} ; make show-var VARNAME=BUILDLOG )`;
 if [ "$BLDLOG" = "" ]; then
-	echo "Had problems determining the name of the .make.files"
+	echo "Had problems determining the name of the .make files"
+	exit 1
+fi
+STARTFILE=`( cd ${PKGLINT_PKG_DIR} ; make show-var VARNAME=STARTFILE )`;
+if [ "$BLDLOG" = "" ]; then
+	echo "Had problems determining the name of the .start file"
 	exit 1
 fi
 
@@ -94,7 +99,7 @@ rm -fr /var/wwwoffle		# www/wwwoffle
 cd ${USR_PKGSRC}
 rm -f $BROKENF */*/$BROKENF
 rm -f $BLDLOG */*/$BLDLOG
-rm -f .start.${arch}
+rm -f $STARTFILE
 
 
 
@@ -163,4 +168,5 @@ fi
 
 mkdir ${PKG_DBDIR}
 
-touch .start.${arch}
+touch $STARTFILE
+