51 files changed, 51 insertions, 51 deletions

diff --git a/mail/abook/Makefile b/mail/abook/Makefile
index e4ca050ac945..55ae421b6935 100644
--- a/mail/abook/Makefile
+++ b/mail/abook/Makefile
@@ -30,7 +30,7 @@ PORTDOCS=	ANNOUNCE AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/althea/Makefile b/mail/althea/Makefile
index d87301a12071..660236b076c7 100644
--- a/mail/althea/Makefile
+++ b/mail/althea/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet another GTK-based mail reader for X. Supports IMAP
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_OPENSSL=	yes
 MAKE_ENV=	MKDIR="${MKDIR}"
 MAKEFILE=	${FILESDIR}/Makefile.bsd
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index ebc5bfef3862..2baf505280b4 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -47,7 +47,7 @@ _REQUIRE=	mail
 
 .if ${PORT_OPTIONS:MNLS}
 USE_ICONV=	yes
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-address_keeper/Makefile b/mail/claws-mail-address_keeper/Makefile
index f160baa44909..1bbd5f07d60f 100644
--- a/mail/claws-mail-address_keeper/Makefile
+++ b/mail/claws-mail-address_keeper/Makefile
@@ -26,7 +26,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile
index 2a8836189bef..d6483148fc8c 100644
--- a/mail/claws-mail-attach_warner/Makefile
+++ b/mail/claws-mail-attach_warner/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS=	--with-iconv-prefix=${LOCALBASE} \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-bsfilter/Makefile b/mail/claws-mail-bsfilter/Makefile
index 0a5003b4223f..bff92553771f 100644
--- a/mail/claws-mail-bsfilter/Makefile
+++ b/mail/claws-mail-bsfilter/Makefile
@@ -27,7 +27,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile
index b1d850d79c93..48935b42f7f0 100644
--- a/mail/claws-mail-clamd/Makefile
+++ b/mail/claws-mail-clamd/Makefile
@@ -27,7 +27,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index 47d7f8bcc54d..2b5b10f85371 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 1870335add62..6d38eeb1a767 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -25,7 +25,7 @@ MAKE_JOBS_SAFE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-gdata/Makefile b/mail/claws-mail-gdata/Makefile
index ad20d277d2e8..1d5fa8d5f056 100644
--- a/mail/claws-mail-gdata/Makefile
+++ b/mail/claws-mail-gdata/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile
index ad9ef0f34668..d8494ddec9f1 100644
--- a/mail/claws-mail-gtkhtml2_viewer/Makefile
+++ b/mail/claws-mail-gtkhtml2_viewer/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 693bcfc375c7..da8ae686878f 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 9b5da642cb4b..68e00d20cbbc 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -28,7 +28,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-python/Makefile b/mail/claws-mail-python/Makefile
index c818eeae0d21..6ea6375ecc67 100644
--- a/mail/claws-mail-python/Makefile
+++ b/mail/claws-mail-python/Makefile
@@ -28,7 +28,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 0d5f5cac34f8..b2684db16823 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 7852d8807730..299f69069694 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index 4eabe4bbb955..4910c535fc0e 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 47fc7f27fba4..e482788bd2f0 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/clawsker/Makefile b/mail/clawsker/Makefile
index 7c63f82d0286..2a8fd35e6ed5 100644
--- a/mail/clawsker/Makefile
+++ b/mail/clawsker/Makefile
@@ -26,7 +26,7 @@ MAN1=		clawsker.1
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 EXTRA_PATCHES=	${FILESDIR}/extra-Makefile-without_nls
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index e305633eb7dd..d07f5eb09ad8 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_FAM=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_ICONV=	yes
 USE_GNOME=	libxml2
 
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index ebb727be0898..b4f12aa59f15 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -65,7 +65,7 @@ USE_AUTOTOOLS=	libtool aclocal
 USE_BZIP2=	yes
 USE_GCC=	any
 USE_FAM=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 USE_PERL5=	yes
diff --git a/mail/crm114/Makefile b/mail/crm114/Makefile
index 5706f25d7b72..396a02925f8b 100644
--- a/mail/crm114/Makefile
+++ b/mail/crm114/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	tre.5:${PORTSDIR}/textproc/libtre
 
 CRM114RELEASENAME=BlameMichelson
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_ICONV=	yes
 
 MAKE_ARGS=	CC="${CC}" prefix="${PREFIX}" \
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 55a5c9914ca5..13b18bdc90c5 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -19,7 +19,7 @@ CFLAGS+=	-D_SIZE_T
 
 WRKSRC=			${WRKDIR}/elm${PORTVERSION}
 NO_LATEST_LINK=		yes
