Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references

to ${X11BASE} in the header and library search paths into references to ${LOCALBASE}/share/x11-links. These packages should now be strongly- buildlinked regardless of whether xpkgwedge is installed. Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
author: jlam <jlam> 2001-08-29 22:41:00 +0000
committer: jlam <jlam> 2001-08-29 22:41:00 +0000
commit: b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae (patch)
tree: 0943c3791afa0b712d3818b69672014acfe55e03
parent: 68d93d0286e46619b54c9d917dbf553bc889a6e5 (diff)
download: pkgsrc-b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae.tar.gz
160 files changed, 544 insertions, 364 deletions
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index caf6a689c4f..33c0613e2d2 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2001/08/24 08:43:13 lukem Exp $
+# $NetBSD: Makefile,v 1.42 2001/08/29 22:41:00 jlam Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp
 
 DISTNAME=		gqmpeg-0.9.0
@@ -30,4 +30,5 @@ pre-install:
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../graphics/gdk-pixbuf/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 2bb15d71894..34f0af599c0 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/07/16 19:50:50 nra Exp $
+# $NetBSD: Makefile,v 1.23 2001/08/29 22:41:01 jlam Exp $
 #
 
 DISTNAME=		snd
@@ -27,4 +27,5 @@ do-install:
 
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../x11/lesstif/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/snd/distinfo b/audio/snd/distinfo
index b16561dc4b3..3a26f7cfa5f 100644
--- a/audio/snd/distinfo
+++ b/audio/snd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/06/30 21:14:10 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/08/29 22:41:01 jlam Exp $
 
 SHA1 (snd.tar.gz) = cb48922170602f30553b604bda039974c1706b65
 Size (snd.tar.gz) = 735422 bytes
@@ -6,7 +6,7 @@ SHA1 (patch-aa) = 3aa0e5bcc54730628d220515919d8dbf11951c1a
 SHA1 (patch-ab) = de7027da166eda24e9f19c8ffc86192027e7eee1
 SHA1 (patch-ac) = d3073b7d102abcd05d7588b57eb8a053f20b74a7
 SHA1 (patch-ad) = 19a185e3e5a9800e56c904c06613b5d9645e6d17
-SHA1 (patch-ae) = c4b33c31fb70107f0501228f3c1f66512febd945
+SHA1 (patch-ae) = 3366a8151ceab8a835e18417d61cb5d8a62d4bd0
 SHA1 (patch-af) = a8cf1931093397bcf88be08d36bd11efd9d4c161
 SHA1 (patch-ag) = 7a19ce85c0c45ef2844ca22bca74de9238aa3ad1
 SHA1 (patch-ah) = f744861a8736e4acf498a751b42708e0922d5ff2
diff --git a/audio/snd/patches/patch-ae b/audio/snd/patches/patch-ae
index d9c10022176..fbe7108bd83 100644
--- a/audio/snd/patches/patch-ae
+++ b/audio/snd/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.7 2001/06/30 21:14:10 jlam Exp $
+$NetBSD: patch-ae,v 1.8 2001/08/29 22:41:01 jlam Exp $
 
 --- makefile.netbsd.orig	Mon Aug  9 19:22:24 1999
 +++ makefile.netbsd	Mon Aug  9 19:25:36 1999
@@ -6,8 +6,8 @@ $NetBSD: patch-ae,v 1.7 2001/06/30 21:14:10 jlam Exp $
 +# Snd make file for NetBSD, assuming Motif is available (audio currently stubbed out)
 +
 +#CC = gcc
-+#CFLAGS = -O2 -DXPM -DHAVE_OSS -I${X11BASE}/include -I${BUILDLINK_DIR}/include
-+CFLAGS += -DXPM -DHAVE_OSS -I${X11BASE}/include -I${BUILDLINK_DIR}/include
++#CFLAGS = -O2 -DXPM -DHAVE_OSS -I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include
++CFLAGS += -DXPM -DHAVE_OSS -I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include
 +CFLAGS += -g
 +
 +LIBS = ${LDFLAGS} -lMrm -lXm -lXpm -lXmu -lSM -lXt -lXext -lX11 -lm -lossaudio
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 00a3e03d875..6ef0f15b147 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/07/24 10:39:01 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:01 jlam Exp $
 #
 
 DISTNAME=	WSoundServer-0.4.0
@@ -18,15 +18,6 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == SunOS)
-CPPFLAGS+=	-I${X11BASE}/include
-MAKE_ENV+=	OSSAUDIO_LIBS=
-.else
-MAKE_ENV+=	OSSAUDIO_LIBS=-lossaudio
-.endif
-
 post-patch:
 	@cd ${WRKSRC}/doc && for f in *; do				\
 		${SED} "s/1x/1/g" $$f > $$f.tmp && ${MV} $$f.tmp $$f;	\
@@ -46,4 +37,5 @@ post-install:
 .include "../../devel/libdockapp/buildlink.mk"
 .include "../../wm/windowmaker/buildlink.mk"
 .include "../../mk/ossaudio.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/wsoundserver/distinfo b/audio/wsoundserver/distinfo
index 351e6025807..f9cafd34f62 100644
--- a/audio/wsoundserver/distinfo
+++ b/audio/wsoundserver/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/07/24 10:39:01 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/08/29 22:41:02 jlam Exp $
 
 SHA1 (WSoundServer-0.4.0.tar.gz) = b414025f0f19e66cd9146546ecf634564941b1e4
 Size (WSoundServer-0.4.0.tar.gz) = 147044 bytes
-SHA1 (patch-ac) = a8968a49ad6d2e3ae755e7f980704819c15d9654
+SHA1 (patch-ac) = 8595912bdc913dae46c82bc3a59fc96318350982
 SHA1 (patch-ad) = 998cc4b2f87c4bce4d8c32e42aa9c06134633252
 SHA1 (patch-ae) = 3a008dc50f6e78070ceb78b1f564d7c94be2dfea
 SHA1 (patch-af) = 1ea20d0e00d19a2c23bb8e07cdf182e43db28ca8
