BUILD_USE_MSGFMT and USE_MSGFMT_PLURALS are obsolete. Replace with

USE_TOOLS+=msgfmt.

16 files changed, 32 insertions, 63 deletions

diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 8446034fac1..b202b300f9f 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/02/05 23:10:48 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2006/04/13 18:23:37 jlam Exp $
 
 DISTNAME=		apcupsd-3.8.6
 PKGREVISION=		5
@@ -9,9 +9,7 @@ MAINTAINER=		bouyer@NetBSD.org
 HOMEPAGE=		http://www.sibbald.com/apcupsd/
 COMMENT=		UPS power management for APCC Products
 
-BUILD_USES_MSGFMT=	yes
-
-USE_TOOLS+=		gmake sh
+USE_TOOLS+=		gmake msgfmt sh
 
 GNU_CONFIGURE=		yes
 
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 64a3823d47d..55728d8cfad 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/04/07 19:54:16 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/13 18:23:37 jlam Exp $
 
 DISTNAME=	coreutils-5.2.1
 PKGREVISION=	2
@@ -12,12 +12,10 @@ COMMENT=	GNU basic file, shell and text manipulation utilities
 
 NOT_FOR_PLATFORM=	NetBSD-2.0[D-H]-*
 
-BUILD_USES_MSGFMT=	YES
-
 CONFLICTS=	fileutils-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]*
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		perl
+USE_TOOLS+=		msgfmt perl
 USE_PKGLOCALEDIR=	YES
 
 INFO_FILES=		# PLIST
diff --git a/sysutils/gentoo/Makefile b/sysutils/gentoo/Makefile
index e84352c54f4..693ee674377 100644
--- a/sysutils/gentoo/Makefile
+++ b/sysutils/gentoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/02/05 23:10:50 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/04/13 18:23:37 jlam Exp $
 
 DISTNAME=	gentoo-0.11.55
 PKGREVISION=	1
@@ -9,8 +9,7 @@ MAINTAINER=	dunse@goa.nu
 HOMEPAGE=	http://www.obsession.se/gentoo/
 COMMENT=	Two-pane filemanager using GTK+, 100% GUI configurable
 
-BUILD_USES_MSGFMT=	yes
-
+USE_TOOLS+=		msgfmt
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/sysutils/gkrellm-share/Makefile b/sysutils/gkrellm-share/Makefile
index 8b8bcc12984..4f593253194 100644
--- a/sysutils/gkrellm-share/Makefile
+++ b/sysutils/gkrellm-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:10:50 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/04/13 18:23:37 jlam Exp $
 .include "../../sysutils/gkrellm/Makefile.common"
 
 PKGREVISION=		1
@@ -6,7 +6,7 @@ GKRELLM_PKGBASE=	gkrellm-share
 
 COMMENT=		GKrellM2 locale files
 
-BUILD_USES_MSGFMT=	YES
+USE_TOOLS+=		msgfmt
 
 MAKE_ENV+=		MODULES=po
 
diff --git a/sysutils/gkrellm1/Makefile b/sysutils/gkrellm1/Makefile
index 24fa9d34276..b8bf21d7687 100644
--- a/sysutils/gkrellm1/Makefile
+++ b/sysutils/gkrellm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:10:50 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/13 18:23:37 jlam Exp $
 #
 
 DISTNAME=	gkrellm-1.2.13
@@ -11,10 +11,8 @@ MAINTAINER=	anthony.mallet@ficus.yi.org
 HOMEPAGE=	http://gkrellm.net/
 COMMENT=	GTK based system monitor
 
-BUILD_USES_MSGFMT=	YES
-
 OSVERSION_SPECIFIC=	YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 USE_PKGLOCALEDIR=	YES
 
 CONFLICTS+=	gkrellm-share>=2.0
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index f5101d21c31..2ff11713402 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/21 06:00:49 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/13 18:23:37 jlam Exp $
 #
 
 DISTNAME=	gnome-pkgview-1.0.6
@@ -10,9 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.greatnorthern.demon.co.uk/gnome-pkgview.html
 COMMENT=	Displays the version of GNOME components installed
 
-BUILD_USES_MSGFMT=	yes
-
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		msgfmt pkg-config
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index c3d7ac3a2c3..79ba01723db 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/04/06 06:22:45 reed Exp $
+# $NetBSD: Makefile,v 1.57 2006/04/13 18:23:37 jlam Exp $
 
 DISTNAME=		gnome-vfs-1.0.5
 PKGREVISION=		10
@@ -10,12 +10,11 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME Virtual File System
 
 BROKEN_GETTEXT_DETECTION=	yes
-BUILD_USES_MSGFMT=	YES
 BUILDLINK_API_DEPENDS.gnome-mime-data+=	gnome-mime-data>=2.0.1
 
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index 48277016b62..2da264de044 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2006/04/06 06:22:45 reed Exp $
+# $NetBSD: Makefile.common,v 1.33 2006/04/13 18:23:37 jlam Exp $
 #
 
 GNOME_VFS2_VERSION=	2.14.0
@@ -14,16 +14,13 @@ MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME Virtual File System (v2)
 
