Only check for the existence of the first word of ${IMAKE} since it may

contain a command plus arguments.  We use the standard idiom to extract
the first word of a list stored in a make variable:

	VAR_CMD=	${VAR:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}

XXX This can be replaced with a more succinct use of variable modifiers
XXX when we update the bootstrap bmake to match the latest NetBSD make
XXX sources, i.e.:
XXX
XXX	VAR_CMD=	${VAR:[1]}

5 files changed, 16 insertions, 10 deletions

diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk
index 5c5011d5f38..24087d80b12 100644
--- a/x11/Xcomposite/builtin.mk
+++ b/x11/Xcomposite/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2005/06/03 16:03:09 jlam Exp $
+# $NetBSD: builtin.mk,v 1.8 2005/06/03 17:02:36 jlam Exp $
 
 BUILTIN_PKG:=	Xcomposite
 
@@ -17,7 +17,8 @@ IS_BUILTIN.Xcomposite=	no
 .  if exists(${H_XCOMPOSITE})
 PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
-.    if defined(IMAKE) && exists(${IMAKE})
+_BUILTIN_IMAKE_CMD=	${IMAKE:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
+.    if exists(${_BUILTIN_IMAKE_CMD})
 IS_BUILTIN.Xcomposite!=							\
 	dir=`cd ${BUILDLINK_PKGSRCDIR.Xcomposite} && ${PWD_CMD}`;	\
 	cd ${TMPDIR:U/tmp:Q} && 					\
diff --git a/x11/Xfixes/builtin.mk b/x11/Xfixes/builtin.mk
index cd16893492d..2485408df11 100644
--- a/x11/Xfixes/builtin.mk
+++ b/x11/Xfixes/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2005/06/03 16:03:09 jlam Exp $
+# $NetBSD: builtin.mk,v 1.7 2005/06/03 17:02:36 jlam Exp $
 
 BUILTIN_PKG:=	Xfixes
 
@@ -16,7 +16,8 @@ IS_BUILTIN.Xfixes=	no
 .  if exists(${H_XFIXES})
 PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
-.    if defined(IMAKE) && exists(${IMAKE})
+_BUILTIN_IMAKE_CMD=	${IMAKE:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
+.    if exists(${_BUILTIN_IMAKE_CMD})
 IS_BUILTIN.Xfixes!=							\
 	dir=`cd ${BUILDLINK_PKGSRCDIR.Xfixes} && ${PWD_CMD}`;		\
 	cd ${TMPDIR:U/tmp:Q} && 					\
diff --git a/x11/Xrandr-mixedcase/builtin.mk b/x11/Xrandr-mixedcase/builtin.mk
index 73975128da4..b162c179896 100644
--- a/x11/Xrandr-mixedcase/builtin.mk
+++ b/x11/Xrandr-mixedcase/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2005/06/03 16:03:09 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2005/06/03 17:02:36 jlam Exp $
 
 BUILTIN_PKG:=	Xrandr
 
@@ -16,7 +16,8 @@ IS_BUILTIN.Xrandr=	no
 .  if exists(${H_XRANDR})
 PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
-.    if defined(IMAKE) && exists(${IMAKE})
+_BUILTIN_IMAKE_CMD=	${IMAKE:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
+.    if exists(${_BUILTIN_IMAKE_CMD})
 IS_BUILTIN.Xrandr!=							\
 	dir=`cd ${BUILDLINK_PKGSRCDIR.Xrandr} && ${PWD_CMD}`;		\
 	cd ${TMPDIR:U/tmp:Q} && 					\
diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk
index 452564b2c8c..69aae99d4e4 100644
--- a/x11/Xrender/builtin.mk
+++ b/x11/Xrender/builtin.mk
@@ -1,9 +1,10 @@
-# $NetBSD: builtin.mk,v 1.9 2005/06/03 16:03:09 jlam Exp $
+# $NetBSD: builtin.mk,v 1.10 2005/06/03 17:02:36 jlam Exp $
 
 BUILTIN_PKG:=	Xrender
 
 BUILTIN_FIND_FILES_VAR:=	H_XRENDER
 BUILTIN_FIND_FILES.H_XRENDER=	${X11BASE}/include/X11/extensions/Xrender.h
+
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
 ###
@@ -15,7 +16,8 @@ IS_BUILTIN.Xrender=	no
 .  if exists(${H_XRENDER})
 PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
-.    if defined(IMAKE) && exists(${IMAKE})
+_BUILTIN_IMAKE_CMD=	${IMAKE:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
+.    if exists(${_BUILTIN_IMAKE_CMD})
 IS_BUILTIN.Xrender!=							\
 	dir=`cd ${BUILDLINK_PKGSRCDIR.Xrender} && ${PWD_CMD}`;		\
 	cd ${TMPDIR:U/tmp:Q} && 					\
diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk
index d3798e46e35..4d4fc7d8ac4 100644
--- a/x11/xcursor/builtin.mk
+++ b/x11/xcursor/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2005/06/03 16:03:09 jlam Exp $
+# $NetBSD: builtin.mk,v 1.8 2005/06/03 17:02:36 jlam Exp $
 
 BUILTIN_PKG:=	xcursor
 
@@ -16,7 +16,8 @@ IS_BUILTIN.xcursor=	no
 .  if exists(${H_XCURSOR})
 PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
-.    if defined(IMAKE) && exists(${IMAKE})
+_BUILTIN_IMAKE_CMD=	${IMAKE:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
+.    if exists(${_BUILTIN_IMAKE_CMD})
 IS_BUILTIN.xcursor!=							\
 	dir=`cd ${BUILDLINK_PKGSRCDIR.xcursor} && ${PWD_CMD}`;		\
 	cd ${TMPDIR:U/tmp:Q} && 					\