BUILD_USE_MSGFMT and USE_MSGFMT_PLURALS are obsolete. Replace with

USE_TOOLS+=msgfmt.

8 files changed, 16 insertions, 32 deletions

diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 32f2dc6a464..db2ad7fbbe5 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/04/08 15:13:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/13 18:23:37 jlam Exp $
 #
 
 DISTNAME=	gnome-keyring-manager-2.14.0
@@ -10,14 +10,11 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://gnomesupport.org/wiki/index.php/GNOME_Keyring_Manager_Wiki
 COMMENT=	GNOME password and secret manager
 
-BUILD_USES_MSGFMT=	YES
-
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.6
 USE_LIBTOOL=		YES
-USE_MSGFMT_PLURALS=	YES
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 
 GCONF2_SCHEMAS=		gnome-keyring-manager.schemas
 
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index d80abaf2dc5..439aa3b632a 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:38 reed Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/13 18:23:37 jlam Exp $
 #
 
 DISTNAME=	gnome-keyring-0.4.9
@@ -10,9 +10,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME password and secret manager
 
-BUILD_USES_MSGFMT=	YES
-
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		msgfmt pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index b120ab0d405..2b49e66509b 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2006/04/07 15:28:49 jlam Exp $
+# $NetBSD: Makefile,v 1.85 2006/04/13 18:23:37 jlam Exp $
 
 DISTNAME=	gnupg-1.4.3
 CATEGORIES=	security
@@ -16,14 +16,12 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.gnupg.org/
 COMMENT=	GNU Privacy Guard, public-Key encryption and digital signatures
 
-BUILD_USES_MSGFMT=	yes
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 CRYPTO=			yes
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 CONFIGURE_ARGS+=	--with-static-rnd=auto
 CONFIGURE_ARGS+=	--with-mailprog=/usr/sbin/sendmail
 TEST_TARGET=		check
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index b634714ae12..136b46b6219 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/31 23:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/04/13 18:23:37 jlam Exp $
 
 DISTNAME=		gsasl-0.2.5
 PKGREVISION=		1
@@ -10,9 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/gsasl/
 COMMENT=		GNU implementation of the Simple Authentication and Security Layer
 
-BUILD_USES_MSGFMT=	yes
-
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		msgfmt pkg-config
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/security/seahorse-gedit/Makefile b/security/seahorse-gedit/Makefile
index 934b466e601..d5794e4c8db 100644
--- a/security/seahorse-gedit/Makefile
+++ b/security/seahorse-gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/04/06 06:22:44 reed Exp $
+# $NetBSD: Makefile,v 1.4 2006/04/13 18:23:37 jlam Exp $
 
 DISTNAME=	seahorse-0.8.1
 PKGNAME=	seahorse-gedit-0.8.1
@@ -13,13 +13,11 @@ COMMENT=	Seahorse plugin for gedit
 
 PATCHDIR=	${.CURDIR}/../seahorse/patches
 DISTINFO_FILE=	${.CURDIR}/../seahorse/distinfo
-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
 
 CONFIGURE_ARGS+=	--disable-nautilus
diff --git a/security/seahorse-nautilus/Makefile b/security/seahorse-nautilus/Makefile
index bd0657939f9..a1a477967e7 100644
--- a/security/seahorse-nautilus/Makefile
+++ b/security/seahorse-nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/04/06 06:22:44 reed Exp $
+# $NetBSD: Makefile,v 1.4 2006/04/13 18:23:37 jlam Exp $
 
 DISTNAME=	seahorse-0.8.1
 PKGNAME=	seahorse-nautilus-0.8.1
@@ -13,13 +13,11 @@ COMMENT=	Seahorse plugin for nautilus
 
 PATCHDIR=	${.CURDIR}/../seahorse/patches
 DISTINFO_FILE=	${.CURDIR}/../seahorse/distinfo
-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
 
 CONFIGURE_ARGS+=	--disable-gedit
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 861489a5ec2..0c2b00e5c70 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/04/06 06:22:44 reed Exp $
+# $NetBSD: Makefile,v 1.54 2006/04/13 18:23:37 jlam Exp $
 
 DISTNAME=	seahorse-0.8.1
 PKGREVISION=	1
@@ -10,14 +10,12 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://seahorse.sourceforge.net/
 COMMENT=	GnuPG front end and bonobo component for GNOME
 
-BUILD_USES_MSGFMT=	yes
 DEPENDS+=		gnupg>=1.2.1:../../security/gnupg
 
 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
 
 CONFIGURE_ARGS+=	--disable-gedit
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index 821d4ee2821..9baa1e68846 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/20 23:04:38 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/13 18:23:37 jlam Exp $
 
 DISTNAME=		steghide-0.5.1
 PKGREVISION=		3
@@ -9,9 +9,8 @@ MAINTAINER=		adam@monkeybyte.org
 HOMEPAGE=		http://steghide.sourceforge.net/
 COMMENT=		Steganography program
 
-BUILD_USES_MSGFMT=	yes
-
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		msgfmt
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes