BUILD_USE_MSGFMT and USE_MSGFMT_PLURALS are obsolete. Replace with

USE_TOOLS+=msgfmt.

9 files changed, 18 insertions, 34 deletions

diff --git a/misc/deskbar-applet/Makefile b/misc/deskbar-applet/Makefile
index b480a48ec7d..d1515a13c55 100644
--- a/misc/deskbar-applet/Makefile
+++ b/misc/deskbar-applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/04/10 16:30:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/13 18:23:35 jlam Exp $
 #
 
 DISTNAME=	deskbar-applet-2.14.0.1
@@ -10,14 +10,11 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://raphael.slinckx.net/deskbar
 COMMENT=	Omnipresent, versatile search interface for the GNOME Desktop
 
-BUILD_USES_MSGFMT=	YES
-
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		YES
-USE_MSGFMT_PLURALS=	YES
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 
 PKGCONFIG_OVERRIDE=	data/deskbar-applet.pc
 
diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile
index 10cc94cf5d1..cb145a6ce2e 100644
--- a/misc/dpkg/Makefile
+++ b/misc/dpkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:10 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/13 18:23:35 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV:S,-,_,}
@@ -11,13 +11,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://packages.debian.org/stable/base/dpkg.html
 COMMENT=	Package maintenance system for Debian
 
-BUILD_USES_MSGFMT=	yes
-
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake msgfmt perl
 USE_NCURSES=		# tigetstr()
 
 REPLACE_PERL=		${WRKSRC}/scripts/*.pl
diff --git a/misc/gkrellm-weather/Makefile b/misc/gkrellm-weather/Makefile
index 02424b38418..935381e9d0c 100644
--- a/misc/gkrellm-weather/Makefile
+++ b/misc/gkrellm-weather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/25 17:29:45 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/13 18:23:35 jlam Exp $
 
 DISTNAME=       gkrellweather-2.0.6
 PKGNAME=        gkrellm-weather-2.0.6
@@ -12,9 +12,8 @@ HOMEPAGE=	http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
 COMMENT=	Gkrellm2 weather plugin
 
 DEPENDS+=       wget>=1.8:../../net/wget
-BUILD_USES_MSGFMT=      YES
 
-USE_TOOLS+=		gmake perl:run pkg-config
+USE_TOOLS+=		gmake msgfmt perl:run pkg-config
 USE_PKGLOCALEDIR=	YES
 BUILD_TARGET=		gkrellweather.so
 
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 31dafee23f4..db8e762fda6 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2006/04/08 17:18:26 joerg Exp $
+# $NetBSD: Makefile,v 1.56 2006/04/13 18:23:35 jlam Exp $
 #
 
 DISTNAME=		gnome-utils-2.14.0
@@ -10,11 +10,8 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Set of useful GNOME2 utilities and applications
 
-BUILD_USES_MSGFMT=	yes
-
-USE_TOOLS+=		gmake perl pkg-config
+USE_TOOLS+=		gmake msgfmt perl pkg-config
 USE_DIRS+=		gnome2-1.5
-USE_MSGFMT_PLURALS=	yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index 2ee289e3986..26f71827ebe 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/03/04 21:30:11 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2006/04/13 18:23:35 jlam Exp $
 
 DISTNAME=		gperiodic-2.0.8
 PKGREVISION=		2
@@ -9,11 +9,9 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.acclab.helsinki.fi/~frantz/software/gperiodic.php
 COMMENT=		Displays a periodic table of the elements
 
-BUILD_USES_MSGFMT=	yes
-
 USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 
 BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=	rm:-DGDK_DISABLE_DEPRECATED
diff --git a/misc/gxmame/Makefile b/misc/gxmame/Makefile
index 769f5eff8ab..52f0570dfc4 100644
--- a/misc/gxmame/Makefile
+++ b/misc/gxmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:10:09 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/13 18:23:35 jlam Exp $
 #
 
 DISTNAME=	gxmame-0.35beta1
@@ -10,13 +10,12 @@ MAINTAINER=	flynn@energyhq.es.eu.org
 HOMEPAGE=	http://gxmame.sourceforge.net/
 COMMENT=	Frontend for XMame using the GTK2 library
 
-BUILD_USES_MSGFMT=	yes
 DEPENDS+=		xmame>=0.87:../../emulators/xmame
 DEPENDS+=               p5-XML-Parser>=2.34:../../textproc/p5-XML-Parser
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index ae58a7b8aaf..ca0162b5815 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/04/05 22:54:59 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/13 18:23:35 jlam Exp $
 #
 
 DISTNAME=		pinfo-0.6.1
@@ -10,9 +10,8 @@ MAINTAINER=		fredb@NetBSD.org
 HOMEPAGE=		http://zeus.polsl.gliwice.pl/~pborys/
 COMMENT=		Przemek's Info Viewer
 
-BUILD_USES_MSGFMT=	yes
-
 USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		msgfmt
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index 56db4035acd..7fce4f00cf6 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/03/14 01:14:31 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2006/04/13 18:23:35 jlam Exp $
 
 DISTNAME=	rpm-2.5.4
 PKGREVISION=	5
@@ -9,13 +9,11 @@ MAINTAINER=	mycroft@NetBSD.org
 HOMEPAGE=	http://www.rpm.org/
 COMMENT=	The Red Hat Package Manager
 
-BUILD_USES_MSGFMT=	yes
-
 CONFLICTS+=		rpm2cpio<1.0nb1
 
 NOT_FOR_PLATFORM+=	Interix-*-* # getmntent() is nonpublic; needs porting
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 GNU_CONFIGURE=		yes
 
 # this is needed instead of USE_PKGLOCALEDIR
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 53ce14ef013..83fbf94af9d 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/04/12 20:02:24 drochner Exp $
+# $NetBSD: Makefile,v 1.49 2006/04/13 18:23:35 jlam Exp $
 #
 
 DISTNAME=		yelp-2.14.1
@@ -11,12 +11,11 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Help browser for GNOME 2 desktop
 
 DEPENDS+=		docbook>=4.2:../../textproc/docbook
-BUILD_USES_MSGFMT=	yes
 
 BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=1.1.4
 
 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