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.

4 files changed, 8 insertions, 50 deletions

diff --git a/fonts/Xft2/builtin-imake.mk b/fonts/Xft2/builtin-imake.mk
deleted file mode 100644
index 173c5fbd0a4..00000000000
--- a/fonts/Xft2/builtin-imake.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:48 jlam Exp $
-
-/*
- * Check the value of BuildXftLibrary for the presence of
- * Xft2 in the X11 distribution.
- */
-builtin-test:
-#if BuildXftLibrary
-	@echo yes
-#else
-	@echo no
-#endif
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk
index 0fefe090f74..6a91387cfe5 100644
--- a/fonts/Xft2/builtin.mk
+++ b/fonts/Xft2/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:49 jlam Exp $
 
 BUILTIN_PKG:=	Xft2
 
@@ -14,18 +14,9 @@ BUILTIN_FIND_FILES.H_XFT2=	${X11BASE}/include/X11/Xft.h
 .if !defined(IS_BUILTIN.Xft2)
 IS_BUILTIN.Xft2=	no
 .  if exists(${H_XFT2})
-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.Xft2!=							\
-	dir=`cd ${BUILDLINK_PKGSRCDIR.Xft2} && ${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:=	Xft2:BuildXftLibrary
+.    include "../../mk/buildlink3/imake-check.mk"
+IS_BUILTIN.Xft2=	${BUILTIN_IMAKE_CHECK.Xft2}
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.Xft2
diff --git a/fonts/fontconfig/builtin-imake.mk b/fonts/fontconfig/builtin-imake.mk
deleted file mode 100644
index 0698c062e62..00000000000
--- a/fonts/fontconfig/builtin-imake.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:48 jlam Exp $
-
-/*
- * Check the value of BuildFontconfigLibrary for the presence of
- * fontconfig in the X11 distribution.
- */
-builtin-test:
-#if BuildFontconfigLibrary
-	@echo yes
-#else
-	@echo no
-#endif
diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk
index 3fdac8407a1..c8103f6429c 100644
--- a/fonts/fontconfig/builtin.mk
+++ b/fonts/fontconfig/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2005/06/03 17:02:36 jlam Exp $
+# $NetBSD: builtin.mk,v 1.7 2005/06/03 19:12:49 jlam Exp $
 
 BUILTIN_PKG:=	fontconfig
 
@@ -15,18 +15,9 @@ BUILTIN_FIND_FILES.H_FONTCONFIG=	\
 .if !defined(IS_BUILTIN.fontconfig)
 IS_BUILTIN.fontconfig=	no
 .  if exists(${H_FONTCONFIG})
-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.fontconfig!=							\
-	dir=`cd ${BUILDLINK_PKGSRCDIR.fontconfig} && ${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:=	fontconfig:BuildFontconfigLibrary
+.    include "../../mk/buildlink3/imake-check.mk"
+IS_BUILTIN.fontconfig=	${BUILTIN_IMAKE_CHECK.fontconfig}
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.fontconfig