BUILD_USE_MSGFMT and USE_MSGFMT_PLURALS are obsolete. Replace with

USE_TOOLS+=msgfmt.

7 files changed, 14 insertions, 21 deletions

diff --git a/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile
index c8a7a182318..91a31b66f2f 100644
--- a/wm/e16menuedit2/Makefile
+++ b/wm/e16menuedit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/21 06:00:50 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/13 18:23:38 jlam Exp $
 #
 
 DISTNAME=		e16menuedit2-0.0.1
@@ -12,11 +12,10 @@ COMMENT=		Menu editor for the Enlightenment window manager
 
 DEPENDS+=		enlightenment-0.16.*:../../wm/enlightenment
 
-BUILD_USES_MSGFMT=	yes
 BROKEN_GETTEXT_DETECTION=	yes
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		automake pkg-config
+USE_TOOLS+=		automake msgfmt pkg-config
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 MAKE_ENV+=		CATALOGS="de.gmo en.gmo ko.gmo tr.gmo"
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index 9e933d48a77..e7343d92f67 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.50 2006/03/04 21:30:54 jlam Exp $
+# $NetBSD: Makefile.common,v 1.51 2006/04/13 18:23:38 jlam Exp $
 
 DISTNAME=		icewm-1.2.25
 CATEGORIES=		x11 wm
@@ -8,9 +8,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.icewm.org/
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 USE_PKGLOCALEDIR=	yes
-BUILD_USES_MSGFMT=	yes
 
 DISTINFO_FILE=		${.CURDIR}/../../wm/icewm/distinfo
 FILESDIR=		${.CURDIR}/../../wm/icewm/files
diff --git a/wm/ion3-devel/Makefile b/wm/ion3-devel/Makefile
index 17c8827d192..cfd987779b1 100644
--- a/wm/ion3-devel/Makefile
+++ b/wm/ion3-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/11 10:03:48 cube Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/13 18:23:38 jlam Exp $
 #
 
 DISTNAME=	ion-3ds-20060107
@@ -12,9 +12,8 @@ COMMENT=	Keyboard friendly tiling window manager
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=		gmake msgfmt
 USE_PKGLOCALEDIR=	YES
-BUILD_USES_MSGFMT=	YES
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 71760a645a2..0f6cfa5aa26 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/03/30 21:38:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.57 2006/04/13 18:23:38 jlam Exp $
 #
 
 DISTNAME=	metacity-2.14.1
@@ -10,11 +10,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/softwaremap/projects/Metacity/
 COMMENT=	GNOME-compliant window manager
 
-BUILD_USES_MSGFMT=	YES
-
 USE_DIRS+=		gnome2-1.5 theme-1.0
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index 99df655ff62..703d09c0912 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/02/05 23:11:14 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/13 18:23:38 jlam Exp $
 
 DISTNAME=	openbox-3.2
 PKGREVISION=	3
@@ -9,12 +9,11 @@ MAINTAINER=	snj@NetBSD.org
 HOMEPAGE=	http://icculus.org/openbox/
 COMMENT=	Standards compliant, light-weight and extensible window manager
 
-BUILD_USES_MSGFMT=	YES
 DEPENDS+=		vera-ttf>=1.10:../../fonts/vera-ttf
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index a1432e0540a..12bf5c0a58a 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/04/08 05:02:59 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2006/04/13 18:23:38 jlam Exp $
 #
 
 PKGNAME=		sawfish-${SF_VERS}
@@ -13,9 +13,8 @@ USE_X11BASE=		yes
 
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
-BUILD_USES_MSGFMT=	YES
 
-USE_TOOLS+=		makeinfo
+USE_TOOLS+=		makeinfo msgfmt
 INFO_FILES=		# PLIST
 
 PLIST_SUBST+=		SF_VERS=${SF_VERS:Q}
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 2dad9c969c7..c2bc7f33b5b 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2006/03/10 23:04:46 rillig Exp $
+# $NetBSD: Makefile,v 1.67 2006/04/13 18:23:38 jlam Exp $
 
 DISTNAME=	WindowMaker-0.92.0
 PKGNAME=	${DISTNAME:S/WindowMaker/windowmaker/}
@@ -12,9 +12,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.windowmaker.org/
 COMMENT=	GNUStep-compliant NEXTSTEP(tm) window manager clone
 
-BUILD_USES_MSGFMT=	yes
 BROKEN_GETTEXT_DETECTION=	yes
 
+USE_TOOLS+=		msgfmt
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes