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.

37 files changed, 68 insertions, 74 deletions

diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index 7e4c9fe69f8..18b46e4d1f8 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:57 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:46 jlam Exp $
 
 DISTNAME=	BasiliskII_src_14032003
 PKGNAME=	BasiliskII-1.0.20030314
@@ -16,13 +16,14 @@ WRKSRC=		${WRKDIR}/BasiliskII-1.0/src/Unix
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
-USE_X11=	yes
 
 CONFIGURE_ARGS+=	--without-gtk \
 			--without-esd \
 			--disable-fbdev-dga \
 			--without-mon
 
+.include "../../mk/x11.buildlink3.mk"
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/BasiliskII
 	${INSTALL_DATA} ${WRKSRC}/../../README ${PREFIX}/share/doc/BasiliskII/
diff --git a/emulators/aranym/Makefile b/emulators/aranym/Makefile
index e9a338d2182..2f3431d3ef8 100644
--- a/emulators/aranym/Makefile
+++ b/emulators/aranym/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:57 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:46 jlam Exp $
 #
 
 DISTNAME=		aranym-0.8.9beta
@@ -12,7 +12,6 @@ COMMENT=		Atari Running on Any Machine
 
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 WRKSRC=			${WRKDIR}/${DISTNAME}/src/Unix
 USE_TOOLS+=		gzip
diff --git a/emulators/arcem/Makefile b/emulators/arcem/Makefile
index d2ceb11d003..72e2f8a74b3 100644
--- a/emulators/arcem/Makefile
+++ b/emulators/arcem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:57 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:46 jlam Exp $
 #
 
 DISTNAME=	arcem-1.00-src
@@ -24,11 +24,12 @@ HOMEPAGE=	http://arcem.sourceforge.net/
 COMMENT=	Dave Gilbert's Acorn Archimedes emulator
 
 WRKSRC=		${WRKDIR}/arcem
-USE_X11=	# defined
 USE_TOOLS+=	gmake
 
 MAKE_ENV+=	SYSTEM=X
 
+.include "../../mk/x11.buildlink3.mk"
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/arcem
 	${INSTALL_DATA} ${WRKDIR}/linux.rom ${PREFIX}/share/arcem/ROM
diff --git a/emulators/atari800/options.mk b/emulators/atari800/options.mk
index 7a2d9ae3c16..17f99feade5 100644
--- a/emulators/atari800/options.mk
+++ b/emulators/atari800/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $
+# $NetBSD: options.mk,v 1.4 2005/06/01 18:02:46 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.atari800
 PKG_SUPPORTED_OPTIONS=	sdl x11
@@ -7,8 +7,8 @@ PKG_SUGGESTED_OPTIONS=	sdl
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mx11)
-USE_X11=		yes
 CONFIGURE_ARGS+=	--target=x11
+.include "../../mk/x11.buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Msdl)
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 05992b1ee8c..e8efe94790f 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/05/22 20:07:57 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2005/06/01 18:02:46 jlam Exp $
 
 DISTNAME=		bochs-2.1.1
 PKGREVISION=		1
@@ -50,7 +50,6 @@ CONFIGURE_ARGS+=	--enable-daz
 CONFIGURE_ARGS+=	--enable-sep
 .endif # !BOCHS_TINY
 CONFIGURE_ENV+=		CXXFLAGS="-I${X11BASE}/include ${CXXFLAGS}"
-USE_X11=		yes
 MANCOMPRESSED=		yes
 MAKE_ENV+=		GZIP_CMD=${GZIP_CMD:Q} \
 			GUNZIP_CMD=${GUNZIP_CMD:Q}
@@ -59,6 +58,8 @@ BOCHS_MAINDIR=		${PREFIX}/share/bochs
 BOCHS_BIOSDIR=		${BOCHS_MAINDIR}/bios
 BOCHS_FONTDIR=		${BOCHS_MAINDIR}/xfonts
 
