Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

31 files changed, 88 insertions, 123 deletions

diff --git a/wm/amaterus/Makefile b/wm/amaterus/Makefile
index 740d4ecf651..4f7fd64171a 100644
--- a/wm/amaterus/Makefile
+++ b/wm/amaterus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/24 22:11:08 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 21:51:26 jlam Exp $
 
 DISTNAME=	amaterus-0.34.1
 CATEGORIES=	wm
@@ -8,15 +8,16 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.taiyaki.org/
 COMMENT=	GTK+ window manager
 
-GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
+GNU_CONFIGURE=	YES
+USE_BUILDLINK2=	YES
+USE_X11=	YES
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amaterus
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/amaterus
 	${INSTALL_DATA} ${WRKSRC}/README.en ${PREFIX}/share/doc/amaterus
 
-.include "../../textproc/libxml/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile
index 956bd69b1e2..561cfc4a421 100644
--- a/wm/amiwm/Makefile
+++ b/wm/amiwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/03/12 22:25:18 jmc Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:27 jlam Exp $
 #
 
 DISTNAME=	amiwm0.20pl48
@@ -15,12 +15,11 @@ RESTRICTED=     "Restrictive copyright (non-commerical use only)"
 NO_SRC_ON_CDROM=        ${RESTRICTED}
 NO_BIN_ON_CDROM=        ${RESTRICTED}
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=	yes
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 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 80c4ded2be1..dfc7f611be6 100644
--- a/wm/bbkeys/Makefile
+++ b/wm/bbkeys/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/03/18 09:23:00 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 21:51:27 jlam Exp $
 #
 
 DISTNAME=	bbkeys-0.8.4
@@ -12,10 +12,9 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://bbkeys.sourceforge.net/
 COMMENT=	General X Window keygrabber
 
-GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
-USE_PERL5=		YES
-USE_X11BASE=		YES
+GNU_CONFIGURE=	YES
+USE_BUILDLINK2=	YES
+USE_X11BASE=	YES
 
-.include "../../mk/x11.buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bbpager/Makefile b/wm/bbpager/Makefile
index 47f270727c3..bfec0bc590f 100644
--- a/wm/bbpager/Makefile
+++ b/wm/bbpager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/14 15:14:40 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 21:51:27 jlam Exp $
 #
 
 DISTNAME=	bbpager-0.3.0
@@ -9,9 +9,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://bbtools.thelinuxcommunity.org/available.phtml
 COMMENT=	pager for the blackbox window manager
 
-GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
-USE_X11BASE=		YES
+GNU_CONFIGURE=	YES
+USE_BUILDLINK2=	YES
+USE_X11BASE=	YES
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile
index 198cd39e19c..94ec2718417 100644
--- a/wm/bbrun/Makefile
+++ b/wm/bbrun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/06/17 18:57:49 tron Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 21:51:28 jlam Exp $
 
 DISTNAME=	bbrun-1.3
 WRKSRC=		${WRKDIR}/${DISTNAME}/bbrun
@@ -9,8 +9,9 @@ MAINTAINER=	ptiJo@noos.fr
 HOMEPAGE=	http://www.dwave.net/~jking/bbrun/
 COMMENT=	run utility for BlackBox
 
-USE_GMAKE=		YES
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=	YES
+USE_X11=	YES
+USE_GMAKE=	YES
 
 ALL_TARGET=	bbrun
 
@@ -19,7 +20,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bbrun
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README ${PREFIX}/share/doc/bbrun
 
-.include "../../mk/x11.buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bbrun/PLIST b/wm/bbrun/PLIST
index b715541d6b2..ce6be6b60bd 100644
--- a/wm/bbrun/PLIST
+++ b/wm/bbrun/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/12 00:36:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:51:28 jlam Exp $
 bin/bbrun
 share/doc/bbrun/README
 @dirrm share/doc/bbrun
diff --git a/wm/bbrun/distinfo b/wm/bbrun/distinfo
index c010fec9595..ca0d7c0c7dd 100644
--- a/wm/bbrun/distinfo
+++ b/wm/bbrun/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/06/17 18:57:50 tron Exp $
+$NetBSD: distinfo,v 1.3 2002/08/25 21:51:28 jlam Exp $
 
 SHA1 (bbrun-1.3.tar.gz) = 719af622334f6c3186f07da7c9246a8b05381f6c
 Size (bbrun-1.3.tar.gz) = 19423 bytes
