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.

16 files changed, 23 insertions, 31 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 6111eec6ab6..d1cf50e6581 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:44 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/06/01 18:03:26 jlam Exp $
 
 DISTNAME=	amaya-fullsrc-9.0
 PKGNAME=	${DISTNAME:S/-fullsrc//}
@@ -16,7 +16,6 @@ EXTRACT_ELEMENTS=	Amaya libwww
 WRKSRC=			${WRKDIR}/Amaya/work
 
 USE_TOOLS+=		gmake
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../configure
 CONFIGURE_ARGS+=	--without-graphic-libs	# Use pkgsrc libraries
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 62cc601ed2c..9beb99ddb35 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/05/22 20:08:44 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2005/06/01 18:03:26 jlam Exp $
 
 DISTNAME=	bluefish-1.0
 PKGREVISION=	1
@@ -20,7 +20,6 @@ BUILD_USES_MSGFMT=	YES
 USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-icon-path=${PREFIX}/share/pixmaps
 
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 37595fafcc2..c6a3727bb51 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:47:52 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/06/01 18:03:26 jlam Exp $
 
 DISTNAME=	dillo-0.8.4
 CATEGORIES=	www
@@ -10,7 +10,6 @@ HOMEPAGE=	http://dillo.auriga.wearlab.de/
 COMMENT=	Very small and fast graphical web-browser
 
 USE_PKGINSTALL=		yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS=		--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 2811249c90d..71e0550c484 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2005/05/31 15:43:56 drochner Exp $
+# $NetBSD: Makefile,v 1.79 2005/06/01 18:03:26 jlam Exp $
 #
 
 DISTNAME=	galeon-1.3.21
@@ -19,7 +19,6 @@ USE_TOOLS+=		gmake
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 MOZILLA_USE_GTK2=	# defined
 MOZILLA_USE_XFT=	YES
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index e0ef7613aad..ba7cf56fe97 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:53 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:26 jlam Exp $
 #
 
 DISTNAME=		glibwww-0.2
@@ -10,7 +10,6 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Event register functions that use the glib event loop
 
-USE_X11=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/www/grail/Makefile b/www/grail/Makefile
index 3c57d0272d9..ae5a4a8d801 100644
--- a/www/grail/Makefile
+++ b/www/grail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:47:53 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:26 jlam Exp $
 #
 
 DISTNAME=	grail-0.6
@@ -11,7 +11,6 @@ MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://grail.sourceforge.net/
 COMMENT=	Grail(TM) is a web browser written in Python
 
-USE_X11=	yes
 NO_CONFIGURE=   yes
 NO_BUILD=       yes
 
diff --git a/www/htmldoc-x11/Makefile b/www/htmldoc-x11/Makefile
index 21bd0aa4fe4..a40fea61aa0 100644
--- a/www/htmldoc-x11/Makefile
+++ b/www/htmldoc-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:18:26 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:26 jlam Exp $
 #
 
 .include "../htmldoc/Makefile.common"
@@ -9,7 +9,6 @@ COMMENT=	Converts HTML to indexed HTML, PDF and/or PostScript (GUI available)
 
 CONFLICTS=		htmldoc-[0-9]*
 
-USE_X11=		# defined
 CONFIGURE_ARGS+=	--with-gui --with-x
 
 .include "../../x11/fltk/buildlink3.mk"
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index b38a478b610..dd4e9cebf73 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:45 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/06/01 18:03:26 jlam Exp $
 #
 
 DISTNAME=	libgtkhtml-2.6.3
@@ -15,7 +15,6 @@ BUILD_USES_MSGFMT=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
-USE_X11=		yes
 
 PKGCONFIG_OVERRIDE=	libgtkhtml-2.0.pc.in
 
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index 58c21d5c7d7..9b37bb86fe4 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:45 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:26 jlam Exp $
 
 DISTNAME=		liferea-0.6.4
 CATEGORIES=		www
@@ -13,7 +13,6 @@ USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 
 SHLIBTOOL_OVERRIDE=	libtool
 
diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile
index 730b8cd6104..30fdd2f62da 100644
--- a/www/links-gui/Makefile
+++ b/www/links-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/02/26 10:08:11 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/06/01 18:03:26 jlam Exp $
 #
 
 PKGNAME=	links-gui-2.1.0.17
@@ -7,7 +7,6 @@ COMMENT=	Lynx-like text and graphics WWW browser
 
 CONFLICTS+=	links-[0-9]* elinks-0.3*
 
-USE_X11=	YES
 
 CONFIGURE_ARGS+=	--enable-graphics
 CONFIGURE_ARGS+=	--without-sdl
@@ -15,5 +14,6 @@ CONFIGURE_ARGS+=	--without-sdl
 .include "../../www/links/Makefile.common"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile
index dbb9bc2fa77..1771d8af3b9 100644
--- a/www/mMosaic/Makefile
+++ b/www/mMosaic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:26 jlam Exp $
 #
 
 DISTNAME=	mMosaic-3.7.2
@@ -11,7 +11,6 @@ HOMEPAGE=	http://perso.enst.fr/~dauphin/mMosaic/
 COMMENT=	Modern derivative of NCSA XMosaic
 
 WRKSRC=		${WRKDIR}/mMosaic-src-3.7.2
-USE_X11=	YES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mMosaic ${PREFIX}/bin/
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index d00e9477e4e..ba511646634 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.55 2005/05/22 20:08:45 jlam Exp $
+# $NetBSD: Makefile.common,v 1.56 2005/06/01 18:03:26 jlam Exp $
 
 MOZ_DIST_VER?=	${MOZ_VER}
 DISTNAME?=	mozilla-${MOZ_DIST_VER}-source
@@ -17,7 +17,6 @@ WRKSRC=		${WRKDIR}/mozilla
 USE_LANGUAGES=	c c++
 USE_PERL5=	build
 USE_TOOLS+=	gmake
-USE_X11=	yes
 GNU_CONFIGURE=	yes
 
 CONFIG_GUESS_OVERRIDE=	build/autoconf/config.guess
diff --git a/www/navigator3/Makefile b/www/navigator3/Makefile
index fd6703bbced..c4a11532e37 100644
--- a/www/navigator3/Makefile
+++ b/www/navigator3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:27:59 agc Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:27 jlam Exp $
 
 DISTNAME=		netscape-v304-export.x86-unknown-bsd
 PKGNAME=		navigator3-3.04
@@ -22,6 +22,8 @@ USE_X11BASE=		YES
 SCRIPTS_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 NO_BUILD=		YES
 
+.include "../../mk/x11.buildlink3.mk"
+
 pre-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
diff --git a/www/ns-remote/Makefile b/www/ns-remote/Makefile
index af1420dd39c..d44327a7226 100644
--- a/www/ns-remote/Makefile
+++ b/www/ns-remote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:27 jlam Exp $
 
 DISTNAME=	ns-remote
 PKGNAME=	ns-remote-1.10
@@ -12,10 +12,11 @@ COMMENT=	Remote-control of Netscape and Mozilla-based browsers
 
 DIST_SUBDIR=	netscape
 
-USE_X11=	# defined
 
 LDFLAGS.SunOS=	-lsocket -lnsl
 
+.include "../../mk/x11.buildlink3.mk"
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 .for distfile in ${DISTFILES}
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 08a4b0a97c6..3503895af44 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:55 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:27 jlam Exp $
 #
 
 DISTNAME=	Apache-Gallery-0.9.1
@@ -21,7 +21,6 @@ DEPENDS+=	p5-Text-Template-[0-9]*:../../textproc/p5-Text-Template
 DEPENDS+=	p5-libapreq{,2}-[0-9]*:../../www/${LIBAPREQ}
 
 USE_PKGINSTALL=		YES
-USE_X11=		YES
 USE_PERL5=		run
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/Gallery/.packlist
 
@@ -99,6 +98,7 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/${AG}.conf ${AG_EGDIR}
 
 .include "../../graphics/imlib2/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
index cc0f945024d..c71c06c928b 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2005/05/22 20:08:46 jlam Exp $
+# $NetBSD: Makefile.common,v 1.35 2005/06/01 18:03:27 jlam Exp $
 #
 
 DISTNAME=	w3m-${W3M_VERS}
@@ -62,7 +62,6 @@ CONFIGURE_ARGS+=	--enable-keymap=w3m
 
 _W3M_USE_IMAGE?=	NO
 .if ${_W3M_USE_IMAGE} == YES
-USE_X11=		YES
 CONFIGURE_ARGS+=	--enable-image=x11
 .else
 CONFIGURE_ARGS+=	--disable-image
@@ -128,5 +127,6 @@ post-install:
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
 .endif
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"