diff --git a/audio/wsoundserver/patches/patch-ac b/audio/wsoundserver/patches/patch-ac
index 9cc9c7ae240..40a70bb48f9 100644
--- a/audio/wsoundserver/patches/patch-ac
+++ b/audio/wsoundserver/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2001/07/07 17:15:06 tron Exp $
+$NetBSD: patch-ac,v 1.3 2001/08/29 22:41:02 jlam Exp $
 
 --- wslib/Makefile.in.orig	Fri Mar 31 22:10:25 2000
 +++ wslib/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.2 2001/07/07 17:15:06 tron Exp $
  
  libwsound.la: $(libwsound_la_OBJECTS) $(libwsound_la_DEPENDENCIES)
 -	$(LINK) -rpath $(libdir) $(libwsound_la_LDFLAGS) $(libwsound_la_OBJECTS) $(libwsound_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(libdir) $(libwsound_la_LDFLAGS) $(libwsound_la_OBJECTS) $(libwsound_la_LIBADD) $(LIBS) $(OSSAUDIO_LIBS)
++	$(LINK) -rpath $(libdir) $(libwsound_la_LDFLAGS) $(libwsound_la_OBJECTS) $(libwsound_la_LIBADD) $(LIBS) ${LIBOSSAUDIO}
  
  mostlyclean-noinstPROGRAMS:
  
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index c8a583656d5..d94c399d064 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/08/23 13:57:57 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:03 jlam Exp $
 #
 
 DISTNAME=		xmms-crossfade-0.2.9
@@ -13,7 +13,6 @@ COMMENT=		Crossfading/Gapless Plugin for XMMS
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_X11=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 LDFLAGS+=		${LIBOSSAUDIO}
@@ -21,4 +20,5 @@ CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 
 .include "../../audio/xmms/buildlink.mk"
 .include "../../mk/ossaudio.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dflowers/Makefile b/audio/xmms-dflowers/Makefile
index 3dd0e0c1abd..1553548a853 100644
--- a/audio/xmms-dflowers/Makefile
+++ b/audio/xmms-dflowers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/08/23 13:54:51 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/08/29 22:41:03 jlam Exp $
 #
 
 DISTNAME=	dflowers-1.2
@@ -11,9 +11,9 @@ HOMEPAGE=	http://hem.passagen.se/joakime/linuxapp.html
 COMMENT=	XMMS plugin for dual flower scope
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dscope/Makefile b/audio/xmms-dscope/Makefile
index 38be48c30eb..1ddf744480a 100644
--- a/audio/xmms-dscope/Makefile
+++ b/audio/xmms-dscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/08/17 21:16:48 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:03 jlam Exp $
 #
 
 DISTNAME=	dscope-1.2
@@ -11,11 +11,11 @@ HOMEPAGE=	http://hem.passagen.se/joakime/linuxapp.html
 COMMENT=	XMMS plugin for dual scope
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL=		YES
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dspectogram/Makefile b/audio/xmms-dspectogram/Makefile
index b278390a591..d75b1ed34cf 100644
--- a/audio/xmms-dspectogram/Makefile
+++ b/audio/xmms-dspectogram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/08/17 21:16:48 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:03 jlam Exp $
 #
 
 DISTNAME=	dspectogram-1.2
@@ -11,11 +11,11 @@ HOMEPAGE=	http://hem.passagen.se/joakime/linuxapp.html
 COMMENT=	XMMS plugin for dual spectogram
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL=		YES
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dspectralizer/Makefile b/audio/xmms-dspectralizer/Makefile
index 33f38c6bc15..79852adb425 100644
--- a/audio/xmms-dspectralizer/Makefile
+++ b/audio/xmms-dspectralizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/08/23 14:07:52 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:03 jlam Exp $
 #
 
 DISTNAME=	dspectral-1.2
@@ -11,11 +11,11 @@ HOMEPAGE=	http://hem.passagen.se/joakime/linuxapp.html
 COMMENT=	XMMS plugin for dual spectral analyzer
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=		YES
 USE_LIBTOOL=		YES
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-gdancer/Makefile b/audio/xmms-gdancer/Makefile
index 3f29a107904..6539f987c5a 100644
--- a/audio/xmms-gdancer/Makefile
+++ b/audio/xmms-gdancer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/23 14:07:32 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:04 jlam Exp $
 #
 
 DISTNAME=	gdancer-0.4.3
@@ -12,9 +12,9 @@ COMMENT=	XMMS plugin to animate characters to the beat of the music
 
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
-USE_X11=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-neato/Makefile b/audio/xmms-neato/Makefile
index 3c6a674a4f5..22404578f0c 100644
--- a/audio/xmms-neato/Makefile
+++ b/audio/xmms-neato/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/18 05:02:21 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2001/08/29 22:41:04 jlam Exp $
 #
 
 DISTNAME=	neato
@@ -12,7 +12,6 @@ COMMENT=	Circle effect XMMS plugin
 
 GNU_CONFIGURE=	yes
 USE_BUILDLINK_ONLY=	yes
-USE_X11=	yes
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
@@ -33,4 +32,5 @@ post-extract:
 		${MAKE} distclean
 
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-vismsa/Makefile b/audio/xmms-vismsa/Makefile
index cc2c79fe4d5..162721ee686 100644
--- a/audio/xmms-vismsa/Makefile
+++ b/audio/xmms-vismsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/18 02:52:20 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2001/08/29 22:41:04 jlam Exp $
 #
 
 DISTNAME=	vismsa-xmms-plugin-0.2
@@ -11,11 +11,11 @@ HOMEPAGE=	http://a.godau.org/
 COMMENT=	vis plugin similar to the Spectrum Analyser from Open Cubic Player
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL=		YES
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index 2871493d25a..f4d82d0c42b 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2001/08/11 20:51:24 fredb Exp $
+$NetBSD: distinfo,v 1.7 2001/08/29 22:41:02 jlam Exp $
 
 SHA1 (xmms-1.2.5.tar.gz) = 64d64a6db0b08ba91a135229437c384da7dba1e5
 Size (xmms-1.2.5.tar.gz) = 2414840 bytes
@@ -12,8 +12,8 @@ SHA1 (patch-ai) = d05ba576dc40dd29d59c571fbab369d83fbe0b06
 SHA1 (patch-aj) = 95e965c5033dea5d2b0be2a22058f19504da0031
 SHA1 (patch-ak) = 9c89fc3014c1109b14f56c4bdaae7782f2531529
 SHA1 (patch-al) = 3150ee9972911c5152f14a0771d9e9a2cbcb107f
-SHA1 (patch-am) = 3f44eb6ea71c47133482142f4d18ff60c230763c
-SHA1 (patch-an) = 9055b76be68766955311b8f388afd60c604c0c34
+SHA1 (patch-am) = 0de11b998fcf90f64c2e8442edc427e3bc49653c
+SHA1 (patch-an) = 2a622693d825c631e36f73bc35a9639c40071564
 SHA1 (patch-ao) = 428e1083a104358d752ddc483310a97764cb6979
 SHA1 (patch-ap) = 493a4d81960b4d11548b8f277c00b8315339ac02
 SHA1 (patch-aq) = 3eb19fbebfc0ea68cd6703b6b3d1a706406b1aee
diff --git a/audio/xmms/patches/patch-am b/audio/xmms/patches/patch-am
index 9d5f03c5cfe..a084ab3823d 100644
--- a/audio/xmms/patches/patch-am
+++ b/audio/xmms/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2001/05/20 20:52:24 rh Exp $
+$NetBSD: patch-am,v 1.3 2001/08/29 22:41:02 jlam Exp $
 
 --- Output/OSS/Makefile.in.orig	Tue Nov 28 01:56:02 2000
 +++ Output/OSS/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.2 2001/05/20 20:52:24 rh Exp $
  
  libOSS_la_LDFLAGS = $(ossldflags)
 -libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@
-+libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ -lossaudio
++libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ ${LIBOSSAUDIO}
  libOSS_la_SOURCES = $(osssources)
  INCLUDES = @GTK_CFLAGS@ @OSS_CFLAGS@ -I$(top_builddir)/intl
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/audio/xmms/patches/patch-an b/audio/xmms/patches/patch-an
index e5e0dd06eb9..e17529159d3 100644
--- a/audio/xmms/patches/patch-an
+++ b/audio/xmms/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.3 2001/06/21 16:38:34 rh Exp $
+$NetBSD: patch-an,v 1.4 2001/08/29 22:41:02 jlam Exp $
 
 --- Input/cdaudio/Makefile.in.orig	Mon Jun 18 21:55:46 2001
 +++ Input/cdaudio/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-an,v 1.3 2001/06/21 16:38:34 rh Exp $
  INCLUDES = @GTK_CFLAGS@ @XML_CFLAGS@ -I$(top_buiddir)/intl
  libcdaudio_la_LDFLAGS = $(cdaudioldflags)
 -libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@
-+libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@ -lossaudio
++libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@ ${LIBOSSAUDIO}
  libcdaudio_la_SOURCES = $(cdaudiosources)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h ../../xmms/i18n.h
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 815cac61a3a..821f6e5776f 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/06/26 18:32:26 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/08/29 22:41:04 jlam Exp $
 #
 
 DISTNAME=	xsidplay-1_5_4
@@ -27,4 +27,5 @@ do-install:
 
 .include "../../audio/libsidplay/buildlink.mk"
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index 838b808f75d..eebc4dc777c 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/08/23 04:26:51 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/08/29 22:41:04 jlam Exp $
 
 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
@@ -38,4 +38,5 @@ post-install:
 
 .include "../../devel/readline/buildlink.mk"
 .include "../../mk/xaw.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/felt/distinfo b/cad/felt/distinfo
index d3c5ef60171..328c450c426 100644
--- a/cad/felt/distinfo
+++ b/cad/felt/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2001/08/23 04:26:51 jlam Exp $
+$NetBSD: distinfo,v 1.7 2001/08/29 22:41:05 jlam Exp $
 
 SHA1 (felt-3.05.src.tar.gz) = da3e1ced626cc1c65a570d3e6e242252c039c28b
 Size (felt-3.05.src.tar.gz) = 956901 bytes
 SHA1 (felt-3.05.ps.gz) = 10fbac9927fe20cec3884d989204fe1a92d61784
 Size (felt-3.05.ps.gz) = 626985 bytes
-SHA1 (patch-aa) = fbf4c14dec40fc1e5aa5009625c6465bc8d763ab
+SHA1 (patch-aa) = d04579e0f1801341391a551ae797358089cff91a
 SHA1 (patch-ab) = 60feea9b0b0af2b71b2a8780227eccbd223b12c5
diff --git a/cad/felt/patches/patch-aa b/cad/felt/patches/patch-aa
index 226d81ab97d..60d5024d3b3 100644
--- a/cad/felt/patches/patch-aa
+++ b/cad/felt/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2001/05/22 16:48:59 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2001/08/29 22:41:05 jlam Exp $
 
 --- etc/Makefile.conf.orig	Sat Mar  4 20:37:06 2000
 +++ etc/Makefile.conf	Tue May 22 12:21:18 2001
@@ -42,5 +42,5 @@ $NetBSD: patch-aa,v 1.5 2001/05/22 16:48:59 jlam Exp $
 -X11INC		= /usr/X11R6/include
 -X11LIB		= /usr/X11R6/lib
 +X11DEF		= ${PREFIX}/lib/X11/app-defaults
-+X11INC		= ${X11BASE}/include
-+X11LIB		= ${X11BASE}/lib
++X11INC		= ${BUILDLINK_X11_DIR}/include
++X11LIB		= ${BUILDLINK_X11_DIR}/lib
diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile
index 78965072a30..a80897153fe 100644
--- a/cad/ng-spice/Makefile
+++ b/cad/ng-spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/08/22 02:16:31 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:05 jlam Exp $
 #
 
 DISTNAME=	ng-spice-rework-13
@@ -19,10 +19,9 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-debug
 LIBS+=			${LIBGETOPT}
 
-USE_X11=		YES
-#USE_CURSES=		YES
 USE_BUILDLINK_ONLY=	YES
 
 .include "../../devel/libgetopt/buildlink.mk"
 .include "../../devel/ncurses/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 70dc6f10a49..5f72118daa2 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/26 20:10:22 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:05 jlam Exp $
 
 DISTNAME=		qcad-1.4.7-src
 PKGNAME=		qcad-1.4.7
@@ -10,7 +10,6 @@ HOMEPAGE=		http://www.qcad.org/
 COMMENT=		2D CAD System
 
 USE_BUILDLINK_ONLY=	# defined
-USE_X11=		# defined
 
 do-configure:
 	@for f in rappwin.cpp rconfig.cpp relement.cpp rfile.cpp	\
@@ -35,4 +34,5 @@ do-install:
 	(cd ${PREFIX}/share/qcad; ${GTAR} vxf - )
 
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index 33b65b20efa..e34cbf78dba 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/06/26 20:10:23 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/08/29 22:41:05 jlam Exp $
 
 SHA1 (qcad-1.4.7-src.tar.gz) = a84d6ab41c8ce5ff114f01594c5d8378b01eff48
 Size (qcad-1.4.7-src.tar.gz) = 1511955 bytes
-SHA1 (patch-aa) = f066d56f80c1875a1d792fce677f06560f1af507
+SHA1 (patch-aa) = 46d4350760f96e4da7854a48d81d0d69d9776436
 SHA1 (patch-ab) = cea24c43b1d9187f8b55c2c831e26ac8d7a6efe7
 SHA1 (patch-ac) = 4e0dc2d55c9f3cb5a612c60699772bee0d9c82f0
 SHA1 (patch-ad) = 0961a104cfa006e5c08682aa45f08e1206f41308
diff --git a/cad/qcad/patches/patch-aa b/cad/qcad/patches/patch-aa
index 56b85db8817..c1f40d6a4fe 100644
--- a/cad/qcad/patches/patch-aa
+++ b/cad/qcad/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2001/06/26 20:10:23 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:06 jlam Exp $
 
 --- Makefile.orig	Sun Mar 25 06:17:10 2001
 +++ Makefile
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.2 2001/06/26 20:10:23 jlam Exp $
 -MOC	=	moc
 +LINK	=	$(CXX)
 +LFLAGS	=	${LDFLAGS}
-+LIBS	=	-L$(QTDIR)/lib -lqt -L${X11BASE}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg
++LIBS	=	-L$(QTDIR)/lib -lqt -L${BUILDLINK_X11_DIR}/lib -lGLU -lGL -lXmu -lXext -lX11 -lm -lSM -lICE -lXmu -lpng -lz -ljpeg
 +MOC	=	$(QTDIR)/bin/moc
  
  ####### Files
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index b777128a43a..07286bf35b8 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/06/26 20:26:16 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2001/08/29 22:41:06 jlam Exp $
 #
 
 DISTNAME=	vipec-2.0.4
@@ -12,7 +12,6 @@ COMMENT=	Network analyser for electrical networks
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-USE_X11=		yes
 USE_BUILDLINK_ONLY=	yes
 
 CONFIGURE_ARGS+=	--with-qt-dir=${BUILDLINK_QTDIR}
@@ -36,4 +35,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/vipec/help/models/*.png ${PREFIX}/share/doc/vipec/models
 
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/vipec/distinfo b/cad/vipec/distinfo
index 14572d27839..f84cc02f609 100644
--- a/cad/vipec/distinfo
+++ b/cad/vipec/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/06/26 20:26:16 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/08/29 22:41:06 jlam Exp $
 
 SHA1 (vipec-2.0.4.tar.gz) = 56e273d50fb9886fc25b91eb446da4812032508e
 Size (vipec-2.0.4.tar.gz) = 408479 bytes
-SHA1 (patch-aa) = 0e1640fc310770b49a91a3f1f15012102730d0d9
+SHA1 (patch-aa) = 78ae035d59c4a1e674fb5f9a99be8be680ce089a
 SHA1 (patch-ab) = 3a6b0783950fae7aa79ff4f913a719ce26a70d81
 SHA1 (patch-ac) = e4ab38a8b41e9dfa83881f8b7fd50c01b76103ac
diff --git a/cad/vipec/patches/patch-aa b/cad/vipec/patches/patch-aa
index 585ef0a6285..f7f42a1b8e3 100644
--- a/cad/vipec/patches/patch-aa
+++ b/cad/vipec/patches/patch-aa
@@ -1,18 +1,54 @@
-$NetBSD: patch-aa,v 1.8 2001/06/26 20:26:16 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2001/08/29 22:41:06 jlam Exp $
 
 --- configure.orig	Mon May 22 14:34:07 2000
-+++ configure	Wed Aug 30 10:53:54 2000
-@@ -4408,5 +4408,5 @@
++++ configure
+@@ -3970,12 +3970,12 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   # One or both of the vars are not set, and there is no cached value.
+-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
++if test "${x_includes+set}" != set || test "$x_includes" = NONE; then
+    kde_x_includes=NO
+ else
+    kde_x_includes=$x_includes
+ fi
+-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
++if test "${x_libraries+set}" != set || test "$x_libraries" = NONE; then
+    kde_x_libraries=NO
+ else
+    kde_x_libraries=$x_libraries
+@@ -4132,6 +4132,8 @@
+ rm -f conftest*
+ fi # $ac_x_libraries = NO
+ 
++# Don't second-guess the package builder.
++if false; then
+ rm -fr conftestdir
+ if mkdir conftestdir; then
+   cd conftestdir
+@@ -4165,6 +4167,7 @@
+   cd ..
+   rm -fr conftestdir
+ fi
++fi
+ 
+ if test -z "$ac_x_includes"; then
+ ac_x_includes="."
+@@ -4407,7 +4410,7 @@
+ echo $ac_n "checking for Qt""... $ac_c" 1>&6
  echo "configure:4409: checking for Qt" >&5
  
 -LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSOCKET"
 +LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 -lz -lpng -lSM -ljpeg -lICE $LIBSOCKET"
  ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
  qt_libraries=""
-@@ -4631,5 +4631,5 @@
+ qt_includes=""
+@@ -4630,7 +4633,7 @@
+ 
  CXXFLAGS="$CXXFLAGS -I$qt_includes"
  LDFLAGS="$X_LDFLAGS"
 -LIBS="-lqt -lXext -lX11 $LIBSOCKET"
 +LIBS="-lqt -lXext -lX11 -lz -lpng -lSM -ljpeg -lICE $LIBSOCKET"
  LD_LIBRARY_PATH=
  export LD_LIBRARY_PATH
+ LIBRARY_PATH=
diff --git a/comms/estic/Makefile b/comms/estic/Makefile
index 23d20596d51..3216d1519a4 100644
--- a/comms/estic/Makefile
+++ b/comms/estic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/08/19 04:48:35 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:06 jlam Exp $
 
 DISTNAME=	estic-1.61
 CATEGORIES=	comms
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.von-bassewitz.de/uz/estic/estic.html
 COMMENT=	German language configuration tool for ISTEC 1003/1008 ISDN systems
 
 EXTRACT_ONLY=	estic-1.60-sources${EXTRACT_SUFX}
-USE_X11=	YES
 
 RESTRICTED=	"Only free distribution permitted"
 NO_SRC_ON_CDROM=${RESTRICTED}
@@ -44,4 +43,5 @@ do-install:
 	cd ${WRKSRC}/samples && \
 	${INSTALL_DATA} * ${PREFIX}/share/examples/estic
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/estic/distinfo b/comms/estic/distinfo
index 3bc302d89a2..eba755bdf1b 100644
--- a/comms/estic/distinfo
+++ b/comms/estic/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 09:04:18 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/29 22:41:06 jlam Exp $
 
 SHA1 (estic-1.60-sources.zip) = ce66a6d52faaf6adba492bb3f74e49eab608d0c3
 Size (estic-1.60-sources.zip) = 892311 bytes
@@ -10,7 +10,7 @@ SHA1 (patch-ac) = 9fda10375f0b074473c47202c59f4f872b14ae87
 SHA1 (patch-ad) = b7287df75abc237859ee25ce04c5b3df4d338c37
 SHA1 (patch-ae) = 29ce3dafba535a26aef00e53da05d51eb09617be
 SHA1 (patch-af) = 39a39789e8875d901bce07581b544ef8590af4fa
-SHA1 (patch-ag) = f12d7fe2bf40a420b8b045e52215cb844cae33e5
+SHA1 (patch-ag) = 6a2703a6839e4e75c0d3a40e9ffd8c6362b29ffc
 SHA1 (patch-ah) = 4a5ce78d5d7173132c91ec5dbcf20b0484afe882
 SHA1 (patch-ai) = d7fdcc29f357a9a8b0790e2491f577160d05db34
 SHA1 (patch-aj) = afaa7e22e01fc698418fb6543fe8e7f81feab106
diff --git a/comms/estic/patches/patch-ag b/comms/estic/patches/patch-ag
index 5929c0306d0..ef7582f99c6 100644
--- a/comms/estic/patches/patch-ag
+++ b/comms/estic/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $
+$NetBSD: patch-ag,v 1.2 2001/08/29 22:41:06 jlam Exp $
 
 --- ../spunk/make/freebsd-x.mak.orig	Sun Nov 24 22:33:26 1996
 +++ ../spunk/make/freebsd-x.mak	Sat Feb 10 19:06:51 2001
@@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $
  
  # Flags for the gnu compiler
 -CFLAGS	= -DFREEBSD -DUSE_OLD_TTY -g -Wall -x c++ -I /usr/X11R6/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
-+CFLAGS	+= -DFREEBSD -Wall -x c++ -I$(X11BASE)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
++CFLAGS	+= -DFREEBSD -Wall -x c++ -I$(BUILDLINK_X11_DIR)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
  
  LIB	= spunk.a
  ZIPFILE = spunk.zip
diff --git a/comms/jpilot-expense/Makefile b/comms/jpilot-expense/Makefile
index 8d5a46b2fbe..f0fc10bea8e 100644
--- a/comms/jpilot-expense/Makefile
+++ b/comms/jpilot-expense/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/29 04:54:50 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:07 jlam Exp $
 
 DISTNAME=		jpilot-0.99
 PKGNAME=		jpilot-expense-0.99
@@ -13,7 +13,6 @@ COMMENT=		Expense synchronization plugin for J-Pilot
 DEPENDS+=		jpilot>=0.99:../../comms/jpilot
 
 USE_BUILDLINK_ONLY=	# defined
-USE_X11=		# defined
 USE_LIBTOOL=		# defined
 
 GNU_CONFIGURE=		# defined
@@ -29,4 +28,5 @@ post-extract:
 
 .include "../../comms/jpilot/buildlink.mk"
 .include "../../comms/pilot-link-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index 522cd0b29a9..df146e8faac 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/29 04:54:50 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/08/29 22:41:07 jlam Exp $
 
 DISTNAME=		jpilot-syncmal_0.60
 PKGNAME=		jpilot-syncmal-0.60
@@ -15,7 +15,6 @@ DEPENDS+=		jpilot>=0.99:../../comms/jpilot
 
 USE_BUILDLINK_ONLY=	# defined
 GNU_CONFIGURE=		# defined
-USE_X11=		# defined
 USE_GMAKE=		# defined
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
@@ -35,4 +34,5 @@ do-install:
 
 .include "../../comms/jpilot/buildlink.mk"
 .include "../../comms/pilot-link-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/jpilot-synctime/Makefile b/comms/jpilot-synctime/Makefile
index 21b2acf39e2..481796d0cd6 100644
--- a/comms/jpilot-synctime/Makefile
+++ b/comms/jpilot-synctime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/29 04:54:50 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:07 jlam Exp $
 
 DISTNAME=		jpilot-0.99
 PKGNAME=		jpilot-synctime-0.99
@@ -13,7 +13,6 @@ COMMENT=		Time synchronization plugin for J-Pilot
 DEPENDS+=		jpilot>=0.99:../../comms/jpilot
 
 USE_BUILDLINK_ONLY=	# defined
-USE_X11=		# defined
 USE_LIBTOOL=		# defined
 
 GNU_CONFIGURE=		# defined
@@ -29,4 +28,5 @@ post-extract:
 
 .include "../../comms/jpilot/buildlink.mk"
 .include "../../comms/pilot-link-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index b7df0d4e1d3..861eae0a795 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/08/27 14:35:06 tron Exp $
+# $NetBSD: Makefile,v 1.21 2001/08/29 22:41:07 jlam Exp $
 #
 
 DISTNAME=		jpilot-0.99
@@ -17,7 +17,6 @@ CONFLICTS+=		jpilot-libplugin-*
 USE_BUILDLINK_ONLY=	# defined
 GNU_CONFIGURE=		# defined
 USE_LIBTOOL=		# defined
-USE_X11=		# defined
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CONFIGURE_ARGS+=	--with-gtk-prefix="${BUILDLINK_DIR}"
@@ -45,4 +44,5 @@ post-install:
 .include "../../comms/pilot-link-libs/buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index 13f618e9de3..2637cf6c9c5 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/08/20 04:02:15 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/08/29 22:41:07 jlam Exp $
 #
 
 DISTNAME=	psiconv-0.6.1
@@ -10,7 +10,6 @@ HOMEPAGE=	http://huizen.dds.nl/~frodol/psiconv/
 COMMENT=	PSION 5 file format data conversion utilities
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		YES
@@ -25,4 +24,5 @@ post-install:
 	done
 
 .include "../../graphics/ImageMagick/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index 2d768854a44..1bdf961a3ab 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/13 04:49:10 kei Exp $
+# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:08 jlam Exp $
 #
 
 DISTNAME=		wv-0.6.5
@@ -13,11 +13,10 @@ COMMENT=		Microsoft Word 6, 7, 8, and 9 (95/97/2000) doc to HTML/LaTeX converter
 #CONFLICTS+=		libgetopt-*
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=		YES
+REPLACE_BUILDLINK=	wv-incconfig wv-libconfig
+
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
-
-EVAL_PREFIX=		XPMDIR=xpm
 MAKE_ENV+=		RM="${RM} -f"
 
 post-install:
@@ -28,7 +27,8 @@ post-install:
 
 .include "../../converters/libiconv/buildlink.mk"
 .include "../../devel/glib/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../graphics/libwmf/buildlink.mk"
 .include "../../graphics/ImageMagick/buildlink.mk"
+.include "../../graphics/libwmf/buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index 86a50a3fcb7..e26af9ece6e 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/08/23 21:44:12 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/08/29 22:41:08 jlam Exp $
 #
 
 DISTNAME=		gtksql-0.3
@@ -18,4 +18,5 @@ MAKE_ENV+=		MCFLAGS="${CFLAGS}"
 
 .include "../../databases/postgresql-lib/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 5652634ce8f..70b306a89c1 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/07/14 15:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2001/08/29 22:41:08 jlam Exp $
 #
 
 DISTNAME=	SDL-1.2.1
@@ -19,7 +19,6 @@ REPLACE_BUILDLINK=	sdl-config
 
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
-USE_X11=		YES
 
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
@@ -56,4 +55,5 @@ post-configure:
 .include "../../devel/pth/buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../mk/ossaudio.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 269489687e2..1582a5ac3f8 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:51 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:08 jlam Exp $
 
 DISTNAME=		gcvs-1.0a7
 CATEGORIES=		devel
@@ -11,7 +11,6 @@ COMMENT=		GTK interface for CVS
 CONFLICTS=		cvs-[0-9]*
 
 USE_BUILDLINK_ONLY=	yes
-USE_X11=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 
@@ -25,4 +24,5 @@ post-patch:
 
 .include "../../lang/tcl/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libdockapp/Makefile b/devel/libdockapp/Makefile
index 95e76f11a1c..8592785fc4e 100644
--- a/devel/libdockapp/Makefile
+++ b/devel/libdockapp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/29 22:57:41 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:08 jlam Exp $
 #
 
 DISTNAME=	libdockapp-0.4.0
@@ -13,11 +13,11 @@ USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-USE_X11=		YES
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdockapp
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libdockapp
 
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 9e68539ab0c..f748238ec2c 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/07/13 14:41:19 fredb Exp $
+# $NetBSD: Makefile,v 1.17 2001/08/29 22:41:09 jlam Exp $
 #
 
 DISTNAME=	maketool-0.6.1
@@ -14,10 +14,9 @@ USE_BUILDLINK_ONLY=	YES
 BUILD_USES_MSGFMT=	YES
 
 USE_GMAKE=	yes
-USE_X11=	yes
-
 GNU_CONFIGURE=	yes
 
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 831bb21906a..d589470c0d4 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2001/08/17 21:16:50 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2001/08/29 22:41:09 jlam Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -65,4 +65,5 @@ post-install:
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index 8cad7c4a101..a3501aee39a 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/08/06 17:44:45 pooka Exp $
+# $NetBSD: Makefile,v 1.25 2001/08/29 22:41:09 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -11,7 +11,6 @@ CONFLICTS+=		vim-[0-9]* vim-xaw-*
 
 DISTFILES+=		${DISTNAME}-rt${EXTRACT_SUFX}
 
-USE_X11=		yes
 USE_BUILDLINK_ONLY=	yes
 
 CONFIGURE_ARGS+=	--enable-gui=gtk
@@ -32,4 +31,5 @@ post-install:
 
 .include "../../devel/ncurses/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 04681a0b0c0..2c858075a3b 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/08/23 04:26:52 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/08/29 22:41:09 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -9,9 +9,7 @@ COMMENT=		Vim editor (vi clone) with X11 Athena GUI
 DEPENDS+=		vim-share-${VIM_VERSION}:../vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk-*
 
-USE_X11=		yes
 USE_BUILDLINK_ONLY=	yes
-
 CONFIGURE_ARGS+=	--enable-gui=athena
 CONFIGURE_ARGS+=	--with-tlib=ncurses
 
@@ -39,4 +37,5 @@ post-install:
 
 .include "../../devel/ncurses/buildlink.mk"
 .include "../../mk/xaw.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index 430d3a30286..f4b2b176a35 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/06/29 04:54:52 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2001/08/29 22:41:09 jlam Exp $
 
 DISTNAME=	baduki-0.2.9
 CATEGORIES=	games
@@ -9,7 +9,6 @@ HOMEPAGE=	http://soback.kornet21.net/~artist/baduk/baduki.html
 COMMENT=	Go playing program based on xamigo
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=		YES
 GNU_CONFIGURE=		YES
 BUILD_USES_MSGFMT=	YES
 
@@ -17,4 +16,5 @@ CONFIGURE_ARGS+=	--without-included-gettext
 
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile
index e0cc312ebf4..45ef52299be 100644
--- a/games/clanbomber/Makefile
+++ b/games/clanbomber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/08/23 20:28:57 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/08/29 22:41:10 jlam Exp $
 
 DISTNAME=		clanbomber-1.01
 PKGNAME=		${DISTNAME}nb1
@@ -14,8 +14,6 @@ USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 
-CPPFLAGS+=		-I${X11BASE}/include
-
 # needs a valid X display to compile its datafiles
 .ifndef DISPLAY
 IS_INTERACTIVE=		yes
@@ -33,4 +31,5 @@ pre-build:
 	fi;
 
 .include "../../graphics/clanlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/fire/Makefile b/games/fire/Makefile
index b47023d2589..468b89d381b 100644
--- a/games/fire/Makefile
+++ b/games/fire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:53 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:10 jlam Exp $
 #
 
 DISTNAME=	fire-1.0
@@ -11,7 +11,7 @@ COMMENT=	organic fireworks demo
 
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
-USE_X11=		YES
 
 .include "../../devel/SDL/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile
index a097c66802f..23cc5a2ea5e 100644
--- a/games/freeciv-client-gtk/Makefile
+++ b/games/freeciv-client-gtk/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2001/08/15 19:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/08/29 22:41:10 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-gtk-/}
 COMMENT=		Freeciv client with GTK+ interface
 
 DEPENDS+=		freeciv-share-${FC_VERS}:../../games/freeciv-share
 
-USE_X11=		# defined
 USE_BUILDLINK_ONLY=	# defined
 
 CONFIGURE_ARGS+=	--disable-server
@@ -22,4 +21,5 @@ do-install:
 .include "../../devel/zlib/buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index 4bc0f95d3b5..16d41fe49d1 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/08/23 04:26:53 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:10 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
 COMMENT=		Freeciv client with Xaw interface
@@ -7,8 +7,6 @@ DEPENDS+=		freeciv-share-${FC_VERS}:../../games/freeciv-share
 
 CONFLICTS=		freeciv-client-gtk<=1.11.4
 
-USE_X11=		# defined
-
 .include "../../mk/bsd.prefs.mk"
 
 USE_BUILDLINK_ONLY=	# defined
@@ -30,4 +28,5 @@ do-install:
 .include "../../devel/zlib/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/xaw.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index c8e40b39890..3f204e5197e 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/04 02:23:26 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/08/29 22:41:11 jlam Exp $
 
 DISTNAME=		imaze1.3
 PKGNAME=		imaze-1.3
@@ -15,10 +15,10 @@ WRKSRC=			${WRKDIR}/imaze
 
 USE_BUILDLINK_ONLY=	yes
 USE_X11BASE=		yes
-CFLAGS+=		-I${X11BASE}/include
 
 post-build:
 	cd ${WRKSRC} && ${PAX} -rf ${DISTDIR}/imaze-sounds.tar
 
 .include "../../x11/lesstif/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/kulki/Makefile b/games/kulki/Makefile
index 28a5e55f3f0..ee52dced1de 100644
--- a/games/kulki/Makefile
+++ b/games/kulki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/26 17:56:58 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/08/29 22:41:11 jlam Exp $
 #
 
 DISTNAME=	kulki-1.01
@@ -13,7 +13,6 @@ COMMENT=	Simple logic game - "balls"
 WRKSRC=		${WRKDIR}/kulki
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=		YES
 USE_GMAKE=		YES
 
 MAKE_ENV+=	CXX="${CXX}"
@@ -31,4 +30,5 @@ do-install:
 		( ${GUNZIP_CMD} -c ${WRKSRC}/images.tgz | ${GTAR} xf - )
 
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/kulki/distinfo b/games/kulki/distinfo
index 1f8dd60f35b..e2bfea8e609 100644
--- a/games/kulki/distinfo
+++ b/games/kulki/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2001/06/25 04:29:26 jlam Exp $
+$NetBSD: distinfo,v 1.6 2001/08/29 22:41:11 jlam Exp $
 
 SHA1 (kulki-1.01.tgz) = 20f14bdbde44dc56d914e4451ae33824f30abaf1
 Size (kulki-1.01.tgz) = 1190074 bytes
-SHA1 (patch-aa) = 27a971b6be1059d258c49663c123e46c748cbc38
+SHA1 (patch-aa) = 97dd61393d4617f20a9dd2f20a6534710e208c46
diff --git a/games/kulki/patches/patch-aa b/games/kulki/patches/patch-aa
index 3c059b049f0..e5830506af1 100644
--- a/games/kulki/patches/patch-aa
+++ b/games/kulki/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.5 2001/06/25 04:29:26 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2001/08/29 22:41:11 jlam Exp $
 
 --- Makefile.orig	Thu Feb  8 13:27:43 2001
 +++ Makefile
 @@ -1,8 +1,8 @@
  DEBUG = #-g
 -GLIBS = -L/usr/X11/lib \
-+GLIBS = -L${X11BASE}/lib \
++GLIBS = -L${BUILDLINK_X11_DIR}/lib \
  	-I$(QTDIR)/include -L$(QTDIR)/lib\
  	-lqt -lX11 -lXext 
 -INSTALL = /usr/games/
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile
index 9a251d33b0f..fb7e2a8f809 100644
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/08/15 19:41:44 rh Exp $
+# $NetBSD: Makefile,v 1.9 2001/08/29 22:41:12 jlam Exp $
 #
 
 DISTNAME=	lbreakout-010315
@@ -10,9 +10,9 @@ HOMEPAGE=	http://lgames.sourceforge.net/
 COMMENT=	breakout-style arcade game
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-sound
 
 .include "../../devel/SDL/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index c0897edef36..9e36ace7c66 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/06/30 10:39:06 zuntum Exp $
+# $NetBSD: Makefile,v 1.9 2001/08/29 22:41:12 jlam Exp $
 #
 
 DISTNAME=		lincity-1.11
@@ -24,4 +24,5 @@ pre-build:
 post-install:
 	${LN} -sf lincity.6 ${PREFIX}/man/man6/xlincity.6
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/lincity/distinfo b/games/lincity/distinfo
index b24f95c8dd5..cac0657a036 100644
--- a/games/lincity/distinfo
+++ b/games/lincity/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:30 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/08/29 22:41:12 jlam Exp $
 
 SHA1 (lincity-1.11.tar.gz) = b3b7fb00fffea90352fa5e5c6b7bf76d49cd493b
 Size (lincity-1.11.tar.gz) = 475037 bytes
-SHA1 (patch-aa) = ac8b6a23b0167f98bf21bbdea7966f99aec3f61a
+SHA1 (patch-aa) = 0f318f35627fc592a0f995e1cab99997c3ac79b8
 SHA1 (patch-ab) = 09860dec60aefe24c020aa3daf130512ec893d09
diff --git a/games/lincity/patches/patch-aa b/games/lincity/patches/patch-aa
index 3a65321f8dd..d3fda5e7c8f 100644
--- a/games/lincity/patches/patch-aa
+++ b/games/lincity/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2000/08/12 06:30:49 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:12 jlam Exp $
 
 --- Makefile.orig	Thu Feb 25 23:17:38 1999
 +++ Makefile	Sat Aug 12 00:38:42 2000
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.2 2000/08/12 06:30:49 jlam Exp $
  
 -LC_XFLAGS = $(CFLAGS) -DLC_X11 
 -LC_XLIBS = -lXExExt -lXext -lX11
-+LC_XFLAGS = $(CFLAGS) -I${X11BASE}/include -DLC_X11 
++LC_XFLAGS = $(CFLAGS) -I${BUILDLINK_X11_DIR}/include -DLC_X11 
 +LC_XLIBS = ${LDFLAGS} -lXExExt -lXext -lX11
  
  XOBJS = xmain.o xmouse.o xscreen.o xmps.o xtypeinit.o xengine.o\
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 4e03022e925..768166779b0 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/06/26 19:10:37 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2001/08/29 22:41:12 jlam Exp $
 #
 
 .include		"../nethack-lib/Makefile.common"
@@ -10,7 +10,6 @@ COMMENT=		The QT-Enhanced X11 version of NetHack
 
 DEPENDS+=		nethack-lib-${NETHACK_VERSION}:../nethack-lib
 
-USE_X11=		YES
 USE_BUILDLINK_ONLY=	YES
 
 ALL_TARGET=		x11tiles nethack
@@ -26,4 +25,5 @@ post-install:
 
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack-qt/distinfo b/games/nethack-qt/distinfo
index ac9bc5f0845..85e97b17d2a 100644
--- a/games/nethack-qt/distinfo
+++ b/games/nethack-qt/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/06/26 19:10:18 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/08/29 22:41:13 jlam Exp $
 
 SHA1 (nethack-331.tgz) = e3d07efc81c9aeb85fadc268d1d4976ab3a0f7e9
 Size (nethack-331.tgz) = 3061094 bytes
 SHA1 (patch-aa) = d8ec9c209bf28abda1f78159e9d240895e38db30
-SHA1 (patch-ac) = 55d083ade87986ff236994144e6d5931daaf8f2b
+SHA1 (patch-ac) = f3fb0576ad1bffa88fa1fdb6c1c134536a522e19
 SHA1 (patch-ad) = 580a75c7ebc55b099a702ad21ce12d960f2805ff
diff --git a/games/nethack-qt/patches/patch-ac b/games/nethack-qt/patches/patch-ac
index 246754ca8db..4d8ec04648c 100644
--- a/games/nethack-qt/patches/patch-ac
+++ b/games/nethack-qt/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.8 2001/06/26 19:10:18 jlam Exp $
+$NetBSD: patch-ac,v 1.9 2001/08/29 22:41:13 jlam Exp $
 
 --- sys/unix/Makefile.src.orig	Sat Aug  5 13:52:57 2000
 +++ sys/unix/Makefile.src	Thu Aug 10 20:03:19 2000
@@ -8,7 +8,7 @@ $NetBSD: patch-ac,v 1.8 2001/06/26 19:10:18 jlam Exp $
  
 -CFLAGS = -O -I../include
 -LFLAGS =
-+CFLAGS += -I../include -I${X11BASE}/include
++CFLAGS += -I../include -I${BUILDLINK_X11_DIR}/include
 +LFLAGS = ${LDFLAGS}
  
  # The Qt and Be window systems are written in C++, while the rest of
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.8 2001/06/26 19:10:18 jlam Exp $
  #
  # libraries for Qt
 -WINQTLIB = -L$(QTDIR)/lib -lqt
-+WINQTLIB = -Wl,-R$(QTDIR)/lib -L$(QTDIR)/lib -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext
++WINQTLIB = -L$(QTDIR)/lib -lqt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext
  #
  # libraries for KDE (with Qt)
  WINKDELIB = -lkdecore -lkdeui -lXext
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index 8f660affe47..70c014114ae 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.12 2001/06/26 19:11:04 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/08/29 22:41:13 jlam Exp $
 #
 
 .include		"../nethack-lib/Makefile.common"
 
 PKGNAME=		nethack-x11-${NETHACK_VERSION}
-
 COMMENT=		the X11 version of NetHack
 
 CATEGORIES+=		x11
 
 DEPENDS+=		nethack-lib-${NETHACK_VERSION}:../nethack-lib
 
-USE_X11=		YES
 USE_BUILDLINK_ONLY=	YES
 
 ALL_TARGET=		x11tiles nethack
@@ -25,4 +23,5 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/dat/x11tiles ${PREFIX}/share/nethackdir
 
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack-x11/distinfo b/games/nethack-x11/distinfo
index b77efdc2e19..4b4cf5de34a 100644
--- a/games/nethack-x11/distinfo
+++ b/games/nethack-x11/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/06/26 19:11:04 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/08/29 22:41:13 jlam Exp $
 
 SHA1 (nethack-331.tgz) = e3d07efc81c9aeb85fadc268d1d4976ab3a0f7e9
 Size (nethack-331.tgz) = 3061094 bytes
 SHA1 (patch-aa) = 27b14831057da6ca2863f75d0910e0479c9c6b99
-SHA1 (patch-ab) = 9cb29ef166fefa5672cad337e00fc960b46140eb
+SHA1 (patch-ab) = dc195cd1fa7dbae59904847c357b9a6c7796d7fa
diff --git a/games/nethack-x11/patches/patch-ab b/games/nethack-x11/patches/patch-ab
index 8f915a05c82..8d213557190 100644
--- a/games/nethack-x11/patches/patch-ab
+++ b/games/nethack-x11/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2001/06/26 19:11:04 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2001/08/29 22:41:13 jlam Exp $
 
 --- sys/unix/Makefile.src.orig	Sat Aug  5 13:52:57 2000
 +++ sys/unix/Makefile.src	Thu Aug 10 19:28:31 2000
@@ -8,7 +8,7 @@ $NetBSD: patch-ab,v 1.5 2001/06/26 19:11:04 jlam Exp $
  
 -CFLAGS = -O -I../include
 -LFLAGS =
-+CFLAGS += -I../include -I${X11BASE}/include
++CFLAGS += -I../include -I${BUILDLINK_X11_DIR}/include
 +LFLAGS = ${LDFLAGS}
  
  # The Qt and Be window systems are written in C++, while the rest of
diff --git a/games/newvox/Makefile b/games/newvox/Makefile
index a96d949f7ee..d7662cea028 100644
--- a/games/newvox/Makefile
+++ b/games/newvox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:53 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:13 jlam Exp $
 #
 
 DISTNAME=	newvox-1.0
@@ -11,7 +11,7 @@ COMMENT=	voxel-style landscape rendering fly-by
 
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
-USE_X11=		YES
 
 .include "../../devel/SDL/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/pacman/Makefile b/games/pacman/Makefile
index 396fe42f9b8..9ebdf68da8a 100644
--- a/games/pacman/Makefile
+++ b/games/pacman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/06/30 11:27:17 zuntum Exp $
+# $NetBSD: Makefile,v 1.13 2001/08/29 22:41:14 jlam Exp $
 
 DISTNAME=		Pacman-0.3-CVS-00-11-17
 PKGNAME=		Pacman-0.3
@@ -16,8 +16,6 @@ USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 
-CFLAGS+=		-I${X11BASE}/include
-
 # needs a valid X display to compile its datafiles
 .ifndef DISPLAY
 IS_INTERACTIVE=		yes
@@ -36,4 +34,5 @@ pre-build:
 	fi;
 
 .include "../../graphics/clanlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/pacman/distinfo b/games/pacman/distinfo
index c0fa651d5fb..5935d8517d9 100644
--- a/games/pacman/distinfo
+++ b/games/pacman/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/06/30 11:27:17 zuntum Exp $
+$NetBSD: distinfo,v 1.4 2001/08/29 22:41:14 jlam Exp $
 
 SHA1 (Pacman-0.3-CVS-00-11-17.tar.gz) = 0d30f2ae3410d2df7b3fecb5cce732ba3022041d
 Size (Pacman-0.3-CVS-00-11-17.tar.gz) = 62257 bytes
-SHA1 (patch-aa) = 03ae72b67b3d268ecdc8d37ad00497a96725cf71
+SHA1 (patch-aa) = 28103a483316c870325e63f378ea36955b029b84
 SHA1 (patch-ab) = 8d20c41dfb1a010586a3ebfb3ab4e7f675b93400
diff --git a/games/pacman/patches/patch-aa b/games/pacman/patches/patch-aa
index f75ce16f942..dbc5f7646de 100644
--- a/games/pacman/patches/patch-aa
+++ b/games/pacman/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2001/06/30 11:27:17 zuntum Exp $
+$NetBSD: patch-aa,v 1.4 2001/08/29 22:41:14 jlam Exp $
 
 --- Makefile.in.orig	Wed Oct  6 02:19:37 1999
 +++ Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 2001/06/30 11:27:17 zuntum Exp $
  OBJF =          .build/pacman.o .build/objects.o .build/fontblowup.o
  DATAFILES =     pacman.dat
 -EXTERN_LIBS =   -lclanCore
-+EXTERN_LIBS =   -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lclanCore \
++EXTERN_LIBS =   -L${BUILDLINK_X11_DIR}/lib -Wl,-R$(X11BASE)/lib -lclanCore \
 +		-L${BUILDLINK_DIR}/lib -Wl,-R$(LOCALBASE)/lib -lHermes -lpth -lz
  
  all: pacman $(DATAFILES)
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index 2be969c7aee..bf502128d9f 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/08/27 14:35:09 tron Exp $
+# $NetBSD: Makefile,v 1.18 2001/08/29 22:41:14 jlam Exp $
 #
 
 DISTNAME=		xracer-0.96.9
@@ -11,10 +11,9 @@ COMMENT=		XRacer is a clone of the popular Psygnosis game Wipeout
 
 BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
-BUILD_USES_MSGFMT=	yes
+BUILD_USES_MSGFMT=	# defined
 
-USE_BUILDLINK_ONLY=	YES
-USE_X11=		# defined
+USE_BUILDLINK_ONLY=	# defined
 USE_GMAKE=		# defined
 USE_PERL5=		# defined
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XRacer/.packlist
@@ -43,4 +42,5 @@ pre-patch:
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 27c1d311090..c194b2a44e6 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2001/07/02 16:48:31 jlam Exp $
+# $NetBSD: Makefile,v 1.75 2001/08/29 22:41:14 jlam Exp $
 
 DISTNAME=		ImageMagick-5.2.8
 CATEGORIES=		graphics
@@ -20,7 +20,6 @@ REPLACE_BUILDLINK=	Magick++/bin/Magick++-config
 REPLACE_BUILDLINK+=	magick/Magick-config
 
 GNU_CONFIGURE=		YES
-USE_X11=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
@@ -47,4 +46,5 @@ post-install:
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/tiff/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/SDL-image/Makefile b/graphics/SDL-image/Makefile
index 578f1d38312..48df1ba35c5 100644
--- a/graphics/SDL-image/Makefile
+++ b/graphics/SDL-image/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/07 11:32:23 rh Exp $
+# $NetBSD: Makefile,v 1.2 2001/08/29 22:41:15 jlam Exp $
 #
 
 DISTNAME=		SDL_image-1.2.0
@@ -11,7 +11,6 @@ HOMEPAGE=		http://www.libsdl.org/projects/SDL_image/
 COMMENT=		image file loading library
 
 GNU_CONFIGURE=		YES
-USE_X11=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
@@ -20,4 +19,5 @@ USE_BUILDLINK_ONLY=	YES
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../devel/SDL/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 1c443ee9ab1..c182ef52955 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/07/09 18:25:30 zuntum Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:15 jlam Exp $
 #
 
 DISTNAME=	autotrace-0.26
@@ -11,8 +11,8 @@ HOMEPAGE=	http://homepages.go.com/homepages/m/a/r/martweb/AutoTrace.htm
 COMMENT=	convert bitmap to vector graphics
 
 USE_BUILDLINK_ONLY=	YES
-GNU_CONFIGURE=	YES
-USE_X11=	YES
+GNU_CONFIGURE=		YES
 
 .include "../../graphics/ImageMagick/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile
index de2b0d739e6..e6c819a09d8 100644
--- a/graphics/avifile-devel/Makefile
+++ b/graphics/avifile-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/08/26 10:32:21 skrll Exp $
+# $NetBSD: Makefile,v 1.19 2001/08/29 22:41:15 jlam Exp $
 #
 
 DISTNAME=	avifile-0.6.20010814
@@ -28,7 +28,7 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		YES
 
-CXXFLAGS+=		-L${BUILDLINK_DIR}/lib -I${BUILDLINK_DIR}/include -I${X11PREFIX}/include
+CXXFLAGS+=		-L${BUILDLINK_DIR}/lib -I${BUILDLINK_DIR}/include
 
 CONFIGURE_ARGS+=	--with-win32-path=${LOCALBASE}/lib/win32
 CONFIGURE_ARGS+=	--disable-dpms
@@ -63,4 +63,5 @@ pre-configure:
 	cd ${WRKSRC} && ${SH} autogen.sh
 
 .include "../../devel/SDL/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index 530cfc4b1c0..3f922c2184e 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/08/23 15:55:26 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2001/08/29 22:41:15 jlam Exp $
 
 DISTNAME=		ClanLib-0.4.4
 CATEGORIES=		graphics games devel x11
@@ -40,6 +40,7 @@ post-patch:
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../devel/pth/buildlink.mk"
 .include "../../mk/ossaudio.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
 
 .if ${OPSYS} == "NetBSD"
diff --git a/graphics/clanlib/distinfo b/graphics/clanlib/distinfo
index fbccd989055..8b76dc101ca 100644
--- a/graphics/clanlib/distinfo
+++ b/graphics/clanlib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2001/08/23 15:55:26 jlam Exp $
+$NetBSD: distinfo,v 1.6 2001/08/29 22:41:15 jlam Exp $
 
 SHA1 (ClanLib-0.4.4.tar.gz) = 326fb3812bd3c26cd8ecf60d8975c662674ae9a8
 Size (ClanLib-0.4.4.tar.gz) = 642836 bytes
-SHA1 (patch-aa) = 6aad55020babe8c11c44fee3c6b67157f1cf228c
+SHA1 (patch-aa) = 3c9669716944b0c1617b9020daa51599616aed5e
 SHA1 (patch-ab) = 38acc42d60694482b61853fb14e0460a437a1653
 SHA1 (patch-ac) = 383a03b0ecca44a6d3397184d6022a0bb91882da
 SHA1 (patch-ad) = ea6da825d77090177c2c5c73362fc5caa80181f3
diff --git a/graphics/clanlib/patches/patch-aa b/graphics/clanlib/patches/patch-aa
index 4b6bd869c75..601ddb98ac8 100644
--- a/graphics/clanlib/patches/patch-aa
+++ b/graphics/clanlib/patches/patch-aa
@@ -1,17 +1,22 @@
-$NetBSD: patch-aa,v 1.4 2001/06/30 11:26:32 zuntum Exp $
---- Makefile.conf.in.orig	Thu Dec 14 19:27:08 2000
-+++ Makefile.conf.in	Thu Dec 14 19:28:06 2000
-@@ -13,11 +13,11 @@
+$NetBSD: patch-aa,v 1.5 2001/08/29 22:41:16 jlam Exp $
+
+--- Makefile.conf.in.orig	Sun Apr  9 08:17:58 2000
++++ Makefile.conf.in
+@@ -13,7 +13,7 @@
  BIN_PREFIX = @bindir@
  TARGET_PREFIX = @libdir@/ClanLib
  
 -INCLUDE_DIRS =	-I Sources @x_includes@
-+INCLUDE_DIRS =	-I Sources @x_includes@ -I$(BUILDLINK_DIR)/include
++INCLUDE_DIRS =	-I Sources @CPPFLAGS@ @x_includes@
  
  COMP_OPTIONS =	-Wall $(INCLUDE_DIRS) -fPIC -DNOCONTROLS @DEFS@ @comp_mode@
  
--LINK_CORE = @libs@
-+LINK_CORE = -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib @libs@
+@@ -21,7 +21,7 @@
  
  OBJF_NONDYN = @objf_nondyn@
  
+-LINK_COMMAND = $(CXX) -shared -fPIC -Wl,-rpath,$(TARGET_PREFIX)
++LINK_COMMAND = $(CXX) -shared -fPIC -Wl,-rpath,$(TARGET_PREFIX) @LDFLAGS@
+ 
+ Libs/Intermediate/%.o : %.cpp
+ 	@echo "Compiling $<"
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index dab27eb440e..5af82a8cfde 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/03 16:30:19 zuntum Exp $
+# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:16 jlam Exp $
 
 DISTNAME=		fnlib-0.5
 CATEGORIES=		x11 graphics
@@ -14,9 +14,23 @@ GNU_CONFIGURE=		# defined
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+# Remove -I$(includedir) from the INCLUDES passed to the compiler as this
+# defeats buildlink.
+#
+post-patch:
+	cd ${WRKSRC};							\
+	files=`${FIND} . -name "Makefile.in" -print`;			\
+	for file in $${files}; do					\
+		${MV} -f $${file} $${file}.fixme;			\
+		${SED} -e "/^INCLUDES.*=.*/s|[  ]*-I\$$(includedir)||"	\
+			$${file}.fixme > $${file};			\
+		${RM} $${file}.fixme;					\
+	done
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fnlib
 	${INSTALL_DATA} ${WRKSRC}/doc/fontinfo.README ${PREFIX}/share/doc/fnlib
 
 .include "../../graphics/imlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index f783f3b4138..c9f3d5ced7f 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/06/28 20:02:56 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2001/08/29 22:41:16 jlam Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
 #
 
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.boutell.com/gd/
 COMMENT=	graphics library for fast PNG creation
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=		YES
 USE_LIBTOOL=		YES
 REPLACE_PERL=		bdftogd
 
@@ -23,7 +22,6 @@ MAKE_ENV+=	EXTRA_LIBS="-lsocket -lnsl"
 
 CPPFLAGS+=	-I${BUILDLINK_DIR}/include/freetype	# freetype.h
 CPPFLAGS+=	-I${BUILDLINK_DIR}/include/X11		# xpm.h
-CPPFLAGS+=	-I${X11BASE}/include
 
 # When the API changes and breaks binary-compatibility with the previous
 # version, increment the MAJOR by 1 and reset the MINOR to 0.  Otherwise,
@@ -38,4 +36,5 @@ MAKE_ENV+=	GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}" COMPILER="${CC}"
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 0934eeed97a..08874ca182f 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/06/26 16:30:57 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/08/29 22:41:17 jlam Exp $
 #
 
 PKGNAME=	${DISTNAME}
