Coalesce the common makefile code in the builtin.mk file that inspect

the X11 distribution using imake into mk/buildlink3/imake-check.mk.
imake-check.mk calls out to a helper shell script mk/buildlink3/imake-check
that generates the required Imakefiles and runs imake.  Remove the
now extraneous builtin-imake.mk files as the builtin.mk files can now
contain the name of the imake symbol to check.

10 files changed, 20 insertions, 125 deletions

diff --git a/x11/Xcomposite/builtin-imake.mk b/x11/Xcomposite/builtin-imake.mk
deleted file mode 100644
index 30158e304ca..00000000000
--- a/x11/Xcomposite/builtin-imake.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $
-
-/*
- * Check the value of BuildCompositeLibrary for the presence of
- * Xcomposite in the X11 distribution.
- */
-builtin-test:
-#if BuildCompositeLibrary
-	@echo yes
-#else
-	@echo no
-#endif
diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk
index 24087d80b12..53c51ee2e04 100644
--- a/x11/Xcomposite/builtin.mk
+++ b/x11/Xcomposite/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2005/06/03 17:02:36 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2005/06/03 19:12:49 jlam Exp $
 
 BUILTIN_PKG:=	Xcomposite
 
@@ -15,18 +15,9 @@ BUILTIN_FIND_FILES.H_XCOMPOSITE=	\
 .if !defined(IS_BUILTIN.Xcomposite)
 IS_BUILTIN.Xcomposite=	no
 .  if exists(${H_XCOMPOSITE})
-PKGSRC_USE_TOOLS+=	imake			# XXX
-IMAKE?=			${X11BASE}/bin/imake	# XXX
-_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} && 					\
-	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
-		-s - |							\
-	${IMAKE_MAKE} -f - builtin-test
-.    endif
+BUILTIN_IMAKE_CHECK:=	Xcomposite:BuildCompositeLibrary
+.    include "../../mk/buildlink3/imake-check.mk"
+IS_BUILTIN.Xcomposite=	${BUILTIN_IMAKE_CHECK.Xcomposite}
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.Xcomposite
diff --git a/x11/Xfixes/builtin-imake.mk b/x11/Xfixes/builtin-imake.mk
deleted file mode 100644
index 7963f807be3..00000000000
--- a/x11/Xfixes/builtin-imake.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $
-
-/*
- * Check the value of BuildXfixesLibrary for the presence of
- * Xfixes in the X11 distribution.
- */
-builtin-test:
-#if BuildXfixesLibrary
-	@echo yes
-#else
-	@echo no
-#endif
diff --git a/x11/Xfixes/builtin.mk b/x11/Xfixes/builtin.mk
index 2485408df11..59d68dac2ac 100644
--- a/x11/Xfixes/builtin.mk
+++ b/x11/Xfixes/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2005/06/03 17:02:36 jlam Exp $
+# $NetBSD: builtin.mk,v 1.8 2005/06/03 19:12:49 jlam Exp $
 
 BUILTIN_PKG:=	Xfixes
 
@@ -14,18 +14,9 @@ BUILTIN_FIND_FILES.H_XFIXES=	${X11BASE}/include/X11/extensions/Xfixes.h
 .if !defined(IS_BUILTIN.Xfixes)
 IS_BUILTIN.Xfixes=	no
 .  if exists(${H_XFIXES})
-PKGSRC_USE_TOOLS+=	imake			# XXX
-IMAKE?=			${X11BASE}/bin/imake	# XXX
-_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} && 					\
-	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
-		-s - |							\
-	${IMAKE_MAKE} -f - builtin-test
-.    endif
+BUILTIN_IMAKE_CHECK:=	Xfixes:BuildXfixesLibrary
+.    include "../../mk/buildlink3/imake-check.mk"
+IS_BUILTIN.Xfixes=	${BUILTIN_IMAKE_CHECK.Xfixes}
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.Xfixes
diff --git a/x11/Xrandr-mixedcase/builtin-imake.mk b/x11/Xrandr-mixedcase/builtin-imake.mk
deleted file mode 100644
index 7474999aba3..00000000000
--- a/x11/Xrandr-mixedcase/builtin-imake.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $
-
-/*
- * Check the value of BuildRandRLibrary for the presence of
- * Xrandr in the X11 distribution.
- */
-builtin-test:
-#if BuildRandRLibrary
-	@echo yes
-#else
-	@echo no
-#endif
diff --git a/x11/Xrandr-mixedcase/builtin.mk b/x11/Xrandr-mixedcase/builtin.mk
index b162c179896..7a94c705b59 100644
--- a/x11/Xrandr-mixedcase/builtin.mk
+++ b/x11/Xrandr-mixedcase/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2005/06/03 17:02:36 jlam Exp $
+# $NetBSD: builtin.mk,v 1.12 2005/06/03 19:12:49 jlam Exp $
 
 BUILTIN_PKG:=	Xrandr
 
