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.

23 files changed, 38 insertions, 43 deletions

diff --git a/misc/9menu/Makefile b/misc/9menu/Makefile
index 86937841202..1321e8a87b8 100644
--- a/misc/9menu/Makefile
+++ b/misc/9menu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/03/24 21:12:57 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:04 jlam Exp $
 
 DISTNAME=		9menu-1.8
 CATEGORIES=		misc plan9
@@ -10,10 +10,11 @@ COMMENT=		Simple menu patterned after the plan9 user interface
 
 MAKEFILE=		Makefile.noimake
 BUILD_TARGET=		9menu
-USE_X11=		yes
 
 WRKSRC=			${WRKDIR}
 
+.include "../../mk/x11.buildlink3.mk"
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/9menu ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/9menu.1 ${PREFIX}/man/man1
diff --git a/misc/Addresses/Makefile b/misc/Addresses/Makefile
index 87801e12a84..ac204ec3856 100644
--- a/misc/Addresses/Makefile
+++ b/misc/Addresses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:33 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:04 jlam Exp $
 #
 
 DISTNAME=		Addresses-0.4.6
@@ -9,7 +9,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://giesler.biz/bjoern/en/sw_addr.html
 COMMENT=		Address book for GNUstep
 
-USE_X11=		yes
 NO_CONFIGURE=		yes
 MAKE_ENV+=		Addresses_OBJCFLAGS=-I..
 
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index c7ee9b46a77..0c6f6764584 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:46:33 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:04 jlam Exp $
 
 DISTNAME=       ast54unx
 PKGNAME=        astrolog-5.40
@@ -27,6 +27,8 @@ USE_X11BASE=	yes
 DIST_SUBDIR=    astrolog
 BUILD_TARGET=     astrolog
 
+.include "../../mk/x11.buildlink3.mk"
+
 do-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/lib/astrolog
 	cd ${DISTDIR}/${DIST_SUBDIR} && \
diff --git a/misc/bbappconf/Makefile b/misc/bbappconf/Makefile
index 76845663283..5aa77619b1a 100644
--- a/misc/bbappconf/Makefile
+++ b/misc/bbappconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:33 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:04 jlam Exp $
 #
 
 DISTNAME=	bbappconf-0.0.2
@@ -13,6 +13,8 @@ USE_LANGUAGES=		c c++
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 
+.include "../../mk/x11.buildlink3.mk"
+
 post-patch:
 	${SED} -e 's,@PREFIX@,${PREFIX},' ${WRKSRC}/data/bbappconf.1.tmp > \
 		${WRKSRC}/data/bbappconf.1
diff --git a/misc/bbweather/Makefile b/misc/bbweather/Makefile
index 480a65373a8..e5e03f63024 100644
--- a/misc/bbweather/Makefile
+++ b/misc/bbweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/05/15 22:02:27 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:04 jlam Exp $
 #
 
 DISTNAME=	bbweather-0.6.2
@@ -12,12 +12,13 @@ COMMENT=	Show current weather conditions
 
 DEPENDS+=	wget>=1.7:../../net/wget
 
-USE_X11=		YES
 GNU_CONFIGURE=		YES
 REPLACE_PERL=		GrabWeather
 USE_PERL5=		run
 PKGSRC_USE_TOOLS+=	gunzip
 
+.include "../../mk/x11.buildlink3.mk"
+
 post-install:
 	cd ${PREFIX}/man/man1 && ${GUNZIP_CMD} GrabWeather.1.gz
 	cd ${PREFIX}/man/man1 && ${GUNZIP_CMD} bbweather.1.gz
diff --git a/misc/celestia/Makefile.common b/misc/celestia/Makefile.common
index 4d60666239c..64e383b97a1 100644
--- a/misc/celestia/Makefile.common
+++ b/misc/celestia/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2005/05/22 20:08:14 jlam Exp $
+# $NetBSD: Makefile.common,v 1.18 2005/06/01 18:03:05 jlam Exp $
 
 DISTNAME=	celestia-${CELESTIA_VERS}
 CATEGORIES=	misc x11
@@ -15,7 +15,6 @@ CELESTIA_VERS=	1.3.2
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c++
 USE_LIBTOOL=		yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-lua --with-glut
 
