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

have been converted to USE_BUILDLINK2.

42 files changed, 101 insertions, 97 deletions

diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index cca1f1effc3..2f92955e696 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/12/25 20:50:01 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2002/08/25 21:50:53 jlam Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -12,7 +12,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.amanda.org/
 COMMENT=		Libraries and binaries used by both the client and server parts of amanda
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-common/Makefile.common"
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index c6ec5734415..a42a48ce5e6 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2002/07/21 19:07:32 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.8 2002/08/25 21:50:54 jlam Exp $
 #
 # common make file fragment shared by all amanda-* pkgs.
 #
diff --git a/sysutils/amanda-dev-common/Makefile b/sysutils/amanda-dev-common/Makefile
index bb15460fa18..a5b565a6926 100644
--- a/sysutils/amanda-dev-common/Makefile
+++ b/sysutils/amanda-dev-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 21:50:54 jlam Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -7,7 +7,7 @@ SVR4_PKGNAME=		amaco
 
 COMMENT=		Libraries and binaries used by both the client and server parts of amanda
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-dev-common/Makefile.common"
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 6f86c8e7c06..8bcfd1e540c 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/11/26 19:55:40 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2002/08/25 21:50:54 jlam Exp $
 #
 
 DISTNAME=		asapm-2.11
@@ -15,13 +15,13 @@ COMMENT=		Laptop battery status display for X11
 IGNORE+=		"APM is not available for ${MACHINE_PLATFORM}"
 .endif
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		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
+CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include
+CONFIGURE_ARGS+=	--with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bbsload/Makefile b/sysutils/bbsload/Makefile
index 4addd80404b..38261b742e0 100644
--- a/sysutils/bbsload/Makefile
+++ b/sysutils/bbsload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/16 21:49:25 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 21:50:55 jlam Exp $
 #
 
 DISTNAME=	bbsload-0.2.5
@@ -10,10 +10,7 @@ HOMEPAGE=	http://bbtools.thelinuxcommunity.org/
 COMMENT=	Small (in dimensions) tool to display the avarage load
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 
-GNU_CONFIGURE=	YES
-
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index 439cebb1cfc..ec4a3845a96 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2001/09/27 23:18:42 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2002/08/25 21:50:55 jlam Exp $
 
 DISTNAME=	cdrtools-1.10
 PKGNAME=	cdrecord-1.10
@@ -11,6 +11,7 @@ COMMENT=	This program allows you to create CD's on a CD-Recorder
 
 CONFLICTS=	mkisofs-[0-9]*
 USE_GMAKE=	yes
+USE_BUILDLINK2=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/a.*//}
 TARGET_ARCH=	${MACHINE_ARCH}-netbsd-cc
diff --git a/sysutils/cdrecord/distinfo b/sysutils/cdrecord/distinfo
index 61da39c7a99..f0be0e6b9af 100644
--- a/sysutils/cdrecord/distinfo
+++ b/sysutils/cdrecord/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/05/18 15:00:42 wiz Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 21:50:56 jlam Exp $
 
 SHA1 (cdrtools-1.10.tar.gz) = 0d61bd1331d69a579e6582719a119d94166fcf10
 Size (cdrtools-1.10.tar.gz) = 1331424 bytes
diff --git a/sysutils/cdrecord/patches/patch-aj b/sysutils/cdrecord/patches/patch-aj
index 112bf92fa04..83c977120d2 100644
--- a/sysutils/cdrecord/patches/patch-aj
+++ b/sysutils/cdrecord/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.3 2002/05/18 14:52:31 bouyer Exp $
+$NetBSD: patch-aj,v 1.4 2002/08/25 21:50:56 jlam Exp $
 
 --- cdrecord/scsi_cdr.c.orig	Wed Apr 11 00:22:21 2001
 +++ cdrecord/scsi_cdr.c	Wed May 15 19:55:52 2002
diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile
index fa70856dba6..2e05c68cd50 100644
--- a/sysutils/fsviewer/Makefile
+++ b/sysutils/fsviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:42 fredb Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 21:50:57 jlam Exp $
 #
 
 DISTNAME=	FSViewer.app-0.2.3