@@ -24,4 +24,5 @@ post-install:
 		${LOCALBASE}/share/aclocal/gdk-pixbuf.m4
 	${RM} ${PREFIX}/lib/gnomecanvaspixbufConf.sh
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 1fb5b3cb7cc..61f2cbb01c2 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/07/04 03:08:57 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/08/29 22:41:17 jlam Exp $
 
 DISTNAME=		geomview-1.8.1
 CATEGORIES=		graphics math
@@ -12,12 +12,11 @@ CONFLICTS=		ImageMagick-*	# both have a program named 'animate'
 
 USE_BUILDLINK_ONLY=	yes
 GNU_CONFIGURE=		yes
-USE_X11=		yes
 
 CONFIGURE_ARGS+=	--without-xforms
 CONFIGURE_ARGS+=	--with-opengl=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=	--with-motif=${BUILDLINK_DIR}
-CPPFLAGS+=		-Dunix -Dalloca=__builtin_alloca -I${X11BASE}/include
+CPPFLAGS+=		-Dunix -Dalloca=__builtin_alloca
 
 INFO_FILES=		geomview
 
@@ -43,4 +42,5 @@ post-install:
 
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../x11/lesstif/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index c378a4288a0..2ef845339d3 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/23 19:45:42 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:17 jlam Exp $
 #
 
 DISTNAME=	gfract-0.21
