Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.

Several changes are involved since they are all interrelated.  These
changes affect about 1000 files.

The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk.  bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files.  Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred.  This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.

The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages.  Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc.  This modification is a nod toward LOCALBASE=/usr.  The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.

The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc.  The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.

The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files.  Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories.  These files are used as input
to imake since imake can't use stdin for that purpose.

The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead.  This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed.  Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries.  Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.

6 files changed, 87 insertions, 57 deletions

diff --git a/textproc/catdoc-tk/Makefile b/textproc/catdoc-tk/Makefile
index 62606ff50c8..31c40fda475 100644
--- a/textproc/catdoc-tk/Makefile
+++ b/textproc/catdoc-tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/29 17:27:36 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:23 jlam Exp $
 #
 
 .include "../../textproc/catdoc/Makefile.common"
@@ -8,7 +8,6 @@ COMMENT+=		(Tk interface)
 
 DEPENDS+=		catdoc>=0.91.4nb1:../../textproc/catdoc
 
-USE_X11=		yes
 
 CONFIGURE_ARGS+=	--enable-wordview
 CONFIGURE_ENV+=		WISH="${BUILDLINK_PREFIX.tk}/bin/wish"
diff --git a/textproc/expat/builtin-imake.mk b/textproc/expat/builtin-imake.mk
new file mode 100644
index 00000000000..77f5d4aa43d
--- /dev/null
+++ b/textproc/expat/builtin-imake.mk
@@ -0,0 +1,12 @@
+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 1b6ea514d5b..595e56266f5 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/builtin.mk
@@ -1,69 +1,91 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:35 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:03:23 jlam Exp $
 
-_EXPAT_H=	${X11BASE}/include/expat.h
-_X11_TMPL=	${X11BASE}/lib/X11/config/X11.tmpl
+BUILTIN_PKG:=	expat
 
+BUILTIN_FIND_FILES_VAR:=	H_EXPAT
+BUILTIN_FIND_FILES.H_EXPAT=	${X11BASE}/include/expat.h
+
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+###
+### Determine if there is a built-in implementation of the package and
+### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
+###
 .if !defined(IS_BUILTIN.expat)
 IS_BUILTIN.expat=	no
-.  if exists(${_X11_TMPL}) && exists(${_EXPAT_H})
+.  if exists(${H_EXPAT})
+PKGSRC_USE_TOOLS+=	imake			# XXX
+IMAKE?=			${X11BASE}/bin/imake	# XXX
+.    if defined(IMAKE) && exists(${IMAKE})
 IS_BUILTIN.expat!=							\
