From 398c09e2fccacaf4dd920465a2c407c83d2a7898 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 19 Jul 2005 23:01:55 +0000
Subject: 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".
---
 mk/bsd.pkg.use.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'mk/bsd.pkg.use.mk')

diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index 6b64bfcd8ab..a455a4a7d35 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -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 @@ RMAN?=			${X11BASE}/bin/rman
 ### 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
-- 
cgit v1.2.3