-BUILD_USES_MSGFMT=	YES
-
 DISTINFO_FILE=		${.CURDIR}/../../sysutils/gnome-vfs2/distinfo
 PATCHDIR=		${.CURDIR}/../../sysutils/gnome-vfs2/patches
 
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		YES
-USE_MSGFMT_PLURALS=	YES
 
 CONFIGURE_ARGS+=	--disable-cdda
 CONFIGURE_ARGS+= 	--disable-fam
diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile
index f0a10e5990f..15f15f7d30f 100644
--- a/sysutils/gnome2-system-monitor/Makefile
+++ b/sysutils/gnome2-system-monitor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/04/06 18:25:39 reed Exp $
+# $NetBSD: Makefile,v 1.37 2006/04/13 18:23:37 jlam Exp $
 #
 
 DISTNAME=	gnome-system-monitor-2.14.0
@@ -11,13 +11,10 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME 2 system monitor program
 
-BUILD_USES_MSGFMT=	yes
-
 USE_DIRS+=		gnome2-1.5
-USE_MSGFMT_PLURALS=	yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		autoconf gmake pkg-config
+USE_TOOLS+=		autoconf gmake msgfmt pkg-config
 
 LIBS+=			-lutil
 GCONF2_SCHEMAS+=	gnome-system-monitor.schemas
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index 419d791d9ec..25b2eb3c245 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:10:55 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/13 18:23:38 jlam Exp $
 
 DISTNAME=	kdirstat-2.4.3
 PKGREVISION=	2
@@ -10,11 +10,10 @@ MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://kdirstat.sourceforge.net/
 COMMENT= 	Graphical disk usage utility
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=          yes
-BUILD_USES_MSGFMT=	yes
 
 REPLACE_PERL=		kdirstat/fix_move_to_trash_bin.pl
 
diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile
index 9447ce611bb..6b717d5b9dd 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/04/06 06:22:45 reed Exp $
+# $NetBSD: Makefile,v 1.36 2006/04/13 18:23:38 jlam Exp $
 
 DISTNAME=		libgtop-2.14.0
 PKGNAME=		${DISTNAME:S/-/2-/}
@@ -10,13 +10,10 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Library to retrieve system information, used in GNOME2
 
-BUILD_USES_MSGFMT=	YES
-
 OSVERSION_SPECIFIC=	YES
-USE_MSGFMT_PLURALS=	YES
 
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake makeinfo perl pkg-config
+USE_TOOLS+=		gmake makeinfo msgfmt perl pkg-config
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	libgtop-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	support/gnome-support-2.0.pc.in
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 054a8d0a469..0c37437bc39 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/04/12 20:11:25 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2006/04/13 18:23:38 jlam Exp $
 #
 
 DISTNAME=	nautilus-cd-burner-2.14.1
@@ -11,11 +11,9 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	CD burner view for Nautilus
 
 DEPENDS+=		{cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools
-BUILD_USES_MSGFMT=	yes
-USE_MSGFMT_PLURALS=	yes
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index bfdb150d4a3..8960e7c6021 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2006/04/12 20:08:13 drochner Exp $
+# $NetBSD: Makefile,v 1.67 2006/04/13 18:23:38 jlam Exp $
 #
 
 DISTNAME=		nautilus-2.14.1
@@ -10,13 +10,10 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/projects/nautilus/
 COMMENT=		Nautilus file manager for GNOME2
 
-BUILD_USES_MSGFMT=	yes
-
 USE_PKGLOCALEDIR=	yes
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		yes
-USE_MSGFMT_PLURALS=	yes
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	libnautilus-extension/libnautilus-extension.pc.in
 
diff --git a/sysutils/pv/Makefile b/sysutils/pv/Makefile
index d34e5538d60..6152d44728a 100644
--- a/sysutils/pv/Makefile
+++ b/sysutils/pv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/04/11 02:28:09 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/04/13 18:23:38 jlam Exp $
 #
 
 DISTNAME=		pv-0.9.6
@@ -10,10 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.ivarch.com/programs/pv.shtml
 COMMENT=		Monitor the progress of data through a pipeline
 
-BUILD_USES_MSGFMT=	yes
-
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 USE_PKGLOCALEDIR=	yes
 INFO_FILES=		# PLIST
 
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index ff24313a740..4538fbca841 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/03/14 01:14:34 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2006/04/13 18:23:38 jlam Exp $
 
 DISTNAME=	xcdroast-${DIST_VER}
 PKGNAME=	xcdroast-${DIST_VER:S/alpha/a/}
@@ -10,13 +10,11 @@ MAINTAINER=	frueauf@NetBSD.org
 HOMEPAGE=	http://www.xcdroast.org/
 COMMENT=	Graphical user interface for the command-line cdrecord-tools
 
-BUILD_USES_MSGFMT=	YES
-
 DEPENDS+=		cdrtools>=2.01:../../sysutils/cdrtools
 
 DIST_VER=		0.98alpha15
 
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile
index e3e35260e61..d7e9ec46194 100644
--- a/sysutils/xfe/Makefile
+++ b/sysutils/xfe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:44 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/13 18:23:38 jlam Exp $
 
 DISTNAME=	xfe-0.84
 PKGREVISION=	1
@@ -9,11 +9,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://xfe.sourceforge.net/
 COMMENT=	Fast MS-Explorer like filemanager for X
 
-BUILD_USES_MSGFMT=	yes
-
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 GNU_CONFIGURE=		yes
 
 PKG_SYSCONFSUBDIR=	xfe