BUILD_USE_MSGFMT and USE_MSGFMT_PLURALS are obsolete. Replace with

USE_TOOLS+=msgfmt.

10 files changed, 20 insertions, 38 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 0ce20d1c313..1f5d1d106b8 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2006/03/21 06:00:51 jlam Exp $
+# $NetBSD: Makefile,v 1.68 2006/04/13 18:23:38 jlam Exp $
 
 DISTNAME=	bluefish-1.0.5
 PKGREVISION=	5
@@ -15,10 +15,9 @@ HOMEPAGE=	http://bluefish.openoffice.nl/
 COMMENT=	GTK HTML editor for the experienced web designer
 
 DEPENDS+=		weblint-[0-9]*:../../www/weblint
-BUILD_USES_MSGFMT=	yes
 
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		find gmake grep pkg-config
+USE_TOOLS+=		find gmake grep msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-icon-path=${PREFIX:Q}/share/pixmaps
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index dff1fe34c4a..855265d27f0 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/04/06 06:22:54 reed Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/13 18:23:39 jlam Exp $
 #
 
 DISTNAME=	epiphany-extensions-1.8.1
@@ -12,9 +12,8 @@ HOMEPAGE=	http://www.gnome.org/projects/epiphany/extensions.html
 COMMENT=	Extensions for the Epiphany web browser
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		YES
-USE_MSGFMT_PLURALS=	YES
 USE_PKGLOCALEDIR=	YES
 
 # Avoid -Werror, which breaks the build sometimes.
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 8d9865c6f1b..db15bc7c6a4 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/04/06 06:22:53 reed Exp $
+# $NetBSD: Makefile,v 1.53 2006/04/13 18:23:39 jlam Exp $
 #
 
 DISTNAME=	epiphany-2.14.0
@@ -10,13 +10,10 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/projects/epiphany/
 COMMENT=	The web browser for the GNOME Desktop
 
-BUILD_USES_MSGFMT=	YES
-
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		YES
-USE_MSGFMT_PLURALS=	YES
 USE_PKGLOCALEDIR=	YES
 
 PKGCONFIG_OVERRIDE=	data/epiphany-1.8.pc.in
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index a108740db43..8a9e1a3ac95 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2006/03/21 06:00:51 jlam Exp $
+# $NetBSD: Makefile,v 1.97 2006/04/13 18:23:39 jlam Exp $
 #
 
 DISTNAME=		galeon-1.3.21
@@ -13,12 +13,10 @@ COMMENT=		GNOME2 Web browser based on gecko
 
 BROKEN_IN=		pkgsrc-2005Q4
 
-BUILD_USES_MSGFMT=	yes
-
 CONFLICTS+=		galeon-devel-[0-9]*
 
 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/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index e505889f7f7..498b8c33bf2 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/02/23 18:21:15 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2006/04/13 18:23:39 jlam Exp $
 
 DISTNAME=		gtkhtml-1.1.10
 PKGREVISION=		7
@@ -11,11 +11,10 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Lightweight HTML rendering/printing/editing engine
 
 USE_X11BASE=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-BUILD_USES_MSGFMT=	yes
 BROKEN_GETTEXT_DETECTION=	yes
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index a24886c33e5..aa16fb21c23 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:58 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/13 18:23:39 jlam Exp $
 #
 
 DISTNAME=	kazehakase-0.3.3
@@ -12,11 +12,9 @@ COMMENT=	Web browser with multiple layout engines support
 
 BROKEN_IN=		pkgsrc-2005Q4
 
-BUILD_USES_MSGFMT=	yes
-
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.2
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 7c06b8be6e2..3480a429125 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/03/06 00:18:11 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2006/04/13 18:23:39 jlam Exp $
 #
 
 DISTNAME=	libgtkhtml-2.6.3
@@ -11,10 +11,8 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Lightweight HTML rendering GTK2 widget
 
-BUILD_USES_MSGFMT=	yes
-
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE=	libgtkhtml-2.0.pc.in
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index c8cd820cae5..0db1bf83074 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2006/02/13 12:37:47 drochner Exp $
+# $NetBSD: Makefile,v 1.88 2006/04/13 18:23:39 jlam Exp $
 
 #
 # NOTE: Please do not enable the lynxcgi feature unless it is lynx
@@ -24,8 +24,6 @@ MAINTAINER=	fredb@NetBSD.org
 HOMEPAGE=	http://lynx.isc.org/
 COMMENT=	Alphanumeric display oriented World-Wide Web Client
 
-BUILD_USES_MSGFMT=	yes
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DIST_SUBDIR=		lynx
@@ -36,7 +34,7 @@ INSTALL_TARGET=		install-full install-lss
 MAKEFILE=       	makefile
 
 CONFIGURE_ENV+=		GZIP=${TOOLS_GZIP_CMD:Q}
-USE_TOOLS+=		gzip
+USE_TOOLS+=		gzip msgfmt
 
 .include "options.mk"
 
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index 0287e0fe311..d579b01c482 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/03/04 21:31:03 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2006/04/13 18:23:39 jlam Exp $
 
 DISTNAME=		sitecopy-0.16.2
 CATEGORIES=		www
@@ -8,9 +8,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.lyra.org/sitecopy/
 COMMENT=		Utility for synchronizing remote and local web sites
 
-BUILD_USES_MSGFMT=	yes
-
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 USE_PKGLOCALEDIR=	yes
 
 GNU_CONFIGURE=		yes
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index 8f3988ba574..b982405a162 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/03/04 21:31:03 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/13 18:23:39 jlam Exp $
 
 DISTNAME=	snownews-1.5.7
 PKGREVISION=	4
@@ -10,13 +10,11 @@ HOMEPAGE=	http://kiza.kcore.de/software/snownews/
 COMMENT=	Small, curses based RSS feed reader
 
 DEPENDS+=		p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML
-USE_MSGFMT_PLURALS=	YES
-BUILD_USES_MSGFMT=	YES
 
 HAS_CONFIGURE=		YES
 USE_NCURSES=		# missing WA_BOLD, WA_REVERSE, KEY_RESIZE
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		msgfmt perl:run
 
 REPLACE_PERL+=		configure opml2snow snowsync