@@ -14,18 +14,9 @@ BUILTIN_FIND_FILES.H_XRANDR=	${X11BASE}/include/X11/extensions/Xrandr.h
 .if !defined(IS_BUILTIN.Xrandr)
 IS_BUILTIN.Xrandr=	no
 .  if exists(${H_XRANDR})
-PKGSRC_USE_TOOLS+=	imake			# XXX
-IMAKE?=			${X11BASE}/bin/imake	# XXX
-_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} && 					\
-	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
-		-s - |							\
-	${IMAKE_MAKE} -f - builtin-test
-.    endif
+BUILTIN_IMAKE_CHECK:=	Xrandr:BuildRandRLibrary
+.    include "../../mk/buildlink3/imake-check.mk"
+IS_BUILTIN.Xrandr=	${BUILTIN_IMAKE_CHECK.Xrandr}
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.Xrandr
diff --git a/x11/Xrender/builtin-imake.mk b/x11/Xrender/builtin-imake.mk
deleted file mode 100644
index 0e225d1d135..00000000000
--- a/x11/Xrender/builtin-imake.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $
-
-/*
- * Check the value of BuildRenderLibrary for the presence of
- * Xrender in the X11 distribution.
- */
-builtin-test:
-#if BuildRenderLibrary
-	@echo yes
-#else
-	@echo no
-#endif
diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk
index 69aae99d4e4..e107e21c9bf 100644
--- a/x11/Xrender/builtin.mk
+++ b/x11/Xrender/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2005/06/03 17:02:36 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2005/06/03 19:12:50 jlam Exp $
 
 BUILTIN_PKG:=	Xrender
 
@@ -14,18 +14,9 @@ BUILTIN_FIND_FILES.H_XRENDER=	${X11BASE}/include/X11/extensions/Xrender.h
 .if !defined(IS_BUILTIN.Xrender)
 IS_BUILTIN.Xrender=	no
 .  if exists(${H_XRENDER})
-PKGSRC_USE_TOOLS+=	imake			# XXX
-IMAKE?=			${X11BASE}/bin/imake	# XXX
-_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} && 					\
-	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
-		-s - |							\
-	${IMAKE_MAKE} -f - builtin-test
-.    endif
+BUILTIN_IMAKE_CHECK:=	Xrender:BuildRenderLibrary
+.    include "../../mk/buildlink3/imake-check.mk"
+IS_BUILTIN.Xrender=	${BUILTIN_IMAKE_CHECK.Xrender}
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.Xrender
diff --git a/x11/xcursor/builtin-imake.mk b/x11/xcursor/builtin-imake.mk
deleted file mode 100644
index 0d398fd827a..00000000000
--- a/x11/xcursor/builtin-imake.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:32 jlam Exp $
-
-/*
- * Check the value of BuildXcursorLibrary for the presence of
- * Xcursor in the X11 distribution.
- */
-builtin-test:
-#if BuildXcursorLibrary
-	@echo yes
-#else
-	@echo no
-#endif
diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk
index 4d4fc7d8ac4..8647e24523d 100644
--- a/x11/xcursor/builtin.mk
+++ b/x11/xcursor/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2005/06/03 17:02:36 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2005/06/03 19:12:50 jlam Exp $
 
 BUILTIN_PKG:=	xcursor
 
@@ -14,18 +14,9 @@ BUILTIN_FIND_FILES.H_XCURSOR=	${X11BASE}/include/X11/Xcursor/Xcursor.h
 .if !defined(IS_BUILTIN.xcursor)
 IS_BUILTIN.xcursor=	no
 .  if exists(${H_XCURSOR})
-PKGSRC_USE_TOOLS+=	imake			# XXX
-IMAKE?=			${X11BASE}/bin/imake	# XXX
-_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} && 					\
-	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
-		-f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c	\
-		-s - |							\
-	${IMAKE_MAKE} -f - builtin-test
-.    endif
+BUILTIN_IMAKE_CHECK:=	xcursor:BuildXcursorLibrary
+.    include "../../mk/buildlink3/imake-check.mk"
+IS_BUILTIN.Xcursor=	${BUILTIN_IMAKE_CHECK.Xcursor}
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.xcursor