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.

4 files changed, 52 insertions, 59 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index cf1c66415e0..102d87a7728 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2005/05/07 22:24:04 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2005/06/01 18:03:08 jlam Exp $
 #
 # NOTE:	If you update this package, then you'll likely need to also update
 #	the x11-links dependency in buildlink3.mk to the correct version,
@@ -20,7 +20,6 @@ USE_LANGUAGES=		# empty
 EXTRACT_ONLY=		# empty
 NO_CHECKSUM=		yes
 NO_MTREE=		yes
-USE_X11=		yes
 
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 PLIST_SRC.dirs=		${PLIST_SRC}.dirs
@@ -50,6 +49,8 @@ FILES_LIST_CMD=	${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#"
 
 CREATE_X11LINK?=	${LN} -fs $$src $$dest
 
+.include "../../mk/x11.buildlink3.mk"
+
 do-build:
 	${MKDIR} ${X11_LINKS_BUILD_DIR}
 	${RM} -f ${PLIST_SRC.dirs}
diff --git a/pkgtools/x11-links/builtin.mk b/pkgtools/x11-links/builtin.mk
index d46a19f35fc..10d8241067d 100644
--- a/pkgtools/x11-links/builtin.mk
+++ b/pkgtools/x11-links/builtin.mk
@@ -1,53 +1,9 @@
-# $NetBSD: builtin.mk,v 1.6 2005/03/05 18:16:21 wiz Exp $
+# $NetBSD: builtin.mk,v 1.7 2005/06/01 18:03:08 jlam Exp $
 
-.if !defined(XF86_VERSION)
-.  if exists(${X11BASE}/lib/X11/config/xorg.cf)
-_X11_CONFIG_VERSION_DEF=	${X11BASE}/lib/X11/config/xorg.cf
-_XORG_MAJOR!=	\
-	${AWK} '/\#define[ 	]*XORG_VERSION_MAJOR/ { print $$3 }'	\
-                ${_X11_CONFIG_VERSION_DEF}
-_XORG_MINOR!=	\
-	${AWK} '/\#define[ 	]*XORG_VERSION_MINOR/ { print $$3 }'	\
-                ${_X11_CONFIG_VERSION_DEF}
-_XORG_PATCH!=	\
-	${AWK} '/\#define[ 	]*XORG_VERSION_PATCH/ { print $$3 }'	\
-                ${_X11_CONFIG_VERSION_DEF}
-_XORG_SNAP!=	\
-	${AWK} '/\#define[ 	]*XORG_VERSION_SNAP/ { print $$3 }'	\
-                ${_X11_CONFIG_VERSION_DEF}
-_XORG_TEENY=	${_XORG_PATCH}.${_XORG_SNAP}
-.    if !empty(_XORG_TEENY:M0.0)
-XF86_VERSION=	4.4
-.    else
-XF86_VERSION=	4.4.${_XORG_TEENY}
-.    endif
-.  else
-_X11_CONFIG_VERSION_DEF=	${X11BASE}/lib/X11/config/version.def
-XF86_VERSION=	3.3
-.    if !exists(${_X11_CONFIG_VERSION_DEF})
-XF86_VERSION=	0
-.    else
-_XF86_MAJOR!=	\
-	${AWK} '/\#define[ 	]*XF86_VERSION_MAJOR/ { print $$3 }'	\
-		${_X11_CONFIG_VERSION_DEF}
-_XF86_MINOR!=	\
-	${AWK} '/\#define[ 	]*XF86_VERSION_MINOR/ { print $$3 }'	\
-		${_X11_CONFIG_VERSION_DEF}
-_XF86_PATCH!=	\
-	${AWK} '/\#define[ 	]*XF86_VERSION_PATCH/ { print $$3 }'	\
-		${_X11_CONFIG_VERSION_DEF}
-_XF86_SNAP!=	\
-	${AWK} '/\#define[ 	]*XF86_VERSION_SNAP/ { print $$3 }'	\
-		${_X11_CONFIG_VERSION_DEF}
-_XF86_TEENY=	${_XF86_PATCH}.${_XF86_SNAP}
-.      if !empty(_XF86_TEENY:M0.0)
-XF86_VERSION=	${_XF86_MAJOR}.${_XF86_MINOR}
-.      else
-XF86_VERSION=	${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
-.      endif
-.    endif
-.  endif	# xorg
-BUILDLINK_VARS+=	XF86_VERSION
-.endif
+BUILTIN_PKG:=	x11-links
+.include "../../mk/buildlink3/bsd.builtin.mk"
 
-USE_BUILTIN.x11-links?=	no
+.if !defined(USE_BUILTIN.x11-links)
+USE_BUILTIN.x11-links=	no
+.endif
+MAKEVARS+=	USE_BUILTIN.x11-links
diff --git a/pkgtools/x11-links/version.mk b/pkgtools/x11-links/version.mk
new file mode 100644
index 00000000000..59ea8ad2782
--- /dev/null
+++ b/pkgtools/x11-links/version.mk
@@ -0,0 +1,35 @@
+# $NetBSD: version.mk,v 1.1 2005/06/01 18:03:08 jlam Exp $
+#
+# This Makefile fragment is included by Makefiles that need to access
+# the X11_TYPE and version number of a native X11 distribution.
+#
+# The following variables are provided by this file:
+#
+#    BUILTIN_X11_TYPE.native is the X11_TYPE of the native X11
+#	distribution detected on the system.
+#
+#    BUILTIN_X11_VERSION.native is the version number, where applicable,
+#	of the native X11 distribution detected on the system.
+#
+
+.if !defined(BUILTIN_X11_VERSION.native)
+.  include "../../x11/xorg-libs/version.mk"
+.  include "../../x11/XFree86-libs/version.mk"
+
+.  if defined(BUILTIN_X11_VERSION.xorg)
+BUILTIN_X11_TYPE.native=	${BUILTIN_X11_TYPE.xorg}
+BUILTIN_X11_VERSION.native=	${BUILTIN_X11_VERSION.xorg}
+.  elif defined(BUILTIN_X11_VERSION.XFree86)
+BUILTIN_X11_TYPE.native=	${BUILTIN_X11_TYPE.XFree86}
+BUILTIN_X11_VERSION.native=	${BUILTIN_X11_VERSION.XFree86}
+.  elif !empty(X11BASE:M*openwin)
+BUILTIN_X11_TYPE.native=	openwin
+.  elif ${OPSYS} == "IRIX"
+BUILTIN_X11_TYPE.native=	xsgi
+.  elif ${OPSYS} == "OSF1"
+BUILTIN_X11_TYPE.native=	xdec
+.  else
+BUILTIN_X11_TYPE.native=	unknown
+.  endif
+.endif
+MAKEVARS+=	BUILTIN_X11_VERSION.native
diff --git a/pkgtools/x11-links/xfree.mk b/pkgtools/x11-links/xfree.mk
index adddf84380a..05740091ada 100644
--- a/pkgtools/x11-links/xfree.mk
+++ b/pkgtools/x11-links/xfree.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xfree.mk,v 1.10 2004/03/29 05:43:32 jlam Exp $
+# $NetBSD: xfree.mk,v 1.11 2005/06/01 18:03:08 jlam Exp $
 
 FILES_LIST=	${FILESDIR}/xfree
 
@@ -18,13 +18,14 @@ FILES_LIST=	${FILESDIR}/xfree
 # Check if any headers and libraries for ${X11_MODULES} found in
 # ${X11BASE} actually belong to the base XFree86 or not.
 #
-.for _pkg_ in ${BUILDLINK_PACKAGES}
-CHECK_BUILTIN.${_pkg_}=	yes
-USE_BUILTIN.${_pkg_}=	yes
+.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links}
+CHECK_BUILTIN.${_pkg_}:=	yes
+USE_BUILTIN.${_pkg_}=		yes
+.  sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk"
+CHECK_BUILTIN.${_pkg_}:=	no
 .endfor
-.include "../../mk/buildlink3/bsd.builtin.mk"
 
-.for _pkg_ in ${BUILDLINK_PACKAGES}
+.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links}
 IGNORE_PKG.${_pkg_}=	yes
 .  if !empty(IS_BUILTIN.${_pkg_}:M[yY][eE][sS]) && \
       exists(${FILESDIR}/xfree.${_pkg_})