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.

28 files changed, 43 insertions, 56 deletions

diff --git a/print/advi/Makefile b/print/advi/Makefile
index e6cd1aea21a..e95018478b3 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:27 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:08 jlam Exp $
 
 DISTNAME=		advi-1.6.0
 CATEGORIES=		print
@@ -15,7 +15,6 @@ BUILD_DEPENDS+=		ocaml>=3.04:../../lang/ocaml
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
-USE_X11=		yes
 
 post-extract:
 	@${CP} ${WRKSRC}/tex/*.eps ${WRKSRC}/doc
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 95c97a883c0..de9bece9dd7 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:06 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:09 jlam Exp $
 
 DISTNAME=	lyx-${LYX_VERS}
 PKGNAME=	cjk-${DISTNAME}
@@ -26,7 +26,6 @@ DEPENDS+=	teTeX-bin>=1.0.7nb1:../../print/teTeX-bin
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 USE_PERL5=		yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 1068dc52cc6..029ed64ffb3 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/05/22 20:08:27 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2005/06/01 18:03:09 jlam Exp $
 #
 
 DISTNAME=		ggv-2.8.4
@@ -17,7 +17,6 @@ USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 USE_TOOLS+=		gmake
-USE_X11=		YES
 
 GCONF2_SCHEMAS= 	ggv.schemas
 
diff --git a/print/ghostscript-esp/Makefile b/print/ghostscript-esp/Makefile
index 25bd8d52cc1..8ca3d605a42 100644
--- a/print/ghostscript-esp/Makefile
+++ b/print/ghostscript-esp/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2005/05/30 14:57:28 dillo Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:09 jlam Exp $
 
 PKGNAME=	ghostscript-esp-${GS_VERS}
 PKGREVISION=	4
 COMMENT=	ESP/CUPS Postscript interpreter
 
-USE_X11=		# defined
 CONFIGURE_ARGS+=	--with-x
 
+.include "../../mk/x11.buildlink3.mk"
 .include "Makefile.common"
diff --git a/print/ghostscript-gnu-x11/Makefile b/print/ghostscript-gnu-x11/Makefile
index e3d193bf151..691e0f435e2 100644
--- a/print/ghostscript-gnu-x11/Makefile
+++ b/print/ghostscript-gnu-x11/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/05/30 15:39:11 dillo Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:09 jlam Exp $
 
 PKGNAME=	ghostscript-gnu-x11-${GS_VERS}
 COMMENT=	GNU Postscript interpreter with X11 and image drivers only
 
-USE_X11=		YES
 CONFIGURE_ARGS+=	--with-x
 
 # Based on the definitions for the DEVICE_DEVS* from ${WRKSRC}/src/devs.mak,
@@ -19,4 +18,5 @@ MAKE_FLAGS+=	DEVICE_DEVS${N}=
 #
 MAKE_FLAGS+=	DEVICE_DEVS5="\$$(DD)ijs.dev"
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../ghostscript-gnu/Makefile.common"
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 34957e0c549..a8f62dfc37e 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2005/05/30 15:39:11 dillo Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:09 jlam Exp $
 
 PKGNAME=	ghostscript-gnu-${GS_VERS}
 COMMENT=	GNU Postscript interpreter with all drivers
 
-USE_X11=		YES
 CONFIGURE_ARGS+=	--with-x
 
+.include "../../mk/x11.buildlink3.mk"
 .include "Makefile.common"
diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index 913664f92f6..73c33d04bb7 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2005/05/30 14:57:28 dillo Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:09 jlam Exp $
 
 PKGNAME=	ghostscript-${GS_VERS}
 PKGREVISION=	5
 COMMENT=	Aladdin Postscript interpreter
 
-USE_X11=		YES
 GS_DISPLAY_DEVICE=	x11.dev
 XLIBS=			Xt SM ICE Xext X11
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../print/ghostscript-nox11/Makefile.common"
 
 MAKEFRAGS+=		${FILESDIR}/devs.x11
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index 052be3c6711..0eff7948f1d 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:28 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:09 jlam Exp $
 
 DISTNAME=	gimp-print-4.2.7
 PKGREVISION=	1
@@ -13,7 +13,6 @@ CONFLICTS+=	gimp<=1.2.3
 
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-samples --without-user-guide
 CONFIGURE_ARGS+=	--without-cups --without-translated-ppds
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index ef858184b9d..1b5f7943518 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.68 2005/06/01 18:03:09 jlam Exp $
 
 DISTNAME=		gnome-print-0.37
 CATEGORIES=		print gnome
@@ -10,7 +10,6 @@ COMMENT=		Prototype implementation of the Gnome Printing Architecture
 
 USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	YES
-USE_X11=		YES
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/print/gpdf/Makefile b/print/gpdf/Makefile
index 8c19d8a7b74..e28d135c190 100644
--- a/print/gpdf/Makefile
+++ b/print/gpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:28 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:09 jlam Exp $
 #
 
 DISTNAME=	gpdf-2.10.0
@@ -17,7 +17,6 @@ USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 GCONF2_SCHEMAS=		gpdf.schemas
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 5690dcbce63..b3574c057de 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/05/22 20:08:28 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2005/06/01 18:03:09 jlam Exp $
 
 DISTNAME=	gv-3.6.1
 CATEGORIES=	print
@@ -10,7 +10,6 @@ COMMENT=	PostScript and PDF previewer
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
-USE_X11=		yes
 
 USE_MAKEINFO=		yes
 TEXINFO_REQD=		4.2
diff --git a/print/imposter/Makefile b/print/imposter/Makefile
index bf1d8fb9bc2..969c4c8f2ca 100644
--- a/print/imposter/Makefile
+++ b/print/imposter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:28 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:09 jlam Exp $
 #
 
 DISTNAME=	imposter-0.2
@@ -15,7 +15,6 @@ BUILD_USES_MSGFMT=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/print/ja-ptex/Makefile b/print/ja-ptex/Makefile
index 468c6cc5942..f7057d4abbd 100644
--- a/print/ja-ptex/Makefile
+++ b/print/ja-ptex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/01/19 12:22:36 kei Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:20 jlam Exp $
 
 DISTNAME=	ja-ptex-1.0
 PKGREVISION=	1
@@ -14,7 +14,6 @@ DEPENDS+=	ja-jsclasses>=0.0.0.20021127:../../print/ja-jsclasses
 DEPENDS+=	ja-vfxdvik>=22.40v.j1.14:../../print/ja-vfxdvik
 DEPENDS+=	dvipdfmx>=0.0.0.20021230nb1:../../print/dvipdfmx
 
-USE_X11=	yes
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
@@ -24,4 +23,5 @@ MESSAGE_SRC=	${PKGDIR}/MESSAGE
 
 do-install:	# empty
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-vflib-utils/Makefile b/print/ja-vflib-utils/Makefile
index 51e1d1de577..484b53a8baf 100644
--- a/print/ja-vflib-utils/Makefile
+++ b/print/ja-vflib-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/03 15:15:07 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:20 jlam Exp $
 
 .include "../../print/ja-vflib-lib/Makefile.common"
 
@@ -8,11 +8,11 @@ COMMENT=	Utilities for manipulating VFlib vector font files
 
 BUILDLINK_DEPENDS.vflib=ja-vflib-lib>=${VFLIB_VERSION}
 
-USE_X11=		# defined
 CONFIGURE_ARGS+=	--enable-tools --with-x
 
 BUILD_TARGET=		build-tools
 INSTALL_TARGET=		install-tools
 
 .include "../../print/ja-vflib-lib/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-vflib/Makefile b/print/ja-vflib/Makefile
index 5ba17cfc5ac..f4ecc56a0b7 100644
--- a/print/ja-vflib/Makefile
+++ b/print/ja-vflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/10/28 11:48:24 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:20 jlam Exp $
 
 DISTNAME=		ja-vflib-${VFLIB_VERSION}
 VFLIB_VERSION=		2.24.2nb1
@@ -13,7 +13,6 @@ COMMENT=		Japanese Vector font libraries and utilities
 DEPENDS+=		ja-vflib-lib-${VFLIB_VERSION}:../../print/ja-vflib-lib
 DEPENDS+=		ja-vflib-utils-${VFLIB_VERSION}:../../print/ja-vflib-utils
 
-USE_X11=		# defined	# ja-vflib-utils uses X11
 
 EXTRACT_ONLY=		# empty
 NO_CHECKSUM=		# defined
@@ -22,4 +21,5 @@ NO_BUILD=		# defined
 
 do-install:		# empty
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile
index ef8e1c9999c..c80042377de 100644
--- a/print/ja-vfxdvik/Makefile
+++ b/print/ja-vfxdvik/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:28 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:20 jlam Exp $
 
 DISTNAME=	xdvik-${XDVIK_ORIGINAL_VERS}
 PKGNAME=	ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
@@ -26,7 +26,6 @@ DEPENDS+=	ja-ptex-bin>=3.1.2:../../print/ja-ptex-bin
 XDVI_DIR=	${WRKDIR}/${DISTNAME}/texk/xdvik
 
 USE_TOOLS+=		gmake
-USE_X11=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/config/config
 LIBTOOL_OVERRIDE=	klibtool
@@ -80,4 +79,5 @@ do-install:
 .include "../../print/ja-vflib-lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../fonts/t1lib/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index 4d6aeee9579..b78c73ca9e4 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/01/17 12:51:29 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:20 jlam Exp $
 
 DISTNAME=	lgrind
 PKGNAME=	lgrind-3.5
@@ -13,10 +13,11 @@ COMMENT=	Source pretty printer for LaTeX
 DEPENDS+=	teTeX>=1.0:../../print/teTeX
 
 WRKSRC=		${WRKDIR}/lgrind/source
-USE_X11=	yes
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 NO_CONFIGURE=	yes
 
+.include "../../mk/x11.buildlink3.mk"
+
 pre-patch:
 	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile-prepatch
 	${SED} -e '/Id/s|\$$||g' ${WRKSRC}/Makefile-prepatch > ${WRKSRC}/Makefile
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 6f201ede7d6..4a501e35477 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:28 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2005/06/01 18:03:20 jlam Exp $
 #
 
 DISTNAME=	libgnomeprint-2.10.3
@@ -14,7 +14,6 @@ BUILD_USES_MSGFMT=	YES
 
 USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	YES
-USE_X11=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 6bee92b222a..ec7da66f871 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/05/22 20:08:28 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/06/01 18:03:20 jlam Exp $
 #
 
 DISTNAME=	libgnomeprintui-2.10.2
@@ -15,7 +15,6 @@ BUILD_USES_MSGFMT=	YES
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake
-USE_X11=		YES
 USE_LIBTOOL=		YES
 
 PKGCONFIG_OVERRIDE=	libgnomeprintui/libgnomeprintui-2.2.pc.in
diff --git a/print/mp/Makefile b/print/mp/Makefile
index 70f3c293486..30f04a4a368 100644
--- a/print/mp/Makefile
+++ b/print/mp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:08 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:20 jlam Exp $
 #
 
 DISTNAME=	mpdist-3.7.1
@@ -13,7 +13,6 @@ COMMENT=	PostScript pretty printer
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_X11=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index a7f0f23e60c..5e5caff4cd5 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:28 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/06/01 18:03:20 jlam Exp $
 
 DISTNAME=	scribus-1.2.1
 CATEGORIES=	print
@@ -9,7 +9,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.scribus.net/
 COMMENT=	Publishing layout with graphical interface
 
-USE_X11=		# defined
 USE_TOOLS+=		gmake
 PTHREAD_OPTS+=		require
 
diff --git a/print/teTeX-bin/Makefile.common b/print/teTeX-bin/Makefile.common
index 7fc8e6103b4..bcbede64090 100644
--- a/print/teTeX-bin/Makefile.common
+++ b/print/teTeX-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/05/22 20:08:29 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/06/01 18:03:20 jlam Exp $
 
 TETEX_BIN_VERS=		2.0.2
 DIST_SUBDIR=		teTeX
@@ -8,7 +8,6 @@ INSTALL_TARGET=		install strip
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_PKGINSTALL=		yes
-USE_X11=		yes
 CFLAGS+=		-Dunix
 
 GNU_CONFIGURE=		yes
@@ -60,3 +59,4 @@ OWN_DIRS_PERMS+=	${TEXFONTSDIR}/tfm ${ROOT_USER} ${ROOT_GROUP} 1777
 .include "../../fonts/t1lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
diff --git a/print/teTeX1-bin/Makefile b/print/teTeX1-bin/Makefile
index e4735f41e62..c4eb101bdb5 100644
--- a/print/teTeX1-bin/Makefile
+++ b/print/teTeX1-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:29 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:20 jlam Exp $
 
 DISTNAME=	teTeX-src-1.0.7
 PKGNAME=	teTeX-bin-1.0.7
@@ -25,7 +25,6 @@ INSTALL_TARGET=		install strip
 USE_PKGINSTALL=		yes
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
-USE_X11=		yes
 CFLAGS+=		-Dunix
 
 INFO_FILES=		latex.info dvips.info web2c.info kpathsea.info
@@ -93,5 +92,6 @@ post-install:
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../www/libwww/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX1/Makefile b/print/teTeX1/Makefile
index 579a373e989..ad5041f640b 100644
--- a/print/teTeX1/Makefile
+++ b/print/teTeX1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:20 jlam Exp $
 #
 
 DISTNAME=	teTeX-1.0.7
@@ -15,7 +15,6 @@ DEPENDS+=	teTeX-bin-1.0.[7-9]*:../teTeX1-bin
 DEPENDS+=	teTeX-sharesrc-1.0.[1-9]*:../teTeX1-sharesrc
 DEPENDS+=	texi2html>=1.52:../../textproc/texi2html
 
-USE_X11=        yes
 EXTRACT_ONLY=   # empty
 NO_CHECKSUM=    yes
 NO_CONFIGURE=   yes
diff --git a/print/teTeX3-bin/Makefile.common b/print/teTeX3-bin/Makefile.common
index 5ee64ca05a7..b9b5b6ddf30 100644
--- a/print/teTeX3-bin/Makefile.common
+++ b/print/teTeX3-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/05/22 20:08:29 jlam Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/06/01 18:03:20 jlam Exp $
 
 TETEX_BIN_VERS=		3.0
 DIST_SUBDIR=		teTeX
@@ -8,7 +8,6 @@ INSTALL_TARGET=		install strip
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_PKGINSTALL=		yes
-USE_X11=		yes
 CFLAGS+=		-Dunix
 
 GNU_CONFIGURE=		yes
@@ -60,3 +59,4 @@ OWN_DIRS_PERMS+=	${TEXFONTSDIR}/tfm ${ROOT_USER} ${ROOT_GROUP} 1777
 .include "../../fonts/t1lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
diff --git a/print/texfamily/Makefile b/print/texfamily/Makefile
index 36edb9d9274..3954012ca5a 100644
--- a/print/texfamily/Makefile
+++ b/print/texfamily/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:29 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:20 jlam Exp $
 
 DISTNAME=	TeXfamily-1.2.1
 PKGREVISION=	5
@@ -40,7 +40,6 @@ PKGSRC_USE_TOOLS+=	gtar
 BUILD_TARGET=	all
 INSTALL_TARGET=	install strip
 USE_TOOLS+=	gmake
-USE_X11=	yes
 PLIST_SUBST+=	MV="${MV}"
 CFLAGS+=	-Dunix
 MAKEFLAGS+=	PREFIX=${PREFIX:Q}
@@ -83,6 +82,8 @@ TEXFAMILY_PTEXVERSION=	3.0.1
 TEXFAMILY_DVIPSVERSION=	1.5g
 TEXFAMILY_MENDEXVERSION=2.5
 
+.include "../../mk/x11.buildlink3.mk"
+
 pre-extract:
 	if [ ! -r ${WRKSRC} ]; then \
 		cd ../../print/teTeX1-bin && ${MAKE} patch; \
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index 26e8598a258..48478c2c780 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.37 2005/06/01 18:03:20 jlam Exp $
 
 DISTNAME=	xpdf-3.00
 PKGNAME=	${DISTNAME}pl3
@@ -22,7 +22,6 @@ DEPENDS+=	ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts
 CONFLICTS=	xpdf-crypto-[0-9]*
 
 USE_PKGINSTALL=		YES
-USE_X11=		YES
 USE_LANGUAGES=		c c++
 
 GNU_CONFIGURE=		YES
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 36aa5e7906b..9630e624c7d 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:29 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/06/01 18:03:20 jlam Exp $
 
 DISTNAME=	xpp-1.1
 PKGREVISION=	5
@@ -9,7 +9,6 @@ MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://cups.sourceforge.net/xpp/index.html
 COMMENT=	X Printing Panel
 
-USE_X11=	yes
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c++