BUILD_USE_MSGFMT and USE_MSGFMT_PLURALS are obsolete. Replace with

USE_TOOLS+=msgfmt.

26 files changed, 54 insertions, 91 deletions

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 93c00888eba..d94290d10e7 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/03/04 21:29:12 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2006/04/13 18:23:30 jlam Exp $
 #
 
 DISTNAME=		GConf-1.0.9
@@ -12,9 +12,9 @@ HOMEPAGE=		http://advogato.org/proj/GConf/
 COMMENT=		Configuration database system used by GNOME
 
 BUILD_DEPENDS+=		gtk-doc-[0-9]*:../../textproc/gtk-doc
-BUILD_USES_MSGFMT=	yes
 
 USE_PKGLOCALEDIR=	YES
+USE_TOOLS+=		msgfmt
 GNU_CONFIGURE=		YES
 MAKE_FLAGS+=		AM_MAKEFLAGS="BDBBACKEND="
 
diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index 847881ed68c..7c0f7a16328 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2006/04/06 06:21:43 reed Exp $
+# $NetBSD: Makefile.common,v 1.39 2006/04/13 18:23:30 jlam Exp $
 #
 
 GCONF2_VERSION=		2.14.0
@@ -15,8 +15,6 @@ COMMENT=		Configuration database system used by GNOME (v2)
 # not ready yet.  .schemas are installed in the depot.
 #PKG_INSTALLATION_TYPES= overwrite pkgviews
 
-BUILD_USES_MSGFMT=	yes
-
 DISTINFO_FILE=		${.CURDIR}/../GConf2/distinfo
 FILESDIR=		${.CURDIR}/../GConf2/files
 PATCHDIR=		${.CURDIR}/../GConf2/patches
@@ -24,7 +22,7 @@ PATCHDIR=		${.CURDIR}/../GConf2/patches
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake perl pkg-config
+USE_TOOLS+=		gmake msgfmt perl pkg-config
 
 PKGCONFIG_OVERRIDE=	gconf-2.0.pc.in
 
diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index 29f37ec5539..ec9464b7773 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/13 18:23:30 jlam Exp $
 #
 
 DISTNAME=	aegis-4.15
@@ -10,11 +10,10 @@ MAINTAINER=	Matthew@Aldous.com
 HOMEPAGE=	http://aegis.sourceforge.net/
 COMMENT=	Aegis is a transaction base software configuration management system
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 CONFIGURE_ARGS+=	--with-nlsdir=${_PKGLOCALEDIR:Q}
-USE_TOOLS+=	groff gsoelim
-BUILD_USES_MSGFMT=	yes
+USE_TOOLS+=		groff gsoelim msgfmt
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 9abd5a6dd0e..8e9d99e2ab7 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2006/03/30 03:44:42 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2006/04/13 18:23:31 jlam Exp $
 
 DISTNAME=		bison-2.1
 CATEGORIES=		devel
@@ -11,10 +11,9 @@ COMMENT=		GNU yacc(1) replacement
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-BUILD_USES_MSGFMT=	yes
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gm4:run
+USE_TOOLS+=		gm4:run msgfmt
 INFO_FILES=		# PLIST
 
 TEST_TARGET=		check
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 5505d81d504..4f64ce64f59 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/04/06 06:21:45 reed Exp $
+# $NetBSD: Makefile,v 1.57 2006/04/13 18:23:31 jlam Exp $
 
 DISTNAME=	bonobo-1.0.22
 PKGREVISION=	1
@@ -15,11 +15,10 @@ BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 BUILDLINK_API_DEPENDS.libxml=	libxml>1.8.15
 
 BROKEN_GETTEXT_DETECTION=	yes
-BUILD_USES_MSGFMT=	yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11BASE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE:Q}
 CONFIGURE_ENV+=		X11BASE=${X11BASE:Q}
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index 568a5c3f461..3763974a343 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:40 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/13 18:23:31 jlam Exp $
 
 DISTNAME=	cook-2.22
 PKGREVISION=	3
@@ -9,8 +9,7 @@ MAINTAINER=	groo@NetBSD.org
 HOMEPAGE=	http://www.canb.auug.org.au/~millerp/cook/cook.html
 COMMENT=	More powerful replacement for the traditional make(1) tool
 
-BUILD_USES_MSGFMT=	yes
-
+USE_TOOLS+=	msgfmt
 GNU_CONFIGURE=	yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/doc++/Makefile b/devel/doc++/Makefile
index 63159d6e1be..1f19b021b03 100644
--- a/devel/doc++/Makefile
+++ b/devel/doc++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:29:14 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/04/13 18:23:31 jlam Exp $
 
 DISTNAME=		doc++-3.4.10
 PKGREVISION=	2
@@ -9,11 +9,10 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://docpp.sourceforge.net/
 COMMENT=		Documentation system for C, C++ and Java
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
-BUILD_USES_MSGFMT=	yes
 
 #post-extract:
 #	${RM} ${WRKSRC}/src/getopt.h
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index 4f41891e9da..435309b8cf9 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/04 21:29:14 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2006/04/13 18:23:31 jlam Exp $
 
 DISTNAME=	eel-1.0.2
 PKGREVISION=	2