@@ -37,4 +37,5 @@ do-install:
 
 .include "../../graphics/png/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index 4d17013c5cf..6e479f3709c 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/23 14:03:11 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/08/29 22:41:17 jlam Exp $
 #
 
 DISTNAME=	gifsicle-1.29
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.lcdf.org/~eddietwo/gifsicle/
 COMMENT=	create, edit, and inspect GIFs from shell
 
 GNU_CONFIGURE=		YES
-USE_X11=		YES
 USE_BUILDLINK_ONLY=	YES
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index ebce341908b..58d85dcb1b1 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2001/08/02 13:33:09 jlam Exp $
+# $NetBSD: Makefile,v 1.73 2001/08/29 22:41:17 jlam Exp $
 
 DISTNAME=		gimp-1.2.2
 CATEGORIES=		graphics
@@ -69,4 +69,5 @@ post-install:
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../graphics/mpeg-lib/buildlink.mk"
 .include "../../x11/gnome-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index 16d35d50ce6..92c9e79c81b 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/18 21:32:24 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:18 jlam Exp $
 #
 
 DISTNAME=		gle-3.0.3
@@ -11,7 +11,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.linas.org/gle/
 COMMENT=		GL subroutines for drawing tubing and extrusions
 
-#USE_MESA=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
@@ -20,4 +19,5 @@ USE_BUILDLINK_ONLY=	YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../../graphics/Mesa/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index dbe73995ceb..89d4ddef413 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/14 03:07:34 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/08/29 22:41:18 jlam Exp $
 #
 
 .include "../Mesa/Makefile.common"
