[pkgsrc/trunk]: pkgsrc/mk Tools that are marked with ":pkgsrc" are needed ver...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b31f89efd64e
branches:  trunk
changeset: 497066:b31f89efd64e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jul 19 23:01:55 2005 +0000

description:
Tools that are marked with ":pkgsrc" are needed very early on, probably
too early for pkgsrc to adequately cope.  In this case, imake-check.mk
was marking "imake" as a tool that was used to perform some tests.
This was causing xpkgwedge to be unnecessarily marked as a build
dependency since using imake in pkgsrc pretty much requires xpkgwedge.
However, in the case where we are running the "imake checks", we don't
need xpkgwedge around.

Solve this issue by marking all the tools in imake-check.mk with
":pkgsrc", and modify the xpkgwedge dependency test to not care about
"imake:pkgsrc".

diffstat:

 mk/bsd.pkg.use.mk            |  5 +++--
 mk/buildlink3/imake-check.mk |  7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 19656669c7e9 -r b31f89efd64e mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Tue Jul 19 22:31:01 2005 +0000
+++ b/mk/bsd.pkg.use.mk Tue Jul 19 23:01:55 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.use.mk,v 1.21 2005/06/23 18:41:57 jlam Exp $
+#      $NetBSD: bsd.pkg.use.mk,v 1.22 2005/07/19 23:01:55 jlam Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -125,7 +125,8 @@
 ### USE_XPKGWEDGE
 
 .if (defined(USE_X11BASE) || \
-     defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake)) && \
+     defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake) || \
+     !empty(USE_TOOLS:Mimake\:*:Nimake\:pkgsrc)) && \
     !empty(USE_XPKGWEDGE:M[yY][eE][sS])
 BUILD_DEPENDS+=                xpkgwedge>=${_XPKGWEDGE_REQD:U1.14}:../../pkgtools/xpkgwedge
 .endif
diff -r 19656669c7e9 -r b31f89efd64e mk/buildlink3/imake-check.mk
--- a/mk/buildlink3/imake-check.mk      Tue Jul 19 22:31:01 2005 +0000
+++ b/mk/buildlink3/imake-check.mk      Tue Jul 19 23:01:55 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: imake-check.mk,v 1.2 2005/07/15 18:27:55 jlam Exp $
+# $NetBSD: imake-check.mk,v 1.3 2005/07/19 23:01:55 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -58,8 +58,9 @@
 #
 
 .for _pair_ in ${BUILTIN_IMAKE_CHECK}
-USE_TOOLS+=    cat echo grep imake mkdir rm    # XXX
-IMAKE?=                ${X11BASE}/bin/imake            # XXX
+USE_TOOLS+=    cat:pkgsrc echo:pkgsrc grep:pkgsrc imake:pkgsrc         \
+               mkdir:pkgsrc rm:pkgsrc test:pkgsrc      # XXX
+IMAKE?=                ${X11BASE}/bin/imake                    # XXX
 
 .  if !defined(BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//})
 BUILTIN_IMAKE_CHECK.${_pair_:C/\:[^:]*$//}!=                           \