[pkgsrc/trunk]: pkgsrc/mk Split PKGTOOLS_REQD into two parts. If we don't hav...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cccf1da43579
branches:  trunk
changeset: 539061:cccf1da43579
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Feb 26 13:46:21 2008 +0000

description:
Split PKGTOOLS_REQD into two parts. If we don't have PKGTOOLS_REQD,
but something after PKGTOOLS_BASE_REQD, just register a bootstrap
dependency.

diffstat:

 mk/bsd.pkg.mk |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 91582ee67156 -r cccf1da43579 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Feb 26 13:38:57 2008 +0000
+++ b/mk/bsd.pkg.mk     Tue Feb 26 13:46:21 2008 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1938 2008/02/13 09:28:41 rillig Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1939 2008/02/26 13:46:21 joerg Exp $
 #
 # This file is in the public domain.
 #
@@ -117,8 +117,9 @@
 ##### Non-overridable constants
 
 # Latest versions of tools required for correct pkgsrc operation.
-PKGTOOLS_REQD= 20070802
-
+PKGTOOLS_REQD=         20070802
+# Versions of tools that are good enough to handle dependencies
+PKGTOOLS_BASE_REQD=    20051103
 
 ##### Transform USE_* into dependencies
 
@@ -146,12 +147,14 @@
 
 # Check that we are using up-to-date pkg_* tools with this file.
 .if !defined(NO_PKGTOOLS_REQD_CHECK)
-.  if ${PKGTOOLS_VERSION} < ${PKGTOOLS_REQD}
+.  if ${PKGTOOLS_VERSION} < ${PKGTOOLS_BASE_REQD}
 PKG_FAIL_REASON+='The package tools installed on this system are out of date.'
 PKG_FAIL_REASON+='The installed package tools are dated ${PKGTOOLS_VERSION:C|(....)(..)(..)|\1/\2/\3|} and you must'
 PKG_FAIL_REASON+='update them to at least ${PKGTOOLS_REQD:C|(....)(..)(..)|\1/\2/\3|} using the following command:'
 PKG_FAIL_REASON+=' '
 PKG_FAIL_REASON+='    (cd ${PKGSRCDIR}/pkgtools/pkg_install && ${MAKE} clean && ${MAKE} update)'
+.  elif ${PKGTOOLS_VERSION} < ${PKGTOOLS_REQD}
+BOOTSTRAP_DEPENDS+=    pkg_install>=${PKGTOOLS_REQD}:../../pkgtools/pkg_install
 .  endif
 .endif # !NO_PKGTOOLS_REQD_CHECK