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.

15 files changed, 25 insertions, 28 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index 2c3aa55a21d..f49b4dda31f 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2005/05/22 20:08:13 jlam Exp $
+# $NetBSD: Makefile,v 1.68 2005/06/01 18:03:00 jlam Exp $
 
 DISTNAME=		R-2.1.0
 CATEGORIES=		math
@@ -15,7 +15,6 @@ NOT_FOR_PLATFORM=	NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 TEST_TARGET=		check
-USE_X11=		# defined
 USE_PERL5=		# defined
 USE_TOOLS+=		gmake xmkmf
 USE_GNU_READLINE=	# uses callback interface
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 205b973d91c..267361e968e 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:13 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/06/01 18:03:03 jlam Exp $
 #
 
 DISTNAME=		gcalctool-5.5.42
@@ -15,7 +15,6 @@ BUILD_USES_MSGFMT=	YES
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake
-USE_X11=		YES
 USE_PKGLOCALEDIR=	yes
 
 GCONF2_SCHEMAS=		gcalctool.schemas
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index b9d63b180d8..667480a85be 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2005/05/22 20:08:13 jlam Exp $
+# $NetBSD: Makefile,v 1.95 2005/06/01 18:03:03 jlam Exp $
 #
 
 DISTNAME=		gnumeric-1.2.13
@@ -14,7 +14,6 @@ COMMENT=		Spreadsheet program from the GNOME project
 BUILD_USES_MSGFMT=	YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
-USE_X11=		YES
 USE_TOOLS+=		gmake
 USE_PERL5=		YES
 USE_LIBTOOL=		YES
diff --git a/math/gnumeric14/Makefile b/math/gnumeric14/Makefile
index 83eaa5db90c..06b2ff2824a 100644
--- a/math/gnumeric14/Makefile
+++ b/math/gnumeric14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/01 12:55:10 markd Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:03 jlam Exp $
 #
 
 DISTNAME=		gnumeric-1.4.3
@@ -13,7 +13,6 @@ COMMENT=		Spreadsheet program from the GNOME project
 BUILD_USES_MSGFMT=	YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
-USE_X11=		YES
 USE_TOOLS+=		gmake
 USE_PERL5=		YES
 USE_LIBTOOL=		YES
diff --git a/math/grpn/Makefile b/math/grpn/Makefile
index 21e1ccba6c4..958498e2c16 100644
--- a/math/grpn/Makefile
+++ b/math/grpn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:29 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:03 jlam Exp $
 #
 
 DISTNAME=	grpn-1.1.2
@@ -11,7 +11,6 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://lashwhip.com/grpn.html
 COMMENT=	Graphical reverse polish notation (RPN) calculator
 
-USE_X11=	# defined
 BUILD_TARGET=	grpn
 
 .include "../../x11/gtk/buildlink3.mk"
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 19e73596005..444a2ba66d5 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/05/22 20:08:13 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2005/06/01 18:03:03 jlam Exp $
 
 DISTNAME=	Guppi-0.40.3
 PKGNAME=	${DISTNAME:S/G/g/}
@@ -20,7 +20,6 @@ CONFIGURE_ARGS=		--disable-gnumeric
 
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
-USE_X11=		YES
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index 26fed8af060..1ffaf729e0b 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:14 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:03 jlam Exp $
 
 DISTNAME=	octave-forge-2004.11.16
 PKGREVISION=	1
@@ -12,7 +12,6 @@ COMMENT=	Extensions to Octave
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
 USE_TOOLS+=		gmake
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 UNLIMIT_RESOURCES=	datasize
@@ -48,5 +47,6 @@ post-patch:
 .include "../../graphics/png/buildlink3.mk"
 .include "../../math/gsl/buildlink3.mk"
 .include "../../math/octave/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/pari/Makefile b/math/pari/Makefile
index b2d7447d6c2..1f6b9ed36fb 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:30 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:03 jlam Exp $
 
 DISTNAME=		pari-2.1.5
 PKGREVISION=		4
@@ -13,7 +13,6 @@ COMMENT=		Software package for computer-aided number theory
 BUILD_DEPENDS+= 	teTeX-[0-9]*:../../print/teTeX
 
 USE_LIBTOOL=		yes
-USE_X11=		yes
 USE_GNU_READLINE=	# rl_save_prompt
 
 HAS_CONFIGURE=		yes