+.include "../../mk/x11.buildlink3.mk"
+
 post-configure:
 	${MV} ${WRKSRC}/.bochsrc ${WRKSRC}/.bochsrc.BAK
 	${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' \
diff --git a/emulators/darcnes/Makefile b/emulators/darcnes/Makefile
index e3760548c0c..3338a4345ab 100644
--- a/emulators/darcnes/Makefile
+++ b/emulators/darcnes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/09/17 07:15:32 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:46 jlam Exp $
 
 PKGNAME=	darcnes-20010401
 PKGREVISION=	1
@@ -6,7 +6,6 @@ PKGREVISION=	1
 MAINTAINER=	wiz@NetBSD.org
 COMMENT=	Multi-system emulator (NES, SMS, GG, PCE, and others)
 
-USE_X11=	yes
 MAKE_ENV+=	TARGET=Linux_X
 
 do-install:
@@ -15,4 +14,5 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/readme ${PREFIX}/share/doc/darcnes
 
 .include "Makefile.common"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/dega/Makefile b/emulators/dega/Makefile
index 976d4c7d229..1f0d51e2758 100644
--- a/emulators/dega/Makefile
+++ b/emulators/dega/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:57 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:46 jlam Exp $
 #
 
 DISTNAME=	dega-1.07
@@ -13,7 +13,6 @@ COMMENT=	Sega Game Gear, Sega Mark III and Sega Master System emulator
 BUILD_DEPENDS=	nasm>=0.98:../../devel/nasm
 
 USE_TOOLS+=	gmake
-USE_X11=	yes
 
 # Uses i386 assembly code
 ONLY_FOR_PLATFORM=	*-*-i386
diff --git a/emulators/dgen/Makefile b/emulators/dgen/Makefile
index db39b764bae..02895381677 100644
--- a/emulators/dgen/Makefile
+++ b/emulators/dgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:57 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:47 jlam Exp $
 #
 
 DISTNAME=	dgen-sdl-1.23
@@ -16,7 +16,6 @@ DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
-USE_X11=	yes
 
 CONFIGURE_ARGS+=	--with-extra-opt
 
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index 7cb337935da..e39595906b0 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/03/13 16:43:20 uebayasi Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:47 jlam Exp $
 
 DISTNAME=	fMSX24.tar
 PKGNAME=	fmsx-2.4
@@ -17,7 +17,6 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 
 WRKSRC= 	${WRKDIR}/MSX
-USE_X11=	yes
 
 .include "../../mk/bsd.prefs.mk"
 USE_SUN_AUDIO?=	YES
@@ -30,6 +29,8 @@ DEFS+=		-DSUN_AUDIO
 
 MAKE_ENV=	DEFS="${DEFS}"
 
+.include "../../mk/x11.buildlink3.mk"
+
 post-extract:
 	@${RM} ${WRKSRC}/CMOS.ROM
 	@${CHMOD} -R a+r ${WRKSRC}
diff --git a/emulators/fuse-utils/Makefile b/emulators/fuse-utils/Makefile
index b6b84e90c16..819866c50a2 100644
--- a/emulators/fuse-utils/Makefile
+++ b/emulators/fuse-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:47 jlam Exp $
 
 DISTNAME=	fuse-utils-0.7.0
 PKGREVISION=	1
@@ -9,7 +9,6 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://fuse-emulator.sourceforge.net/
 COMMENT=	ZX Spectrum Emulator utilities
 
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 LIBS+=			-lgcrypt
@@ -18,5 +17,6 @@ LIBS+=			-lgpg-error
 .include "../../emulators/libspectrum/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libgpg-error/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index 41bb1923a0a..85759142b24 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:47 jlam Exp $
 
 DISTNAME=	fuse-0.7.0
 PKGREVISION=	1
@@ -10,7 +10,6 @@ HOMEPAGE=	http://fuse-emulator.sourceforge.net/
 COMMENT=	ZX Spectrum Emulator
 
 USE_PERL5=		build
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-gtk2
 LIBS+=	${LIBOSSAUDIO}
diff --git a/emulators/gcube/Makefile b/emulators/gcube/Makefile
index 82e42b76c7d..43c5cf291b6 100644
--- a/emulators/gcube/Makefile
+++ b/emulators/gcube/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:57 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:47 jlam Exp $
 #
 
 DISTNAME=		gcube-v0.2-src
@@ -15,7 +15,6 @@ COMMENT=		Opensource Nintendo GameCube(TM) emulator
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_TOOLS+=		gmake
-USE_X11=		yes
 WRKSRC=			${WRKDIR}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index 57061d67dd7..70638d25999 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/15 19:04:20 kristerw Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:47 jlam Exp $
 #
 
 DISTNAME=	generator-0.35
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.squish.net/generator/
 COMMENT=	Sega Mega drive genesis emulator
 
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 .if (${MACHINE_ARCH} == "i386")
diff --git a/emulators/gnuboy-sdl/Makefile b/emulators/gnuboy-sdl/Makefile
index a3ec803f675..d0a4ad0de86 100644
--- a/emulators/gnuboy-sdl/Makefile
+++ b/emulators/gnuboy-sdl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:47 jlam Exp $
 
 DISTNAME=	gnuboy-1.0.3
 PKGNAME=	${DISTNAME:S/-/-sdl-/}
@@ -11,7 +11,6 @@ HOMEPAGE=	http://gnuboy.unix-fu.org/
 COMMENT=	SDL port of Gameboy emulator
 
 GNU_CONFIGURE=	yes
-USE_X11=	yes
 CONFIGURE_ARGS+=--with-sdl
 
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile
index c3123567a4a..529ab030ee8 100644
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:47 jlam Exp $
 
 DISTNAME=	gnuboy-1.0.3
 PKGREVISION=	1
@@ -10,7 +10,8 @@ HOMEPAGE=	http://gnuboy.unix-fu.org/
 COMMENT=	Gameboy emulator
 
 GNU_CONFIGURE=	yes
-USE_X11=	yes
+
+.include "../../mk/x11.buildlink3.mk"
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnuboy
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index c7805c2babb..05ab2fdc6b9 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/31 11:21:41 dillo Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:47 jlam Exp $
 #
 
 DISTNAME=	gxemul-0.3.2
@@ -35,7 +35,6 @@ PKG_OPTIONS_LEGACY_OPTS+=	X11:x11
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mx11)
-USE_X11=		yes
 GLOBAL_LDFLAGS=		-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
 SUBST_CLASSES=		x11
 SUBST_STAGE.x11=	post-patch
