Don't require a read-write pkgsrc tree when invoking imake. We avoid

this requirement by using TMPDIR as the read-write location demanded
by using imake.

12 files changed, 48 insertions, 24 deletions

diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk
index d91b108a0a9..9ca295d32d8 100644
--- a/fonts/Xft2/builtin.mk
+++ b/fonts/Xft2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=	Xft2
 
@@ -18,8 +18,10 @@ PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.Xft2!=							\
+	dir=`cd ${BUILDLINK_PKGSRCDIR.Xft2} && ${PWD_CMD}`;		\
+	cd ${TMPDIR:U/tmp:Q} &&						\
 	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f ${BUILDLINK_PKGSRCDIR.Xft2}/builtin-imake.mk		\
+		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
 		-s - |							\
 	${IMAKE_MAKE} -f - builtin-test
 .    endif
diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk
index 7ee81f5f5a9..5e48d16ab8c 100644
--- a/fonts/fontconfig/builtin.mk
+++ b/fonts/fontconfig/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=	fontconfig
 
@@ -19,8 +19,10 @@ PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.fontconfig!=							\
+	dir=`cd ${BUILDLINK_PKGSRCDIR.fontconfig} && ${PWD_CMD}`;	\
+	cd ${TMPDIR:U/tmp:Q} &&						\
 	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f ${BUILDLINK_PKGSRCDIR.fontconfig}/builtin-imake.mk	\
+		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
 		-s - |							\
 	${IMAKE_MAKE} -f - builtin-test
 .    endif
diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk
index 71806635124..b5eba29fbab 100644
--- a/graphics/MesaLib/builtin.mk
+++ b/graphics/MesaLib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.7 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=	MesaLib
 
@@ -18,8 +18,10 @@ PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.MesaLib!=							\
+	dir=`cd ${BUILDLINK_PKGSRCDIR.MesaLib} && ${PWD_CMD}`;		\
+	cd ${TMPDIR:U/tmp:Q} &&						\
 	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f ${BUILDLINK_PKGSRCDIR.MesaLib}/builtin-imake.mk	\
+		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
 		-s - |							\
 	${IMAKE_MAKE} -f - builtin-test
 .    endif
diff --git a/graphics/freetype2/builtin.mk b/graphics/freetype2/builtin.mk
index 29d6f0b40b6..893ddde5f88 100644
--- a/graphics/freetype2/builtin.mk
+++ b/graphics/freetype2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=	freetype2
 
@@ -18,8 +18,10 @@ PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.freetype2!=							\
+	dir=`cd ${BUILDLINK_PKGSRCDIR.freetype2} && ${PWD_CMD}`;	\
+	cd ${TMPDIR:U/tmp:Q} &&						\
 	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f ${BUILDLINK_PKGSRCDIR.freetype2}/builtin-imake.mk	\
+		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
 		-s - |							\
 	${IMAKE_MAKE} -f - builtin-test
 .    endif
diff --git a/graphics/glu/builtin.mk b/graphics/glu/builtin.mk
index e4ca1e8d17c..665d8512e75 100644
--- a/graphics/glu/builtin.mk
+++ b/graphics/glu/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=	glu
 
@@ -18,8 +18,10 @@ PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.glu!=							\
+	dir=`cd ${BUILDLINK_PKGSRCDIR.glu} && ${PWD_CMD}`;		\
+	cd ${TMPDIR:U/tmp:Q} &&						\
 	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f ${BUILDLINK_PKGSRCDIR.glu}/builtin-imake.mk		\
+		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
 		-s - |							\
 	${IMAKE_MAKE} -f - builtin-test
 .    endif
diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk
index abc72b04bf4..65269bdec3f 100644
--- a/graphics/xpm/builtin.mk
+++ b/graphics/xpm/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2005/06/02 22:48:18 dillo Exp $
+# $NetBSD: builtin.mk,v 1.8 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=	xpm
 