@@ -28,4 +27,5 @@ TEST_TARGET=		test-compat bench
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/snns/Makefile b/math/snns/Makefile
index fe7a48aef83..7af222786be 100644
--- a/math/snns/Makefile
+++ b/math/snns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:31 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:04 jlam Exp $
 
 DISTNAME=	SNNSv4.2
 PKGNAME=	snns-4.2
@@ -9,7 +9,6 @@ MAINTAINER=	wulf@NetBSD.org
 HOMEPAGE=	http://www-ra.informatik.uni-tuebingen.de/SNNS/
 COMMENT=	Software simulator for neural networks
 
-USE_X11=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS= --enable-global
 
diff --git a/math/tasp-vsipl/Makefile b/math/tasp-vsipl/Makefile
index 80401065816..94f90e61827 100644
--- a/math/tasp-vsipl/Makefile
+++ b/math/tasp-vsipl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:31 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:04 jlam Exp $
 
 DISTNAME=	tvcpp0p8
 PKGNAME=	tasp-vsipl-20030710
@@ -12,7 +12,8 @@ COMMENT=	Vector Signal Image Processing Library
 WRKSRC=		${WRKDIR}/${DISTNAME}/lib
 DIST_SUBDIR=	tasp-vsipl
 
-USE_X11=	yes
+
+.include "../../mk/x11.buildlink3.mk"
 
 post-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/math/vista/Makefile b/math/vista/Makefile
index 717e0048d5e..a4aca67a658 100644
--- a/math/vista/Makefile
+++ b/math/vista/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:14 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:04 jlam Exp $
 #
 
 DISTNAME=	vista
@@ -16,4 +16,5 @@ WRKSRC=		${WRKDIR}/vista-5.0.5
 USE_X11BASE=	yes
 USE_TOOLS+=	gmake
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/xgap/Makefile b/math/xgap/Makefile
index 528b5384c0d..ce74309e376 100644
--- a/math/xgap/Makefile
+++ b/math/xgap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:31 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:04 jlam Exp $
 #
 
 DISTNAME=	xgap4r16
@@ -13,7 +13,6 @@ HOMEPAGE=	http://www.gap-system.org/Share/xgap.html
 COMMENT=	GUI for GAP
 
 WRKSRC=         ${WRKDIR}/${GAP_PKG_NAME}
-USE_X11=	YES
 GNU_CONFIGURE=	YES
 BUILD_TARGET=	default
 
@@ -35,5 +34,6 @@ do-install:
 		cd ${WRKSRC} && ${PAX} -rw $$I ${GAP_PKG_DIRECTORY};	\
 		done
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../math/gap/gap.package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile
index d179654fab1..13d98990a92 100644
--- a/math/xlispstat/Makefile
+++ b/math/xlispstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/03/24 21:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:04 jlam Exp $
 
 DISTNAME=		xlispstat-3-52-18
 PKGNAME=		xlispstat-3.52.18
@@ -25,4 +25,5 @@ MAKE_ENV+=		CPPFLAGS=
 
 MAKE_ENV+=		DISPLAY=	# Prevent 'Rejected connection'
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index bf721e96d24..c1eb703a21f 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:14 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:04 jlam Exp $
 #
 
 DISTNAME=	yacas-1.0.57
@@ -13,7 +13,6 @@ USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	YES
-USE_X11=	YES
 USE_PERL5=	build
 
 TEST_TARGET=	test
@@ -37,4 +36,5 @@ post-install:
 .endfor
 
 .include "../../math/gsl/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/yorick/Makefile b/math/yorick/Makefile
index 390e49f51b3..fa512e71042 100644
--- a/math/yorick/Makefile
+++ b/math/yorick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/31 21:53:26 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:04 jlam Exp $
 
 DISTNAME=	yorick-1.6.02
 CATEGORIES=	math
@@ -10,7 +10,6 @@ HOMEPAGE=	ftp://ftp-icf.llnl.gov/pub/Yorick/doc/index.html
 COMMENT=	Numerical algebra system (similar to Matlab)
 
 WRKSRC=		${WRKDIR}/yorick-1.6
-USE_X11=        yes
 BUILD_DIRS=	${WRKSRC} ${WRKSRC}/doc
 INSTALL_DIRS=	${WRKSRC}
 
@@ -18,6 +17,8 @@ USE_MAKEINFO=	YES
 INFO_FILES=	yorick.info
 USE_TOOLS+=	gmake
 
+.include "../../mk/x11.buildlink3.mk"
+
 post-patch:
 	for f in ${WRKSRC}/ysite.sh; do				\
 	${SED} -e 's:@PREFIX@:${PREFIX}:g' $$f > $$f.tmp	\