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.

8 files changed, 16 insertions, 100 deletions

diff --git a/graphics/MesaLib/builtin-imake.mk b/graphics/MesaLib/builtin-imake.mk
deleted file mode 100644
index 43855010f0a..00000000000
--- a/graphics/MesaLib/builtin-imake.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:54 jlam Exp $
-
-/*
- * Check the value of BuildGLXLibrary for the presence of
- * MesaLib in the X11 distribution.
- */
-builtin-test:
-#if BuildGLXLibrary
-	@echo yes
-#else
-	@echo no
-#endif
diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk
index 576b9edd3ee..b9f9bfd30f1 100644
--- a/graphics/MesaLib/builtin.mk
+++ b/graphics/MesaLib/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:=	MesaLib
 
@@ -14,18 +14,9 @@ BUILTIN_FIND_FILES.H_MESALIB=	${X11BASE}/include/GL/glx.h
 .if !defined(IS_BUILTIN.MesaLib)
 IS_BUILTIN.MesaLib=	no
 .  if exists(${H_MESALIB})
-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.MesaLib!=							\
-	dir=`cd ${BUILDLINK_PKGSRCDIR.MesaLib} && ${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:=	MesaLib:BuildGLXLibrary
+.    include "../../mk/buildlink3/imake-check.mk"
+IS_BUILTIN.MesaLib=	${BUILTIN_IMAKE_CHECK.MesaLib}
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.MesaLib
diff --git a/graphics/freetype2/builtin-imake.mk b/graphics/freetype2/builtin-imake.mk
deleted file mode 100644
index cf72049efe4..00000000000
--- a/graphics/freetype2/builtin-imake.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:55 jlam Exp $
-
-/*
- * Check the value of BuildFreetype2Library for the presence of
- * freetype2 in the X11 distribution.
- */
-builtin-test:
-#if BuildFreetype2Library
-	@echo yes
-#else
-	@echo no
-#endif
diff --git a/graphics/freetype2/builtin.mk b/graphics/freetype2/builtin.mk
index ed3e4d22211..d6c21b54c28 100644
--- a/graphics/freetype2/builtin.mk
+++ b/graphics/freetype2/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:=	freetype2
 
@@ -14,18 +14,9 @@ BUILTIN_FIND_FILES.H_FREETYPE2=	${X11BASE}/include/freetype2/freetype/freetype.h
 .if !defined(IS_BUILTIN.freetype2)
 IS_BUILTIN.freetype2=	no
 .  if exists(${H_FREETYPE2})
-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.freetype2!=							\
-	dir=`cd ${BUILDLINK_PKGSRCDIR.freetype2} && ${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:=	freetype2:BuildFreetype2Library
+.    include "../../mk/buildlink3/imake-check.mk"
+IS_BUILTIN.freetype2=	${BUILTIN_IMAKE_CHECK.freetype2}
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.freetype2
diff --git a/graphics/glu/builtin-imake.mk b/graphics/glu/builtin-imake.mk
deleted file mode 100644
index d4a66cae37c..00000000000
--- a/graphics/glu/builtin-imake.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:56 jlam Exp $
-
-/*
- * Check the value of BuildGLULibrary for the presence of
- * glu in the X11 distribution.
- */
-builtin-test:
-#if BuildGLULibrary
-	@echo yes
-#else
-	@echo no
-#endif
diff --git a/graphics/glu/builtin.mk b/graphics/glu/builtin.mk
index a0fc6575364..18f3916117e 100644
--- a/graphics/glu/builtin.mk
+++ b/graphics/glu/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:=	glu
 
@@ -14,18 +14,9 @@ BUILTIN_FIND_FILES.H_GLU=	${X11BASE}/include/GL/glu.h
 .if !defined(IS_BUILTIN.glu)
 IS_BUILTIN.glu=	no
 .  if exists(${H_GLU})
-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.glu!=							\
-	dir=`cd ${BUILDLINK_PKGSRCDIR.glu} && ${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:=	glu:BuildGLULibrary
+.    include "../../mk/buildlink3/imake-check.mk"
+IS_BUILTIN.glu=		${BUILTIN_IMAKE_CHECK.glu}
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.glu
diff --git a/graphics/xpm/builtin-imake.mk b/graphics/xpm/builtin-imake.mk
deleted file mode 100644
index b4ac4fdec4c..00000000000
--- a/graphics/xpm/builtin-imake.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:02:58 jlam Exp $
-
-/*
- * Check the value of NormalLibXpm for the presence of Xpm
- * in the X11 distribution.
- */
-builtin-test:
-#if NormalLibXpm
-	@echo yes
-#else
-	@echo no
-#endif
diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk
index cdf9d3d0ccd..277e9727234 100644
--- a/graphics/xpm/builtin.mk
+++ b/graphics/xpm/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2005/06/03 17:02:36 jlam Exp $
+# $NetBSD: builtin.mk,v 1.10 2005/06/03 19:12:49 jlam Exp $
 
 BUILTIN_PKG:=	xpm
 
@@ -24,18 +24,9 @@ IS_BUILTIN.xpm!=							\
 .    elif ${OPSYS} == "IRIX"
 IS_BUILTIN.xpm=		yes
 .    else
-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.xpm!=							\
-	dir=`cd ${BUILDLINK_PKGSRCDIR.xpm} && ${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:=	xpm:NormalLibXpm
+.      include "../../mk/buildlink3/imake-check.mk"
+IS_BUILTIN.xpm=		${BUILTIN_IMAKE_CHECK.xpm}
 .    endif
 .  endif
 .endif