-SHA1 (patch-aa) = 20abf46fedcd208fc2a50d8afc2615bf4b6ae95a
diff --git a/wm/bbrun/patches/patch-aa b/wm/bbrun/patches/patch-aa
deleted file mode 100644
index e2ffcda84b4..00000000000
--- a/wm/bbrun/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/06/17 18:57:50 tron Exp $
-
---- Makefile.orig	Wed Feb  6 20:05:51 2002
-+++ Makefile	Mon Jun 17 07:16:33 2002
-@@ -1,6 +1,6 @@
- CC     = gcc
--LIBS   = -lXpm `gtk-config --libs`
--CFLAGS = `gtk-config --cflags`
-+LIBS   += -lXpm `${GTK_CONFIG} --libs`
-+CFLAGS += `${GTK_CONFIG} --cflags`
- OBJS   = bbrun.o \
-          ../wmgeneral/wmgeneral.o \
-          ../wmgeneral/misc.o \
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index d90b7315180..f69c263644a 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/03/14 15:07:01 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:30 jlam Exp $
 #
 
 DISTNAME=	blackbox-0.62.1
@@ -9,11 +9,10 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://blackboxwm.sourceforge.net/
 COMMENT=	small and fast X11R6 window manager
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 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 86385fa114f..dab7babf82e 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:46 fredb Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 21:51:31 jlam Exp $
 
 DISTNAME=		enlightenment-0.16.4
 PKGREVISION=		1
@@ -9,27 +9,13 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.enlightenment.org/
 COMMENT=		Window manager for X
 
-USE_BUILDLINK_ONLY=	yes
-USE_PERL5=		yes
+USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 
 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}; \
@@ -39,10 +25,11 @@ post-install:
 	${FIND} ${PREFIX}/share/enlightenment/themes -type f | \
 	${XARGS} ${CHMOD} ${NONBINMODE}
 
-.include "../../audio/esound/buildlink.mk"
-.include "../../graphics/imlib/buildlink.mk"
-.include "../../graphics/fnlib/buildlink.mk"
-.include "../../graphics/freetype-lib/buildlink.mk"
-.include "../../www/libghttp/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../audio/esound/buildlink2.mk"
+.include "../../graphics/imlib/buildlink2.mk"
+.include "../../graphics/fnlib/buildlink2.mk"
+.include "../../graphics/freetype-lib/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
+.include "../../www/libghttp/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index 1eabd83a27a..d04a80654ec 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/04/22 18:39:18 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 21:51:31 jlam Exp $
 #
 
 DISTNAME=	fluxbox-0.1.8
@@ -9,7 +9,7 @@ MAINTAINER=	jmcneill@invisible.yi.org
 HOMEPAGE=	http://fluxbox.sourceforge.net/
 COMMENT=	Window Manager for X based on Blackbox
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 
@@ -21,5 +21,4 @@ GCC_VERSION!=		gcc --version
 .include "../../lang/gcc/Makefile.gcc"
 .endif
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index 26698099613..07f7c667c42 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/08/11 04:43:14 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:51:31 jlam Exp $
 
 SHA1 (fluxbox-0.1.8.tar.gz) = 48c010631d24ed3cf9620169cd1203c2cc7cb0b3
 Size (fluxbox-0.1.8.tar.gz) = 437047 bytes
diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab
index 8708122d3a0..06ec5836dce 100644
--- a/wm/fluxbox/patches/patch-ab
+++ b/wm/fluxbox/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/08/11 13:15:26 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/25 21:51:32 jlam Exp $
 
 --- src/Makefile.in.orig	Sat Apr 20 06:11:45 2002
 +++ src/Makefile.in
diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile
index 92db899190a..2aa6ab69b38 100644
--- a/wm/flwm/Makefile
+++ b/wm/flwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/24 22:11:09 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/25 21:51:32 jlam Exp $
 #
 
 DISTNAME=	flwm-1.00
@@ -10,12 +10,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://flwm.sourceforge.net/
 COMMENT=	The Fast, Light Window Manager
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=	# defined
 USE_X11BASE=	# defined
 
 GNU_CONFIGURE=	# defined
 CONFIGURE_ENV+=	X_LIBS="-lGL"
 
-.include "../../x11/fltk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../x11/fltk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index 004b2b1afad..34ac3c08f5b 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2002/08/22 10:58:34 martti Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 21:51:33 jlam Exp $
 
 PKGNAME=		${DISTNAME}
 COMMENT=		Small, fast and light-weight window manager
 
 CONFLICTS+=		icewm-gnome-[0-9]*
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
 
 .include "Makefile.common"
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index de57416b4f9..600c871d0f4 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2002/08/22 10:58:34 martti Exp $
+# $NetBSD: Makefile.common,v 1.15 2002/08/25 21:51:34 jlam Exp $
 
 DISTNAME=		icewm-1.2.0
 CATEGORIES=		x11 wm
diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST
index 2a4fc5f1997..ca1160b0e63 100644
--- a/wm/icewm/PLIST
+++ b/wm/icewm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/22 10:58:34 martti Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:34 jlam Exp $
 bin/genpref
 bin/icehelp
 bin/icesh
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index c271f612531..027b4678e6f 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/08/22 10:58:34 martti Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 21:51:34 jlam Exp $
 
 SHA1 (icewm-1.2.0.tar.gz) = bef4daba4bb94120f08f90755a9bc3518c254c21
 Size (icewm-1.2.0.tar.gz) = 684306 bytes
diff --git a/wm/icewm/patches/patch-ae b/wm/icewm/patches/patch-ae
index 03da865c289..687bc5d112b 100644
--- a/wm/icewm/patches/patch-ae
+++ b/wm/icewm/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2002/08/22 10:58:35 martti Exp $
+$NetBSD: patch-ae,v 1.4 2002/08/25 21:51:35 jlam Exp $
 
 --- src/wmtaskbar.cc.orig	Thu May 16 05:00:02 2002
 +++ src/wmtaskbar.cc	Sat May 25 09:41:09 2002
diff --git a/wm/ion/Makefile b/wm/ion/Makefile
index f7f66cf3eb3..8f4fb50dae1 100644
--- a/wm/ion/Makefile
+++ b/wm/ion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:24 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 21:51:35 jlam Exp $
 #
 
 DISTNAME=	ion-20010523
@@ -9,9 +9,8 @@ MAINTAINER=	daniel@codefactory.se,zuntum@netbsd.org
 HOMEPAGE=	http://www.students.tut.fi/~tuomov/ion/
 COMMENT=	keyboard friendly tiling window manager
 
-USE_BUILDLINK_ONLY=	YES
-USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_BUILDLINK2=	YES
+USE_X11BASE=	YES
+USE_GMAKE=	YES
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile
index 2f04fa99fdd..b5c11b3e9a3 100644
--- a/wm/pwm/Makefile
+++ b/wm/pwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/01/31 04:07:59 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:36 jlam Exp $
 #
 
 DISTNAME=	pwm-1.0
@@ -9,7 +9,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.students.tut.fi/~tuomov/pwm/
 COMMENT=	Window manager that frames multiple client windows in a single frame
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 USE_GMAKE=		YES
 MAKE_ENV+=		SYSCONFDIR="${PKG_SYSCONFDIR}"
 
@@ -29,6 +30,5 @@ SUPPORT_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
 post-install:
 	${RM} -f ${EGDIR}/sample.conf
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/pwm/distinfo b/wm/pwm/distinfo
index a31ec421cdd..188cb9cf0b8 100644
--- a/wm/pwm/distinfo
+++ b/wm/pwm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/01/31 04:07:59 jlam Exp $
+$NetBSD: distinfo,v 1.9 2002/08/25 21:51:36 jlam Exp $
 
 SHA1 (pwm-1.0.tar.gz) = 79c708a2a6260a06bc8dc586110578bf23aa01e7
 Size (pwm-1.0.tar.gz) = 93239 bytes
@@ -8,5 +8,5 @@ SHA1 (patch-ac) = 53b2d849539a533ba03ad18ec2f1831177a8c892
 SHA1 (patch-ad) = ce5e61f7c4011366708b4a7f0b7f2f575def1867
 SHA1 (patch-ae) = 66aab44974a3076fdf72cdbf7b32c9281ff6b04b
 SHA1 (patch-af) = 58d7a96776487f0356120775084fc7d616187fde
-SHA1 (patch-ag) = f60d81c0f92fdff44e50c73b3e7bed57071cfd8c
+SHA1 (patch-ag) = c2f75054ac2d1daffb5ab40a8f4448d72e5bc5ea
 SHA1 (patch-ah) = a2ad468be06120abf44790e237aba8c003e61557
diff --git a/wm/pwm/patches/patch-ag b/wm/pwm/patches/patch-ag
index b8943876709..5bec063fb62 100644
--- a/wm/pwm/patches/patch-ag
+++ b/wm/pwm/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2001/09/09 03:10:08 jlam Exp $
+$NetBSD: patch-ag,v 1.3 2002/08/25 21:51:36 jlam Exp $
 
 --- system.mk.orig	Sat Jul  1 12:37:50 2000
 +++ system.mk
@@ -16,7 +16,7 @@ $NetBSD: patch-ag,v 1.2 2001/09/09 03:10:08 jlam Exp $
  ##
  
 -X11_PREFIX=/usr/X11R6
