Move PKGTOOLS_VERSION check to bsd.prefs.mk for speedups in recursive tree walks.bsd.pkg.mk bsd.prefs.mk

Bump required version number of PKGTOOLS to 20010306 for the latest bugfixes
and the -V option support.

3 files changed, 14 insertions, 17 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 594c3f83636..c97b102c660 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.676 2001/03/06 14:50:45 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.677 2001/03/06 16:00:15 wiz Exp $
 #
 # This file is in the public domain.
 #
@@ -565,7 +565,6 @@ PATCH?=		/usr/bin/gpatch -b
 PATCH?=		${LOCALBASE}/bin/patch -b
 .endif
 PAX?=		/bin/pax
-PKG_TOOLS_BIN?= ${LOCALBASE}/bsd/bin
 RM?=		/usr/bin/rm
 RMDIR?=		/usr/bin/rmdir
 SED?=		/usr/bin/sed
@@ -611,7 +610,6 @@ MTREE?=		${LOCALBASE}/bsd/bin/mtree
 MV?=		/bin/mv
 PATCH?=		/usr/bin/patch
 PAX?=		/usr/local/bsd/bin/pax
-PKG_TOOLS_BIN?= ${LOCALBASE}/bsd/bin
 RM?=		/bin/rm
 RMDIR?=		/bin/rmdir
 SED?=		/bin/sed
@@ -657,7 +655,6 @@ MTREE?=		/usr/sbin/mtree
 MV?=		/bin/mv
 PATCH?=		/usr/bin/patch
 PAX?=		/bin/pax
-PKG_TOOLS_BIN?= /usr/sbin
 RM?=		/bin/rm
 RMDIR?=		/bin/rmdir
 SED?=		/usr/bin/sed
@@ -697,17 +694,8 @@ uptodate-digest:
 		esac							\
 	fi
 
-.if !defined(PKGTOOLS_VERSION)
-.if !exists(${IDENT})
-PKGTOOLS_VERSION=${PKGTOOLS_REQD}
-.else
-PKGTOOLS_VERSION!=${IDENT} ${PKG_TOOLS_BIN}/pkg_add ${PKG_TOOLS_BIN}/pkg_admin ${PKG_TOOLS_BIN}/pkg_create ${PKG_TOOLS_BIN}/pkg_delete ${PKG_TOOLS_BIN}/pkg_info | ${AWK} 'BEGIN {n = 0;}; $$1 ~ /\$$NetBSD/ && $$2 !~ /^crt0/ {gsub("/", "", $$4); if ($$4 > n) {n = $$4;}}; END {print n;}'
-.endif
-.endif
-MAKEFLAGS+=	PKGTOOLS_VERSION="${PKGTOOLS_VERSION}"
-
 # Latest version of pkgtools required for this file.
-PKGTOOLS_REQD=		20000202
+PKGTOOLS_REQD=		20010306
 
 # Check that we're using up-to-date pkg_* tools with this file.
 uptodate-pkgtools:
diff --git a/mk/bsd.pkg.subdir.mk b/mk/bsd.pkg.subdir.mk
index 7e1e4d8c842..a2d4321d77e 100644
--- a/mk/bsd.pkg.subdir.mk
+++ b/mk/bsd.pkg.subdir.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.subdir.mk,v 1.41 2001/02/16 13:06:19 wiz Exp $
+#	$NetBSD: bsd.pkg.subdir.mk,v 1.42 2001/03/06 16:00:16 wiz Exp $
 #	Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp 
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
 #
@@ -97,7 +97,7 @@ ${SUBDIR}::
 		cleandir distclean depend describe reinstall tags checksum \
 		makepatchsum mirror-distfiles deinstall show-downlevel \
 		show-pkgsrc-dir show-var bulk-install bulk-package \
-		${PKG_MISC_TARGETS}
+		readme-prepare ${PKG_MISC_TARGETS}
 .if !target(__target)
 ${__target}: _SUBDIRUSE
 .endif
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index d62d13d110f..8d722c544c6 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.22 2001/03/06 14:50:46 agc Exp $
+# $NetBSD: bsd.prefs.mk,v 1.23 2001/03/06 16:00:16 wiz Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -146,8 +146,12 @@ NEED_NCURSES=   	YES
 ##### Some overrides of defaults below on a per-OS basis.
 .if (${OPSYS} == "NetBSD")
 LOCALBASE?=             ${DESTDIR}/usr/pkg
+PKG_TOOLS_BIN?=		/usr/sbin
 .elif (${OPSYS} == "SunOS")
 X11BASE?=               ${DESTDIR}/usr/openwin
+PKG_TOOLS_BIN?=		${LOCALBASE}/bsd/bin
+.elf (${OPSYS} == "Linux")
+PKG_TOOLS_BIN?=		${LOCALBASE}/bsd/bin
 .endif
 
 LOCALBASE?=		${DESTDIR}/usr/local
@@ -168,4 +172,9 @@ DIGEST_VERSION=		${DIGEST_REQD}
 MAKEFLAGS+=		DIGEST_VERSION="${DIGEST_VERSION}"
 .endif
 
+.ifndef PKGTOOLS_VERSION
+PKGTOOLS_VERSION!=${PKG_TOOLS_BIN}/pkg_info -V 2>/dev/null || echo 20010302
+MAKEFLAGS+=	PKGTOOLS_VERSION="${PKGTOOLS_VERSION}"
+.endif
+
 .endif	# BSD_PKG_MK