@@ -28,8 +28,10 @@ PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
 .      if defined(IMAKE) && exists(${IMAKE:C/ .*//})
 IS_BUILTIN.xpm!=							\
+	dir=`cd ${BUILDLINK_PKGSRCDIR.xpm} && ${PWD_CMD}`;		\
+	cd ${TMPDIR:U/tmp:Q} && 					\
 	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f ${BUILDLINK_PKGSRCDIR.xpm}/builtin-imake.mk		\
+		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
 		-s - |							\
 	${IMAKE_MAKE} -f - builtin-test
 .      endif
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk
index abbe9b8c61c..c5f1e0875bb 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=	expat
 
@@ -18,8 +18,10 @@ PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.expat!=							\
+	dir=`cd ${BUILDLINK_PKGSRCDIR.expat} && ${PWD_CMD}`;		\
+	cd ${TMPDIR:U/tmp:Q} && 					\
 	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f ${BUILDLINK_PKGSRCDIR.expat}/builtin-imake.mk	\
+		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
 		-s - |							\
 	${IMAKE_MAKE} -f - builtin-test
 .    endif
diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk
index 1896c1d0ca8..5c5011d5f38 100644
--- a/x11/Xcomposite/builtin.mk
+++ b/x11/Xcomposite/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.7 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=	Xcomposite
 
@@ -19,8 +19,10 @@ PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.Xcomposite!=							\
+	dir=`cd ${BUILDLINK_PKGSRCDIR.Xcomposite} && ${PWD_CMD}`;	\
+	cd ${TMPDIR:U/tmp:Q} && 					\
 	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f ${BUILDLINK_PKGSRCDIR.Xcomposite}/builtin-imake.mk	\
+		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
 		-s - |							\
 	${IMAKE_MAKE} -f - builtin-test
 .    endif
diff --git a/x11/Xfixes/builtin.mk b/x11/Xfixes/builtin.mk
index fe09ed11822..cd16893492d 100644
--- a/x11/Xfixes/builtin.mk
+++ b/x11/Xfixes/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=	Xfixes
 
@@ -18,8 +18,10 @@ PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.Xfixes!=							\
+	dir=`cd ${BUILDLINK_PKGSRCDIR.Xfixes} && ${PWD_CMD}`;		\
+	cd ${TMPDIR:U/tmp:Q} && 					\
 	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f ${BUILDLINK_PKGSRCDIR.Xfixes}/builtin-imake.mk	\
+		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
 		-s - |							\
 	${IMAKE_MAKE} -f - builtin-test
 .    endif
diff --git a/x11/Xrandr-mixedcase/builtin.mk b/x11/Xrandr-mixedcase/builtin.mk
index a36ee760ca4..73975128da4 100644
--- a/x11/Xrandr-mixedcase/builtin.mk
+++ b/x11/Xrandr-mixedcase/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.10 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=	Xrandr
 
@@ -18,8 +18,10 @@ PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.Xrandr!=							\
+	dir=`cd ${BUILDLINK_PKGSRCDIR.Xrandr} && ${PWD_CMD}`;		\
+	cd ${TMPDIR:U/tmp:Q} && 					\
 	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f ${BUILDLINK_PKGSRCDIR.Xrandr}/builtin-imake.mk	\
+		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
 		-s - |							\
 	${IMAKE_MAKE} -f - builtin-test
 .    endif
diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk
index f0b1a7cd841..452564b2c8c 100644
--- a/x11/Xrender/builtin.mk
+++ b/x11/Xrender/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=	Xrender
 
@@ -17,8 +17,10 @@ PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.Xrender!=							\
+	dir=`cd ${BUILDLINK_PKGSRCDIR.Xrender} && ${PWD_CMD}`;		\
+	cd ${TMPDIR:U/tmp:Q} && 					\
 	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f ${BUILDLINK_PKGSRCDIR.Xrender}/builtin-imake.mk	\
+		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
 		-s - |							\
 	${IMAKE_MAKE} -f - builtin-test
 .    endif
diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk
index 807b50772db..d3798e46e35 100644
--- a/x11/xcursor/builtin.mk
+++ b/x11/xcursor/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2005/06/01 18:33:02 jlam Exp $
+# $NetBSD: builtin.mk,v 1.7 2005/06/03 16:03:09 jlam Exp $
 
 BUILTIN_PKG:=	xcursor
 
@@ -18,8 +18,10 @@ PKGSRC_USE_TOOLS+=	imake			# XXX
 IMAKE?=			${X11BASE}/bin/imake	# XXX
 .    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.xcursor!=							\
+	dir=`cd ${BUILDLINK_PKGSRCDIR.xcursor} && ${PWD_CMD}`;		\
+	cd ${TMPDIR:U/tmp:Q} && 					\
 	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f ${BUILDLINK_PKGSRCDIR.xcursor}/builtin-imake.mk	\
+		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
 		-s - |							\
 	${IMAKE_MAKE} -f - builtin-test
 .    endif