bl3ify

23 files changed, 86 insertions, 84 deletions

diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index 5a85eab3190..8a84713218e 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/07/17 22:55:08 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/03/10 14:12:50 xtraeme Exp $
 
 DISTNAME=	AfterStep-1.8.11
 PKGNAME=	afterstep-1.8.11
@@ -16,7 +16,7 @@ DEPENDS+=		asclock-[0-9]*:../../time/asclock
 DEPENDS+=		xp-[0-9]*:../../x11/xp
 
 AUTOCONF_REQD=		2.13
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_X11=		YES
@@ -41,9 +41,9 @@ pre-configure:
 	  ${CHMOD} 755 configure; \
 	  ${AUTOHEADER} --localdir=autoconf autoconf/configure.in > autoconf/config.h.in;
 
-.include "../../audio/rplay/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../audio/rplay/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/amaterus/Makefile b/wm/amaterus/Makefile
index bddc8e08b39..5e754e84165 100644
--- a/wm/amaterus/Makefile
+++ b/wm/amaterus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:55:09 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/10 14:12:50 xtraeme Exp $
 
 DISTNAME=	amaterus-0.34.1
 PKGREVISION=	2
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.taiyaki.org/
 COMMENT=	GTK+ window manager
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_X11=	YES
 
 post-install:
@@ -18,7 +18,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/amaterus
 	${INSTALL_DATA} ${WRKSRC}/README.en ${PREFIX}/share/doc/amaterus
 
-.include "../../textproc/libxml/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../textproc/libxml/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile
index 04ddaa53ee9..886c138d0f2 100644
--- a/wm/amiwm/Makefile
+++ b/wm/amiwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/03/14 19:37:59 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/10 14:12:50 xtraeme Exp $
 #
 
 DISTNAME=	amiwm0.20pl48
@@ -15,7 +15,7 @@ RESTRICTED=     "Restrictive copyright (non-commerical use only)"
 NO_SRC_ON_CDROM=        ${RESTRICTED}
 NO_BIN_ON_CDROM=        ${RESTRICTED}
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="-DHAVE_X11_EXTENSIONS_SHAPE_H=1 -O" \
diff --git a/wm/bbkeys/Makefile b/wm/bbkeys/Makefile
index e7075d243a9..94c4fb320d5 100644
--- a/wm/bbkeys/Makefile
+++ b/wm/bbkeys/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/11/10 14:15:08 gavan Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/10 14:12:50 xtraeme Exp $
 #
 
 DISTNAME=	bbkeys-0.8.6
@@ -10,10 +10,10 @@ HOMEPAGE=	http://bbkeys.sourceforge.net/
 COMMENT=	General X Window keygrabber
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_X11=	YES
 USE_GCC_SHLIB=	YES
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bbpager/Makefile b/wm/bbpager/Makefile
index f7a7edbfb35..032a6badd3d 100644
--- a/wm/bbpager/Makefile
+++ b/wm/bbpager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/11/10 14:51:04 gavan Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=	bbpager-0.3.1
@@ -11,7 +11,7 @@ HOMEPAGE=	http://bbtools.thelinuxcommunity.org/available.phtml
 COMMENT=	Pager for the blackbox window manager
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_X11=	YES
 USE_GCC_SHLIB=	YES
 
diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile
index f280c494f8d..a1daffe48e0 100644
--- a/wm/bbrun/Makefile
+++ b/wm/bbrun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/24 15:18:32 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/10 14:12:51 xtraeme Exp $
 
 DISTNAME=	bbrun-1.3
 PKGREVISION=	2
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.dwave.net/~jking/bbrun/
 COMMENT=	Run utility for BlackBox
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/bbrun
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_X11=	YES
 USE_GNU_TOOLS+=	make
 
@@ -21,7 +21,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bbrun
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README ${PREFIX}/share/doc/bbrun
 
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index 7cf35dce658..dc0ca73ffe2 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/09/17 19:41:13 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
@@ -12,10 +12,10 @@ COMMENT=	Small and fast X11R6 window manager
 
 DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GCC_SHLIB=	YES
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bsetroot/Makefile b/wm/bsetroot/Makefile
index 065b470319e..ab148c0c336 100644
--- a/wm/bsetroot/Makefile
+++ b/wm/bsetroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/02/20 00:42:37 abs Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
@@ -12,7 +12,7 @@ HOMEPAGE=	http://blackboxwm.sourceforge.net/
 COMMENT=	Tools to set the root windows background
 
 USE_LANGUAGES=	c c++
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GCC_SHLIB=	YES
 USE_X11=	YES
 GNU_CONFIGURE=	YES