-+X11_PREFIX=${BUILDLINK_X11_DIR}
++X11_PREFIX=${X11BASE}
  
  # SunOS/Solaris
  #X11_PREFIX=/usr/openwin
diff --git a/wm/ratpoison/Makefile b/wm/ratpoison/Makefile
index 8f805477a31..4b602a20315 100644
--- a/wm/ratpoison/Makefile
+++ b/wm/ratpoison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:44 seb Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:37 jlam Exp $
 #
 
 DISTNAME=	ratpoison-1.0.0
@@ -9,9 +9,9 @@ MAINTAINER=	zuntum@netbsd.org
 HOMEPAGE=	http://ratpoison.sourceforge.net/
 COMMENT=	Simple window manager with no fat library dependencies
 
-USE_BUILDLINK_ONLY=	YES
-GNU_CONFIGURE=		YES
+USE_BUILDLINK2=	YES
+USE_X11=	YES
+GNU_CONFIGURE=	YES
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile
index 352c1e34ce8..a76fcb61883 100644
--- a/wm/wm2/Makefile
+++ b/wm/wm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:25 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:38 jlam Exp $
 
 DISTNAME=	wm2-4
 PKGNAME=	wm2-4.0
@@ -11,13 +11,12 @@ COMMENT=	Minimalist window manager for X
 
 ALL_TARGET=	depend wm2
 
-USE_BUILDLINK_ONLY=	YES
-USE_X11BASE=		YES
-MAKE_ENV+=	CCC="${CXX}"
+USE_BUILDLINK2=	YES
+USE_X11BASE=	YES
+MAKE_ENV+=	CCC="${BUILDLINK_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 f0f05098e50..9df81737d28 100644
--- a/wm/wm2/distinfo
+++ b/wm/wm2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/05/11 18:10:43 wiz Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 21:51:38 jlam Exp $
 
 SHA1 (wm2-4.tar.gz) = dd959e72eedca113b372ddf67b95260e25226a91
 Size (wm2-4.tar.gz) = 32807 bytes
diff --git a/wm/wm2/patches/patch-ac b/wm/wm2/patches/patch-ac
index 5f2f987c25d..44ebef93cb1 100644
--- a/wm/wm2/patches/patch-ac
+++ b/wm/wm2/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2002/05/11 18:10:43 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2002/08/25 21:51:38 jlam Exp $
 
 --- General.h.orig	Fri Mar 21 12:12:30 1997
 +++ General.h
diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 5bf667e28ba..6240461e4aa 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/03/13 17:37:49 fredb Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/25 21:51:39 jlam Exp $
 #
 
 DISTNAME=	wmakerconf-2.8.1
@@ -11,15 +11,14 @@ MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://ulli.on.openave.net/wmakerconf/
 COMMENT=	Gtk+ based configuration tool for Window Maker
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		wraster="${GET_WRASTER_FLAGS}"
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/libproplist/buildlink.mk"
-.include "../../graphics/imlib/buildlink.mk"
-.include "../../wm/windowmaker/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/libproplist/buildlink2.mk"
+.include "../../graphics/imlib/buildlink2.mk"
+.include "../../wm/windowmaker/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmx/Makefile b/wm/wmx/Makefile
index f0e80a34dea..159c03d2cfa 100644
--- a/wm/wmx/Makefile
+++ b/wm/wmx/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:26 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 21:51:40 jlam Exp $
 
 PKGNAME=	wmx-${WMX_VERS}
 COMMENT=	another X11 window manager based on wm2
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=	# defined
 
 .include "../../wm/wmx/Makefile.common"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common
index 81b1d64374c..8d187e5dfbf 100644
--- a/wm/wmx/Makefile.common
+++ b/wm/wmx/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2001/11/01 09:41:14 jlam Exp $
+# $NetBSD: Makefile.common,v 1.3 2002/08/25 21:51:40 jlam Exp $
 
 DISTNAME=	wmx-6
 WMX_VERS=	6.0
@@ -25,4 +25,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README.contrib ${PREFIX}/share/doc/wmx
 	${INSTALL_DATA_DIR} ${PREFIX}/etc/wmx
 
-.include "../../graphics/xpm/buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
diff --git a/wm/wmx/PLIST b/wm/wmx/PLIST
index 63f38a4547f..60c98100f02 100644
--- a/wm/wmx/PLIST
+++ b/wm/wmx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:30:05 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:40 jlam Exp $
 bin/wmx
 share/doc/wmx/README
 share/doc/wmx/README.contrib