@@ -17,16 +17,16 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 # needed for the new location of WINGs include files -- can be removed
 # when the application gets updated for windowmaker>=0.64.0
-CFLAGS+=	-I${BUILDLINK_DIR}/include/WINGs
+CFLAGS+=	-I${BUILDLINK_PREFIX.windowmaker}/include/WINGs
 
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
-USE_BUILDLINK_ONLY=	yes
+USE_X11=		yes
+USE_BUILDLINK2=		yes
 
 post-install:
 	cd ${PREFIX}/GNUstep/Apps/FSViewer.app && \
 		${PAX} -zrf ${_DISTDIR}${DISTSUBDIR}/icons.tar.gz *.xpm *.tif
 
-.include "../../wm/windowmaker/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../wm/windowmaker/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gentoo/Makefile b/sysutils/gentoo/Makefile
index 4a1a23611bd..ac5b67ffaf7 100644
--- a/sysutils/gentoo/Makefile
+++ b/sysutils/gentoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/08/24 03:52:30 grant Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:50:57 jlam Exp $
 #
 
 DISTNAME=	gentoo-0.11.31
@@ -9,9 +9,9 @@ MAINTAINER=	dunse@goa.nu
 HOMEPAGE=	http://www.obsession.se/gentoo/
 COMMENT=	Two-pane filemanager using GTK+, 100% GUI configurable
 
-GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
+GNU_CONFIGURE=	YES
+USE_BUILDLINK2=	YES
+USE_X11=	YES
 
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gentoo/PLIST b/sysutils/gentoo/PLIST
index 3868951276e..8230c8ed7e5 100644
--- a/sysutils/gentoo/PLIST
+++ b/sysutils/gentoo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/24 03:52:30 grant Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:50:58 jlam Exp $
 bin/gentoo
 etc/gentoogtkrc
 etc/gentoorc
diff --git a/sysutils/gentoo/distinfo b/sysutils/gentoo/distinfo
index 38f7e1e3fd0..5034fcdd183 100644
--- a/sysutils/gentoo/distinfo
+++ b/sysutils/gentoo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/08/24 03:52:30 grant Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 21:50:58 jlam Exp $
 
 SHA1 (gentoo-0.11.31.tar.gz) = 327b6241613e4c5ae256dffa528c6f2f46fe60b0
 Size (gentoo-0.11.31.tar.gz) = 923857 bytes
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 16270315f0f..eeed23dbd15 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/06/07 17:15:57 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2002/08/25 21:50:59 jlam Exp $
 #
 
 DISTNAME=	gkrellm-1.2.11
@@ -13,13 +13,14 @@ COMMENT=	GTK based system monitor
 
 BUILD_USES_MSGFMT=	YES
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 USE_GMAKE=		YES
 
 ALL_TARGET=		netbsd
 INSTALL_TARGET=		install_netbsd
 