@@ -26,5 +26,5 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/bsetroot.1 ${PREFIX}/man/man1
 	( cd ${WRKSRC}/nls && ${MAKE} install )
 
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile
index 6dba8825dcb..6860266069f 100644
--- a/wm/ctwm/Makefile
+++ b/wm/ctwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:55:10 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=	ctwm-3.6
@@ -11,8 +11,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://ctwm.free.lp.se/
 COMMENT=	Window manager with support for multiple virtual screens and GNOME 1.x
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_IMAKE=	YES
 
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index f189e10a892..824f4015cf9 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/27 00:53:10 heinz Exp $
+# $NetBSD: Makefile,v 1.21 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=		enlightenment-0.16.6
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.enlightenment.org/
 COMMENT=		Highly themeable and configurable window manager
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_X11=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
@@ -29,10 +29,10 @@ post-install:
 	${FIND} ${PREFIX}/share/enlightenment/themes -type f -print | \
 	${XARGS} ${CHMOD} ${SHAREMODE}
 
-.include "../../audio/esound/buildlink2.mk"
-.include "../../graphics/fnlib/buildlink2.mk"
-.include "../../graphics/freetype-lib/buildlink2.mk"
-.include "../../lang/perl5/buildlink2.mk"
-.include "../../www/libghttp/buildlink2.mk"
+.include "../../audio/esound/buildlink3.mk"
+.include "../../graphics/fnlib/buildlink3.mk"
+.include "../../graphics/freetype-lib/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
+.include "../../www/libghttp/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/evilwm/Makefile b/wm/evilwm/Makefile
index 8bd02c5778d..c6e361ddc25 100644
--- a/wm/evilwm/Makefile
+++ b/wm/evilwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:27:35 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=	evilwm_0.99.17.orig
@@ -11,7 +11,8 @@ HOMEPAGE=	http://evilwm.sourceforge.net/
 COMMENT=	Minimalist Window Manager for X
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
-USE_X11=	YES
+USE_BUILDLINK3=	yes
+USE_X11=	yes
 
 ALL_TARGET=	allinone
 
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index f8123a83522..e122c7b7cdf 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/29 16:58:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=	fluxbox-0.9.8
@@ -12,7 +12,7 @@ COMMENT=	Window Manager for X based on Blackbox
 
 DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_X11=	YES
 USE_GCC_SHLIB=	YES
 GNU_CONFIGURE=	YES
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+=	--disable-gnome
 FLUXBOX_USE_XFT?=	YES
 .if !empty(FLUXBOX_USE_XFT:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=	--enable-xft
-.include "../../fonts/Xft2/buildlink2.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
 .elseif
 CONFIGURE_ARGS+=	--disable-xft
 .endif
diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index 14d90bdf7fa..d9f3f48e03e 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/10 14:12:51 xtraeme Exp $
 
 DISTNAME=	fvwm-2.5.7
 PKGNAME=	${DISTNAME:S/fvwm/&-devel/}
@@ -12,7 +12,7 @@ COMMENT=	Development version of X11 Virtual window manager
 
 CONFLICTS=	fvwm-[0-9]* fvwm1-[0-9]* fvwm2-[0-9]*
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
@@ -29,10 +29,10 @@ post-install:
 		`${LS} | ${GREP} -v Makefile` \
 		${PREFIX}/share/examples/fvwm
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
-.include "../../fonts/Xft2/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/golem/Makefile b/wm/golem/Makefile
index 5bcb390b717..b2f59269a07 100644
--- a/wm/golem/Makefile
+++ b/wm/golem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/14 00:54:46 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=	golem-0.0.5
@@ -10,7 +10,7 @@ MAINTAINER=	reide@darkest.org
 HOMEPAGE=	http://golem.sourceforge.net/
 COMMENT=	Fast and lightweight yet customizable window manager
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 USE_GNU_TOOLS+=	make
 USE_X11=	YES
@@ -28,7 +28,7 @@ GOLEM_WITH_SOUND?=	NO
 BUILD_DEFS=		GOLEM_WITH_SOUND
 CONFIGURE_ARGS+=	--enable-sound
 PLIST_SUBST=		NOT_SOUND=
-.include "../../audio/esound/buildlink2.mk"
+.include "../../audio/esound/buildlink3.mk"
 .else
 PLIST_SUBST=		NOT_SOUND="@comment "
 .endif
@@ -47,5 +47,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/golemrc ${EGDIR}/golemrc.default
 
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/matchbox/Makefile b/wm/matchbox/Makefile
index ed02296f608..062f54448c2 100644
--- a/wm/matchbox/Makefile
+++ b/wm/matchbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:53 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=	matchbox-0.3.6
@@ -9,12 +9,12 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://handhelds.org/~mallum/matchbox/
 COMMENT=	Window manager designed for computers with small displays
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_X11=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
 
-.include "../../mk/ossaudio.buildlink2.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/oroborus/Makefile b/wm/oroborus/Makefile
index 74521f1a304..36376a79bb4 100644
--- a/wm/oroborus/Makefile
+++ b/wm/oroborus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:27:35 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=	oroborus_2.0.12-1
@@ -11,10 +11,10 @@ HOMEPAGE=	http://www.oroborus.org/
 COMMENT=	Small and simple window manager for X
 
 WRKSRC=         ${WRKDIR}/${PKGNAME_NOREV}
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 USE_X11=	YES
 
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/piewm/Makefile b/wm/piewm/Makefile
index be20314b778..45b21420192 100644
--- a/wm/piewm/Makefile
+++ b/wm/piewm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:34:04 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/10 14:12:51 xtraeme Exp $
 
 DISTNAME=	piewm-1.02
 PKGREVISION=	1
@@ -10,8 +10,8 @@ HOMEPAGE=	http://www.crynwr.com/piewm/
 COMMENT=	Minimalist window manager based on tvtwm with pie menus
 
 USE_IMAKE=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile
index 74f59395426..d9fcf2bf3ad 100644
--- a/wm/qvwm/Makefile
+++ b/wm/qvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/24 15:18:32 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=	qvwm-1.1.12
@@ -13,13 +13,13 @@ COMMENT=	Windows 95/98/NT like window manager for X11
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GNU_TOOLS+=	make
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_GCC_SHLIB=	yes
 
 post-install:
 	${MV} ${PREFIX}/man/man1/qvwm.1x ${PREFIX}/man/man1/qvwm.1
 
-.include "../../audio/esound/buildlink2.mk"
-.include "../../graphics/imlib/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../audio/esound/buildlink3.mk"
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/ratpoison/Makefile b/wm/ratpoison/Makefile
index 352275ed38f..bea3210f827 100644
--- a/wm/ratpoison/Makefile
+++ b/wm/ratpoison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/08/09 11:30:26 seb Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=	ratpoison-1.2.2
@@ -9,7 +9,7 @@ MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://ratpoison.sourceforge.net/
 COMMENT=	Simple window manager with no fat library dependencies
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/wm/tvtwm/Makefile b/wm/tvtwm/Makefile
index 5e447282283..e3fc5893f68 100644
--- a/wm/tvtwm/Makefile
+++ b/wm/tvtwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:27:35 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/10 14:12:51 xtraeme Exp $
 
 DISTNAME=	tvtwm.pl11
 PKGNAME=	tvtwm-11
@@ -10,8 +10,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Classic twm with virtual desktop support
 
 WRKSRC=		${WRKDIR}/tvtwm
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_IMAKE=	YES
 
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wampager/Makefile b/wm/wampager/Makefile
index 0fd4b5a56fc..cfa11451741 100644
--- a/wm/wampager/Makefile
+++ b/wm/wampager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:55:17 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=	wampager-0.9.1
@@ -11,7 +11,7 @@ COMMENT=	Virtual pager dockapp for the Waimea Window Manager
 
 DEPENDS=	waimea>=0.4.0:../../wm/waimea
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_X11=	YES
 
 do-build:
@@ -23,5 +23,5 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wampager ${PREFIX}/bin
 
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/whiteBOX/Makefile b/wm/whiteBOX/Makefile
index 1bf48852000..634721d31b9 100644
--- a/wm/whiteBOX/Makefile
+++ b/wm/whiteBOX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:53 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=	whiteBOX-0.5
@@ -10,7 +10,8 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://whitebox.sourceforge.net/
 COMMENT=	Multi-purpose configuration tool for Blackbox
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
+USE_X11=	YES
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
@@ -25,6 +26,6 @@ pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/whiteBOX/pixmaps
 	${INSTALL_DATA_DIR} ${PREFIX}/share/whiteBOX/plugins
 
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile
index 5092202d3d6..2651139fff8 100644
--- a/wm/windowlab/Makefile
+++ b/wm/windowlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/24 15:18:32 grant Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/10 14:12:51 xtraeme Exp $
 #
 
 DISTNAME=	windowlab-1.12
@@ -10,7 +10,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.nickgravgaard.com/windowlab/
 COMMENT=	Small and simple window manager
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 USE_GNU_TOOLS+=	make
 USE_X11=	YES
@@ -24,7 +24,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/menurc.sample ${EGDIR}/menurc.default
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../fonts/Xft2/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"