summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fonts/Xft2/builtin.mk5
-rw-r--r--fonts/fontconfig/builtin.mk5
-rw-r--r--graphics/MesaLib/builtin.mk5
-rw-r--r--graphics/freetype2/builtin.mk5
-rw-r--r--graphics/glu/builtin.mk5
-rw-r--r--graphics/xpm/builtin.mk5
-rw-r--r--textproc/expat/builtin.mk5
-rw-r--r--x11/Xcomposite/builtin.mk5
-rw-r--r--x11/Xfixes/builtin.mk5
-rw-r--r--x11/Xrandr-mixedcase/builtin.mk5
-rw-r--r--x11/Xrender/builtin.mk6
-rw-r--r--x11/xcursor/builtin.mk5
12 files changed, 37 insertions, 24 deletions
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk
index 9ca295d32d8..0fefe090f74 100644
--- a/fonts/Xft2/builtin.mk
+++ b/fonts/Xft2/builtin.mk
@@ -1,4 +1,4 @@
-# $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:= Xft2
@@ -16,7 +16,8 @@ IS_BUILTIN.Xft2= no
. if exists(${H_XFT2})
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.Xft2!= \
dir=`cd ${BUILDLINK_PKGSRCDIR.Xft2} && ${PWD_CMD}`; \
cd ${TMPDIR:U/tmp:Q} && \
diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk
index 5e48d16ab8c..3fdac8407a1 100644
--- a/fonts/fontconfig/builtin.mk
+++ b/fonts/fontconfig/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2005/06/03 16:03:09 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2005/06/03 17:02:36 jlam Exp $
BUILTIN_PKG:= fontconfig
@@ -17,7 +17,8 @@ IS_BUILTIN.fontconfig= no
. if exists(${H_FONTCONFIG})
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.fontconfig!= \
dir=`cd ${BUILDLINK_PKGSRCDIR.fontconfig} && ${PWD_CMD}`; \
cd ${TMPDIR:U/tmp:Q} && \
diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk
index b5eba29fbab..576b9edd3ee 100644
--- a/graphics/MesaLib/builtin.mk
+++ b/graphics/MesaLib/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:= MesaLib
@@ -16,7 +16,8 @@ IS_BUILTIN.MesaLib= no
. if exists(${H_MESALIB})
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.MesaLib!= \
dir=`cd ${BUILDLINK_PKGSRCDIR.MesaLib} && ${PWD_CMD}`; \
cd ${TMPDIR:U/tmp:Q} && \
diff --git a/graphics/freetype2/builtin.mk b/graphics/freetype2/builtin.mk
index 893ddde5f88..ed3e4d22211 100644
--- a/graphics/freetype2/builtin.mk
+++ b/graphics/freetype2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2005/06/03 16:03:09 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2005/06/03 17:02:36 jlam Exp $
BUILTIN_PKG:= freetype2
@@ -16,7 +16,8 @@ IS_BUILTIN.freetype2= no
. if exists(${H_FREETYPE2})
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.freetype2!= \
dir=`cd ${BUILDLINK_PKGSRCDIR.freetype2} && ${PWD_CMD}`; \
cd ${TMPDIR:U/tmp:Q} && \
diff --git a/graphics/glu/builtin.mk b/graphics/glu/builtin.mk
index 665d8512e75..a0fc6575364 100644
--- a/graphics/glu/builtin.mk
+++ b/graphics/glu/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:= glu
@@ -16,7 +16,8 @@ IS_BUILTIN.glu= no
. if exists(${H_GLU})
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.glu!= \
dir=`cd ${BUILDLINK_PKGSRCDIR.glu} && ${PWD_CMD}`; \
cd ${TMPDIR:U/tmp:Q} && \
diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk
index 65269bdec3f..cdf9d3d0ccd 100644
--- a/graphics/xpm/builtin.mk
+++ b/graphics/xpm/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2005/06/03 16:03:09 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2005/06/03 17:02:36 jlam Exp $
BUILTIN_PKG:= xpm
@@ -26,7 +26,8 @@ IS_BUILTIN.xpm= yes
. else
PKGSRC_USE_TOOLS+= imake # XXX
IMAKE?= ${X11BASE}/bin/imake # XXX
-. if defined(IMAKE) && exists(${IMAKE:C/ .*//})
+_BUILTIN_IMAKE_CMD= ${IMAKE:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
+. if exists(${_BUILTIN_IMAKE_CMD})
IS_BUILTIN.xpm!= \
dir=`cd ${BUILDLINK_PKGSRCDIR.xpm} && ${PWD_CMD}`; \
cd ${TMPDIR:U/tmp:Q} && \
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk
index c5f1e0875bb..f4d17b96462 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2005/06/03 16:03:09 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2005/06/03 17:02:36 jlam Exp $
BUILTIN_PKG:= expat
@@ -16,7 +16,8 @@ IS_BUILTIN.expat= no
. if exists(${H_EXPAT})
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.expat!= \
dir=`cd ${BUILDLINK_PKGSRCDIR.expat} && ${PWD_CMD}`; \
cd ${TMPDIR:U/tmp:Q} && \
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} && \