BUILD_USE_MSGFMT and USE_MSGFMT_PLURALS are obsolete. Replace with

USE_TOOLS+=msgfmt.

10 files changed, 20 insertions, 36 deletions

diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index d2455ec1892..63beade31ff 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2006/01/26 23:23:08 adam Exp $
+# $NetBSD: Makefile.common,v 1.30 2006/04/13 18:23:32 jlam Exp $
 
 # Be sure to update PLIST and distinfo for editors/abiword-plugins when updating
 ABIWORD_VERSION=	2.4.2
@@ -12,12 +12,10 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.abisource.com/
 
-BUILD_USES_MSGFMT=	yes
-
 MAKEFILE=		GNUmakefile
 USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libpng=${BUILDLINK_PREFIX.png}
 
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 28d3670b3c8..e71764bc5b3 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/03/21 06:00:45 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2006/04/13 18:23:32 jlam Exp $
 #
 
 DISTNAME=	conglomerate-0.9.0
@@ -10,14 +10,13 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.conglomerate.org/
 COMMENT=	XML editor for GNOME2
 
-BUILD_USES_MSGFMT=	yes
 DEPENDS+=		docbook-xsl>=1.64.1:../../textproc/docbook-xsl
 DEPENDS+=		docbook-xml>=4.2nb6:../../textproc/docbook-xml
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake perl pkg-config
+USE_TOOLS+=		gmake msgfmt perl pkg-config
 USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--enable-printing
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index adea07c3e96..d3738f6f031 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/21 15:34:03 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/13 18:23:32 jlam Exp $
 
 DISTNAME=	cooledit-3.17.17
 PKGREVISION=	2
@@ -9,11 +9,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cooledit.sourceforge.net/
 COMMENT=	Full-featured text editor
 
-BUILD_USES_MSGFMT=	yes
-
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 GNU_CONFIGURE=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
diff --git a/editors/fe/Makefile b/editors/fe/Makefile
index f1a062f4f25..0c1c42dd4a9 100644
--- a/editors/fe/Makefile
+++ b/editors/fe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:29:31 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/13 18:23:32 jlam Exp $
 
 DISTNAME=	fe-1.6
 PKGREVISION=	1
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.moria.de/~michael/fe/
 COMMENT=	Folding editor
 
 GNU_CONFIGURE=	yes
-BUILD_USES_MSGFMT=	yes
+USE_TOOLS+=	msgfmt
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fe
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index 9f220be10e3..57f0a2d3e36 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/04/06 06:21:58 reed Exp $
+# $NetBSD: Makefile,v 1.47 2006/04/13 18:23:32 jlam Exp $
 #
 
 DISTNAME=		gconf-editor-2.14.0
@@ -10,13 +10,11 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Editor for the GConf configuration system
 
-BUILD_USES_MSGFMT=	YES
-
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1 gnome2-1.5
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 
 CONFIGURE_ARGS+=	--with-gconf-defaults-source=${GCONF2_CONFIG_SOURCE:Q}
 CONFIGURE_ARGS+=	--with-gconf-mandatory-source=${GCONF2_CONFIG_SOURCE:S/gconf.xml.defaults/gconf.xml.mandatory/g}
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 87fd2a59738..b4c0d05c105 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2006/04/12 20:00:01 drochner Exp $
+# $NetBSD: Makefile,v 1.62 2006/04/13 18:23:32 jlam Exp $
 #
 
 DISTNAME=		gedit-2.14.2
@@ -10,13 +10,10 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://gedit.sourceforge.net/
 COMMENT=		Lightweight GNOME2 text editor
 
-BUILD_USES_MSGFMT=	YES
-
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake perl pkg-config
+USE_TOOLS+=		gmake msgfmt perl pkg-config
 USE_LIBTOOL=		YES
-USE_MSGFMT_PLURALS=	YES
 GNU_CONFIGURE=		YES
 
 PKGCONFIG_OVERRIDE+=	data/gedit.pc.in
diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile
index 9a7017e8ab2..fa828ac4ba0 100644
--- a/editors/gtranslator/Makefile
+++ b/editors/gtranslator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/21 06:00:45 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/04/13 18:23:32 jlam Exp $
 
 DISTNAME=	gtranslator-1.0.2
 PKGREVISION=	5
@@ -9,10 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gtranslator.sourceforge.net/
 COMMENT=	Gettext po file editor for the GNOME2 desktop environment
 
-BUILD_USES_MSGFMT=	yes
-
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 MANCOMPRESSED=		yes
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index 92af40ebd85..189d89c7f3e 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/13 18:23:32 jlam Exp $
 #
 
 DISTNAME=	lpe-1.2.6
@@ -11,11 +11,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cdsmith.twu.net/professional/opensource/lpe.html
 COMMENT=	Small and efficient programmer's editor for UNIX systems
 
-BUILD_USES_MSGFMT=	YES
-
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 GNU_CONFIGURE=		YES
 
 SHLIBTOOL_OVERRIDE=	libtool
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index d31325932f2..05b45359178 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/21 06:00:45 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/13 18:23:32 jlam Exp $
 #
 
 DISTNAME=	mlview-0.7.0
@@ -11,11 +11,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.freespiders.org/projects/gmlview/
 COMMENT=	XML editor for the GNOME environment
 
-BUILD_USES_MSGFMT=	yes
-
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
diff --git a/editors/vim-lang/Makefile b/editors/vim-lang/Makefile
index 24775533bef..d7bc9b71f23 100644
--- a/editors/vim-lang/Makefile
+++ b/editors/vim-lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/02 10:41:41 martti Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/13 18:23:32 jlam Exp $
 
 PKGNAME=	vim-lang-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=	1
@@ -9,7 +9,7 @@ COMMENT=	Language files for the vim editor (vi clone)
 
 DEPENDS+=	vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
 
-BUILD_USES_MSGFMT=	yes
+USE_TOOLS+=	msgfmt
 BUILD_TARGET=	languages
 INSTALL_TARGET=	install-languages