Require version 20030820 of the pkg_install tools to use the new -K and -k

flags to specify package database directories, instead of setting up a
shell environment for the pkg_install tools.  The latter was more prone to
error.

3 files changed, 29 insertions, 23 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 772550992db..372e3c4082b 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1216.2.25 2003/08/21 04:07:37 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1216.2.26 2003/08/22 07:15:43 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -707,7 +707,7 @@ uptodate-digest:
 .if defined(_OPSYS_PKGTOOLS_REQD)
 PKGTOOLS_REQD=		${_OPSYS_PKGTOOLS_REQD}
 .else
-PKGTOOLS_REQD=		20030819
+PKGTOOLS_REQD=		20030820
 .endif
 
 # Check that we are using up-to-date pkg_* tools with this file.
@@ -4595,7 +4595,7 @@ real-su-build-views:
 		*)	dbdir=${LOCALBASE}/$$v/.dbdir; viewname=$$v ;;	\
 		esac;							\
 		${ECHO} "=> Performing package view clash check for ${PKGNAME} in $$viewname view"; \
-		pkg=`${SETENV} PKG_DBDIR=$$dbdir ${PKG_INFO_CMD} -e ${PKGBASE} || ${TRUE}`; \
+		pkg=`${PKG_INFO_CMD} -K $$dbdir -e ${PKGBASE} || ${TRUE}`; \
 		case "$$pkg" in						\
 		"")	;;						\
 		*)	${ECHO} "*** ${PKGBASE} exists in $$viewname view - package $$pkg ***"; \
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 35a63c6b5cc..e55dd7b57c4 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.118.2.10 2003/08/21 04:07:38 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.118.2.11 2003/08/22 07:15:46 jlam Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -290,17 +290,23 @@ PKG_INFO_CMD?=		${PKG_TOOLS_BIN}/pkg_info
 PKG_VIEW_CMD?=		${PKG_TOOLS_BIN}/pkg_view
 LINKFARM_CMD?=		${PKG_TOOLS_BIN}/linkfarm
 
-# Views are rooted in ${LOCALBASE}, and the all packages are depoted in
-# ${DEPOTBASE}.
+# The binary pkg_install tools all need to consistently to refer to the
+# correct package database directory.  PKG_DBDIR is set in bsd.pkg.mk.
 #
-PKG_VIEW_ARGS?=		-W ${LOCALBASE} -d ${DEPOTBASE}
-
-PKG_ADD?=		PKG_DBDIR=${PKG_DBDIR} ${PKG_ADD_CMD}
-PKG_ADMIN?=		PKG_DBDIR=${PKG_DBDIR} ${PKG_ADMIN_CMD}
-PKG_CREATE?=		PKG_DBDIR=${PKG_DBDIR} ${PKG_CREATE_CMD}
-PKG_DELETE?=		PKG_DBDIR=${PKG_DBDIR} ${PKG_DELETE_CMD}
-PKG_INFO?=		PKG_DBDIR=${PKG_DBDIR} ${PKG_INFO_CMD}
-PKG_VIEW?=		PKG_DBDIR_DFLT=${PKG_DBDIR_DFLT} ${PKG_VIEW_CMD} ${PKG_VIEW_ARGS}
+PKGTOOLS_ARGS?=		-K ${PKG_DBDIR}
+
+# Views are rooted in ${LOCALBASE}, all packages are depoted in
+# ${DEPOTBASE}, and the package database directory for the default view
+# is in ${PKG_DBDIR_DFLT}.
+#
+PKG_VIEW_ARGS?=		-W ${LOCALBASE} -d ${DEPOTBASE} -k ${PKG_DBDIR_DFLT}
+
+PKG_ADD?=		${PKG_ADD_CMD} ${PKGTOOLS_ARGS}
+PKG_ADMIN?=		${PKG_ADMIN_CMD} ${PKGTOOLS_ARGS}
+PKG_CREATE?=		${PKG_CREATE_CMD} ${PKGTOOLS_ARGS}
+PKG_DELETE?=		${PKG_DELETE_CMD} ${PKGTOOLS_ARGS}
+PKG_INFO?=		${PKG_INFO_CMD} ${PKGTOOLS_ARGS}
+PKG_VIEW?=		${PKG_VIEW_CMD} ${PKG_VIEW_ARGS}
 LINKFARM?=		${LINKFARM_CMD}
 
 .ifndef PKGTOOLS_VERSION
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index 34f36fbfb1f..79e2a0c4f8e 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-build,v 1.27.2.1 2003/08/21 02:06:17 jlam Exp $
+# $NetBSD: pre-build,v 1.27.2.2 2003/08/22 07:15:48 jlam Exp $
 #
 # Clean up system to be ready for bulk pkg build
 #
@@ -77,24 +77,24 @@ if [ -d ${PKG_DBDIR} ]; then
 	cd ${PKG_DBDIR}
 	for pkg in *
 	do
-		if `env PKG_DBDIR=${DEPOTBASE} pkg_info -qe $pkg`; then
+		if `pkg_info -K ${DEPOTBASE} -qe $pkg`; then
 			echo pkg_delete -r $pkg
-			env PKG_DBDIR=${DEPOTBASE} pkg_delete -r $pkg
-		elif `env PKG_DBDIR=${PKG_DBDIR} pkg_info -qe $pkg`; then
+			pkg_delete -K ${DEPOTBASE} -r $pkg
+		elif `pkg_info -K ${PKG_DBDIR} -qe $pkg`; then
 			echo pkg_delete -r $pkg
-			env PKG_DBDIR=${PKG_DBDIR} pkg_delete -r $pkg
+			pkg_delete -K ${PKG_DBDIR} -r $pkg
 		fi
 	done
 	# this should have removed everything.  Now force any broken pkgs
 	# to deinstall
 	for pkg in *
 	do
-		if `env PKG_DBDIR=${DEPOTBASE} pkg_info -qe $pkg`; then
+		if `pkg_info -K ${DEPOTBASE} -qe $pkg`; then
 			echo pkg_delete -f $pkg
-			env PKG_DBDIR=${DEPOTBASE} pkg_delete -f $pkg
-		elif `env PKG_DBDIR=${PKG_DBDIR} pkg_info -qe $pkg`; then
+			pkg_delete -K ${DEPOTBASE} -f $pkg
+		elif `pkg_info -K ${PKG_DBDIR} -qe $pkg`; then
 			echo pkg_delete -f $pkg
-			env PKG_DBDIR=${PKG_DBDIR} pkg_delete -f $pkg
+			pkg_delete -K ${PKG_DBDIR} -f $pkg
 		fi
 	done