From 2c01ea3b7724677eb90f7cc5186e55f90a768fed Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 13 Apr 2006 18:23:29 +0000 Subject: BUILD_USE_MSGFMT and USE_MSGFMT_PLURALS are obsolete. Replace with USE_TOOLS+=msgfmt. --- mail/balsa2/Makefile | 6 ++---- mail/evolution-data-server/Makefile | 7 ++----- mail/evolution/Makefile | 7 ++----- mail/fetchmail/Makefile | 6 ++---- mail/mail-notification/Makefile | 6 ++---- mail/mutt-devel/Makefile | 5 ++--- mail/mutt/Makefile | 4 ++-- mail/sylpheed-claws/Makefile | 4 ++-- mail/sylpheed-devel/Makefile | 5 ++--- mail/sylpheed/Makefile | 6 ++---- 10 files changed, 20 insertions(+), 36 deletions(-) (limited to 'mail') diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile index 71313e6190c..62cc6453123 100644 --- a/mail/balsa2/Makefile +++ b/mail/balsa2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2006/04/06 06:22:15 reed Exp $ +# $NetBSD: Makefile,v 1.55 2006/04/13 18:23:34 jlam Exp $ DISTNAME= balsa-2.3.10 PKGREVISION= 3 @@ -11,13 +11,11 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://balsa.gnome.org/ COMMENT= GNOME2 EMail client -BUILD_USES_MSGFMT= yes - USE_DIRS+= gnome2-1.5 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -USE_TOOLS+= gmake perl pkg-config +USE_TOOLS+= gmake msgfmt perl pkg-config CONFIGURE_ARGS+= --with-gpgme=${BUILDLINK_PREFIX.gpgme:Q}/bin/gpgme-config CONFIGURE_ARGS+= --disable-more-warnings diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile index 9033491227b..9ed562c116d 100644 --- a/mail/evolution-data-server/Makefile +++ b/mail/evolution-data-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2006/04/06 06:22:17 reed Exp $ +# $NetBSD: Makefile,v 1.37 2006/04/13 18:23:34 jlam Exp $ # DISTNAME= evolution-data-server-1.6.0 @@ -10,14 +10,11 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.gnome.org/projects/evolution/ COMMENT= Evolution data server -BUILD_USES_MSGFMT= yes -USE_MSGFMT_PLURALS= yes - BUILDLINK_API_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.3 GNU_CONFIGURE= YES USE_DIRS+= xdg-1.1 -USE_TOOLS+= bison gmake pkg-config +USE_TOOLS+= bison gmake msgfmt pkg-config USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 35a861b52ea..a240e2300c4 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.106 2006/04/06 06:22:16 reed Exp $ +# $NetBSD: Makefile,v 1.107 2006/04/13 18:23:34 jlam Exp $ DISTNAME= evolution-2.6.0 PKGREVISION= 2 @@ -10,8 +10,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/projects/evolution/ COMMENT= GNOME mailer, calendar, contact manager, and communications tool -BUILD_USES_MSGFMT= YES - PKG_OPTIONS_VAR= PKG_OPTIONS.evolution PKG_SUGGESTED_OPTIONS= inet6 ssl PKG_SUPPORTED_OPTIONS= inet6 krb4 krb5 ssl @@ -28,9 +26,8 @@ PKG_FAIL_REASON+= "Kerberos support conflicts with SSL" GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 -USE_TOOLS+= bison gmake pkg-config +USE_TOOLS+= bison gmake msgfmt pkg-config USE_LIBTOOL= YES -USE_MSGFMT_PLURALS= YES USE_PKGLOCALEDIR= YES REPLACE_PERL+= addressbook/tools/csv2vcard diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 5279a430f9f..656c70b73be 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.157 2006/02/05 23:09:55 joerg Exp $ +# $NetBSD: Makefile,v 1.158 2006/04/13 18:23:34 jlam Exp $ DISTNAME= fetchmail-6.2.5.5 PKGREVISION= 1 @@ -11,15 +11,13 @@ COMMENT= Batch mail retrieval/forwarding utility for pop2, pop3, apop, imap PKG_INSTALLATION_TYPES= overwrite pkgviews -BUILD_USES_MSGFMT= yes - .include "../../mk/bsd.prefs.mk" USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-hesiod LDFLAGS+= ${CFLAGS} -USE_TOOLS+= tbl +USE_TOOLS+= msgfmt tbl .if ${OPSYS} == "Darwin" LDFLAGS+= -lresolv diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile index ab4f07924c2..a5e35a1aab7 100644 --- a/mail/mail-notification/Makefile +++ b/mail/mail-notification/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/03/21 06:00:46 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2006/04/13 18:23:34 jlam Exp $ # DISTNAME= mail-notification-2.0 @@ -12,10 +12,8 @@ COMMENT= Status icon that provides new mail notifications GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 -USE_TOOLS+= gmake pkg-config +USE_TOOLS+= gmake msgfmt pkg-config USE_PKGLOCALEDIR= YES -BUILD_USES_MSGFMT= YES -USE_MSGFMT_PLURALS= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index 3a4c5714a70..2f8a87c45ac 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2006/04/11 14:13:21 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2006/04/13 18:23:34 jlam Exp $ DISTNAME= mutt-1.5.11 PKGREVISION= 4 @@ -17,9 +17,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews .include "../../mk/bsd.prefs.mk" -BUILD_USES_MSGFMT= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= perl:run +USE_TOOLS+= msgfmt perl:run REPLACE_PERL= *.pl */*.pl GNU_CONFIGURE= yes diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 73eebe773b0..d0e0cbb724a 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.138 2006/04/12 13:29:20 tron Exp $ +# $NetBSD: Makefile,v 1.139 2006/04/13 18:23:35 jlam Exp $ DISTNAME= mutt-1.4.2.1i PKGNAME= ${DISTNAME:C/i$//} @@ -18,8 +18,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews .include "../../mk/bsd.prefs.mk" WRKSRC= ${WRKDIR}/${DISTNAME:C/i$$//} -BUILD_USES_MSGFMT= yes USE_PKGLOCALEDIR= yes +USE_TOOLS+= msgfmt GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile index db14537c8b5..276491a9b96 100644 --- a/mail/sylpheed-claws/Makefile +++ b/mail/sylpheed-claws/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2006/03/24 10:09:14 joerg Exp $ +# $NetBSD: Makefile,v 1.46 2006/04/13 18:23:35 jlam Exp $ .include "Makefile.common" @@ -10,7 +10,7 @@ COMMENT= X based e-mail and netnews client CONFLICTS= sylpheed-[0-9]* sylpheed-gtk2-[0-9]* -BUILD_USES_MSGFMT= YES +USE_TOOLS+= msgfmt PKGCONFIG_OVERRIDE+= sylpheed-claws.pc.in CONFIGURE_ARGS+= --enable-aspell diff --git a/mail/sylpheed-devel/Makefile b/mail/sylpheed-devel/Makefile index 9178ab4387c..c571be530b6 100644 --- a/mail/sylpheed-devel/Makefile +++ b/mail/sylpheed-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/02/06 18:05:53 xtraeme Exp $ +# $NetBSD: Makefile,v 1.32 2006/04/13 18:23:35 jlam Exp $ DISTNAME= sylpheed-2.2.0beta8 CATEGORIES= mail news x11 @@ -10,14 +10,13 @@ MAINTAINER= chris@NetBSD.org HOMEPAGE= http://sylpheed.good-day.net/index.cgi.en COMMENT= X based e-mail and netnews client -BUILD_USES_MSGFMT= yes DEPENDS+= metamail>=2.7:../../mail/metamail CONFLICTS= sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]* USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake msgfmt GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-nls diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index 4fd64b52016..484115a2b6c 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.93 2006/03/29 22:54:42 chris Exp $ +# $NetBSD: Makefile,v 1.94 2006/04/13 18:23:35 jlam Exp $ DISTNAME= sylpheed-2.2.4 CATEGORIES= mail news x11 @@ -10,13 +10,11 @@ MAINTAINER= chris@NetBSD.org HOMEPAGE= http://sylpheed.good-day.net/index.cgi.en COMMENT= X based e-mail and netnews client -BUILD_USES_MSGFMT= yes - CONFLICTS= sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]* USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_TOOLS+= gmake pkg-config +USE_TOOLS+= gmake msgfmt pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-nls -- cgit v1.2.3