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.

23 files changed, 119 insertions, 70 deletions

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"