@@ -10,10 +10,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.eazel.com/
 COMMENT=	Eazel Extensions Library
 
-BUILD_USES_MSGFMT=	yes
 BROKEN_GETTEXT_DETECTION=	yes
 
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake msgfmt perl
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile
index b622a5a5528..885907171ba 100644
--- a/devel/eel2/Makefile
+++ b/devel/eel2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/04/12 09:46:26 drochner Exp $
+# $NetBSD: Makefile,v 1.53 2006/04/13 18:23:31 jlam Exp $
 
 DISTNAME=	eel-2.14.1
 PKGNAME=	${DISTNAME:S/-/2-/}
@@ -10,10 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Eazel Extensions Library for GNOME2
 
-BUILD_USES_MSGFMT=	YES
-
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile
index 2a1958b1ea0..227aed58715 100644
--- a/devel/fhist/Makefile
+++ b/devel/fhist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/13 18:23:31 jlam Exp $
 #
 
 DISTNAME=		fhist-1.13
@@ -10,12 +10,9 @@ MAINTAINER=		Matthew@Aldous.com
 HOMEPAGE=		http://fhist.sourceforge.net/
 COMMENT=		File history and comparison tools
 
-BUILD_USES_MSGFMT=	YES
-
+USE_TOOLS+=		gsoelim msgfmt
 GNU_CONFIGURE=		YES
 
-USE_TOOLS+=		gsoelim
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile
index 03a38b11deb..d5bd69b6a0e 100644
--- a/devel/gdb6/Makefile
+++ b/devel/gdb6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/30 03:44:42 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/04/13 18:23:31 jlam Exp $
 #
 
 DISTNAME=		gdb-6.2.1
@@ -13,9 +13,7 @@ COMMENT=		The GNU Project Debugger
 
 NOT_FOR_PLATFORM=	Darwin-*-*
 
-BUILD_USES_MSGFMT=	yes
-
-USE_TOOLS+=		gmake makeinfo
+USE_TOOLS+=		gmake makeinfo msgfmt
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_PKGLOCALEDIR=	yes
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 1a4a8946747..071c6045925 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2006/04/08 21:23:23 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2006/04/13 18:23:31 jlam Exp $
 
 DISTNAME=		glib-2.10.2
 PKGNAME=		${DISTNAME:S/glib/glib2/}
@@ -14,10 +14,8 @@ COMMENT=		Some useful routines for C programming (glib2)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-BUILD_USES_MSGFMT=	yes
-
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake perl:run pkg-config
+USE_TOOLS+=		gmake msgfmt perl:run pkg-config
 USE_LIBTOOL=		yes
 TEST_TARGET=		check
 
diff --git a/devel/gnome2-libole2/Makefile b/devel/gnome2-libole2/Makefile
index eb767fdc305..8029b0a62c2 100644
--- a/devel/gnome2-libole2/Makefile
+++ b/devel/gnome2-libole2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/13 18:23:31 jlam Exp $
 #
 
 DISTNAME=		libole2-2.2.8
@@ -12,11 +12,9 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		OLE2 streams parsing library for GNOME2
 
-BUILD_USES_MSGFMT=	YES
-
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		msgfmt pkg-config
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index 32d78299742..4dce90ed444 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/04/08 21:20:06 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2006/04/13 18:23:31 jlam Exp $
 
 DISTNAME=	id-utils-3.2
 PKGREVISION=	9
@@ -11,8 +11,8 @@ COMMENT=	Classic Berkeley gid/lid tools for looking up variables in code
 
 CONFLICTS=	sh-utils>=2.0nb2 coreutils-[0-9]*
 
-BUILD_USES_MSGFMT=	yes
 USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		msgfmt
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		ac_cv_path_EMACS=no
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index df9a936fbf7..b534b2dfde1 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/03/04 21:29:16 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2006/04/13 18:23:31 jlam Exp $
 
 DISTNAME=	kdbg-2.0.3
 PKGREVISION=	1
@@ -10,9 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=       http://members.telecom.at/~johsixt/kdbg.html
 COMMENT=	Graphical User Interface around gdb using KDE
 
-BUILD_USES_MSGFMT=	yes
-
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index 0e59cf5521e..64647a41f58 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/03/30 03:08:19 markd Exp $
+# $NetBSD: Makefile,v 1.54 2006/04/13 18:23:31 jlam Exp $
 
 DISTNAME=	kdevelop-3.3.2
 PKGNAME=	kdevelop-base-3.3.2
@@ -9,8 +9,6 @@ COMMENT=	Base modules for IDE for Unix/X11/KDE
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
-BUILD_USES_MSGFMT=	yes
-
 DEPENDS+=		automake>=1.7:../../devel/automake
 DEPENDS+=		doxygen>=1.3.5:../../devel/doxygen
 DEPENDS+=		graphviz>=1.10nb1:../../graphics/graphviz
@@ -22,7 +20,7 @@ DEPENDS+=		qt3-tools>=3.1.1:../../x11/qt3-tools
 
 CONFLICTS+=	kdevelop<=1.3
 