-	if ${GREP} -q BuildExpatLibrary ${_X11_TMPL}; then		\
-		${ECHO} "yes";						\
-	else								\
-		${ECHO} "no";						\
-	fi
-.    if !empty(IS_BUILTIN.expat:M[yY][eE][sS])
-#
-# Create an appropriate package name for the built-in expat distributed
-# with the system.  This package name can be used to check against
-# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version
-# or if the built-in one is sufficient.
-#
-_EXPAT_MAJOR!=	\
-	${AWK} '/\#define[ 	]*XML_MAJOR_VERSION/ { print $$3 }'	\
-		${_EXPAT_H}
-_EXPAT_MINOR!=	\
-	${AWK} '/\#define[ 	]*XML_MINOR_VERSION/ { print $$3 }'	\
-		${_EXPAT_H}
-_EXPAT_MICRO!=	\
-	${AWK} '/\#define[ 	]*XML_MICRO_VERSION/ { print $$3 }'	\
-		${_EXPAT_H}
-_EXPAT_VERSION=	${_EXPAT_MAJOR}.${_EXPAT_MINOR}.${_EXPAT_MICRO}
-BUILTIN_PKG.expat=	expat-${_EXPAT_VERSION}
-BUILDLINK_VARS+=	BUILTIN_PKG.expat
+	${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config		\
+		-f ${BUILDLINK_PKGSRCDIR.expat}/builtin-imake.mk	\
+		-s - |							\
+	${MAKE} -f - builtin-test
 .    endif
 .  endif
-BUILDLINK_VARS+=	IS_BUILTIN.expat
-.endif	# IS_BUILTIN.expat
+.endif
+MAKEVARS+=	IS_BUILTIN.expat
 
-.if !defined(USE_BUILTIN.expat)
-USE_BUILTIN.expat?=	${IS_BUILTIN.expat}
+###
+### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
+### a package name to represent the built-in package.
+###
+.if !defined(BUILTIN_PKG.expat) && \
+    !empty(IS_BUILTIN.expat:M[yY][eE][sS]) && \
+    exists(${H_EXPAT})
+BUILTIN_VERSION.expat!=							\
+	${AWK} '/\#define[ 	]*XML_MAJOR_VERSION/ { M = $$3 }	\
+		/\#define[ 	]*XML_MINOR_VERSION/ { m = "."$$3 }	\
+		/\#define[ 	]*XML_MICRO_VERSION/ { u = "."$$3 }	\
+		END { printf "%s%s%s\n", M, m, u }'			\
+		${H_EXPAT}
+BUILTIN_PKG.expat=	expat-${BUILTIN_VERSION.expat}
+.endif
+MAKEVARS+=	BUILTIN_PKG.expat
 
-.  if defined(BUILTIN_PKG.expat)
+###
+### Determine whether we should use the built-in implementation if it
+### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
+###
+.if !defined(USE_BUILTIN.expat)
+.  if ${PREFER.expat} == "pkgsrc"
+USE_BUILTIN.expat=	no
+.  else
+USE_BUILTIN.expat=	${IS_BUILTIN.expat}
+.    if defined(BUILTIN_PKG.expat) && \
+        !empty(IS_BUILTIN.expat:M[yY][eE][sS])
 USE_BUILTIN.expat=	yes
-.    for _depend_ in ${BUILDLINK_DEPENDS.expat}
-.      if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
-USE_BUILTIN.expat!=	\
-	if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.expat}; then	\
-		${ECHO} "yes";						\
+.      for _dep_ in ${BUILDLINK_DEPENDS.expat}
+.        if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
+USE_BUILTIN.expat!=							\
+	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.expat:Q}; then	\
+		${ECHO} yes;						\
 	else								\
-		${ECHO} "no";						\
+		${ECHO} no;						\
 	fi
-.      endif
-.    endfor
-.  endif
-.endif	# USE_BUILTIN.expat
+.        endif
+.      endfor
+.    endif
+.  endif  # PREFER.expat
+.endif
+MAKEVARS+=	USE_BUILTIN.expat
 
+###
+### The section below only applies if we are not including this file
+### solely to determine whether a built-in implementation exists.
+###
 CHECK_BUILTIN.expat?=	no
 .if !empty(CHECK_BUILTIN.expat:M[nN][oO])
 
-.if !empty(USE_BUILTIN.expat:M[nN][oO])
+.  if !empty(USE_BUILTIN.expat:M[nN][oO])
 BUILDLINK_DEPENDS.expat+=	expat>=1.95.4
-.endif
+.  endif
 
-.if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
-BUILDLINK_PREFIX.expat=		${X11BASE}
-USE_X11=			yes
-.endif
+.  if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
+BUILDLINK_PREFIX.expat=	${X11BASE}
+.    include "../../mk/x11.buildlink3.mk"
+.    include "../../mk/x11.builtin.mk"
+.  endif
 
 .endif	# CHECK_BUILTIN.expat
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index f77448fba2a..8adb79d63a0 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/26 20:15:04 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:23 jlam Exp $
 
 DISTNAME=	gtkspell-2.0.10
 CATEGORIES=	textproc devel
@@ -10,7 +10,6 @@ COMMENT=	Spell checking GtkTextView widget
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	gtkspell-2.0.pc.in
 
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 8e1d22681c7..4dfd851a0b5 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:35 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:23 jlam Exp $
 #
 
 DISTNAME=	libcroco-0.6.0
@@ -13,7 +13,6 @@ COMMENT=	Toolkit to parse and manipulate CSS (Cascading Style Sheets)
 
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=    libcroco-0.6.pc.in
diff --git a/textproc/stardic/Makefile b/textproc/stardic/Makefile
index aa556798f62..f9a990f4477 100644
--- a/textproc/stardic/Makefile
+++ b/textproc/stardic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:42 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:23 jlam Exp $
 
 DISTNAME=	dic
 PKGNAME=	stardic-1.31
@@ -11,7 +11,6 @@ COMMENT=	English-Chinese dictionary
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
-USE_X11=	# defined
 MAKEFILE=	makefile
 USE_LANGUAGES=	c c++