@@ -37,4 +37,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/include/GL/${inc} ${PREFIX}/include/GL
 .endfor
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index be8b2771467..57c8434551b 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/06/29 04:54:55 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/08/29 22:41:18 jlam Exp $
 #
 
 DISTNAME=	gqview-0.10.1
@@ -22,4 +22,5 @@ BUILDLINK_DEPENDS.gdk-pixbuf=	gdk-pixbuf>=0.9.0
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../graphics/gdk-pixbuf/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 82629f703de..efe43e321e7 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2001/08/27 14:35:09 tron Exp $
+# $NetBSD: Makefile,v 1.57 2001/08/29 22:41:18 jlam Exp $
 #
 
 DISTNAME=		imlib-1.9.11
@@ -20,6 +20,7 @@ PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 USE_GMAKE=		yes
 
 USE_BUILDLINK_ONLY=	yes
+REPLACE_BUILDLINK=	imlib-config
 
 CPPFLAGS+=		-DENABLE_NLS
 CONFIGURE_ENV+=		ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
@@ -28,7 +29,7 @@ CONFIGURE_ENV+=		X_LDFLAGS="${X_LDFLAGS}"
 # The following ensures that `imlib-config --libs' includes the correct
 # linker flags for linking the X11 libs.
 #
-X_LDFLAGS=		-Wl,-R${X11BASE}/lib -L${X11BASE}/lib
+X_LDFLAGS=		-Wl,-R${X11BASE}/lib -L${BUILDLINK_X11_DIR}/lib
 
 pre-configure:
 	${TOUCH} ${WRKSRC}/ltconfig
@@ -49,4 +50,5 @@ post-install:
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/tiff/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 5a84a0d0ace..a5a35eee4cb 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/07/09 18:51:38 zuntum Exp $
+# $NetBSD: Makefile,v 1.24 2001/08/29 22:41:19 jlam Exp $
 #
 
 DISTNAME=		libwmf-0.1.21
@@ -10,7 +10,6 @@ HOMEPAGE=		http://www.wvware.com/libwmf.html
 COMMENT=		library for reading and converting WMF (Windows Meta Files)
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--includedir="${PREFIX}/include/libwmf"
 
@@ -36,4 +35,5 @@ post-install:
 .include "../../graphics/freetype-lib/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mpeg2codec/Makefile b/graphics/mpeg2codec/Makefile
index 86baa83bf7b..06611a60877 100644
--- a/graphics/mpeg2codec/Makefile
+++ b/graphics/mpeg2codec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/06/20 21:38:58 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:19 jlam Exp $
 
 DISTNAME=	mpeg2vidcodec_v12
 PKGNAME=	mpeg2codec-1.2
@@ -24,4 +24,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/mpeg2codec
 	${INSTALL_DATA} ${WRKSRC}/par/* ${PREFIX}/share/mpeg2codec
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mpeg2codec/distinfo b/graphics/mpeg2codec/distinfo
index 2e37eef4e26..66335c07b7a 100644
--- a/graphics/mpeg2codec/distinfo
+++ b/graphics/mpeg2codec/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:20 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/08/29 22:41:19 jlam Exp $
 
 SHA1 (mpeg2vidcodec_v12.tar.gz) = 2ba56c46f3a70213e4f09417ad5340ef2b1e312e
 Size (mpeg2vidcodec_v12.tar.gz) = 259790 bytes
-SHA1 (patch-aa) = 208e1aa22e94438a281fdca3ec711d93654b6e27
+SHA1 (patch-aa) = 9cf82666ec01966a63832f9105c083722ac3b41d
diff --git a/graphics/mpeg2codec/patches/patch-aa b/graphics/mpeg2codec/patches/patch-aa
index f2d48d398b1..02faf8ff6fb 100644
--- a/graphics/mpeg2codec/patches/patch-aa
+++ b/graphics/mpeg2codec/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2001/03/30 07:44:35 zuntum Exp $
+$NetBSD: patch-aa,v 1.6 2001/08/29 22:41:19 jlam Exp $
 
 --- Makefile.orig	Sat Jul 20 01:35:46 1996
 +++ Makefile
@@ -33,8 +33,8 @@ $NetBSD: patch-aa,v 1.5 2001/03/30 07:44:35 zuntum Exp $
  
 -#INCLUDEDIR = -I/usr/openwin/include
 -#LIBRARYDIR = -L/usr/openwin/lib
-+INCLUDEDIR = -I${X11BASE}/include
-+LIBRARYDIR = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
++INCLUDEDIR = -I${BUILDLINK_X11_DIR}/include
++LIBRARYDIR = -L${BUILDLINK_X11_DIR}/lib -Wl,-R${X11BASE}/lib
  
  # select one of the following CC CFLAGS settings
  
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 3feeedd2177..3be191b6843 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/06/29 19:53:21 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2001/08/29 22:41:19 jlam Exp $
 # FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
 # 
 
@@ -41,4 +41,5 @@ post-install:
 .include "../../graphics/freetype-lib/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../textproc/t1lib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index 684719c9807..f76ff7c5726 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/08/23 15:56:41 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/08/29 22:41:19 jlam Exp $
 
 DISTNAME=	xzgv-0.7
 CATEGORIES=	graphics
@@ -23,4 +23,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/$$f ${PREFIX}/info ; done
 
 .include "../../graphics/imlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 23eae69c4ec..dba89a271f4 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/07/19 16:22:41 tron Exp $
+# $NetBSD: Makefile,v 1.13 2001/08/29 22:41:20 jlam Exp $
 
 DISTNAME=	mm2.7
 PKGNAME=	mm-2.7
@@ -13,7 +13,6 @@ CONFLICTS+=	elm>=2.5.5
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK_ONLY=	YES
-USE_X11=		YES
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -25,4 +24,5 @@ MAKE_ENV+=	CC="${CC}"
 post-patch:
 	${RM} -f ${WRKDIR}/mm2.7/src/bin/*.orig
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index e31a9a2734a..e4accbdfe9d 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/07/15 13:11:18 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:20 jlam Exp $
 
 DISTNAME=	sylpheed-0.3.23
 CATEGORIES=	mail x11
@@ -16,4 +16,5 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-nls
 
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 1422b3f57d0..2eaca3c8d3a 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/06/20 21:20:58 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/08/29 22:41:20 jlam Exp $
 
 DISTNAME=	xpp-1.0
 CATEGORIES=	print x11
@@ -8,7 +8,6 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://cups.sourceforge.net/xpp/index.html
 COMMENT=	X Printing Panel
 
-USE_X11=		# defined
 USE_BUILDLINK_ONLY=	# defined
 USE_GMAKE=		# defined
 GNU_CONFIGURE=		# defined
@@ -24,4 +23,5 @@ post-install:
 
 .include "../../print/cups/buildlink.mk"
 .include "../../x11/fltk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 7b184e1029d..1075abf8229 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/07/15 10:50:07 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/08/29 22:41:20 jlam Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp
 #
 
@@ -18,9 +18,11 @@ IGNORE+=		"APM is not available for ${MACHINE_PLATFORM}"
 
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
-USE_X11=		YES
 CONFIGURE_ARGS+=	--disable-jpeg	# there actually is no JPEG support
 CONFIGURE_ARGS+=	--with-xpm
+CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_DIR}/include
+CONFIGURE_ARGS+=	--with-xpm-library=${BUILDLINK_DIR}/lib
 
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 872c4a9c234..15ee0774195 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/08/23 19:11:36 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:21 jlam Exp $
 #
 
 DISTNAME=	gkrellm-1.2.1
@@ -34,4 +34,5 @@ do-install:
 .include "../../devel/pth/buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
index 4325538a1a8..be2e2ccf483 100644
--- a/sysutils/xps/Makefile
+++ b/sysutils/xps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/03 01:46:07 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/08/29 22:41:21 jlam Exp $
 
 DISTNAME=	xps-3.14
 CATEGORIES=	sysutils
@@ -15,7 +15,8 @@ USE_X11BASE=	# defined
 
 USE_BUILDLINK_ONLY=	# defined
 GNU_CONFIGURE=		# defined
-CONFIGURE_ENV+=		XINCLUDES="-I${X11BASE}/include"
+CONFIGURE_ENV+=		XINCLUDES="-I${BUILDLINK_X11_DIR}/include"
 
 .include "../../x11/lesstif/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/t1lib/Makefile b/textproc/t1lib/Makefile
index 8b747fafe39..ee444ef31f7 100644
--- a/textproc/t1lib/Makefile
+++ b/textproc/t1lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/07/30 20:07:22 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/08/29 22:41:21 jlam Exp $
 #
 
 DISTNAME=	t1lib-1.1.1
@@ -39,4 +39,5 @@ post-install:
 
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/asclock-gtk/Makefile b/time/asclock-gtk/Makefile
index 25498ea8065..7ac13a30763 100644
--- a/time/asclock-gtk/Makefile
+++ b/time/asclock-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/07/16 10:41:18 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:21 jlam Exp $
 #
 
 DISTNAME=	asclock-gtk-2.1.10beta
@@ -38,4 +38,5 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock-gtk
 
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index a42b7a7b482..2a5aa472a8c 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/08/27 14:35:15 tron Exp $
+# $NetBSD: Makefile,v 1.15 2001/08/29 22:41:21 jlam Exp $
 
 DISTNAME=	AfterStep-1.8.9
 PKGNAME=	afterstep-1.8.9
@@ -22,10 +22,10 @@ USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_PERL5=		YES
-USE_X11=		YES
 
 CONFIGURE_ARGS+=	--disable-staticlibs
 CONFIGURE_ARGS+=	--with-helpcommand="xpman"
+CFLAGS+=		-I${BUILDLINK_DIR}/include/X11		# xpm.h
 
 post-patch:
 	for i in `${FIND} ${WRKSRC} -name "*.man" -print` \
@@ -44,4 +44,5 @@ pre-configure:
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/amaterus/Makefile b/wm/amaterus/Makefile
index ef05632f204..281038ef6d1 100644
--- a/wm/amaterus/Makefile
+++ b/wm/amaterus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/06/29 04:54:56 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:22 jlam Exp $
 
 DISTNAME=	amaterus-0.34.1
 CATEGORIES=	wm
@@ -10,7 +10,6 @@ COMMENT=	GTK+ window manager
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK_ONLY=	YES
-USE_X11=		YES
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amaterus
@@ -19,4 +18,5 @@ post-install:
 
 .include "../../textproc/libxml/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile
index 29ef7526a50..7f2abe2de4c 100644
--- a/wm/amiwm/Makefile
+++ b/wm/amiwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/30 09:45:48 zuntum Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:22 jlam Exp $
 #
 
 DISTNAME=	amiwm0.20pl48
@@ -19,4 +19,5 @@ CONFIGURE_ENV=	CFLAGS="-DHAVE_X11_EXTENSIONS_SHAPE_H=1 -O" \
 		X_PRE_LIBS="-Wl,-R${X11BASE}/lib" \
 		X_EXTRA_LIBS="-lXt"
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bbkeys/Makefile b/wm/bbkeys/Makefile
index 3af42b5c339..fde9e37dd13 100644
--- a/wm/bbkeys/Makefile
+++ b/wm/bbkeys/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/26 20:55:37 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:22 jlam Exp $
 #
 
 .include "Makefile.common"
@@ -9,4 +9,5 @@ COMMENT=	General X Window keygrabber
 GNU_CONFIGURE=		YES
 USE_BUILDLINK_ONLY=	YES
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index c9456d01c4d..d4e2c5e1583 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/30 09:24:56 zuntum Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:22 jlam Exp $
 #
 
 DISTNAME=	blackbox-0.61.1
@@ -15,4 +15,5 @@ GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--enable-kde
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index a887ccdf3a0..dbee50bd426 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/30 10:37:25 zuntum Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:22 jlam Exp $
 
 DISTNAME=		enlightenment-0.16.4
 CATEGORIES=		x11 gnome wm
@@ -8,7 +8,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.enlightenment.org/
 COMMENT=		Window manager for X
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK_ONLY=	yes
 USE_PERL5=		yes
 USE_X11BASE=		yes
 
@@ -16,6 +16,19 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-fsstd
 MAKE_ENV+=		USER=${SHAREOWN}:${SHAREGRP}
 
+# Remove -I$(includedir) from the INCLUDES passed to the compiler as this
+# defeats buildlink.
+#
+post-patch:
+	cd ${WRKSRC};							\
+	files=`${FIND} . -name "Makefile.in" -print`;			\
+	for file in $${files}; do					\
+		${MV} -f $${file} $${file}.fixme;			\
+		${SED} -e "/^INCLUDES.*=.*/s|[  ]*-I\$$(includedir)||"	\
+			$${file}.fixme > $${file};			\
+		${RM} $${file}.fixme;					\
+	done
+
 post-install:
 	for FILE in `${GREP} "\.directory$$" ${PKGDIR}/PLIST`; do \
 	  ${TOUCH} ${PREFIX}/$${FILE}; \
@@ -30,4 +43,5 @@ post-install:
 .include "../../graphics/fnlib/buildlink.mk"
 .include "../../graphics/freetype-lib/buildlink.mk"
 .include "../../www/libghttp/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/enlightenment/distinfo b/wm/enlightenment/distinfo