-USE_TOOLS+=	perl:run
+USE_TOOLS+=	msgfmt perl:run
 
 REPLACE_PERL+= \
 	kdevprj2kdevelop \
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index be4899eb217..b117d89aa4f 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/04/06 06:21:50 reed Exp $
+# $NetBSD: Makefile,v 1.51 2006/04/13 18:23:31 jlam Exp $
 #
 
 DISTNAME=	libbonoboui-2.14.0
@@ -10,12 +10,10 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME2 Object activation framework library (graphical version)
 
-BUILD_USES_MSGFMT=	yes
-
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE=	bonobo/libbonoboui-2.0.pc.in
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 96cc9d64207..859ee96958c 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2006/04/13 18:23:31 jlam Exp $
 
 DISTNAME=		libglade-0.17
 PKGREVISION=		8
@@ -9,8 +9,7 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.daa.com.au/~james/gnome/
 COMMENT=		Runtime interpreter for GLADE GUI files
 
-BUILD_USES_MSGFMT=	yes
-
+USE_TOOLS+=		msgfmt
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 2da21c66aac..bff8605bd31 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/04/06 06:21:51 reed Exp $
+# $NetBSD: Makefile,v 1.45 2006/04/13 18:23:31 jlam Exp $
 #
 
 DISTNAME=		libglade-2.5.1
@@ -12,9 +12,7 @@ MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.daa.com.au/~james/gnome/
 COMMENT=		Runtime interpreter for GLADE GUI files (v2)
 
-BUILD_USES_MSGFMT=	YES
-
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	libglade-2.0.pc.in
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 8b2b0d5a0f2..c425344cb0e 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/04/11 20:36:55 drochner Exp $
+# $NetBSD: Makefile,v 1.57 2006/04/13 18:23:31 jlam Exp $
 #
 
 DISTNAME=	libgnome-2.14.1
@@ -10,12 +10,10 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Core GNOME2 library (non-graphical)
 
-BUILD_USES_MSGFMT=	YES
-
 BUILDLINK_API_DEPENDS.esound+=	esound>=0.2.26
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index 59fc35822cd..6b3a5dc922f 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/04/11 20:36:55 drochner Exp $
+# $NetBSD: Makefile,v 1.59 2006/04/13 18:23:31 jlam Exp $
 #
 
 DISTNAME=	libgnomeui-2.14.1
@@ -10,14 +10,12 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Core GNOME2 graphical libraries
 
-BUILD_USES_MSGFMT=	yes
-
 CONFLICTS+=		gnome-libs<=1.4.2nb1
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake perl pkg-config
+USE_TOOLS+=		gmake msgfmt perl pkg-config
 USE_LIBTOOL=		yes
 
 CONFIGURE_ARGS+=	--disable-gtk-doc
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index e94c6877a2c..b79526417dc 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/04/12 20:04:35 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2006/04/13 18:23:31 jlam Exp $
 #
 
 DISTNAME=	libwnck-2.14.1
@@ -10,11 +10,9 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Library to write pagers and tasklists
 
-BUILD_USES_MSGFMT=	yes
-
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE=	libwnck-1.0.pc.in
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 842851bfff2..68dfa60427e 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/02/05 23:08:48 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2006/04/13 18:23:31 jlam Exp $
 #
 
 DISTNAME=	maketool-0.7-src
@@ -11,10 +11,9 @@ MAINTAINER=	fredb@NetBSD.org
 HOMEPAGE=	http://www.alphalink.com.au/~gnb/maketool/
 COMMENT=	Graphical front end to GNU make
 
-BUILD_USES_MSGFMT=	yes
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index a4f52956236..a2d645e11ee 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/04 21:29:26 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/13 18:23:31 jlam Exp $
 #
 
 DISTNAME=	popt-1.7
@@ -15,12 +15,10 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 CONFLICTS=		ORBit<=0.5.3
 
-BUILD_USES_MSGFMT=	yes
-
 WRKSRC=			${WRKDIR}/${DISTNAME}
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 USE_LIBTOOL=		yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 817b133d045..fe52afd96f7 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/04/06 06:21:56 reed Exp $
+# $NetBSD: Makefile,v 1.35 2006/04/13 18:23:31 jlam Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
@@ -7,10 +7,10 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../../devel/subversion/Makefile.common"
 
-BUILD_USES_MSGFMT=	yes
-
 BUILD_DEFS+=		PKG_BUILD_OPTIONS.apr
 
+USE_TOOLS+=		msgfmt
+
 CONFIGURE_ARGS+=	--without-apache
 CONFIGURE_ARGS+=	--without-apxs
 
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index a19a399c9a3..52e5cb460bc 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:30 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/13 18:23:32 jlam Exp $
 #
 
 DISTNAME=	yasm-0.4.0
@@ -10,9 +10,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tortall.net/projects/yasm/
 COMMENT=	Complete rewrite of the NASM assembler with BSD license
 
-BUILD_USES_MSGFMT=	YES
 BROKEN_GETTEXT_DETECTION=	NO
 
+USE_TOOLS+=		msgfmt
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES