From b21f057e470adb863435dc41a0293a76a45ee0ee Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Fri, 3 Jun 2005 19:12:49 +0000
Subject: 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.

---
 textproc/expat/builtin-imake.mk | 12 ------------
 textproc/expat/builtin.mk       | 17 ++++-------------
 2 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 textproc/expat/builtin-imake.mk

(limited to 'textproc')

diff --git a/textproc/expat/builtin-imake.mk b/textproc/expat/builtin-imake.mk
deleted file mode 100644
index 77f5d4aa43d..00000000000
--- a/textproc/expat/builtin-imake.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:23 jlam Exp $
-
-/*
- * Check the value of BuildExpatLibrary for the presence of
- * expat in the X11 distribution.
- */
-builtin-test:
-#if BuildExpatLibrary
-	@echo yes
-#else
-	@echo no
-#endif
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk
index f4d17b96462..4f5677823c3 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/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:=	expat
 
@@ -14,18 +14,9 @@ BUILTIN_FIND_FILES.H_EXPAT=	${X11BASE}/include/expat.h
 .if !defined(IS_BUILTIN.expat)
 IS_BUILTIN.expat=	no
 .  if exists(${H_EXPAT})
-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.expat!=							\
-	dir=`cd ${BUILDLINK_PKGSRCDIR.expat} && ${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:=	expat:BuildExpatLibrary
+.    include "../../mk/buildlink3/imake-check.mk"
+IS_BUILTIN.expat=	${BUILTIN_IMAKE_CHECK.expat}
 .  endif
 .endif
 MAKEVARS+=	IS_BUILTIN.expat
-- 
cgit v1.2.3