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.

10 files changed, 15 insertions, 22 deletions

diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index f59460fafe6..0f4b5dd33d6 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/05/22 20:07:40 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:40 jlam Exp $
 #
 
 DISTNAME=	dinotrace-9.2a
@@ -12,7 +12,6 @@ COMMENT=	Tool for viewing the output of digital simulators
 GNU_CONFIGURE=		YES
 INFO_FILES=		dinotrace.info
 USE_PERL5=		build
-USE_X11=		YES
 USE_TOOLS+=		gmake
 
 .include "../../mk/motif.buildlink3.mk"
diff --git a/cad/electric/Makefile b/cad/electric/Makefile
index fd68d1a519f..df681bcb47c 100644
--- a/cad/electric/Makefile
+++ b/cad/electric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:40 jlam Exp $
 #
 
 DISTNAME=	electric-7.00
@@ -9,7 +9,6 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/electric/electric.html
 COMMENT=	Electrical CAD system
 
-USE_X11=		YES
 GNU_CONFIGURE=		YES
 
 post-patch:
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index 7171796564d..9569a9bfa66 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:40 jlam Exp $
 #
 
 #DISTNAME=		gtkwave-2.0.0pre3
@@ -13,7 +13,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.cs.man.ac.uk/apt/tools/gtkwave/index.html
 COMMENT=		Electronic waveform viewer
 
-USE_X11=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 7813ab03aef..b0472449fcf 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:40 jlam Exp $
 #
 
 DISTNAME=	magic-7.1
@@ -11,9 +11,10 @@ HOMEPAGE=	http://vlsi.cornell.edu/magic/
 COMMENT=	Integrated circuit layout system
 
 USE_TOOLS+=	gmake
-USE_X11=	YES
 MAKE_ENV+=	MAGIC_HOME=${PREFIX}
 
+.include "../../mk/x11.buildlink3.mk"
+
 post-patch:
 	cd ${WRKSRC} && for f in `${FIND} . -type f -exec ${GREP} -l CAD_HOME {} /dev/null \;` ; do \
 		${ECHO} "Replacing CAD_HOME in $$f" ; \
diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile
index 498e7f0e44f..d12deed0572 100644
--- a/cad/ng-spice/Makefile
+++ b/cad/ng-spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:40 jlam Exp $
 #
 
 DISTNAME=	ng-spice-rework-15c
@@ -11,7 +11,6 @@ HOMEPAGE=	http://ngspice.sourceforge.net/
 COMMENT=	Next generation circuit simulation program
 
 WRKSRC=			${WRKDIR}/ng-spice-rework-15
-USE_X11=		YES
 USE_LIBTOOL=		YES
 USE_MAKEINFO=		YES
 USE_TOOLS+=		gmake
@@ -20,11 +19,12 @@ USE_GNU_READLINE=	uses rl_* interface
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--with-readline
-LIBS+=			${LIBGETOPT}
+LIBS+=			${BUILDLINK_LDADD.getopt}
 
 INFO_FILES=	ngspice.info
 
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/pcb-current/Makefile b/cad/pcb-current/Makefile
index 376e668a320..beb8bc8ab4d 100644
--- a/cad/pcb-current/Makefile
+++ b/cad/pcb-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/22 20:28:47 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:40 jlam Exp $
 #
 
 DISTNAME=	pcb-${SNAPDATE}
@@ -20,7 +20,6 @@ SNAPDATE=		20050315
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		bison gm4 gmake lex
 TOOLS_DEPMETHOD.gm4=	DEPENDS
-USE_X11=		yes
 
 INFO_FILES=	pcb.info
 
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 89eb4b57d9b..6a604435d8e 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:40 jlam Exp $
 
 DISTNAME=		qcad-1.5.4-src
 PKGNAME=		qcad-1.5.4
@@ -11,7 +11,6 @@ HOMEPAGE=		http://www.qcad.org/
 COMMENT=		2D CAD System
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-USE_X11=		# defined
 MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 MAKE_ENV+=		QTDIR=${BUILDLINK_PREFIX.qt3}
 
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 5d95e934c8a..a72df8adb3d 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/06/01 18:02:40 jlam Exp $
 
 DISTNAME=	sp3f4.kit
 PKGNAME=	spice-3f5.1
@@ -13,7 +13,6 @@ COMMENT=	General-purpose circuit simulation program
 
 
 WRKSRC=			${WRKDIR}
-USE_X11=		# defined
 # GPL license used by GNU readline is not compatible
 # with 4 clause BSD license used by spice.
 #BUILDLINK_DEPENDS.readline=	readline>=4.0
@@ -64,4 +63,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/*.cir ${PREFIX}/share/examples/spice3
 
 #.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index 9c3f9b69975..ab04bb7858b 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2005/06/01 18:02:41 jlam Exp $
 #
 
 DISTNAME=	ViPEC-3.2.0
@@ -9,7 +9,6 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://vipec.sourceforge.net/
 COMMENT=	Network analyser for electrical networks
 
-USE_X11=		yes
 USE_TOOLS+=		gmake
 UNLIMIT_RESOURCES+=	datasize
 
diff --git a/cad/xchiplogo/Makefile b/cad/xchiplogo/Makefile
index 02ba695a1a7..c5913404dc0 100644
--- a/cad/xchiplogo/Makefile
+++ b/cad/xchiplogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:41 jlam Exp $
 #
 
 DISTNAME=	xchiplogo
@@ -11,8 +11,6 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.eleceng.adelaide.edu.au/Personal/moini/chiplogo.html
 COMMENT=	Program for generating pretty logos on VLSI chips
 
-USE_X11=	YES
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xchiplogo ${LOCALBASE}/bin/xchiplogo