Merge pkgviews-mk branch into the HEAD by running:

	cd pkgsrc/mk
	cvs update -Pd -A
	cvs update -Pd -j pkgviews-mk-base -j pkgviews-mk

5 files changed, 39 insertions, 35 deletions

diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index e0ded737069..72fb63cf917 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.48 2003/08/21 16:24:31 gavan Exp $
+#	$NetBSD: bsd.bulk-pkg.mk,v 1.49 2003/09/02 07:00:04 jlam Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org>
@@ -289,8 +289,8 @@ bulk-package:
 				pkgfile=${PACKAGES}/All/$${pkgname}.tgz ;\
 				if ! ${PKG_INFO} -qe $$pkgname ; then \
 					if [ -f $$pkgfile ]; then \
-						${ECHO_MSG} "BULK>  ${PKG_ADD} $$pkgfile"; \
-						${DO} ${PKG_ADD} $$pkgfile || ${ECHO_MSG} "warning:  could not add $$pkgfile." ; \
+						${ECHO_MSG} "BULK>  ${PKG_ADD} ${PKG_ARGS_ADD} $$pkgfile"; \
+						${DO} ${PKG_ADD} ${PKG_ARGS_ADD} $$pkgfile || ${ECHO_MSG} "warning:  could not add $$pkgfile." ; \
 					else \
 						${ECHO_MSG} "BULK> warning:  $$pkgfile does not exist.  It will be rebuilt." ;\
 					fi ;\
@@ -378,8 +378,8 @@ bulk-install:
 	@if [ `${MAKE} bulk-check-uptodate REF=${PKGFILE}` = 1 ]; then \
 		if ! ${PKG_INFO} -qe ${PKGNAME} ; then \
 			${DO} ${MAKE} install-depends ; \
-			${ECHO_MSG} "BULK> " ${PKG_ADD} ${PKGFILE} ; \
-			${DO} ${PKG_ADD} ${PKGFILE} ; \
+			${ECHO_MSG} "BULK> " ${PKG_ADD} ${PKG_ARGS_ADD} ${PKGFILE} ; \
+			${DO} ${PKG_ADD} ${PKG_ARGS_ADD} ${PKGFILE} ; \
 		fi ; \
 	else \
 		${ECHO_MSG} ${MAKE} bulk-package PRECLEAN=no; \
diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox
index 772161919aa..68e7d6ee8ba 100755
--- a/mk/bulk/mksandbox
+++ b/mk/bulk/mksandbox
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.24 2003/08/10 20:33:53 seb Exp $
+# $NetBSD: mksandbox,v 1.25 2003/09/02 07:00:05 jlam Exp $
 #
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
diff --git a/mk/bulk/post-build b/mk/bulk/post-build
index ed5b6b44e82..f52394bb8b4 100644
--- a/mk/bulk/post-build
+++ b/mk/bulk/post-build
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.25 2003/08/19 15:24:01 gavan Exp $
+# $NetBSD: post-build,v 1.26 2003/09/02 07:00:05 jlam Exp $
 #
 # Collect stuff after a pkg bulk build
 #
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index f0ba2530803..134147ca4cf 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-build,v 1.28 2003/08/26 08:18:09 hubertf Exp $
+# $NetBSD: pre-build,v 1.29 2003/09/02 07:00:06 jlam Exp $
 #
 # Clean up system to be ready for bulk pkg build
 #
@@ -69,33 +69,37 @@ fi
 # Clean out everything and its mother
 #
 PKG_DBDIR=`(cd ${PKGLINT_PKG_DIR}; ${BMAKE} show-var VARNAME=PKG_DBDIR)`
-
-echo Removing all installed packages in ${PKG_DBDIR}
-
-if [ -d ${PKG_DBDIR} ]; then
-	cd ${PKG_DBDIR}
-	for pkg in *
-	do
-		if `env PKG_DBDIR=${PKG_DBDIR} pkg_info -qe $pkg`; then
-			echo pkg_delete -r $pkg
-			env PKG_DBDIR=${PKG_DBDIR} pkg_delete -r $pkg
-		fi
-	done
-	# this should have removed everything.  Now force any broken pkgs
-	# to deinstall
-	for pkg in *
-	do
-		if `env PKG_DBDIR=${PKG_DBDIR} pkg_info -qe $pkg`; then
-			echo pkg_delete -f $pkg
-			env PKG_DBDIR=${PKG_DBDIR} pkg_delete -f $pkg
-		fi
-	done
+DEPOTBASE=`(cd ${PKGLINT_PKG_DIR}; ${BMAKE} show-var VARNAME=DEPOTBASE)`
+
+for dbdir in ${PKG_DBDIR} ${DEPOTBASE}; do
+	echo Removing all installed packages in $dbdir
+	if [ -d $dbdir ]; then
+		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
+			fi
+		done
+		#
+		# this should have removed everything.
+		# Now force any broken pkgs to deinstall.
+		#
+		for pkg in *
+		do
+			if `pkg_info -K $dbdir -qe $pkg`; then
+				echo pkg_delete -f $pkg
+				pkg_delete -K $dbdir -f $pkg
+			fi
+		done
 	
-	# We've tried our best to get rid of the pkgs, now do it the hard way
-	# If it wasn't for stuff in $X11BASE, I wouldn't have hard feelings
-	# about this!
-	rm -fr *
-fi
+		# We've tried our best to get rid of the pkgs, now do it
+		# the hard way.  If it wasn't for stuff in $X11BASE, I
+		# wouldn't have hard feelings about this!
+		rm -fr *
+	fi
+done
 
 cd $LOCALBASE && rm -fr * && rm -fr .??*;
 if [ x"$BMAKE" = x"bmake" ]; then
diff --git a/mk/bulk/tflat b/mk/bulk/tflat
index eaec453e421..6796df09936 100755
--- a/mk/bulk/tflat
+++ b/mk/bulk/tflat
@@ -1,4 +1,4 @@
-# $NetBSD: tflat,v 1.10 2003/07/25 11:29:33 dmcmahill Exp $
+# $NetBSD: tflat,v 1.11 2003/09/02 07:00:06 jlam Exp $
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
 # All rights reserved.