@@ -42,3 +41,4 @@ CONFIGURE_ARGS+=	--disable-threading
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
diff --git a/misc/fooseti/Makefile b/misc/fooseti/Makefile
index beb110d8a87..b79f9f07d6a 100644
--- a/misc/fooseti/Makefile
+++ b/misc/fooseti/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:34 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:05 jlam Exp $
 #
 
 DISTNAME=	fooseti-0.6.6
@@ -13,7 +13,6 @@ COMMENT=	Simple GTK+ frontend for the Seti@home client
 DEPENDS+=	setiathome>=3.00:../../misc/setiathome
 
 GNU_CONFIGURE=	YES
-USE_X11=	YES
 
 CPPFLAGS+=	-DPKG_BINDIR="\"${LOCALBASE}/bin\""
 
diff --git a/misc/gnome2-user-docs/Makefile b/misc/gnome2-user-docs/Makefile
index f8f0b035c46..7ab20138572 100644
--- a/misc/gnome2-user-docs/Makefile
+++ b/misc/gnome2-user-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:15 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:05 jlam Exp $
 #
 
 DISTNAME=	gnome2-user-docs-2.8.1
@@ -14,7 +14,6 @@ USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 .include "../../textproc/scrollkeeper/omf.mk"
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index ae4f6ebcf77..341e8a60748 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/05/22 20:08:15 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/06/01 18:03:05 jlam Exp $
 #
 
 DISTNAME=		gnome-utils-2.10.1
@@ -16,7 +16,6 @@ USE_PERL5=		build
 USE_TOOLS+=		gmake
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index 68f9f97f0cd..274564b52e2 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:15 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/06/01 18:03:05 jlam Exp $
 #
 
 DISTNAME=		gok-1.0.3
@@ -14,7 +14,6 @@ USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index 78eb9fd4403..105354e28cc 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:15 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/06/01 18:03:05 jlam Exp $
 
 DISTNAME=		gperiodic-2.0.8
 CATEGORIES=		misc x11
@@ -12,7 +12,6 @@ BUILD_USES_MSGFMT=	# defined
 
 USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	# defined
-USE_X11=		# defined
 USE_TOOLS+=		gmake
 
 BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
diff --git a/misc/gxmame/Makefile b/misc/gxmame/Makefile
index 6f8bfa0b64a..bab98d0c389 100644
--- a/misc/gxmame/Makefile
+++ b/misc/gxmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:15 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:05 jlam Exp $
 #
 
 DISTNAME=	gxmame-0.35beta1
@@ -17,7 +17,6 @@ GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index ce3fa10a561..2401c2b19fe 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/03/24 21:12:57 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:05 jlam Exp $
 
 DISTNAME=       kp-0.96
 CATEGORIES=	misc tk
@@ -9,7 +9,7 @@ COMMENT=	The Keyboard Practicer, touch-type training program
 
 DEPENDS=	tk>=8.3.2:../../x11/tk
 
