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.

12 files changed, 21 insertions, 23 deletions

diff --git a/time/bbdate/Makefile b/time/bbdate/Makefile
index b67bbb7af53..d913ed36b38 100644
--- a/time/bbdate/Makefile
+++ b/time/bbdate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/11/22 21:02:33 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:23 jlam Exp $
 #
 
 DISTNAME=	bbdate-0.2.4
@@ -10,7 +10,7 @@ HOMEPAGE=	http://bbtools.windsofstorm.net/available.phtml#bbdate
 COMMENT=	Display the current date
 
 GNU_CONFIGURE=  YES
-USE_X11=        YES
 USE_LANGUAGES=	c++
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/dclock/Makefile b/time/dclock/Makefile
index 96d71a9569f..e02bf61c8d7 100644
--- a/time/dclock/Makefile
+++ b/time/dclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:44 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:23 jlam Exp $
 #
 
 DISTNAME=	dclock
@@ -15,4 +15,5 @@ CONFLICTS+=	ivtools-*
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	yes
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/glclock/Makefile b/time/glclock/Makefile
index f936fbf0b9d..3f4f56b31b9 100644
--- a/time/glclock/Makefile
+++ b/time/glclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:44 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:23 jlam Exp $
 #
 
 DISTNAME=		glclock-6.0b6.0
@@ -13,7 +13,6 @@ COMMENT=		OpenGL-based pocket watch
 MAKEFILE=		makefile
 BUILD_TARGET=		glclock
 
-USE_X11=		# defined
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -29,4 +28,5 @@ do-install:
 #	${INSTALL_SCRIPT} ${WRKSRC}/$$i ${PREFIX}/bin; done
 
 .include "../../graphics/Mesa/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile
index c5019f7d4ad..92b76da4061 100644
--- a/time/gnotime/Makefile
+++ b/time/gnotime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:43 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:23 jlam Exp $
 
 DISTNAME=	gnotime-2.2.1
 PKGREVISION=	# empty
@@ -14,7 +14,6 @@ USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 
 GCONF2_SCHEMAS=		gnotime.schemas
 
diff --git a/time/ical/Makefile b/time/ical/Makefile
index 6ab19b292f2..8db147c2b0e 100644
--- a/time/ical/Makefile
+++ b/time/ical/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/29 19:01:33 kristerw Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:23 jlam Exp $
 
 DISTNAME=	ical-2.3.1
 PKGREVISION=	1
@@ -12,7 +12,6 @@ COMMENT=	Calendar application
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=	c c++
-USE_X11=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib \
diff --git a/time/pclock/Makefile b/time/pclock/Makefile
index 5b10a7f5483..aa0c7de1b48 100644
--- a/time/pclock/Makefile
+++ b/time/pclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:45 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:23 jlam Exp $
 #
 
 DISTNAME=	pclock_0.13.1.orig
@@ -11,7 +11,6 @@ MAINTAINER=	salo@NetBSD.org
 COMMENT=	Simple analog clock designed for Window Maker
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}.orig
-USE_X11=	YES
 
 MAKE_ENV+=	LN=${LN}
 
@@ -23,5 +22,4 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pclock
 
 .include "../../graphics/xpm/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/ptimetracker/Makefile b/time/ptimetracker/Makefile
index df195856d26..54fd7588602 100644
--- a/time/ptimetracker/Makefile
+++ b/time/ptimetracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:43 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:23 jlam Exp $
 
 DISTNAME=	ptimetracker-1.7.3
 PKGREVISION=	# empty
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.eggtart.plus.com/ptt/
 COMMENT=	Keep track of the time spent on projects
 
 # USE_GNOME=	gnomehack gnomeprefix libgtkhtml libgnomeui
-USE_X11=		yes
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 
diff --git a/time/rclock/Makefile b/time/rclock/Makefile
index c15ab6394f0..39f03018bb7 100644
--- a/time/rclock/Makefile
+++ b/time/rclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/03/24 21:13:03 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:24 jlam Exp $
 
 DISTNAME=		rxvt-2.6.0
 PKGNAME=		rclock-2.6.0
@@ -15,4 +15,5 @@ USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 BUILD_TARGET=		clock
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xbeats/Makefile b/time/xbeats/Makefile
index f3849186ca7..f764f11206f 100644
--- a/time/xbeats/Makefile
+++ b/time/xbeats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:45 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:24 jlam Exp $
 #
 
 DISTNAME=	xbeats-0.4
@@ -9,7 +9,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://iznogood.bohemians.org/
 COMMENT=	Beats clock dockable in both Window Maker and AfterStep
 
-USE_X11=	YES
 GNU_CONFIGURE=	YES
 
 .include "../../graphics/xpm/buildlink3.mk"
diff --git a/time/xdaliclock/Makefile b/time/xdaliclock/Makefile
index 54091f234c0..7f0055d20f8 100644
--- a/time/xdaliclock/Makefile
+++ b/time/xdaliclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:27:16 agc Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:24 jlam Exp $
 #
 
 DISTNAME=		xdaliclock-2.18
@@ -12,6 +12,6 @@ COMMENT=		Animated digital clock
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/X11
 GNU_CONFIGURE=		yes
-USE_X11=		yes
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xdkcal/Makefile b/time/xdkcal/Makefile
index 094130fb5b9..21c9c7da534 100644
--- a/time/xdkcal/Makefile
+++ b/time/xdkcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:45 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:24 jlam Exp $
 #
 
 DISTNAME=	xdkcal-0.9d
@@ -12,10 +12,11 @@ COMMENT=	X Desktop Calendar
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
-USE_X11=		yes
 
 INSTALLATION_DIRS=	bin man/man1
 
+.include "../../mk/x11.buildlink3.mk"
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xdkcal ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xdkcal.1x ${PREFIX}/man/man1/xdkcal.1
diff --git a/time/xtu/Makefile b/time/xtu/Makefile
index 328cb9da05f..578b1983805 100644
--- a/time/xtu/Makefile
+++ b/time/xtu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/04/29 14:18:58 sketch Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:24 jlam Exp $
 #
 
 DISTNAME=	xtu-1.2
@@ -9,7 +9,8 @@ MAINTAINER=	sketch@NetBSD.org
 HOMEPAGE=	http://core.de/~coto/projects/xtu/
 COMMENT=	Small configurable X11 analog clock
 
-USE_X11=	yes
+
+.include "../../mk/x11.buildlink3.mk"
 
 do-build:
 	cd ${WRKSRC} && ${CC} *.c -o xtu -I${X11BASE}/include ${X11_LDFLAGS} -lX11 -lXext