summaryrefslogtreecommitdiff
path: root/mk/bsd.prefs.mk
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2001-03-06 16:00:15 +0000
committerwiz <wiz@pkgsrc.org>2001-03-06 16:00:15 +0000
commitafcceaff608c40cccc79cee7ea1b8ac2a38ee8d2 (patch)
tree10c17510c23ed7cf1044b8e2203b0fd426125f03 /mk/bsd.prefs.mk
parent21163b9a080d1a410f9b36f4d9f0adc3fa0ea120 (diff)
downloadpkgsrc-afcceaff608c40cccc79cee7ea1b8ac2a38ee8d2.tar.gz
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.
Diffstat (limited to 'mk/bsd.prefs.mk')
-rw-r--r--mk/bsd.prefs.mk11
1 files changed, 10 insertions, 1 deletions
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