-USE_X11=	yes
+.include "../../mk/x11.buildlink3.mk"
 
 pre-configure:
 	for f in `${FIND} ${WRKDIR}/. -type f -print \
diff --git a/misc/molden/Makefile b/misc/molden/Makefile
index c9e9dbf5796..d17207a1a98 100644
--- a/misc/molden/Makefile
+++ b/misc/molden/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:38 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:05 jlam Exp $
 
 DISTNAME=	molden4.2
 PKGNAME=	${DISTNAME:S/molden/&-/}
@@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 MAKEFILE=	makefile
 BUILD_TARGET=	molden
 
-USE_X11=		# defined
 USE_LANGUAGES=		fortran
 
 INTERACTIVE_STAGE=	fetch
@@ -48,4 +47,5 @@ do-install:
 	done
 
 .include "../../graphics/Mesa/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index f11a9fa8b1c..c3ac7753537 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/05/22 20:08:17 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2005/06/01 18:03:05 jlam Exp $
 
 DISTNAME=	nxtvepg-2.7.5
 CATEGORIES=	misc
@@ -14,7 +14,6 @@ ONLY_FOR_PLATFORM=      NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
 
 USE_PERL5=	yes
 USE_TOOLS+=	gmake
-USE_X11=	yes
 
 PTHREAD_AUTO_VARS=	yes
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index bc230019e92..0b494bcd398 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2005/05/22 20:08:17 jlam Exp $
+# $NetBSD: Makefile,v 1.65 2005/06/01 18:03:05 jlam Exp $
 
 DISTNAME=		openoffice-1.1.4
 PKGREVISION=		2
@@ -27,7 +27,6 @@ USE_LANGUAGES+=		c c++
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_X11=		# defined
 USE_TOOLS+=		gmake
 USE_PERL5=		build
 PTHREAD_OPTS+=		require
@@ -116,4 +115,5 @@ PLIST_SRC+=		PLIST.common_end
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/root/Makefile b/misc/root/Makefile
index f9f33cb393a..a0dba2c076e 100644
--- a/misc/root/Makefile
+++ b/misc/root/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:17 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:05 jlam Exp $
 
 DISTNAME=		root_v2.23.08.source
 PKGNAME=		root-2.23
@@ -13,7 +13,6 @@ BUILD_DEPENDS+=		cint-5.14.40:../../lang/cint
 
 WRKSRC=			${WRKDIR}
 BUILDLINK_PASSTHRU_DIRS=${PREFIX}/root/lib
-USE_X11=		YES
 USE_TOOLS+=		gmake
 
 BUILD_TARGET=		netbsd
diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index 6e570b66a4c..3a055350272 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/05/22 20:08:18 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2005/06/01 18:03:05 jlam Exp $
 #
 
 DISTNAME=       siag-3.5.7
@@ -20,7 +20,6 @@ CONFIGURE_ARGS+=--with-guile
 CONFIGURE_ARGS+=--with-docdir=${PREFIX}/share/doc/siag
 GNU_CONFIGURE=  YES
 USE_TOOLS+=	gmake
-USE_X11=	YES
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/misc/stellarium/Makefile b/misc/stellarium/Makefile
index a3fe890e4fb..d902875ac50 100644
--- a/misc/stellarium/Makefile
+++ b/misc/stellarium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:18 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:05 jlam Exp $
 #
 
 DISTNAME=		stellarium-0.6.0
@@ -11,7 +11,6 @@ HOMEPAGE=		http://stellarium.free.fr/
 COMMENT=		Generate photorealistic skys with OpenGL
 
 USE_TOOLS+=		gmake
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/misc/xdg-x11-dirs/Makefile b/misc/xdg-x11-dirs/Makefile
index f1ce131215f..c41d8a1abff 100644
--- a/misc/xdg-x11-dirs/Makefile
+++ b/misc/xdg-x11-dirs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/28 23:06:01 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:05 jlam Exp $
 #
 
 DISTNAME=	xdg-x11-dirs-1.2
@@ -32,4 +32,5 @@ MAKE_DIRS+=	${XDG_X11_DIRS:O:S/^/${PREFIX}\//}
 
 do-install:	# nothing
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/xtide/Makefile b/misc/xtide/Makefile
index fa1db12d9ff..218a1c34466 100644
--- a/misc/xtide/Makefile
+++ b/misc/xtide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:40 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:05 jlam Exp $
 
 DISTNAME=	xtide-2.4
 PKGNAME=	${DISTNAME}
@@ -16,7 +16,6 @@ XTIDE_SRC=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
-USE_X11=	yes
 
 CONFIGURE_ARGS+=--sysconfdir="${PKG_SYSCONFDIR}"
 EGDIR=		${PREFIX}/share/examples/xtide
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 202818064b0..b19853b11a2 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/05/31 15:54:26 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2005/06/01 18:03:05 jlam Exp $
 #
 
 DISTNAME=		yelp-2.10.0
@@ -19,7 +19,6 @@ USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--with-html-widget=gtkhtml2
diff --git a/misc/zorro/Makefile b/misc/zorro/Makefile
index c0cd4191b05..58acf1193e9 100644
--- a/misc/zorro/Makefile
+++ b/misc/zorro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/03/24 21:12:58 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:05 jlam Exp $
 
 DISTNAME=	zorro-1.1p8
 PKGNAME=	zorro-1.1.8
@@ -11,7 +11,8 @@ COMMENT=	Simple to-do list manager
 DEPENDS+=	tk>=8.3.2:../../x11/tk
 
 NO_BUILD=	yes
-USE_X11=	yes
+
+.include "../../mk/x11.buildlink3.mk"
 
 post-patch:
 	( cd ${WRKSRC} ; ${SED} 's|@PREFIX@|'${PREFIX}'|g' \