BUILD_USE_MSGFMT and USE_MSGFMT_PLURALS are obsolete. Replace with

USE_TOOLS+=msgfmt.

13 files changed, 27 insertions, 43 deletions

diff --git a/audio/aumix/Makefile.common b/audio/aumix/Makefile.common
index badfde46cb4..ae98d91250f 100644
--- a/audio/aumix/Makefile.common
+++ b/audio/aumix/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2005/04/11 21:44:51 tv Exp $
+# $NetBSD: Makefile.common,v 1.3 2006/04/13 18:23:29 jlam Exp $
 
 DISTNAME=	aumix-2.8
 CATEGORIES=	audio
@@ -13,13 +13,12 @@ MAINTAINER=	trevor@jpj.net
 HOMEPAGE=	http://jpj.net/~trevor/aumix.html
 COMMENT=	Set mix levels
 
-BUILD_USES_MSGFMT=	yes
-
 DISTINFO_FILE=		${.CURDIR}/../../audio/aumix/distinfo
 PATCHDIR=		${.CURDIR}/../../audio/aumix/patches
 PLIST_SRC=		${.CURDIR}/../../audio/aumix/PLIST
 
 USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		msgfmt
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--enable-own-labels
diff --git a/audio/cplay/Makefile b/audio/cplay/Makefile
index 262b7528e73..6736cb1f46c 100644
--- a/audio/cplay/Makefile
+++ b/audio/cplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/02 10:02:10 ghen Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/13 18:23:29 jlam Exp $
 
 DISTNAME=		cplay-1.49
 PKGREVISION=		2
@@ -11,8 +11,8 @@ COMMENT=		Curses front-end for various audio players
 
 PYTHON_PATCH_SCRIPTS=	cplay
 
-BUILD_USES_MSGFMT=	yes
 USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		msgfmt
 
 PKGLOCALES=		da de hu pl
 EGDIR=			${PREFIX}/share/examples/cplay
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 3754512caa1..bbad68dd24e 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/02/05 23:08:06 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2006/04/13 18:23:29 jlam Exp $
 #
 
 DISTNAME=	easytag-1.1
@@ -11,11 +11,10 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://easytag.sourceforge.net/
 COMMENT=	Tool to view, edit and write ID3 v1&2 TAGs with a GTK+ interface
 
-BUILD_USES_MSGFMT=	yes	# xgettext, really
-
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		gmake
+USE_TOOLS+=		msgfmt # xgettext, really
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 
diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile
index 8fc7251125c..67b9efca9e6 100644
--- a/audio/gkrellm-volume/Makefile
+++ b/audio/gkrellm-volume/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/09 21:04:40 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/13 18:23:29 jlam Exp $
 
 DISTNAME=	gkrellm-volume-2.1.13
 PKGREVISION=	2
@@ -9,9 +9,7 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://gkrellm.luon.net/volume.phtml
 COMMENT=	Gkrellm2 volume mixer plugin
 
-BUILD_USES_MSGFMT=	YES
-
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	YES
 WRKSRC=			${WRKDIR}/gkrellm-volume
 
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index deecd3f2ad7..b55fb38cf7d 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/04/06 06:21:34 reed Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/13 18:23:29 jlam Exp $
 #
 
 DISTNAME=	gkrellmms-2.1.20
@@ -11,9 +11,8 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://gkrellm.luon.net/gkrellmms.phtml
 COMMENT=	GKrellM2 plugin to remotely control XMMS
 
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	YES
-BUILD_USES_MSGFMT=	YES
 
 BUILDLINK_API_DEPENDS.gkrellm+=	gkrellm>=2.2.0
 
diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile
index db7a5d75396..e57ddb642f5 100644
--- a/audio/gnome-speech/Makefile
+++ b/audio/gnome-speech/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/03/30 21:27:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.27 2006/04/13 18:23:29 jlam Exp $
 #
 
 DISTNAME=	gnome-speech-0.3.10
@@ -10,9 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME 2 text-to-speech API
 
-BUILD_USES_MSGFMT=	yes
-
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index ba7af5e5c84..089d8908374 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:26 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/13 18:23:29 jlam Exp $
 
 DISTNAME=		gqmpeg-0.91.1
 PKGREVISION=		4
@@ -9,12 +9,11 @@ MAINTAINER=		sekiya@NetBSD.org
 HOMEPAGE=		http://gqmpeg.sourceforge.net/
 COMMENT=		GTK+ front end to mpg123
 