index 4dcc2b64a92..1909628f5d3 100644
--- a/wm/enlightenment/distinfo
+++ b/wm/enlightenment/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/17 16:03:44 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/29 22:41:23 jlam Exp $
 
 SHA1 (enlightenment-0.16.4.tar.gz) = 89e4b120a19c16a9f48de1eda0800837e26fdc92
 Size (enlightenment-0.16.4.tar.gz) = 11377994 bytes
-SHA1 (patch-aa) = c2d9e4c5a2f52adf27437462075d098f197fb6af
+SHA1 (patch-aa) = 7db0ef85e946225f770f0f65505656d341182a6e
 SHA1 (patch-ab) = c7982927d2870fa2eb04903f467d61f8984315c1
 SHA1 (patch-ac) = 9f3b794c818be0471ae6679d67fd79d79cc28216
 SHA1 (patch-ad) = fd1054a21481cf00468f9a72eff7ab0699d7ef75
diff --git a/wm/enlightenment/patches/patch-aa b/wm/enlightenment/patches/patch-aa
index a64f6bcc523..bb112f1dc38 100644
--- a/wm/enlightenment/patches/patch-aa
+++ b/wm/enlightenment/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/29 22:41:23 jlam Exp $
 
---- configure.orig	Tue Apr 11 01:19:49 2000
-+++ configure	Sun Jul 30 21:38:11 2000
+--- configure.orig	Mon Apr 10 19:19:49 2000
++++ configure
 @@ -4810,7 +4810,7 @@
  if test "x$enable_fsstd" = "xyes"; then
  	ENLIGHTENMENT_ROOT=${datadir}/enlightenment
@@ -11,7 +11,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  	USE_FSSTD=yes
  else
  	ENLIGHTENMENT_ROOT=${prefix}/enlightenment
-@@ -5473,7 +5473,7 @@
+@@ -5317,7 +5317,6 @@
+   rm -f conf.imlibtest
+ 
+ 
+-LDFLAGS="$LDFLAGS -L$prefix/lib"
+ LDFLAGS="$LDFLAGS `echo $IMLIB_LIBS | sed 's/\(.*\)-lImlib.*/\1/'`"
+ LDFLAGS="$LDFLAGS `echo $IMLIB_LIBS | sed 's/.*-lImlib.*\(-L[^ ]*\).*$/\1/'`"
+ XTST_LIBS=""
+@@ -5473,7 +5472,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
@@ -20,7 +28,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  cat > conftest.$ac_ext <<EOF
  #line 5479 "configure"
  #include "confdefs.h"
-@@ -5501,7 +5501,7 @@
+@@ -5501,7 +5500,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -29,7 +37,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  else
    echo "$ac_t""no" 1>&6
  
-@@ -5518,14 +5518,14 @@
+@@ -5518,14 +5517,14 @@
  
  
  
@@ -50,7 +58,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  cat > conftest.$ac_ext <<EOF
  #line 5531 "configure"
  #include "confdefs.h"
-@@ -5540,23 +5540,45 @@
+@@ -5540,23 +5539,45 @@
  EOF
  if { (eval echo configure:5542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
@@ -105,7 +113,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  echo "Warning: Enlightenment requires the dl (dynamic loader) library"
  echo "to be supported on your platform for module support.  Modules"
  echo "have been disabled (this will affect functionality)"
-@@ -5564,9 +5586,8 @@
+@@ -5564,9 +5585,8 @@
  fi
  
  
@@ -116,7 +124,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  ac_lib_var=`echo Xtst'_'XTestGrabControl | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5574,7 +5595,7 @@
+@@ -5574,7 +5594,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXtst $X_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -125,7 +133,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5585,7 +5606,7 @@
+@@ -5585,7 +5605,7 @@
  XTestGrabControl()
  ; return 0; }
  EOF
@@ -134,7 +142,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5613,7 +5634,7 @@
+@@ -5613,7 +5633,7 @@
  fi
  
  echo $ac_n "checking for XTestQueryExtension in -lXtst""... $ac_c" 1>&6
@@ -143,7 +151,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  ac_lib_var=`echo Xtst'_'XTestQueryExtension | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5621,7 +5642,7 @@
+@@ -5621,7 +5641,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXtst $X_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -152,7 +160,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5632,7 +5653,7 @@
+@@ -5632,7 +5652,7 @@
  XTestQueryExtension()
  ; return 0; }
  EOF
@@ -161,7 +169,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5654,7 +5675,7 @@
+@@ -5654,7 +5674,7 @@
  
  
  echo $ac_n "checking for XkbQueryExtension in -lXext""... $ac_c" 1>&6
@@ -170,7 +178,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  ac_lib_var=`echo Xext'_'XkbQueryExtension | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5662,7 +5683,7 @@
+@@ -5662,7 +5682,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXext $X_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -179,7 +187,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5673,7 +5694,7 @@
+@@ -5673,7 +5693,7 @@
  XkbQueryExtension()
  ; return 0; }
  EOF
@@ -188,7 +196,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5697,7 +5718,7 @@
+@@ -5697,7 +5717,7 @@
  fi
  
  echo $ac_n "checking for XineramaQueryExtension in -lXinerama""... $ac_c" 1>&6
@@ -197,7 +205,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  ac_lib_var=`echo Xinerama'_'XineramaQueryExtension | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5705,7 +5726,7 @@
+@@ -5705,7 +5725,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXinerama $X_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -206,7 +214,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5716,7 +5737,7 @@
+@@ -5716,7 +5736,7 @@
  XineramaQueryExtension()
  ; return 0; }
  EOF
@@ -215,7 +223,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5753,7 +5774,7 @@
+@@ -5753,7 +5773,7 @@
  
  if test "x$enable_zoom" = "xyes"; then
  echo $ac_n "checking for XF86VidModeQueryExtension in -lXxf86vm""... $ac_c" 1>&6
@@ -224,7 +232,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  ac_lib_var=`echo Xxf86vm'_'XF86VidModeQueryExtension | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5761,7 +5782,7 @@
+@@ -5761,7 +5781,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXxf86vm $X_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -233,7 +241,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5772,7 +5793,7 @@
+@@ -5772,7 +5792,7 @@
  XF86VidModeQueryExtension()
  ; return 0; }
  EOF
@@ -242,7 +250,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5808,7 +5829,7 @@
+@@ -5808,7 +5828,7 @@
  
  
  echo $ac_n "checking for mass_quantities_of_bass_ale in -lFridge""... $ac_c" 1>&6
@@ -251,7 +259,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  ac_lib_var=`echo Fridge'_'mass_quantities_of_bass_ale | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5816,7 +5837,7 @@
+@@ -5816,7 +5836,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lFridge  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -260,7 +268,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5827,7 +5848,7 @@
+@@ -5827,7 +5847,7 @@
  mass_quantities_of_bass_ale()
  ; return 0; }
  EOF
@@ -269,7 +277,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5855,7 +5876,7 @@
+@@ -5855,7 +5875,7 @@
  fi
  
  echo $ac_n "checking for mass_quantities_of_any_ale in -lFridge""... $ac_c" 1>&6