-USE_GETTEXT=		yes
+USES=		gettext
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ENV=		PREFIX="${PREFIX}"
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index fb2b7b0ab6ad..a23a04271ec1 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
 PLIST_SUB+=	NLS=""
-USE_GETTEXT=	yes
+USES+=		gettext
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 94623b648b5c..7fc2d880bade 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -32,7 +32,7 @@ PLIST_SUB+=	NLS="@comment "
 .else
 CONFIGURE_ARGS+=--with-libintl-prefix="${LOCALBASE}"
 PLIST_SUB+=	NLS=""
-USE_GETTEXT=	yes
+USES+=		gettext
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index c801dcf2fea0..c778fae3a80c 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${EVO_PC_FILE}:${PORTSDIR}/mail/evolution
 CONFLICTS=	evolution-exchange-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_BDB=	41
diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
index 298b0d209d4f..81bec32d829e 100644
--- a/mail/evolution-mapi/Makefile
+++ b/mail/evolution-mapi/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PKGFILES}:${PORTSDIR}/mail/evolution
 PKGFILES=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_GNOME=	evolutiondataserver
 USE_LDCONFIG=	yes
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 99966aff06b2..c9a6feaf0dcb 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -69,7 +69,7 @@ PLIST_SUB+=	X11="@comment " NOX11=""
 .if ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=	NLS=""
