Use PKG_TOOLS_BIN, so it doesn't run wrong pkg_* tools found in the PATH.

3 files changed, 24 insertions, 19 deletions

diff --git a/mk/bulk/build b/mk/bulk/build
index b622eb0831e..fdc08dd97f1 100644
--- a/mk/bulk/build
+++ b/mk/bulk/build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: build,v 1.54 2005/06/24 13:37:51 sketch Exp $
+# $NetBSD: build,v 1.55 2005/08/26 07:24:53 reed Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -207,6 +207,7 @@ if [ -d pkgtools/pkglint ]; then
 	MACHINE_ARCH=`${BMAKE} show-var VARNAME=MACHINE_ARCH` || fail=yes
 	OPSYS=`${BMAKE} show-var VARNAME=OPSYS` || fail=yes
 	OS_VERSION=`${BMAKE} show-var VARNAME=OS_VERSION` || fail=yes
+	PKG_TOOLS_BIN=`${BMAKE} show-var VARNAME=PKG_TOOLS_BIN` || fail=yes
 else
 	echo "The pkgtools/pkglint directory does not exist.  Please update"
 	echo "your pkgsrc tree in ${USR_PKGSRC}"
@@ -234,6 +235,7 @@ echo "PERL5           = $PERL5"
 echo "MACHINE_ARCH    = $MACHINE_ARCH"
 echo "OPSYS           = $OPSYS"
 echo "OS_VERSION      = $OS_VERSION"
+echo "PKG_TOOLS_BIN   = $PKG_TOOLS_BIN"
 echo "----------------------------------"
 
 # make sure we have values for these very important
@@ -256,6 +258,7 @@ if [ $fail = "yes" -o \
 	-z "$PERL5" -o \
 	-z "$MACHINE_ARCH" -o \
 	-z "$OPSYS" -o \
+	-z "$PKG_TOOLS_BIN" -o \
 	-z "$OS_VERSION" \
 	]; then
 	echo "ERROR:  build failed to extract certain key variables."
@@ -328,9 +331,9 @@ done
 
 echo "Build finished.  Removing all installed packages left over from build..."
 
-for pkgname in `pkg_info -e \*`
+for pkgname in `${PKG_TOOLS_BIN}/pkg_info -e \*`
 do
-	pkg_info -qe $pkgname
+	${PKG_TOOLS_BIN}/pkg_info -qe $pkgname
 	if [ $? -eq 0 ]; then
 		pkgdir=`${GREP} " $pkgname " $INDEXFILE | ${AWK} '{print $1}'`	
 		case "${BULK_PREREQ}" in
@@ -338,12 +341,12 @@ do
 				echo "Keeping BULK_PREREQ: $pkgname ($pkgdir)" ;
 				;;
 			* )
-				echo pkg_delete -r $pkgname
-				pkg_delete -r $pkgname
-				pkg_info -qe $pkgname
+				echo ${PKG_TOOLS_BIN}/pkg_delete -r $pkgname
+				${PKG_TOOLS_BIN}/pkg_delete -r $pkgname
+				${PKG_TOOLS_BIN}/pkg_info -qe $pkgname
 				if [ $? -eq 0 ]; then
 					echo "$pkgname ($pkgdir) did not deinstall nicely.  Forcing the deinstall"
-					pkg_delete -f $pkgname || true
+					${PKG_TOOLS_BIN}/pkg_delete -f $pkgname || true
 				fi
 				;;
 		esac
diff --git a/mk/bulk/post-build b/mk/bulk/post-build
index d2391a1eeac..609a5ac615d 100644
--- a/mk/bulk/post-build
+++ b/mk/bulk/post-build
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.56 2005/07/17 13:38:01 ben Exp $
+# $NetBSD: post-build,v 1.57 2005/08/26 07:24:53 reed Exp $
 #
 # Collect stuff after a pkg bulk build
 #
@@ -85,6 +85,7 @@ getmakevars(qw(
 	STARTFILE
 	SUPPORTSFILE
 	X11BASE
+	PKG_TOOLS_BIN
 ));
 
 my $bulkdbfile = basename($vars{BULK_DBFILE});
@@ -159,7 +160,7 @@ writeReport();
 	{
 		local $/;
 		undef $/;
-		$perlfiles = `pkg_info -qL perl*`;
+		$perlfiles = `$vars{PKG_TOOLS_BIN}/pkg_info -qL perl*`;
 	}
 
 	my $perlfiles_pattern = $perlfiles;
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index 8f72f1634c1..cd35ff629a3 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-build,v 1.49 2005/08/26 07:19:05 reed Exp $
+# $NetBSD: pre-build,v 1.50 2005/08/26 07:24:53 reed Exp $
 #
 # Clean up system to be ready for bulk pkg build
 #
@@ -99,6 +99,7 @@ fi
 #
 PKG_DBDIR=`(cd ${PKGLINT_PKG_DIR}; ${BMAKE} show-var VARNAME=PKG_DBDIR)`
 DEPOTBASE=`(cd ${PKGLINT_PKG_DIR}; ${BMAKE} show-var VARNAME=DEPOTBASE)`
+PKG_TOOLS_BIN=`(cd ${PKGLINT_PKG_DIR}; ${BMAKE} show-var VARNAME=PKG_TOOLS_BIN)`
 
 for dbdir in ${PKG_DBDIR} ${DEPOTBASE}; do
 	echo Removing all installed packages in $dbdir
@@ -106,9 +107,9 @@ for dbdir in ${PKG_DBDIR} ${DEPOTBASE}; do
 		cd $dbdir
 		for pkg in *
 		do
-			if `pkg_info -K $dbdir -qe $pkg`; then
-				echo pkg_delete -r $pkg
-				pkg_delete -K $dbdir -r $pkg
+			if `${PKG_TOOLS_BIN}/pkg_info -K $dbdir -qe $pkg`; then
+				echo ${PKG_TOOLS_BIN}/pkg_delete -r $pkg
+				${PKG_TOOLS_BIN}/pkg_delete -K $dbdir -r $pkg
 			fi
 		done
 		#
@@ -117,9 +118,9 @@ for dbdir in ${PKG_DBDIR} ${DEPOTBASE}; do
 		#
 		for pkg in *
 		do
-			if `pkg_info -K $dbdir -qe $pkg`; then
-				echo pkg_delete -f $pkg
-				pkg_delete -K $dbdir -f $pkg
+			if `${PKG_TOOLS_BIN}/pkg_info -K $dbdir -qe $pkg`; then
+				echo ${PKG_TOOLS_BIN}/pkg_delete -f $pkg
+				${PKG_TOOLS_BIN}/pkg_delete -K $dbdir -f $pkg
 			fi
 		done
 	
@@ -254,9 +255,9 @@ for dbdir in ${PKG_DBDIR} ${DEPOTBASE}; do
 		cd $dbdir
 		for pkg in *
 		do
-			if `pkg_info -K $dbdir -qe $pkg`; then
-				echo pkg_delete -r $pkg
-				pkg_delete -K $dbdir -r $pkg
+			if `${PKG_TOOLS_BIN}/pkg_info -K $dbdir -qe $pkg`; then
+				echo ${PKG_TOOLS_BIN}/pkg_delete -r $pkg
+				${PKG_TOOLS_BIN}/pkg_delete -K $dbdir -r $pkg
 			fi
 		done
 	fi