BUILD_USE_MSGFMT and USE_MSGFMT_PLURALS are obsolete. Replace with

USE_TOOLS+=msgfmt.

9 files changed, 18 insertions, 28 deletions

diff --git a/databases/abook/Makefile b/databases/abook/Makefile
index ce40b25045d..6c6f7236a61 100644
--- a/databases/abook/Makefile
+++ b/databases/abook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:29:07 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/04/13 18:23:30 jlam Exp $
 #
 
 DISTNAME=	abook-0.5.5
@@ -13,7 +13,7 @@ COMMENT=	Text-based addressbook program
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PKGLOCALEDIR=	yes
-BUILD_USES_MSGFMT=	yes
+USE_TOOLS+=		msgfmt
 USE_GNU_READLINE=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile
index f4f4f779db5..962f3ac92ef 100644
--- a/databases/gnome-mime-data/Makefile
+++ b/databases/gnome-mime-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/03/04 21:29:08 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2006/04/13 18:23:30 jlam Exp $
 #
 
 DISTNAME=		gnome-mime-data-2.4.2
@@ -13,13 +13,11 @@ COMMENT=		MIME and Application database for GNOME2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-BUILD_USES_MSGFMT=	YES
-
 CONFLICTS=		gnome-vfs<=1.0.3
 
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		perl
+USE_TOOLS+=		msgfmt perl
 GNU_CONFIGURE=		YES
 
 PKGCONFIG_OVERRIDE=	gnome-mime-data-2.0.pc.in
diff --git a/databases/gramps/Makefile b/databases/gramps/Makefile
index 674c027b1f1..2441d922816 100644
--- a/databases/gramps/Makefile
+++ b/databases/gramps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/21 06:00:44 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/13 18:23:30 jlam Exp $
 #
 
 DISTNAME=		gramps-1.0.11
@@ -15,11 +15,10 @@ DEPENDS+=	yelp>=2.2:../../misc/yelp
 .if !exists(/usr/bin/msgconv)
 BUILD_DEPENDS+=	gettext>=0.10.35nb1:../../devel/gettext
 .endif
-#BUILD_USES_MSGFMT=	yes
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		msgfmt pkg-config
 
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 # i18n support with other python versions appears to not work
diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile
index 05be4ad5390..3853df2cbbd 100644
--- a/databases/gramps2/Makefile
+++ b/databases/gramps2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/21 06:00:44 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/04/13 18:23:30 jlam Exp $
 #
 
 DISTNAME=		gramps-2.0.10
@@ -15,9 +15,8 @@ DEPENDS+=	yelp>=2.2:../../misc/yelp
 .if !exists(/usr/bin/msgconv)
 BUILD_DEPENDS+=	gettext>=0.10.35nb1:../../devel/gettext
 .endif
-#BUILD_USES_MSGFMT=	yes
 
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 # disable gconf schema and mime type processing
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 381628d57e2..d487e72fbde 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/04/02 22:48:31 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2006/04/13 18:23:30 jlam Exp $
 #
 
 DISTNAME=		libgnomedb-1.9.102
@@ -10,9 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome-db.org/
 COMMENT=		GNOME2 database library
 
-BUILD_USES_MSGFMT=	yes
-
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 USE_LIBTOOL=		YES
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
diff --git a/databases/postgresql74/Makefile.common b/databases/postgresql74/Makefile.common
index 908674e7e02..18bd8a12059 100644
--- a/databases/postgresql74/Makefile.common
+++ b/databases/postgresql74/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2006/04/08 19:14:06 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.35 2006/04/13 18:23:30 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -42,8 +42,7 @@ BUILDLINK_API_DEPENDS.postgresql74-lib?=	postgresql74-lib>=${BASE_VERS}
 #BUILDLINK_API_DEPENDS.tcl-postgresql74?=	tcl-postgresq74l>=${BASE_VERS}
 
 GNU_CONFIGURE=		yes
-BUILD_USES_MSGFMT=	yes
-USE_TOOLS+=		bison gmake lex
+USE_TOOLS+=		bison gmake lex msgfmt
 PKG_SYSCONFSUBDIR=	postgresql
 
 # in 7.4.2, this is done by autoconf stuff which has leading whitespace
diff --git a/databases/postgresql80/Makefile.common b/databases/postgresql80/Makefile.common
index 88c250cc389..831f2f7a1f1 100644
--- a/databases/postgresql80/Makefile.common
+++ b/databases/postgresql80/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2006/04/08 19:08:25 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.22 2006/04/13 18:23:30 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -41,8 +41,7 @@ BASE_VERS?=		${DIST_VERS}
 BUILDLINK_API_DEPENDS.postgresql80-client+=	postgresql80-client>=${BASE_VERS}
 
 GNU_CONFIGURE=		yes
-BUILD_USES_MSGFMT=	yes
-USE_TOOLS+=		bison gmake lex
+USE_TOOLS+=		bison gmake lex msgfmt
 PKG_SYSCONFSUBDIR=	postgresql
 
 # in 7.4.x/8.0.x, this is done by autoconf stuff which has leading whitespace
diff --git a/databases/postgresql81/Makefile.common b/databases/postgresql81/Makefile.common
index ec2df511544..0fc809acb07 100644
--- a/databases/postgresql81/Makefile.common
+++ b/databases/postgresql81/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2006/04/06 06:21:42 reed Exp $
+# $NetBSD: Makefile.common,v 1.5 2006/04/13 18:23:30 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -38,8 +38,7 @@ BASE_VERS?=		${DIST_VERS}
 BUILDLINK_API_DEPENDS.postgresql81-client+=	postgresql81-client>=${BASE_VERS}
 
 GNU_CONFIGURE=		yes
-BUILD_USES_MSGFMT=	yes
-USE_TOOLS+=		bison gmake lex
+USE_TOOLS+=		bison gmake lex msgfmt
 PKG_SYSCONFSUBDIR=	postgresql
 
 # in 7.4.x/8.0.x, this is done by autoconf stuff which has leading whitespace
diff --git a/databases/quicklist/Makefile b/databases/quicklist/Makefile
index b48d3500c9c..4f6a870f95a 100644
--- a/databases/quicklist/Makefile
+++ b/databases/quicklist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:29:11 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/13 18:23:30 jlam Exp $
 #
 
 DISTNAME=	quicklist-0.8.6
@@ -10,8 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.quicklist.org/
 COMMENT=	Simple database like AppleWorks & MS Works
 
-BUILD_USES_MSGFMT=	yes
-
+USE_TOOLS+=	msgfmt
 GNU_CONFIGURE=	yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"