@@ -45,4 +44,5 @@ SUBST_SED.x11=		-e "s|-L/usr/X11R6/lib|${GLOBAL_LDFLAGS}|g" \
 SUBST_MESSAGE.x11=	"Fixing X linking flags."
 .endif
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index b97d134714e..7acd088c26f 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:47 jlam Exp $
 
 DISTNAME=	hatari-0.60
 PKGREVISION=	1
@@ -10,7 +10,6 @@ HOMEPAGE=	http://hatari.sourceforge.net/
 COMMENT=	Atari ST emulator
 
 USE_TOOLS+=		gmake
-USE_X11=		YES
 GNU_CONFIGURE=		YES
 
 post-install:
diff --git a/emulators/minivmac/Makefile b/emulators/minivmac/Makefile
index bfcbafea6d0..dd2e997d03a 100644
--- a/emulators/minivmac/Makefile
+++ b/emulators/minivmac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:47 jlam Exp $
 
 DISTNAME=	minivmac-0.1.7.src
 PKGNAME=	minivmac-0.1.7
@@ -12,12 +12,13 @@ HOMEPAGE=	http://minivmac.sourceforge.net/
 COMMENT=	Miniature Macintosh emulator
 
 WRKSRC=		${WRKDIR}/minivmac
-USE_X11=	YES
 
 SCRIPTS_ENV+=	CC="${CC}"
 
 DOCDIR=		${PREFIX}/share/doc/html/minivmac
 
+.include "../../mk/x11.buildlink3.mk"
+
 do-build:
 	cd ${WRKSRC}/tool/bash; ${SETENV} ${SCRIPTS_ENV} ${SH} build
 
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 9e556e4b06d..31222fc483d 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:47 jlam Exp $
 #
 
 DISTNAME=		openmsx-0.5.0
@@ -12,7 +12,6 @@ COMMENT=		MSX emulator that aims for perfection
 
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
-USE_X11=		yes
 HAS_CONFIGURE=		yes
 
 MAKEFILE=		GNUmakefile
diff --git a/emulators/osf1_lib/Makefile b/emulators/osf1_lib/Makefile
index c3925237d28..49cb5965c2f 100644
--- a/emulators/osf1_lib/Makefile
+++ b/emulators/osf1_lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/25 12:11:23 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:47 jlam Exp $
 
 DISTNAME=	netscape-4.7-3.alpha
 PKGNAME=	osf1_lib-1.1
@@ -34,7 +34,7 @@ RPMARGS=	-i usr/lib -i usr/bin ${DISTDIR}/${DISTFILES}
 CHECK_SHLIBS=	no
 SHLIB_HANDLING=	no
 