-BUILD_USES_MSGFMT=	yes
 DEPENDS+=		mpg123{,-esound,-nas}>=0.59.18:../../audio/mpg123
 DEPENDS+=		vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
 DEPENDS+=		xmp>=2.0.2:../../audio/xmp
 
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		msgfmt pkg-config
 USE_DIRS+=		gnome2-1.5
 USE_DIRS+=		xdg-1.2
 USE_PKGLOCALEDIR=	YES
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 4116e9a46aa..e41f2c55f79 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2006/03/14 01:14:26 jlam Exp $
+# $NetBSD: Makefile,v 1.90 2006/04/13 18:23:29 jlam Exp $
 
 DISTNAME=		gqmpeg-0.20.0
 PKGREVISION=		9
@@ -9,11 +9,11 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://gqmpeg.sourceforge.net/
 COMMENT=		GTK+ front end to mpg123
 
-BUILD_USES_MSGFMT=	yes
 DEPENDS+=		mpg123{,-esound,-nas}>=0.59.18:../../audio/mpg123
 DEPENDS+=		vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
 DEPENDS+=		xmp>=2.0.2:../../audio/xmp
 
+USE_TOOLS+=		msgfmt
 USE_DIRS+=		gnome1-1.5
 USE_DIRS+=		xdg-1.2
 USE_PKGLOCALEDIR=	YES
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index c2d5c4fb071..031f40f686d 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/06 06:21:34 reed Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/13 18:23:29 jlam Exp $
 #
 
 DISTNAME=	gtkpod-0.94.0
@@ -10,13 +10,11 @@ MAINTAINER=	smb@NetBSD.org
 HOMEPAGE=	http://gtkpod.sourceforge.net/
 COMMENT=	GUI for iPod using GTK2
 
-BUILD_USES_MSGFMT=	yes
-
 GNU_CONFIGURE=		yes
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=	pkg-config perl:run
+USE_TOOLS+=		msgfmt pkg-config perl:run
 
 REPLACE_PERL+=		scripts/mab2vcard
 
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index 484aa7392a4..2556c1c11f0 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/02/05 23:08:11 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/13 18:23:29 jlam Exp $
 #
 
 DISTNAME=	madplay-0.15.2b
@@ -11,11 +11,10 @@ MAINTAINER=	simonb@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/mad/
 COMMENT=	High-quality MPEG audio decoder
 
-BUILD_USES_MSGFMT=	YES
-
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
+USE_TOOLS+=		msgfmt
 
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE:Q}
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 41d1ae53c5f..a535bc4ffcb 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/03/21 06:00:44 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2006/04/13 18:23:29 jlam Exp $
 #
 
 DISTNAME=	rhythmbox-0.8.8
@@ -11,7 +11,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.rhythmbox.org/
 COMMENT=	Music management application for GNOME
 
-BUILD_USES_MSGFMT=	YES
 DEPENDS+=		gst-plugins0.8-esound>=0.8.1:../../audio/gst-plugins0.8-esound
 DEPENDS+=		gst-plugins0.8-gnomevfs>=0.8.1:../../sysutils/gst-plugins0.8-gnomevfs
 DEPENDS+=		gst-plugins0.8-mad>=0.8.1:../../audio/gst-plugins0.8-mad
@@ -19,7 +18,7 @@ DEPENDS+=		gst-plugins0.8-vorbis>=0.8.1:../../audio/gst-plugins0.8-vorbis
 
 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/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index f3d966b0bed..bab132e4a38 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/21 06:00:44 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/13 18:23:29 jlam Exp $
 #
 
 DISTNAME=	streamtuner-0.99.99
@@ -12,10 +12,8 @@ COMMENT=	Stream directory browser
 
 BUILD_DEPENDS+=	hicolor-icon-theme-[0-9]*:../../graphics/hicolor-icon-theme
 
-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/audio/sweep/Makefile b/audio/sweep/Makefile
index 21a0f51a98e..c878f0afe2f 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/03/09 21:04:41 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/13 18:23:29 jlam Exp $
 #
 
 DISTNAME=	sweep-0.8.3
@@ -10,11 +10,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sweep.sourceforge.net/
 COMMENT=	Full-featured digital sound editor
 
-BUILD_USES_MSGFMT=	YES
-
 USE_DIRS+=		gnome1-1.5
 USE_LIBTOOL=		YES
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	YES
 
 GNU_CONFIGURE=		YES