@@ -278,7 +286,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  ac_lib_var=`echo Fridge'_'mass_quantities_of_any_ale | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5863,7 +5884,7 @@
+@@ -5863,7 +5883,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lFridge  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -287,7 +295,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5874,7 +5895,7 @@
+@@ -5874,7 +5894,7 @@
  mass_quantities_of_any_ale()
  ; return 0; }
  EOF
diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile
index 7b651ca9963..fed35c60333 100644
--- a/wm/flwm/Makefile
+++ b/wm/flwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/30 10:15:06 zuntum Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:23 jlam Exp $
 #
 
 DISTNAME=	flwm-0.25
@@ -15,7 +15,7 @@ USE_X11BASE=	# defined
 
 GNU_CONFIGURE=	# defined
 CONFIGURE_ENV+=	X_LIBS="-lGL"
-CPPFLAGS+=	-I${X11PREFIX}/include
 
 .include "../../x11/fltk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile
index a8c5348b3a0..4c77f315d4f 100644
--- a/wm/icewm-gnome/Makefile
+++ b/wm/icewm-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/08/24 05:35:18 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:24 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-gnome-/}
 COMMENT=		small, fast and light-weight window manager (GNOME version)
@@ -11,4 +11,5 @@ CONFIGURE_ARGS+=	--with-gnome-menus="${GNOME_CONFIG}"
 CONFIGURE_ARGS+=	--with-imlib
 
 .include "../../x11/gnome-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index ae1ca1b05a8..8413a8476cc 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/08/24 05:35:17 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:24 jlam Exp $
 #
 
 COMMENT=		small, fast and light-weight window manager
@@ -7,4 +7,5 @@ CONFLICTS+=		icewm-gnome-[0-9]*
 
 .include "../../wm/icewm/Makefile.common"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/ion/Makefile b/wm/ion/Makefile
index b5825de64e8..f7f66cf3eb3 100644
--- a/wm/ion/Makefile
+++ b/wm/ion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/06/30 09:01:34 zuntum Exp $
+# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:24 jlam Exp $
 #
 
 DISTNAME=	ion-20010523
@@ -13,4 +13,5 @@ USE_BUILDLINK_ONLY=	YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/ion/distinfo b/wm/ion/distinfo
index b5edddf2d1e..9de3ed20b43 100644
--- a/wm/ion/distinfo
+++ b/wm/ion/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/06/30 09:01:34 zuntum Exp $
+$NetBSD: distinfo,v 1.5 2001/08/29 22:41:24 jlam Exp $
 
 SHA1 (ion-20010523.tar.gz) = d2eb29d8cd193d4b2bf1e630f4bbac7bd47979d6
 Size (ion-20010523.tar.gz) = 146376 bytes
 SHA1 (patch-aa) = ae5fd844f89bf11d64f1f977219d70e8f868289c
-SHA1 (patch-ab) = 736e1dd6d2ba3fca8932abed69e6e44a0f02f8c0
+SHA1 (patch-ab) = 1cb5844d831db2c205142f8fe295002b646b66e8
 SHA1 (patch-ac) = 302f20d54304164612d04636642a88d0565da75d
diff --git a/wm/ion/patches/patch-ab b/wm/ion/patches/patch-ab
index e2e7edd9911..95a4b611f9e 100644
--- a/wm/ion/patches/patch-ab
+++ b/wm/ion/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2001/06/16 00:29:30 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2001/08/29 22:41:24 jlam Exp $
 
---- system.mk.orig	Mon Mar  5 17:16:01 2001
+--- system.mk.orig	Mon Mar  5 11:16:01 2001
 +++ system.mk
 @@ -7,13 +7,13 @@
  ## Installation paths
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.2 2001/06/16 00:29:30 wiz Exp $
  # Not used
  INCDIR=$(PREFIX)/include
  LIBDIR=$(PREFIX)/lib
-@@ -24,7 +24,7 @@
+@@ -24,14 +24,14 @@
  ##
  
  #MODULE_SUPPORT=-DCF_NO_MODULE_SUPPORT
@@ -27,6 +27,14 @@ $NetBSD: patch-ab,v 1.2 2001/06/16 00:29:30 wiz Exp $
  
  
  ##
+ ## X libraries, includes and options
+ ##
+ 
+-X11_PREFIX=/usr/X11R6
++X11_PREFIX=${BUILDLINK_X11_DIR}
+ 
+ # SunOS/Solaris
+ #X11_PREFIX=/usr/openwin
 @@ -59,7 +59,6 @@
  ## C compiler
  ##
diff --git a/wm/ratpoison/Makefile b/wm/ratpoison/Makefile
index 27577d2ce60..078cc657f08 100644
--- a/wm/ratpoison/Makefile
+++ b/wm/ratpoison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/30 10:13:21 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:25 jlam Exp $
 #
 
 DISTNAME=	ratpoison-0.1.1
@@ -10,7 +10,7 @@ HOMEPAGE=	http://ratpoison.sourceforge.net/
 COMMENT=	Simple window manager with no fat library dependencies
 
 USE_BUILDLINK_ONLY=	YES
-GNU_CONFIGURE=	YES
-USE_X11=	YES
+GNU_CONFIGURE=		YES
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 04ac7093ca8..9d2b5156405 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/08/26 10:32:23 skrll Exp $
+# $NetBSD: Makefile,v 1.18 2001/08/29 22:41:25 jlam Exp $
 
 DISTNAME=		WindowMaker-0.65.1
 PKGNAME=		windowmaker-0.65.1
@@ -15,6 +15,10 @@ BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK_ONLY=	YES
+REPLACE_BUILDLINK=	WINGs/get-wings-flags
+REPLACE_BUILDLINK+=	WINGs/get-wutil-flags
+REPLACE_BUILDLINK+=	wrlib/get-wraster-flags
+
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 USE_X11BASE=		YES
@@ -88,4 +92,5 @@ post-install:
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/tiff/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index 71820d393bb..f42f74decf2 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2001/08/18 18:13:27 tron Exp $
+$NetBSD: distinfo,v 1.12 2001/08/29 22:41:25 jlam Exp $
 
 SHA1 (WindowMaker-0.65.1.tar.bz2) = 2600498e72ba3fc5a8fd9fb27ac1261b89c42826
 Size (WindowMaker-0.65.1.tar.bz2) = 1916105 bytes
 SHA1 (patch-aa) = 3d0ee91d9c7a98be2ff49614567c2af96178445a
-SHA1 (patch-ab) = 7b24ac2787ad675ba7da64444889a5334ea71a31
+SHA1 (patch-ab) = 5fdc12fc8b4f30d484bf2882ca6392cbf6d24482
 SHA1 (patch-ac) = 8e4b85dc9b8b3cf211b6c76dbca46f60308ac591
 SHA1 (patch-ad) = f2ef4b942be333deb7f5f00e00653beb3081888e
 SHA1 (patch-ae) = 13c09a0cf40eb20d7866cd4855bbfe91cfc11fb0
diff --git a/wm/windowmaker/patches/patch-ab b/wm/windowmaker/patches/patch-ab
index 47cc00bbbe8..71e768f8cc1 100644
--- a/wm/windowmaker/patches/patch-ab
+++ b/wm/windowmaker/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2001/08/18 18:13:28 tron Exp $
+$NetBSD: patch-ab,v 1.7 2001/08/29 22:41:25 jlam Exp $
 
 --- configure.in.orig	Mon Jul 23 21:43:34 2001
 +++ configure.in	Sat Aug 18 19:57:49 2001
@@ -61,8 +61,8 @@ $NetBSD: patch-ab,v 1.6 2001/08/18 18:13:28 tron Exp $
  
 -LIBRARY_SEARCH_PATH="$lib_search_path"
 -HEADER_SEARCH_PATH="$inc_search_path"
-+LIBRARY_SEARCH_PATH="-L${BUILDLINK_DIR}/lib -L${X11BASE}/lib"
-+HEADER_SEARCH_PATH="-I${BUILDLINK_DIR}/include -I${X11BASE}/include"
++LIBRARY_SEARCH_PATH="-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib"
++HEADER_SEARCH_PATH="-I${BUILDLINK_DIR}/include -I${BUILDLINK_X11_DIR}/include"
  
  AC_SUBST(LIBRARY_SEARCH_PATH)
  AC_SUBST(HEADER_SEARCH_PATH)
diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile
index 01cd8b8493f..352c1e34ce8 100644
--- a/wm/wm2/Makefile
+++ b/wm/wm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/30 10:17:53 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:25 jlam Exp $
 
 DISTNAME=	wm2-4
 PKGNAME=	wm2-4.0
@@ -13,9 +13,11 @@ ALL_TARGET=	depend wm2
 
 USE_BUILDLINK_ONLY=	YES
 USE_X11BASE=		YES
+MAKE_ENV+=	CCC="${CXX}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wm2 ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/man/cat1/wm2.0
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wm2/distinfo b/wm/wm2/distinfo
index 60fc0a363cc..8318867ec6d 100644
--- a/wm/wm2/distinfo
+++ b/wm/wm2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/17 16:03:48 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/29 22:41:25 jlam Exp $
 
 SHA1 (wm2-4.tar.gz) = dd959e72eedca113b372ddf67b95260e25226a91
 Size (wm2-4.tar.gz) = 32807 bytes
-SHA1 (patch-aa) = 12e2fe7b7b74c9b1c666093c156c9b3d96656b29
+SHA1 (patch-aa) = 3abf330bd012205dbb6eeff06b0be28fe27835d3
 SHA1 (patch-ab) = 047f72483a5f7d250742a5d53aa8a48ca123558e
diff --git a/wm/wm2/patches/patch-aa b/wm/wm2/patches/patch-aa
index 3f4049eee08..635155a88ba 100644
--- a/wm/wm2/patches/patch-aa
+++ b/wm/wm2/patches/patch-aa
@@ -1,16 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/29 22:41:26 jlam Exp $
 
---- Makefile.orig	Sun Sep 26 23:18:49 1999
-+++ Makefile	Sun Sep 26 23:19:31 1999
+--- Makefile.orig	Fri Mar 21 06:12:30 1997
++++ Makefile
 @@ -1,9 +1,9 @@
  
 -LIBS	=  -L/usr/X11/lib -lXext -lX11 -lXmu -lm
-+LIBS	= -Wl,-R,$(X11BASE)/lib -L$(X11BASE)/lib -lXext -lX11 -lXmu -lm
++LIBS	= ${LDFLAGS} -lXext -lX11 -lXmu -lm
  
- CC	= gcc
- CCC	= gcc
+-CC	= gcc
+-CCC	= gcc
 -CFLAGS	= -O2
-+CFLAGS	= -O2 -I$(X11BASE)/include
++#CC	= gcc
++#CCC	= gcc
++#CFLAGS	= -O2
  OBJECTS	= Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o
  
  .c.o:
diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 9ff5848e722..648a2e532ad 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/08/23 21:00:07 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:26 jlam Exp $
 #
 
 DISTNAME=	wmakerconf-2.8.1
@@ -14,9 +14,11 @@ USE_BUILDLINK_ONLY=	yes
 USE_X11BASE=		yes
 USE_PERL5=		yes
 GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		wraster="${GET_WRASTER_FLAGS}"
 
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
 .include "../../wm/windowmaker/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmx/Makefile b/wm/wmx/Makefile
index 1dc480c78e2..f0e80a34dea 100644
--- a/wm/wmx/Makefile
+++ b/wm/wmx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/07/27 20:39:59 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:26 jlam Exp $
 
 PKGNAME=	wmx-${WMX_VERS}
 COMMENT=	another X11 window manager based on wm2
@@ -6,4 +6,5 @@ COMMENT=	another X11 window manager based on wm2
 USE_BUILDLINK_ONLY=	# defined
 
 .include "../../wm/wmx/Makefile.common"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index 46efe472805..d8bd2d4f702 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/06/30 21:15:01 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2001/08/29 22:41:26 jlam Exp $
 # FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp
 #
 
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+=	--with-jpegdir=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=	--with-pngdir=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=	--with-zdir=${BUILDLINK_DIR}
 
-CPPFLAGS+=		-I${X11BASE}/include
 CPPFLAGS+=		-Dunix
 
 post-configure:
@@ -43,4 +42,5 @@ do-install:
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../x11/lesstif12/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ns-remote/Makefile b/www/ns-remote/Makefile
index d6a779e202c..a4990d73ffe 100644
--- a/www/ns-remote/Makefile
+++ b/www/ns-remote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/27 14:26:19 abs Exp $
+# $NetBSD: Makefile,v 1.10 2001/08/29 22:41:27 jlam Exp $
 
 DISTNAME=	ns-remote
 PKGNAME=	ns-remote-1.4
@@ -11,7 +11,6 @@ HOMEPAGE=	http://home.netscape.com/newsref/std/x-remote.html
 COMMENT=	remote-control Netscape Navigator and Communicator
 
 DIST_SUBDIR=    netscape
-USE_X11=	yes
 
 USE_BUILDLINK_ONLY=	yes
 
@@ -32,4 +31,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ns-remote ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${FILESDIR}/ns-open ${PREFIX}/bin
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ns-remote/files/Makefile b/www/ns-remote/files/Makefile
index e985a1efdc7..a0ae7711872 100644
--- a/www/ns-remote/files/Makefile
+++ b/www/ns-remote/files/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2000/01/13 05:12:16 simonb Exp $
+# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:27 jlam Exp $
 #
 # Very simple Makefile used to compile Netscape's ns-remote program
 #
 
 PROG	= ns-remote
-X11BASE?= /usr/X11R6
 
 all:	${PROG}
 
 ${PROG}:	remote.c
-	${CC} ${CFLAGS} -o ${PROG} remote.c -DSTANDALONE -I${X11BASE}/include \
+	${CC} ${CFLAGS} -o ${PROG} remote.c -DSTANDALONE \
 	    ${LDFLAGS} -lXmu -lXt -lSM -lICE -lXext -lX11
 
 clean:
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile
index 693ab7ba1c6..c06a3806315 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/06/26 19:54:48 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:27 jlam Exp $
 #
 
 DISTNAME=	ebuilder-0.56d
@@ -11,7 +11,6 @@ HOMEPAGE=	http://web.inter.nl.net/users/eavdmeer/index.html
 COMMENT=	GUI builder for the Qt library
 
 USE_BUILDLINK_ONLY=	yes
-USE_X11=		yes
 USE_GMAKE=		yes
 MAKEFILE=		GNUmakefile
 
@@ -21,4 +20,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin
 
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/ebuilder/distinfo b/x11/ebuilder/distinfo
index da8e601e4a1..01949730a8c 100644
--- a/x11/ebuilder/distinfo
+++ b/x11/ebuilder/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/06/26 19:54:48 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/08/29 22:41:27 jlam Exp $
 
 SHA1 (ebuilder-0.56d.tar.gz) = fb0c7d56a7c55580082a832be975d188fe0e5e5d
 Size (ebuilder-0.56d.tar.gz) = 84717 bytes
-SHA1 (patch-aa) = 906ee4003691e821b386cdcd6ccdd56777f7872d
+SHA1 (patch-aa) = e3c24bd15a8942b2ce3573ecb5560ecfe5e39174
 SHA1 (patch-ab) = a50121d2072e2c756432c4e0bfd44c6a2683498a
diff --git a/x11/ebuilder/patches/patch-aa b/x11/ebuilder/patches/patch-aa
index 0c6d17addfb..39217df8e4a 100644
--- a/x11/ebuilder/patches/patch-aa
+++ b/x11/ebuilder/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2001/06/26 19:54:49 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2001/08/29 22:41:27 jlam Exp $
 
 --- config.mk.orig	Sat Mar 25 08:31:45 2000
 +++ config.mk
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.3 2001/06/26 19:54:49 jlam Exp $
  QTINCL = -I$(QTDIR)/include
  QTCC = $(QTDIR)/bin/moc
 -QTLIBS = -L$(QTDIR)/lib -lqt
-+QTLIBS = ${LDFLAGS} -L$(QTDIR)/lib -lqt -L$(X11BASE)/lib -lX11 -lXext -lSM -lpng -lz
++QTLIBS = ${LDFLAGS} -L$(QTDIR)/lib -lqt -L$(BUILDLINK_X11_DIR)/lib -lX11 -lXext -lSM -lpng -lz
  
  # Implicit rules needed to build .o files and Metaobject stuff (_m.o)
  .SUFFIXES: .cc .o .h _m.o
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 4cefb7d825e..144869e24e8 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/26 13:40:43 zuntum Exp $
+# $NetBSD: Makefile,v 1.11 2001/08/29 22:41:27 jlam Exp $
 
 DISTNAME=		Eterm-0.8.10
 PKGNAME=		eterm-0.8.10
@@ -42,4 +42,5 @@ post-install:
 .endif
 
 .include "../../graphics/imlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index 74e57f86c1d..161d5ac02e4 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/28 11:07:34 zuntum Exp $
+$NetBSD: distinfo,v 1.4 2001/08/29 22:41:27 jlam Exp $
 
 SHA1 (Eterm-0.8.10.tar.gz) = 0cafeec2c9d79c874c6b312dcb105b912168ad0d
 Size (Eterm-0.8.10.tar.gz) = 593026 bytes
@@ -12,3 +12,6 @@ SHA1 (patch-aa) = 056585ad4c39b60a3dbf41d8c7e65d31ba5f7fcd
 SHA1 (patch-ab) = cdea7fe7a3c546e9f89a7eb86ec079f34572e984
 SHA1 (patch-ac) = 26b0f5c13f2b621db1c5edf84c5123b315225d8d
 SHA1 (patch-ad) = a750146fe3a0b0b2796997cf2e20e38f14be86bf
+SHA1 (patch-ae) = 7464d0b7b4b8d5b4c825d7fdcfa464b5e3d18a6c
+SHA1 (patch-af) = 8f21b197a56ddc0d66f29dcf9d5dcbe7922a28ae
+SHA1 (patch-ag) = 5359f122eb6fe605202288de59d71d07be4d2556
diff --git a/x11/eterm/patches/patch-ae b/x11/eterm/patches/patch-ae
new file mode 100644
index 00000000000..792bb622c18
--- /dev/null
+++ b/x11/eterm/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 2001/08/29 22:41:28 jlam Exp $
+
+--- libmej/Makefile.in.orig	Fri Nov  5 11:03:53 1999
++++ libmej/Makefile.in
+@@ -105,7 +105,7 @@
+ 
+ libmej_la_SOURCES = debug.c mem.c strings.c snprintf.c
+ 
+-INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
++INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I.. $(X_CFLAGS)
+ 
+ libmej_la_LDFLAGS = -release $(VERSION)
+ 
diff --git a/x11/eterm/patches/patch-af b/x11/eterm/patches/patch-af
new file mode 100644
index 00000000000..782a96609b5
--- /dev/null
+++ b/x11/eterm/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2001/08/29 22:41:28 jlam Exp $
+
+--- src/Makefile.in.orig	Fri Nov  5 14:03:54 1999
++++ src/Makefile.in
+@@ -113,8 +113,8 @@
+ Eterm_DEPENDENCIES = libEterm.la
+ Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir) libEterm.la
+ 
+-INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/libmej -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
+-LDADD = $(DIST_ROOT)/libmej/libmej.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS)
++INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/libmej -I.. $(X_CFLAGS)
++LDADD = $(DIST_ROOT)/libmej/libmej.la $(LIBS) $(GRLIBS) $(X_LIBS)
+ 
+ EXTRA_DIST = activeconfig.h activeeterm.h activetags.h command.h debug.h              eterm_imlib.h eterm_utmp.h feature.h.in graphics.h grkelot.h grx.h main.h              menubar.h misc.h options.h pixmap.h profile.h screen.h scrollbar.h              system.h threads.h graphics/Makefile.am graphics/Makefile.in              graphics/README graphics/data graphics/grxlib.c graphics/grxlib.h              graphics/qplot.c Eterm.xpm
+ 
diff --git a/x11/eterm/patches/patch-ag b/x11/eterm/patches/patch-ag
new file mode 100644
index 00000000000..0a5e32b2a7b
--- /dev/null
+++ b/x11/eterm/patches/patch-ag
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.1 2001/08/29 22:41:28 jlam Exp $
+
+--- utils/Makefile.in.orig	Fri Nov  5 14:03:55 1999
++++ utils/Makefile.in
+@@ -101,14 +101,14 @@
+ THREADLIBS = @THREADLIBS@
+ VERSION = @VERSION@
+ 
+-INCLUDES = -I. -I../libmej -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
++INCLUDES = -I. -I../libmej -I.. $(X_CFLAGS)
+ 
+ bin_PROGRAMS = Esetroot Etbg
+ bin_SCRIPTS = Etcolors.sh Etmenu.sh
+ 
+ Esetroot_SOURCES = Esetroot.c
+ Esetroot_LDFLAGS = -rpath $(libdir):$(pkglibdir)
+-Esetroot_LDADD = -L$(DIST_ROOT)/libmej -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS)
++Esetroot_LDADD = -L$(DIST_ROOT)/libmej $(LIBS) $(GRLIBS) $(X_LIBS)
+ 
+ Etbg_SOURCES = Etbg.c
+ 
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 93ffe225889..c75d351813b 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/06/20 21:17:36 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2001/08/29 22:41:28 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME}-source
@@ -31,4 +31,5 @@ test:
 		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test
 
 .include "../../graphics/Mesa/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 62f83f58cd9..3c2d729dbf0 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2001/06/29 04:54:56 jlam Exp $
+# $NetBSD: Makefile,v 1.68 2001/08/29 22:41:28 jlam Exp $
 
 DISTNAME=		gnome-libs-1.2.13
 CATEGORIES=		x11 gnome
@@ -71,4 +71,5 @@ post-install:
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../net/ORBit/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 0c26238acf0..1796444c20f 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2001/06/29 04:54:56 jlam Exp $
+# $NetBSD: Makefile,v 1.65 2001/08/29 22:41:29 jlam Exp $
 
 DISTNAME=		gtk+-1.2.10
 CATEGORIES=		x11
@@ -34,7 +34,7 @@ PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 # The following ensures that `gtk-config --libs' includes the correct linker
 # flags for linking the X11 libs.
 #