-USE_X11=	yes
+.include "../../mk/x11.buildlink3.mk"
 
 do-install:
 	${RM} -f ${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index 0c67878c750..1d859df1ede 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:47 jlam Exp $
 #
 
 DISTNAME=	emulator_src_${POSE_VERSION}
@@ -33,7 +33,6 @@ CONFIGURE_DIRS=	${POSE_BUILD_DIR}
 BUILD_DIRS=	${POSE_BUILD_DIR}
 
 USE_PERL5=	build
-USE_X11=	YES
 USE_TOOLS+=	gmake
 
 GNU_CONFIGURE=	YES
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index d93c983286f..3c4556bb419 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/03/24 21:12:54 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:47 jlam Exp $
 
 DISTNAME=	pcemu1.01alpha
 PKGNAME=	pcemu-1.01a
@@ -10,9 +10,10 @@ MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/ \
 MAINTAINER=	eric@fox.phoenix.az.us
 COMMENT=	8086 PC emulator, by David Hedley
 
-USE_X11=	yes
 MAKE_ENV+=	FILESDIR=${FILESDIR}
 
+.include "../../mk/x11.buildlink3.mk"
+
 do-configure:
 	cd ${WRKSRC};							\
 		${MKDIR} ${WRKSRC}/bootstrap;				\
diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile
index c35ad95830b..7e0da592531 100644
--- a/emulators/pearpc/Makefile
+++ b/emulators/pearpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:47 jlam Exp $
 #
 
 DISTNAME=		pearpc-0.3.1
@@ -14,7 +14,6 @@ COMMENT=		PowerPC emulator
 GNU_CONFIGURE=		yes
 USE_LANGUAGES+=		c++
 USE_PKGINSTALL=		yes
-USE_X11=		yes
 
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES=		${EGDIR}/ppccfg.example ${PKG_SYSCONFDIR}/ppccfg.conf
@@ -59,4 +58,5 @@ CONFIGURE_ARGS+=	--enable-ui=sdl
 .endif
 
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 5c6f3dd2a34..7b939095c90 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:47 jlam Exp $
 #
 
 DISTNAME=		qemu-0.7.0
@@ -13,7 +13,6 @@ CONFLICTS+=		qemu-bin-*
 NOT_FOR_PLATFORM=	NetBSD-1.[0-6]*-*
 
 USE_TOOLS+=		gmake
-USE_X11=		yes
 HAS_CONFIGURE=		yes
 
 GCC_REQD+=		3.0
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index 73e899d04f4..1f9c18d5359 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:48 jlam Exp $
 #
 
 DISTNAME=	raines-0.40.2
@@ -16,7 +16,6 @@ BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 
 WRKSRC=		${WRKDIR}/raine
 USE_TOOLS+=	gmake
-USE_X11=	yes
 MAKEFILE=	makefile
 MAKE_ENV+=	OSTYPE=linux
 USE_PERL5=	run
@@ -38,4 +37,5 @@ pre-install:
 .include "../../devel/allegro/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 2b2e1749282..d9356155faf 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:48 jlam Exp $
 
 DISTNAME=		s9xs139
 PKGNAME=		snes9x-1.39
@@ -15,7 +15,6 @@ BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
 WRKSRC=			${WRKDIR}/release
 USE_TOOLS+=		gmake
-USE_X11=		yes
 PTHREAD_OPTS=		require
 
 do-install:
@@ -62,4 +61,5 @@ MAKE_ENV+=	USBHID_H=1
 .endif
 
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
index 4e969c6551c..27331a32e3b 100644
--- a/emulators/tuxnes/Makefile
+++ b/emulators/tuxnes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:48 jlam Exp $
 #
 
 DISTNAME=		tuxnes-0.75
@@ -13,7 +13,6 @@ COMMENT=		NES emulator
 ONLY_FOR_PLATFORM=	*-*-i386
 
 USE_TOOLS+=		gmake
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 SUBST_CLASSES+=		dsp
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index dfc1823ef09..9435be743db 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:48 jlam Exp $
 #
 
 DISTNAME=		twin-src-3.1.14
@@ -14,11 +14,12 @@ COMMENT=		Cross-platform implementation of the win32 api
 WRKSRC=			${WRKDIR}/twin
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
-USE_X11=		yes
 BUILD_TARGET=		depend world
 AUTOCONF_REQD=		2.13
 CONFIGURE_ARGS=		--enable-debugger
 
+.include "../../mk/x11.buildlink3.mk"
+
 pre-configure:
 	cd ${WRKSRC} && ${AUTORECONF} --force
 
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index bd1c8403435..b8c3f2572fa 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/05/22 20:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/06/01 18:02:48 jlam Exp $
 
 DISTNAME=	uae-0.8.22
 PKGREVISION=	2
@@ -13,7 +13,6 @@ COMMENT=	The UAE Amiga Emulator
 DEPENDS=	unzip>=5.40:../../archivers/unzip
 
 USE_TOOLS+=	gmake
-USE_X11=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--enable-dga --enable-vidmode
@@ -26,6 +25,7 @@ CONFIGURE_ARGS+=	--disable-ui
 .endif
 
 .include "../../mk/compiler.mk"
+.include "../../mk/x11.buildlink3.mk"
 
 .if !empty(CC_VERSION:Mgcc-3.*)
 post-configure:
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 69f4c68cb5d..5b3f60142e1 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2005/05/31 10:01:36 dillo Exp $
+# $NetBSD: Makefile,v 1.57 2005/06/01 18:02:48 jlam Exp $
 #
 
 DISTNAME=		vice-1.16
@@ -21,7 +21,6 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
 USE_PKGLOCALEDIR=	YES
-USE_X11=		YES
 USE_TOOLS+=		gmake
 USE_LANGUAGES+=		c c++
 GNU_CONFIGURE=		YES
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index e09f7a2a15b..830d11a7480 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2005/05/31 21:42:04 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2005/06/01 18:02:48 jlam Exp $
 
 DISTNAME=	Wine-20050524
 PKGNAME=	${DISTNAME:S/W/w/}
@@ -21,7 +21,6 @@ ONLY_FOR_PLATFORM+=	FreeBSD*-i386 Linux*-i386 SunOS*-i386 Darwin*-i386
 WRKSRC=		 	${WRKDIR}/${DISTNAME:S/W/w/}
 USE_TOOLS+=		bison gmake
 USE_LIBTOOL=		yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-curses --disable-trace #--disable-debug
 CONFIGURE_ENV+=		ac_cv_path_ARTSCCONFIG=${TRUE}
@@ -57,4 +56,5 @@ post-install:
 
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xcopilot/Makefile b/emulators/xcopilot/Makefile
index 045effa4188..735a3620afa 100644
--- a/emulators/xcopilot/Makefile
+++ b/emulators/xcopilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:48 jlam Exp $
 #
 
 DISTNAME=		xcopilot-0.6.6
@@ -12,7 +12,6 @@ COMMENT=		PalmPilot emulator for X
 NOT_FOR_PLATFORM=	*-*-alpha	# suspected LP64 bugs
 
 GNU_CONFIGURE=		YES
-USE_X11=		YES
 
 post-extract:
 	${RM} -f ${WRKSRC}/mc68k/custom.c
diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile
index 3ec511aa20c..49d094ebdd5 100644
--- a/emulators/xm7/Makefile
+++ b/emulators/xm7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/05 10:16:30 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:48 jlam Exp $
 #
 
 DISTNAME=		xm71010s
@@ -24,7 +24,8 @@ EXTRACT_CMD=		lha xqt ${DOWNLOADED_DISTFILE}
 WRKSRC=			${WRKDIR}/vm
 NO_CONFIGURE=		yes
 MAKEFILE=		makefile.x11
-USE_X11=		yes
+
+.include "../../mk/x11.buildlink3.mk"
 
 post-extract:
 	@cd ${WRKDIR}; ${MV} linux/* vm
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 2325007e91b..81775bd9edc 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2005/05/22 20:07:59 jlam Exp $
+# $NetBSD: Makefile,v 1.130 2005/06/01 18:02:48 jlam Exp $
 #
 
 DISTNAME=		xmame-0.96
@@ -15,7 +15,6 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
 USE_PKGINSTALL=		YES
-USE_X11=		YES
 USE_TOOLS+=		gmake
 MAKEFILE=		makefile.unix
 TARGET=			${PKGBASE}
@@ -115,4 +114,5 @@ do-install:
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index f8ebce328c6..1b60623371c 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2005/05/22 20:07:59 jlam Exp $
+# $NetBSD: Makefile,v 1.70 2005/06/01 18:02:48 jlam Exp $
 #
 
 DISTNAME=		xmame-0.96
@@ -16,7 +16,6 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
 USE_PKGINSTALL=		YES
-USE_X11=		YES
 USE_TOOLS+=		gmake
 MAKEFILE=		makefile.unix
 TARGET=			${PKGBASE}
@@ -110,4 +109,5 @@ do-install:
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xtrs/Makefile b/emulators/xtrs/Makefile
index fd42a7d78c3..9df68ab20b4 100644
--- a/emulators/xtrs/Makefile
+++ b/emulators/xtrs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:48 jlam Exp $
 #
 
 DISTNAME=	xtrs-4.9
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	${MASTER_SITES}
 COMMENT=	TRS-80 Model I/III/4 Emulator for Unix
 
-USE_X11=	yes
 
 BUILD_TARGET=	default
 
@@ -31,4 +30,5 @@ post-install:
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 033ac4f1720..65bf35fe037 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/05/22 20:07:59 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:48 jlam Exp $
 #
 
 DISTNAME=		zsnes142src
@@ -20,7 +20,6 @@ BUILD_TARGET=		zsnes
 WRKSRC=			${WRKDIR}/zsnes_1_42/src
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
-USE_X11=		yes
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"