-USE_GETTEXT=	yes
+USES+=		gettext
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
diff --git a/mail/gnome-gmail-notifier/Makefile b/mail/gnome-gmail-notifier/Makefile
index ea8b0a29763f..465ca83aaac2 100644
--- a/mail/gnome-gmail-notifier/Makefile
+++ b/mail/gnome-gmail-notifier/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify \
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	glib20 gtk20 gconf2 libxml2 librsvg2
 USE_GSTREAMER=	good
 
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 0181e3682524..83b6bd7cebcb 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--with-password
 .ifndef(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=		NLS=""
-USE_GETTEXT=		yes
+USES+=		gettext
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
diff --git a/mail/horde3-dimp/Makefile b/mail/horde3-dimp/Makefile
index 8d6c7dea559a..f5febe97adc5 100644
--- a/mail/horde3-dimp/Makefile
+++ b/mail/horde3-dimp/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
 .endif
 
 USE_HORDE=	base
-USE_GETTEXT=	yes
+USES=		gettext
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES
 
 pre-configure:
diff --git a/mail/horde3-forwards/Makefile b/mail/horde3-forwards/Makefile
index f1cf7f6d6671..addb15a00811 100644
--- a/mail/horde3-forwards/Makefile
+++ b/mail/horde3-forwards/Makefile
@@ -33,7 +33,7 @@ USE_PHP+=	ftp
 .endif
 
 USE_HORDE=	base pkg-message
-USE_GETTEXT=	yes
+USES=		gettext
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES TODO
 
 .include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/mail/horde3-imp/Makefile b/mail/horde3-imp/Makefile
index d12510e988e5..bfbcee00cb0b 100644
--- a/mail/horde3-imp/Makefile
+++ b/mail/horde3-imp/Makefile
@@ -67,7 +67,7 @@ RUN_DEPENDS+=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
 
 CONFLICTS=	imp-3.*
 USE_HORDE=	base
-USE_GETTEXT=	yes
+USES=		gettext
 PORTDOCS=	README CHANGES CREDITS INSTALL	\
 		RELEASE_NOTES  TODO  UPGRADING
 
diff --git a/mail/horde3-ingo/Makefile b/mail/horde3-ingo/Makefile
index 8f1f644ba42f..e7c76177e985 100644
--- a/mail/horde3-ingo/Makefile
+++ b/mail/horde3-ingo/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve
 
 USE_PHP=	imap
 USE_HORDE=	base pkg-message
-USE_GETTEXT=	yes
+USES=		gettext
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES TODO
 
 .include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/mail/horde3-mimp/Makefile b/mail/horde3-mimp/Makefile
index 2321e5c7102c..b2eaa27cf2ad 100644
--- a/mail/horde3-mimp/Makefile
+++ b/mail/horde3-mimp/Makefile
@@ -43,7 +43,7 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
 .endif
 
 USE_HORDE=	base
-USE_GETTEXT=	yes
+USES=		gettext
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES
 
 pre-configure:
diff --git a/mail/horde3-turba/Makefile b/mail/horde3-turba/Makefile
index f276824d402b..dab65b8bdc39 100644
--- a/mail/horde3-turba/Makefile
+++ b/mail/horde3-turba/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Contact management application
 
 USE_HORDE=	base
 USE_PHP=	ldap
-USE_GETTEXT=	yes
+USES=		gettext
 
 PORTDOCS=	README CHANGES CREDITS INSTALL LDAP RELEASE_NOTES TODO UPGRADING
 
diff --git a/mail/horde3-vacation/Makefile b/mail/horde3-vacation/Makefile
index 4def9de9b5e0..817211788fa0 100644
--- a/mail/horde3-vacation/Makefile
+++ b/mail/horde3-vacation/Makefile
@@ -33,7 +33,7 @@ USE_PHP+=	ftp
 .endif
 
 USE_HORDE=	base pkg-message
-USE_GETTEXT=	yes
+USES=		gettext
 PORTDOCS=	CHANGES CREDITS INSTALL RELEASE_NOTES TODO
 
 .include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/mail/kcheckgmail/Makefile b/mail/kcheckgmail/Makefile
index dba404e519a7..ab424c9bdb89 100644
--- a/mail/kcheckgmail/Makefile
+++ b/mail/kcheckgmail/Makefile
@@ -22,7 +22,7 @@ USE_AUTOTOOLS=	libtool
 USE_KDELIBS_VER=3
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 4c621502a1f0..c280d820adad 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		notify:${PORTSDIR}/devel/libnotify
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_LDCONFIG=	yes
 USE_GNOME=	gconf2 gnomeprefix gnomevfs2 libglade2 libgnomeui libxml2
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 484fe64ee860..f16ea574b57d 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -78,7 +78,7 @@ MTA_DESC=	integrate with a MTA
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile
index 94f13760ca49..3f94d899dcd2 100644
--- a/mail/mailutils/Makefile
+++ b/mail/mailutils/Makefile
@@ -95,7 +95,7 @@ PLIST_SUB+=		PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=		yes
+USES+=		gettext
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index 6a39bf491a86..85873f0df354 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=	--without-libgsasl-prefix
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=		yes
+USES+=		gettext
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB=		NLS=""
 .else
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 358838f23c77..4e09e34969ae 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--without-gnome-keyring
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=		yes
+USES+=		gettext
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=		NLS=""
 .else
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index c65e406a6f9a..7c35b15608f2 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -177,7 +177,7 @@ XML_USED=	no
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USES+=	gettext
+USES+=		gettext
 SCRIPTS_ENV+=	NLS="yes"
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index d77275c85f4f..16c73adc444e 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -25,7 +25,7 @@ MLINKS=		perdition.8 perdition.imap4.8 \
 MANCOMPRESSED=	no
 
 USE_AUTOTOOLS=	libtool
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/mail/squirrelmail-change_ldappass-plugin/Makefile b/mail/squirrelmail-change_ldappass-plugin/Makefile
index 22c750a6ca54..9b5d7c14ceed 100644
--- a/mail/squirrelmail-change_ldappass-plugin/Makefile
+++ b/mail/squirrelmail-change_ldappass-plugin/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Allows users to change their passwords stored in LDAP Tree
 LICENSE=	GPLv2
 
 USE_PHP+=	ldap
-USE_GETTEXT=	yes
+USES=		gettext
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 082292da575b..807a75ebc406 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -27,7 +27,7 @@ IGNORE_WITH_PHP=5 # known incompatibilities with php-5.4, use 5.3 for now
 DEFAULT_PHP_VER=53
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 
 OPTIONS_DEFINE=	DATABASE LDAP
 DATABASE_DESC=	PEAR database support (must also intall a driver)
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index c0d75a652634..9d581508d284 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -59,7 +59,7 @@ CACHEOWNER?=	bin
 
 USE_PERL5=	YES
 USE_BZIP2=	YES
-USE_GETTEXT=	YES
+USES=		gettext
 USE_GMAKE=	YES
 USE_RC_SUBR=	sqwebmail-sqwebmaild
 GNU_CONFIGURE=	yes
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 57e868f111cc..37e4bd8ee390 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -66,7 +66,7 @@ SUB_FILES=	pkg-install
 USE_RC_SUBR=	sympa
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/vexim/Makefile b/mail/vexim/Makefile
index 5571c53273b3..c287f3a75d72 100644
--- a/mail/vexim/Makefile
+++ b/mail/vexim/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/vexim-release
 SUB_FILES=	pkg-message
 NO_BUILD=	yes
 USE_PHP=	gettext session posix
-USE_GETTEXT=	yes
+USES=		gettext
 
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	MYSQL PGSQL
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index 12b3fe5a0acc..76b8b44c1371 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls \
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 intltool intlhack pkgconfig
 USE_XFCE=	configenv libgui libutil panel