diff options
| -rw-r--r-- | mk/bsd.pkg.use.mk | 5 | ||||
| -rw-r--r-- | mk/buildlink3/imake-check.mk | 7 |
2 files changed, 7 insertions, 5 deletions
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 diff --git a/mk/buildlink3/imake-check.mk b/mk/buildlink3/imake-check.mk index 914a02992e1..e811d81f5ea 100644 --- a/mk/buildlink3/imake-check.mk +++ b/mk/buildlink3/imake-check.mk @@ -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/\:[^:]*$//}!= \ |