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.

9 files changed, 11 insertions, 17 deletions

diff --git a/chat/gaim-encryption/Makefile b/chat/gaim-encryption/Makefile
index 98f00b559fe..4f179f57052 100644
--- a/chat/gaim-encryption/Makefile
+++ b/chat/gaim-encryption/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:42 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/01 18:02:41 jlam Exp $
 
 DISTNAME=	gaim-encryption-2.34
 CATEGORIES=	chat security
@@ -13,7 +13,6 @@ BUILD_USES_MSGFMT=	YES
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
-USE_X11=		YES
 GNU_CONFIGURE=		YES
 
 SHLIBTOOL_OVERRIDE=	libtool
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index a3776d0e51a..491eb36ecdb 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2005/05/22 20:07:42 jlam Exp $
+# $NetBSD: Makefile,v 1.87 2005/06/01 18:02:41 jlam Exp $
 
 DISTNAME=	gaim-1.3.0
 CATEGORIES=	chat x11
@@ -17,7 +17,6 @@ USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 SHLIBTOOL_OVERRIDE=	libtool
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 038d02f30e6..9c8cbfdee49 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:42 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/06/01 18:02:41 jlam Exp $
 
 DISTNAME=	gnomeicu-0.99.5
 CATEGORIES=	chat gnome
@@ -14,7 +14,6 @@ USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
-USE_X11=		YES
 
 CONFIGURE_ARGS+=	--sysconfdir=${EGDIR}
 
diff --git a/chat/gtkyahoo/Makefile b/chat/gtkyahoo/Makefile
index fa92738c30f..ca091dfa5ef 100644
--- a/chat/gtkyahoo/Makefile
+++ b/chat/gtkyahoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:42 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:41 jlam Exp $
 
 DISTNAME=	gtkyahoo-0.18.2
 PKGREVISION=	3
@@ -13,7 +13,6 @@ COMMENT=	GTK+ client for Yahoo! Messenger
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 USE_TOOLS+=		lex
-USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-libyahoo="${BUILDLINK_PREFIX.libyahoo}"
 
diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index a43cea5c880..46df39c61e7 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:43 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:41 jlam Exp $
 
 PSI_VERSION=	0.9.3
 DISTNAME=	psi-${PSI_VERSION}
@@ -22,7 +22,6 @@ DEPENDS+=	qca-tls>=1.0:../../security/qca-tls
 
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
-USE_X11=	yes
 HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS= --prefix="${PREFIX}" --qtdir="${QTDIR}"
diff --git a/chat/quirc/Makefile b/chat/quirc/Makefile
index b7dfa5e9c89..8863aa59ab9 100644
--- a/chat/quirc/Makefile
+++ b/chat/quirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:43 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:41 jlam Exp $
 #
 
 DISTNAME=	quirc-0.9.84
@@ -12,7 +12,6 @@ COMMENT=	Stable and powerful graphical IRC client
 
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake
-USE_X11=	YES
 
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}
 
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 47f56505d45..b44818d810c 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2005/05/22 20:07:43 jlam Exp $
+# $NetBSD: Makefile.common,v 1.38 2005/06/01 18:02:41 jlam Exp $
 
 DISTNAME=	xchat-1.8.11
 PKGREVISION=	11
@@ -52,5 +52,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/xchat
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile
index 0d273d936fc..22f88ff5116 100644
--- a/chat/xchat2/Makefile
+++ b/chat/xchat2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2004/11/29 17:36:10 minskim Exp $
+# $NetBSD: Makefile,v 1.42 2005/06/01 18:02:41 jlam Exp $
 #
 
 .include "Makefile.common"
@@ -17,7 +17,6 @@ CONFLICTS=		xchat-gnome-[0-9]*
 
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
-USE_X11=		YES
 
 CONFIGURE_ARGS+=	--enable-textfe
 CONFIGURE_ARGS+=	--enable-tcl=no
diff --git a/chat/zephyr/Makefile b/chat/zephyr/Makefile
index 4749fb22007..9abdfde1e81 100644
--- a/chat/zephyr/Makefile
+++ b/chat/zephyr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/31 22:41:39 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:41 jlam Exp $
 #
 
 DISTNAME=	zephyr-20010518
@@ -13,7 +13,6 @@ COMMENT=	Project Athena's original Instant Messaging system
 WRKSRC=		${WRKDIR}/zephyr
 USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
-USE_X11=	YES
 
 CPPFLAGS.NetBSD+=	-I/usr/include/kerberosIV -I/usr/include/krb5
 LDFLAGS.NetBSD+=	-lroken -lcrypto -lcom_err -ledit -lcurses
@@ -44,4 +43,5 @@ pre-install:
 .include "../../devel/readline/buildlink3.mk"
 .include "../../net/hesiod/buildlink3.mk"
 .include "../../net/libares/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"