-X_LDFLAGS=		-Wl,-R${X11BASE}/lib -L${X11BASE}/lib
+X_LDFLAGS=		-Wl,-R${X11BASE}/lib -L${BUILDLINK_X11_DIR}/lib
 
 GTK_VERSION=		${DISTNAME:S/gtk+-//}
 GTK_MAJOR_VERSION=	${GTK_VERSION:C/\..*//}
@@ -66,4 +66,5 @@ post-install:
 
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/glib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile
index 8771474aa0d..1295ea3eeca 100644
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/06/30 21:12:24 zuntum Exp $
+# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:29 jlam Exp $
 #
 
 DISTNAME=	imwheel-0.9.9
@@ -10,9 +10,10 @@ HOMEPAGE=	http://jcatki.dhs.org/imwheel/
 COMMENT=	tool which helps to use mousewheels
 
 USE_BUILDLINK_ONLY=	YES
-GNU_CONFIGURE=	YES
-USE_X11BASE=	YES
+GNU_CONFIGURE=		YES
+USE_X11BASE=		YES
 
-CONFIGURE_ARGS+=--disable-gpm
+CONFIGURE_ARGS+=	--disable-gpm
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index d0671260af2..82f45ebc7e1 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2001/08/08 07:37:51 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2001/08/29 22:41:29 jlam Exp $
 
 .include "../../x11/lesstif/Makefile.common"
 
@@ -28,4 +28,5 @@ pre-install:
 post-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lesstif12/Makefile b/x11/lesstif12/Makefile
index 47dc9826052..46f1c252ef8 100644
--- a/x11/lesstif12/Makefile
+++ b/x11/lesstif12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/30 19:08:22 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/08/29 22:41:29 jlam Exp $
 
 .include "../../x11/lesstif/Makefile.common"
 
@@ -21,4 +21,5 @@ CONFIGURE_ARGS+=	--enable-default-12
 post-install:
 	${RMDIR} -p ${PREFIX}/share/doc/html/lesstif 2> /dev/null || ${TRUE}
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 9e8b0832ad3..fd7308a0f51 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/06/23 19:35:27 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:29 jlam Exp $
 #
 #USE_MESA=		yes
 
@@ -30,4 +30,5 @@ do-install:
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../graphics/mng/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index 15af1ef9ce8..a1e18ed2f59 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2001/06/23 19:35:27 jlam Exp $
+# $NetBSD: Makefile.common,v 1.16 2001/08/29 22:41:29 jlam Exp $
 #
 
 DISTNAME=		qt-x11-${QTVERSION}
@@ -43,6 +43,7 @@ CONFIGURE_ARGS+=	-platform solaris-g++
 .endif
 
 FILES_SUBST=		BUILDLINK_DIR=${BUILDLINK_DIR}
+FILES_SUBST+=		BUILDLINK_X11_DIR=${BUILDLINK_X11_DIR}
 FILES_SUBST+=		LOCALBASE=${LOCALBASE}
 FILES_SUBST+=		QTDIR=${QTPREFIX}
 FILES_SUBST+=		X11BASE=${X11BASE}
diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo
index 5c212303bf1..7885500ad92 100644
--- a/x11/qt2-libs/distinfo
+++ b/x11/qt2-libs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2001/06/23 19:35:27 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/08/29 22:41:29 jlam Exp $
 
 SHA1 (qt-x11-2.3.1.tar.gz) = f1403700fe80fbfb125ec84731d0dfe9c576c823
 Size (qt-x11-2.3.1.tar.gz) = 8967271 bytes
 SHA1 (patch-aa) = 10f4cea8c2719c3c70becff88022e910778c4538
-SHA1 (patch-ab) = 7f1cdc853e036f17fee51402756f68504c413d00
-SHA1 (patch-ac) = 25cbb7d243dc2c543b44d2870325d017b26604b0
+SHA1 (patch-ab) = 29254fdd872f763fb48512cbf982481b88e40e5b
+SHA1 (patch-ac) = ce19f2f1dd839b86dda1de20268d380138c39415
 SHA1 (patch-ad) = 26482d22e1d016ef514a43a69a5d58b19f03193c
 SHA1 (patch-ae) = 3ca7c34f608458950e5036f4a0b9ca0c53f83343
 SHA1 (patch-af) = ea8b1c3f7a099a5492301281476ea831134ad97b
diff --git a/x11/qt2-libs/patches/patch-ab b/x11/qt2-libs/patches/patch-ab
index 8992d2de3a6..e0f433c5120 100644
--- a/x11/qt2-libs/patches/patch-ab
+++ b/x11/qt2-libs/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2001/06/23 19:35:27 jlam Exp $
+$NetBSD: patch-ab,v 1.7 2001/08/29 22:41:30 jlam Exp $
 
 --- configs/netbsd-g++-static.in.orig	Wed Jun 13 04:56:48 2001
 +++ configs/netbsd-g++-static.in
@@ -14,10 +14,10 @@ $NetBSD: patch-ab,v 1.6 2001/06/23 19:35:27 jlam Exp $
  
  # Compiling with support libraries
 -SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_X11	= -I@X11BASE@/include
++SYSCONF_CXXFLAGS_X11	= -I@BUILDLINK_X11_DIR@/include
  SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
 -SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_OPENGL	= -I@BUILDLINK_DIR@/include -I@X11BASE@/include
++SYSCONF_CXXFLAGS_OPENGL	= -I@BUILDLINK_DIR@/include -I@BUILDLINK_X11_DIR@/include
  
  # Compiling YACC output
  SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
@@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.6 2001/06/23 19:35:27 jlam Exp $
  # Linking with support libraries
  # X11
 -SYSCONF_LFLAGS_X11	= -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_X11	= -L@X11BASE@/lib
++SYSCONF_LFLAGS_X11	= -L@BUILDLINK_X11_DIR@/lib
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -41,7 +41,7 @@ $NetBSD: patch-ab,v 1.6 2001/06/23 19:35:27 jlam Exp $
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
 -SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_OPENGL	= -L@BUILDLINK_DIR@/lib -L@X11BASE@/lib
++SYSCONF_LFLAGS_OPENGL	= -L@BUILDLINK_DIR@/lib -L@BUILDLINK_X11_DIR@/lib
  SYSCONF_LIBS_OPENGL	= -lGLU -lGL -lXmu
  # Yacc
  SYSCONF_LIBS_YACC	= 
diff --git a/x11/qt2-libs/patches/patch-ac b/x11/qt2-libs/patches/patch-ac
index 1e230e7010b..4ad0ebf9062 100644
--- a/x11/qt2-libs/patches/patch-ac
+++ b/x11/qt2-libs/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2001/06/23 19:35:27 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2001/08/29 22:41:30 jlam Exp $
 
 --- configs/solaris-g++-static.in.orig	Wed Jun 13 04:56:50 2001
 +++ configs/solaris-g++-static.in
@@ -11,10 +11,10 @@ $NetBSD: patch-ac,v 1.3 2001/06/23 19:35:27 jlam Exp $
  
  # Compiling with support libraries
 -SYSCONF_CXXFLAGS_X11	= -I/usr/openwin/include
-+SYSCONF_CXXFLAGS_X11	= -I@X11BASE@/include
++SYSCONF_CXXFLAGS_X11	= -I@BUILDLINK_X11_DIR@/include
  SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
 -SYSCONF_CXXFLAGS_OPENGL	= 
-+SYSCONF_CXXFLAGS_OPENGL	= -I@BUILDLINK_DIR@/include -I@X11BASE@/include
++SYSCONF_CXXFLAGS_OPENGL	= -I@BUILDLINK_DIR@/include -I@BUILDLINK_X11_DIR@/include
  
  # Compiling YACC output
  SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.3 2001/06/23 19:35:27 jlam Exp $
  # Linking with support libraries
  # X11
 -SYSCONF_LFLAGS_X11	= -L/usr/openwin/lib
-+SYSCONF_LFLAGS_X11	= -L@X11BASE@/lib
++SYSCONF_LFLAGS_X11	= -L@BUILDLINK_X11_DIR@/lib
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm -lresolv -lsocket -lnsl
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.3 2001/06/23 19:35:27 jlam Exp $
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
 -SYSCONF_LFLAGS_OPENGL	= 
-+SYSCONF_LFLAGS_OPENGL	= -L@BUILDLINK_DIR@/lib -L@X11BASE@/lib
++SYSCONF_LFLAGS_OPENGL	= -L@BUILDLINK_DIR@/lib -L@BUILDLINK_X11_DIR@/lib
  SYSCONF_LIBS_OPENGL	= -lGLU -lGL -lXmu
  # Yacc
  SYSCONF_LIBS_YACC	= 
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index 8480a8084de..a37c5456329 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/06/26 20:42:59 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/08/29 22:41:30 jlam Exp $
 
 DISTNAME=	qwt-0.3.0
 CATEGORIES=	x11
@@ -31,4 +31,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/man/man3/* ${PREFIX}/man/man3
 
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qwt/distinfo b/x11/qwt/distinfo
index 009b3d74ce3..2b8a6c39b3d 100644
--- a/x11/qwt/distinfo
+++ b/x11/qwt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2001/06/26 20:42:59 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/08/29 22:41:30 jlam Exp $
 
 SHA1 (qwt-0.3.0.tar.gz) = 504940fbf25b058d258bba3589a22752a624847b
 Size (qwt-0.3.0.tar.gz) = 484675 bytes
-SHA1 (patch-aa) = e57c888c1c6ea486dfa24e84e7aaba72f406fa7e
+SHA1 (patch-aa) = 37b74054101d51f1e60acd6afad1a128eb6b867d
diff --git a/x11/qwt/patches/patch-aa b/x11/qwt/patches/patch-aa
index 4561293d5a9..a5c62893227 100644
--- a/x11/qwt/patches/patch-aa
+++ b/x11/qwt/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2001/06/26 20:43:00 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:30 jlam Exp $
 
 --- makefiles/netbsd-g++.orig	Wed Dec 13 23:23:09 2000
 +++ makefiles/netbsd-g++
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 2001/06/26 20:43:00 jlam Exp $
 -LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm
 +#LINK	=	g++
 +#LFLAGS	=	-Bshareable 
-+LIBS	=	${LDFLAGS} $(SUBLIBS) -L$(QTDIR)/lib -L${X11BASE}/lib -lqt -lXext -lX11 -lm
++LIBS	=	${LDFLAGS} $(SUBLIBS) -L$(QTDIR)/lib -L${BUILDLINK_X11_DIR}/lib -lqt -lXext -lX11 -lm
  AR	=	ar cqs
  RANLIB	=	
  MOC	=	$(QTDIR)/bin/moc
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 950cf2ddb3e..19bf333b946 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/08/06 06:09:55 martin Exp $
+# $NetBSD: Makefile,v 1.27 2001/08/29 22:41:30 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
 #
 
@@ -40,7 +40,8 @@ CONFIGURE_ARGS+=	--enable-utmp \
 # enabling it, please fix pkg/MESSAGE as well.
 #			--enable-greek
 
-CPPFLAGS+=		-I${BUILDLINK_DIR}/include/X11
+CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_DIR}/include/X11
+CONFIGURE_ARGS+=	--with-xpm-library=${BUILDLINK_DIR}/lib
 
 post-patch:
 	${MV} ${WRKSRC}/src/feature.h  ${WRKSRC}/src/feature.h.orig
@@ -53,4 +54,5 @@ pre-install:
 	fi
 
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmessage/Makefile b/x11/wmessage/Makefile
index ba9d416b694..bbd7b807250 100644
--- a/x11/wmessage/Makefile
+++ b/x11/wmessage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/24 09:41:16 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:31 jlam Exp $
 
 DISTNAME=	wmessage-0.10
 CATEGORIES=	x11
@@ -8,8 +8,8 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.ozemail.com.au/~crn/wmessage/
 COMMENT=	WINGs based message viewer similar to xmessage
 
-USE_X11=		yes
 USE_BUILDLINK_ONLY=	yes
 
 .include "../../wm/windowmaker/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile
index fec59d171be..dfed1494c35 100644
--- a/x11/wmfire/Makefile
+++ b/x11/wmfire/Makefile
@@ -1,4 +1,4 @@
-#$NetBSD: Makefile,v 1.7 2001/06/29 08:51:20 zuntum Exp $
+#$NetBSD: Makefile,v 1.8 2001/08/29 22:41:31 jlam Exp $
 #
 
 DISTNAME=	wmfire-0.0.3.8
@@ -9,9 +9,7 @@ MAINTAINER=	hubertf@netbsd.org
 COMMENT=	Displays generated fire according to system load
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=	YES
-GNU_CONFIGURE=	YES
-CPPFLAGS+=	-I${X11BASE}/include
+GNU_CONFIGURE=		YES
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmfire
@@ -22,4 +20,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/wmfire
 
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index a8e8ec42d48..324161fe962 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/07/15 14:03:12 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:31 jlam Exp $
 #
 
 DISTNAME=	wmWeather-1.31
@@ -18,4 +18,5 @@ REPLACE_PERL=		GrabWeather
 CPPFLAGS+=		-I${X11BASE}/include
 
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpenguins/Makefile b/x11/xpenguins/Makefile
index 92cdf5b20b6..a47612f0578 100644
--- a/x11/xpenguins/Makefile
+++ b/x11/xpenguins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/07/09 15:40:41 zuntum Exp $
+# $NetBSD: Makefile,v 1.8 2001/08/29 22:41:31 jlam Exp $
 #
 
 DISTNAME=	xpenguins-2.1
@@ -10,9 +10,8 @@ HOMEPAGE=	http://xpenguins.seul.org/
 COMMENT=	Little penguins walking along the tops of your windows
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=	YES
-
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=		YES
 
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index d45bfb5549b..05b903822ce 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/07/10 17:51:14 nra Exp $
+# $NetBSD: Makefile,v 1.18 2001/08/29 22:41:31 jlam Exp $
 #
 
 DISTNAME=       fvwm-${PKG_VERSION}
@@ -32,4 +32,5 @@ do-install:
 	${INSTALL_MAN}		${WRKSRC}/utils/xpmroot.1 ${PREFIX}/man/man1
 
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile
index 95812e32efc..56568ad88a2 100644
--- a/x11/xteddy/Makefile
+++ b/x11/xteddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/07/09 15:43:14 zuntum Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:32 jlam Exp $
 
 DISTNAME=	xteddy-1.1
 CATEGORIES=	x11 games
@@ -9,12 +9,12 @@ HOMEPAGE=	http://www.ITN.LiU.SE/~stegu/xteddy
 COMMENT=	Xteddy is a cuddly teddy bear for your X Windows desktop
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=	YES
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=		YES
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy/pixmaps
 
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xteddy/distinfo b/x11/xteddy/distinfo
index fb0c257fd92..6c29fe8263c 100644
--- a/x11/xteddy/distinfo
+++ b/x11/xteddy/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:08:00 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/08/29 22:41:32 jlam Exp $
 
 SHA1 (xteddy-1.1.tar.gz) = a681923333a4e2b2112290d601c167fd7e8e1302
 Size (xteddy-1.1.tar.gz) = 117141 bytes
-SHA1 (patch-aa) = 335b204442c48616121e6d7d82ffa0ae5b6f9199
+SHA1 (patch-aa) = d90f5121cfdbb28f8a1eb960c405c460de163430
 SHA1 (patch-ab) = 260f836f4aab651c72caebac821e497b54d72cbd
diff --git a/x11/xteddy/patches/patch-aa b/x11/xteddy/patches/patch-aa
index aa4e702d0b8..ae1789c3dc7 100644
--- a/x11/xteddy/patches/patch-aa
+++ b/x11/xteddy/patches/patch-aa
@@ -1,8 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/10/15 01:01:46 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/29 22:41:32 jlam Exp $
 
---- Makefile.in.orig	Fri Oct 15 02:30:18 1999
-+++ Makefile.in	Fri Oct 15 02:31:37 1999
-@@ -74,7 +74,7 @@
+--- Makefile.in.orig	Thu Oct 29 03:01:17 1998
++++ Makefile.in
+@@ -70,11 +70,11 @@
+ xteddy_SOURCES = xteddy.c 
+ HTML_DOC = html/xteddy.html html/xteddy_info.html \
+            html/images/noise.jpg html/images/xteddy.gif html/images/xteddy.xbm
+-xteddy_LDADD = -L/usr/X11R6/lib
++xteddy_LDADD = -L${BUILDLINK_X11_DIR}
  LIBS = -lX11 -lXext -lXpm
  man_MANS = xteddy.1
  
diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index 402fd1d230f..007708d17cb 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/08/23 04:58:04 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:32 jlam Exp $
 
 DISTNAME=	xteddy-2.0.1
 CATEGORIES=	x11 games
@@ -12,9 +12,6 @@ CONFLICT+=	xteddy-1.*
 
 USE_BUILDLINK_ONLY=	yes
 GNU_CONFIGURE=		yes
-USE_X11=		yes
-
-CPPFLAGS+=		-I${X11BASE}/include
 
 pre-configure:
 	files="configure xteddy_test xtoys";				\
@@ -29,4 +26,5 @@ pre-configure:
 	done
 
 .include "../../graphics/imlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
author	jlam <jlam>	2001-08-29 22:41:00 +0000
committer	jlam <jlam>	2001-08-29 22:41:00 +0000
commit	b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae (patch)
tree	0943c3791afa0b712d3818b69672014acfe55e03
parent	68d93d0286e46619b54c9d917dbf553bc889a6e5 (diff)
download	pkgsrc-b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae.tar.gz