-MAKE_ENV+=	PTHREAD_INC="-I${BUILDLINK_DIR}/include"
+MAKE_ENV+=	PTHREAD_INC="-I${LOCALBASE}/include"
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm
@@ -28,6 +29,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
 	${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm/themes
 
-.include "../../graphics/imlib/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/imlib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gkrellm/buildlink.mk b/sysutils/gkrellm/buildlink.mk
index 49f5e0af8c7..4d61e90606e 100644
--- a/sysutils/gkrellm/buildlink.mk
+++ b/sysutils/gkrellm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/07/24 17:24:50 he Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 21:50:59 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gkrellm.
 #
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 79a4f239aa7..baa0b514785 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2002/06/07 17:15:57 wiz Exp $
+$NetBSD: distinfo,v 1.13 2002/08/25 21:50:59 jlam Exp $
 
 SHA1 (gkrellm-1.2.11.tar.bz2) = 809d4bb0c983d65651919b7fd483b64b097a7bf3
 Size (gkrellm-1.2.11.tar.bz2) = 434998 bytes
diff --git a/sysutils/gkrellm/patches/patch-aa b/sysutils/gkrellm/patches/patch-aa
index d28d6482a6c..58ca932550b 100644
--- a/sysutils/gkrellm/patches/patch-aa
+++ b/sysutils/gkrellm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2002/06/07 17:15:57 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2002/08/25 21:51:00 jlam Exp $
 
 --- Makefile.top_enable_nls.orig	Wed Dec  5 08:41:15 2001
 +++ Makefile.top_enable_nls
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index c5636b24895..b4edb1c6a0e 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile,v 1.9 2002/07/20 13:27:32 tron Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 21:51:00 jlam Exp $
+#
 
 DISTNAME=	grub-0.92
 CATEGORIES=	sysutils
@@ -12,7 +13,7 @@ ONLY_FOR_PLATFORM=	*-*-i386
 
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -28,7 +29,7 @@ CONFIGURE_ARGS+=	--enable-${GRUB_NETWORK_CARD}
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/grub
 	${INSTALL_DATA} ${WRKSRC}/netboot/README.netboot \
-	  ${PREFIX}/share/doc/grub
+		${PREFIX}/share/doc/grub
 .else
 PLIST_SUBST+=		NETBOOT="@comment "
 .endif
@@ -37,6 +38,7 @@ PLIST_SUBST+=		NETBOOT="@comment "
 CONFIGURE_ARGS+=	${GRUB_SCAN_ARGS}
 .endif
 
-.include "../../devel/binutils/buildlink.mk"
-.include "../../devel/ncurses/buildlink.mk"
+.include "../../devel/binutils/buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST
index 8745ac9b093..cc3ba1f64aa 100644
--- a/sysutils/grub/PLIST
+++ b/sysutils/grub/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/20 13:27:33 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:01 jlam Exp $
 bin/mbchk
 @unexec install-info --delete --info-dir=%D/info %D/info/grub.info
 info/grub.info
diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile
index 5fc1684102c..fac15ab80dd 100644
--- a/sysutils/grun/Makefile
+++ b/sysutils/grun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/01 05:48:23 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 21:51:01 jlam Exp $
 
 DISTNAME=	grun-0.9.2
 CATEGORIES=	misc
@@ -8,7 +8,8 @@ MAINTAINER=	epg@pretzelnet.org
 HOMEPAGE=	${MASTER_SITES}/grun.html
 COMMENT=	GTK+ based Run dialog
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
 PTHREAD_OPTS+=		require
@@ -16,6 +17,7 @@ PTHREAD_OPTS+=		require
 post-install:
 	${MV} ${LOCALBASE}/man/man1/grun.1x ${LOCALBASE}/man/man1/grun.1
 
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
+.include "../../x11/gtk/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index 8a1d51aeda9..0657e209ce0 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/08/20 03:55:32 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/25 21:51:02 jlam Exp $
 
 DISTNAME=		psmisc-20.1
 CATEGORIES=		sysutils
@@ -10,7 +10,7 @@ COMMENT=		miscellaneous procfs tools: killall, pidof, and pstree
 
 CONFLICTS+=		pstree-[0-9]*
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 LIBS+=			${LIBGETOPT}
 
@@ -19,5 +19,5 @@ post-install:
 	${RM} -f ${PREFIX}/bin/pidof
 	${LN} -f ${PREFIX}/bin/killall ${PREFIX}/bin/pidof
 
-.include "../../devel/libgetopt/buildlink.mk"
+.include "../../devel/libgetopt/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/stow/Makefile b/sysutils/stow/Makefile
index b3628375926..4ebb1ef8683 100644
--- a/sysutils/stow/Makefile
+++ b/sysutils/stow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/06/03 13:29:55 cjep Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:03 jlam Exp $
 #
 
 DISTNAME=	stow-1.3.3
@@ -9,11 +9,12 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.ai.mit.edu/software/stow/stow.html
 COMMENT=	Maps several separate packages into a tree without merging them
 
-USE_BUILDLINK_ONLY=	YES
-GNU_CONFIGURE=		YES
+USE_BUILDLINK2=	YES
+GNU_CONFIGURE=	YES
 
 INFO_FILES=	stow.info
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
+
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/stow/PLIST b/sysutils/stow/PLIST
index 1e80636f782..ac23fa532c8 100644
--- a/sysutils/stow/PLIST
+++ b/sysutils/stow/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/03 13:29:55 cjep Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:03 jlam Exp $
 bin/stow
 @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/stow.info
 info/stow.info
diff --git a/sysutils/stow/distinfo b/sysutils/stow/distinfo
index eaf5c2909b0..6475bce4d06 100644
--- a/sysutils/stow/distinfo
+++ b/sysutils/stow/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/06/03 13:29:55 cjep Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 21:51:03 jlam Exp $
 
 SHA1 (stow-1.3.3.tar.gz) = 570c501f8663feb26360db25df0be342278b7b99
 Size (stow-1.3.3.tar.gz) = 139417 bytes
diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index 76045f6aee5..b1bd1254dc9 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/07/03 11:57:14 lukem Exp $
+# $NetBSD: Makefile,v 1.18 2002/08/25 21:51:07 jlam Exp $
 
 DISTNAME=		nut-0.50.0
 PKGNAME=		ups-nut-cgi-0.50.0
@@ -20,7 +20,8 @@ NUT_CONFDIR=		${PKG_SYSCONFDIR}
 NUT_STATEDIR=		/var/db/nut
 NUT_CGIDIR=		${PREFIX}/share/nut/cgi
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
+USE_X11=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${NUT_CONFDIR}			\
 			--with-statepath=${NUT_STATEDIR}		\
@@ -30,6 +31,5 @@ CONFIGURE_ARGS+=	--sysconfdir=${NUT_CONFDIR}			\
 pre-configure:
 	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf --force
 
-.include "../../graphics/gd/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/gd/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ups-nut-cgi/PLIST b/sysutils/ups-nut-cgi/PLIST
index 65afed21c39..d586f7a473b 100644
--- a/sysutils/ups-nut-cgi/PLIST
+++ b/sysutils/ups-nut-cgi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/13 15:15:24 lukem Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:51:07 jlam Exp $
 man/man5/hosts.conf.5
 man/man5/multimon.conf.5
 man/man5/upsset.conf.5
diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo
index 4767e05580a..6e8ba20ce46 100644
--- a/sysutils/ups-nut-cgi/distinfo
+++ b/sysutils/ups-nut-cgi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/07/03 11:57:14 lukem Exp $
+$NetBSD: distinfo,v 1.10 2002/08/25 21:51:07 jlam Exp $
 
 SHA1 (nut-0.50.0.tar.gz) = b8826f2e7301e5c753ac946574a53d651faf69c3
 Size (nut-0.50.0.tar.gz) = 382755 bytes
diff --git a/sysutils/ups-nut-cgi/patches/patch-aa b/sysutils/ups-nut-cgi/patches/patch-aa
index d2e8e5fa0fd..4a9cef4a296 100644
--- a/sysutils/ups-nut-cgi/patches/patch-aa
+++ b/sysutils/ups-nut-cgi/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2002/07/03 11:57:14 lukem Exp $
+$NetBSD: patch-aa,v 1.6 2002/08/25 21:51:07 jlam Exp $
 
 --- Makefile.in.orig	Wed Apr 17 00:00:49 2002
 +++ Makefile.in
diff --git a/sysutils/ups-nut-cgi/patches/patch-ad b/sysutils/ups-nut-cgi/patches/patch-ad
index a23d45a27b8..bdc5984ad81 100644
--- a/sysutils/ups-nut-cgi/patches/patch-ad
+++ b/sysutils/ups-nut-cgi/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2002/07/03 11:57:14 lukem Exp $
+$NetBSD: patch-ad,v 1.7 2002/08/25 21:51:08 jlam Exp $
 
 --- configure.in.orig	Tue Apr 16 23:34:38 2002
 +++ configure.in
diff --git a/sysutils/ups-nut-cgi/patches/patch-ae b/sysutils/ups-nut-cgi/patches/patch-ae
index 52f204c5515..9f364aeb950 100644
--- a/sysutils/ups-nut-cgi/patches/patch-ae
+++ b/sysutils/ups-nut-cgi/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/07/03 11:57:14 lukem Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 21:51:08 jlam Exp $
 
 --- clients/upsstats.c.orig	Thu Mar 21 17:01:16 2002
 +++ clients/upsstats.c
diff --git a/sysutils/ups-nut/MESSAGE b/sysutils/ups-nut/MESSAGE
index 0f0df12dbcb..651789a1c76 100644
--- a/sysutils/ups-nut/MESSAGE
+++ b/sysutils/ups-nut/MESSAGE
@@ -1,5 +1,5 @@
 ======================================================================
-$NetBSD: MESSAGE,v 1.2 2002/07/03 11:57:11 lukem Exp $
+$NetBSD: MESSAGE,v 1.3 2002/08/25 21:51:04 jlam Exp $
 
  ${NUT_CONFDIR}/upsd.users has a new format from version 0.45.5.
  You will need to update this before restarting upsd(8).
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index a40c14f32d8..6b092b46284 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/07/03 11:57:12 lukem Exp $
+# $NetBSD: Makefile,v 1.22 2002/08/25 21:51:04 jlam Exp $
 #
 
 DISTNAME=		nut-0.50.0
@@ -12,7 +12,7 @@ COMMENT=		Network UPS Tools
 
 BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${NUT_CONFDIR}			\
 			--with-user=${NUT_USER}				\
diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST
index a2144ec3f2e..9139398a2f8 100644
--- a/sysutils/ups-nut/PLIST
+++ b/sysutils/ups-nut/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2002/07/03 11:57:12 lukem Exp $
+@comment $NetBSD: PLIST,v 1.10 2002/08/25 21:51:04 jlam Exp $
 bin/upsc
 bin/upscmd
 bin/upsct
diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo
index 3768fccf2ec..f16b4bd40d1 100644
--- a/sysutils/ups-nut/distinfo
+++ b/sysutils/ups-nut/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/07/03 11:57:12 lukem Exp $
+$NetBSD: distinfo,v 1.14 2002/08/25 21:51:05 jlam Exp $
 
 SHA1 (nut-0.50.0.tar.gz) = b8826f2e7301e5c753ac946574a53d651faf69c3
 Size (nut-0.50.0.tar.gz) = 382755 bytes
diff --git a/sysutils/ups-nut/files/ups.sh b/sysutils/ups-nut/files/ups.sh
index 66f4ea4bdb7..99371f31e32 100644
--- a/sysutils/ups-nut/files/ups.sh
+++ b/sysutils/ups-nut/files/ups.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ups.sh,v 1.8 2002/05/24 22:28:27 hubertf Exp $
+# $NetBSD: ups.sh,v 1.9 2002/08/25 21:51:05 jlam Exp $
 #
 # KEYWORD: nostart
 
diff --git a/sysutils/ups-nut/patches/patch-aa b/sysutils/ups-nut/patches/patch-aa
index b06f339e18c..75598290e63 100644
--- a/sysutils/ups-nut/patches/patch-aa
+++ b/sysutils/ups-nut/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2002/07/03 11:57:13 lukem Exp $
+$NetBSD: patch-aa,v 1.7 2002/08/25 21:51:06 jlam Exp $
 
 --- models/upscommon.c.orig	Fri May 17 15:27:55 2002
 +++ models/upscommon.c
diff --git a/sysutils/ups-nut/patches/patch-ac b/sysutils/ups-nut/patches/patch-ac
index 16286d5f35a..567735ca3b3 100644
--- a/sysutils/ups-nut/patches/patch-ac
+++ b/sysutils/ups-nut/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2002/07/03 11:57:13 lukem Exp $
+$NetBSD: patch-ac,v 1.5 2002/08/25 21:51:06 jlam Exp $
 
 --- clients/upslog.c.orig	Fri May 17 08:26:22 2002
 +++ clients/upslog.c
diff --git a/sysutils/ups-nut/patches/patch-ag b/sysutils/ups-nut/patches/patch-ag
index ea9e99f5ac1..ff0f31b73fa 100644
--- a/sysutils/ups-nut/patches/patch-ag
+++ b/sysutils/ups-nut/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.4 2002/05/13 14:40:51 lukem Exp $
+$NetBSD: patch-ag,v 1.5 2002/08/25 21:51:06 jlam Exp $
 
 --- models/Makefile.in.orig	Tue Mar 26 10:30:31 2002
 +++ models/Makefile.in
diff --git a/sysutils/vcdimager/Makefile b/sysutils/vcdimager/Makefile
index 0c7f6f35143..1e68779a57e 100644
--- a/sysutils/vcdimager/Makefile
+++ b/sysutils/vcdimager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:42 seb Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 21:51:08 jlam Exp $
 #
 
 DISTNAME=       vcdimager-0.6.2
@@ -9,10 +9,11 @@ MAINTAINER=	collver@linuxfreemail.com
 HOMEPAGE=	http://www.gnu.org/software/vcdimager/
 COMMENT=	mastering suite for Video CDs
 
-USE_BUILDLINK_ONLY=	YES
-USE_GMAKE=		YES
-GNU_CONFIGURE=		YES
+USE_BUILDLINK2=	YES
+USE_GMAKE=	YES
+GNU_CONFIGURE=	YES
+
+.include "../../devel/gettext-lib/buildlink2.mk"
 
-.include "../../devel/gettext-lib/buildlink.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile
index d96652ea340..3b0277b2882 100644
--- a/sysutils/whowatch/Makefile
+++ b/sysutils/whowatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/20 04:29:52 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:09 jlam Exp $
 #
 
 DISTNAME=	whowatch-1.4
@@ -10,8 +10,8 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://wizard.ae.krakow.pl/~mike/\#whowatch
 COMMENT=	interactive who-like program displaying real-time user information
 
-GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
+GNU_CONFIGURE=	YES
+USE_BUILDLINK2=	YES
 
-.include "../../devel/ncurses/buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wmcpuload/Makefile b/sysutils/wmcpuload/Makefile
index 081aeb20aad..4d3c4386eb5 100644
--- a/sysutils/wmcpuload/Makefile
+++ b/sysutils/wmcpuload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/24 18:04:57 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 21:51:10 jlam Exp $
 #
 
 DISTNAME=	wmcpuload-0.9.0
@@ -9,9 +9,9 @@ MAINTAINER=	coto@core.de
 HOMEPAGE=	http://www.sh.rim.or.jp/~ssato/dockapp/index.shtml
 COMMENT=	dockable CPU monitor
 
-GNU_CONFIGURE=  	YES
-USE_BUILDLINK_ONLY=	YES
+GNU_CONFIGURE= 	YES
+USE_BUILDLINK2=	YES
+USE_X11=	YES
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
index 666cf6ec1f8..3b0c8db341b 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/12/19 20:21:30 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/25 21:51:10 jlam Exp $
 
 DISTNAME=	xbattbar_1.4.2
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -11,6 +11,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://infonet.aist-nara.ac.jp/member/suguru/xbattbar.html
 COMMENT=	X11 battery graph for laptops
 
+USE_BUILDLINK2=	# defined
+
 USE_X11BASE=	# defined
 USE_IMAKE=	# defined
 
diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
index f97a290fbee..453de27e207 100644
--- a/sysutils/xps/Makefile
+++ b/sysutils/xps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/07/24 19:45:28 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2002/08/25 21:51:11 jlam Exp $
 
 DISTNAME=	xps-3.14
 CATEGORIES=	sysutils
@@ -12,10 +12,8 @@ USE_PERL5=	build
 USE_GMAKE=	# defined
 USE_X11BASE=	# defined
 
-USE_BUILDLINK_ONLY=	# defined
-GNU_CONFIGURE=		# defined
-CONFIGURE_ENV+=		XINCLUDES="-I${BUILDLINK_X11_DIR}/include"
+USE_BUILDLINK2=	# defined
+GNU_CONFIGURE=	# defined
 
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../mk/motif.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"