- Convert USE_GETTEXT to USES (part 3)

Approved by:	portmgr (bapt)

61 files changed, 62 insertions, 62 deletions

diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index 023d14880526..aaf6e152fae6 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -19,7 +19,7 @@ COMMENT=	An editor for the freedesktop.org menu specification
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix pygnomedesktop intlhack
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/deskutils/bmp-docklet/Makefile b/deskutils/bmp-docklet/Makefile
index 5221e1c26031..567d89b2564c 100644
--- a/deskutils/bmp-docklet/Makefile
+++ b/deskutils/bmp-docklet/Makefile
@@ -31,7 +31,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment"
 .else
-USE_GETTEXT=	yes
+USES=		gettext
 PLIST_SUB+=	NLS=""
 .endif
 
diff --git a/deskutils/calcurse/Makefile b/deskutils/calcurse/Makefile
index 0e2bc663a2bf..90c1cd58fb7b 100644
--- a/deskutils/calcurse/Makefile
+++ b/deskutils/calcurse/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--disable-docs
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/deskutils/clipit/Makefile b/deskutils/clipit/Makefile
index 529571bbb922..de100fb2be33 100644
--- a/deskutils/clipit/Makefile
+++ b/deskutils/clipit/Makefile
@@ -19,7 +19,7 @@ XDOTOOL_DESC=	Automatic paste functionality
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 CONFIGURE_ARGS+=	--localedir=${LOCALBASE}/share/locale
 .else
diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile
index 170d5e80c0f8..6874ca114462 100644
--- a/deskutils/conduit/Makefile
+++ b/deskutils/conduit/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goo
 USE_PYTHON=	2.5+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/conkyforecast/Makefile b/deskutils/conkyforecast/Makefile
index 408f200df79e..c82e46f7249c 100644
--- a/deskutils/conkyforecast/Makefile
+++ b/deskutils/conkyforecast/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	conky:${PORTSDIR}/sysutils/conky \
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 INSTALL_EGGINFO=yes
-USE_GETTEXT=	yes
+USES=		gettext
 SUB_FILES=	pkg-message
 SUB_LIST+=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 63cd29f4aad5..9653864a3c3e 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -25,7 +25,7 @@ LICENSE_COMB=	dual
 
 USE_BZIP2=	yes
 USE_GNOME=	gconf2 gnomedocutils gnomevfs2 gtksourceview2
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
diff --git a/deskutils/easystroke/Makefile b/deskutils/easystroke/Makefile
index 1d2bd8b55d36..8145974e1717 100644
--- a/deskutils/easystroke/Makefile
+++ b/deskutils/easystroke/Makefile
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	NLS
 
 .include <bsd.port.options.mk>
 
-USE_GETTEXT=	yes
+USES+=		gettext
 
 .if ${PORT_OPTIONS:MNLS}
 BUILD_DEPENDS+=	intltool-merge:${PORTSDIR}/textproc/intltool
diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index 59c61b026169..ffa7d31365c5 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -23,7 +23,7 @@ IGNORE=		Doesn't build or work with Evolution 2.30
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gnomeprefix gnomehack intlhack
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/deskutils/ganyremote/Makefile b/deskutils/ganyremote/Makefile
index 5556d28aeade..5d261575ac67 100644
--- a/deskutils/ganyremote/Makefile
+++ b/deskutils/ganyremote/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFINE=	DOCS
 
 USE_GNOME=	pygtk2
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/deskutils/gbirthday/Makefile b/deskutils/gbirthday/Makefile
index eceb81f28138..6d6553c0238b 100644
--- a/deskutils/gbirthday/Makefile
+++ b/deskutils/gbirthday/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pygtk2 desktopfileutils
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 USE_GNOME+=	intltool
 LANGUAGES=	de en es fr gl it pl pt ru sk
 PLIST_SUB+=	NLS=""
diff --git a/deskutils/gcal/Makefile b/deskutils/gcal/Makefile
index 7ba0d86bb4c1..5218b34faaba 100644
--- a/deskutils/gcal/Makefile
+++ b/deskutils/gcal/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	johans@FreeBSD.org
 COMMENT=	The GNU Gregorian calendar program
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 
@@ -25,7 +25,7 @@ INFO=		gcal
 .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/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 50e6a4b9f51e..50867da0276b 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/gDesklets-${PORTVERSION}
 
 USE_GNOME=	gnomehack gnomeprefix intlhack librsvg2 pygnomeextras
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index c62dff85ab42..2e78f71d9549 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -37,7 +37,7 @@ INSTALLS_OMF=	yes
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
-USE_GETTEXT=	yes
+USES=		gettext
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=	NLS=""
 .endif
diff --git a/deskutils/gimmie/Makefile b/deskutils/gimmie/Makefile
index 5d21ee21b2a8..ec63435d06fc 100644
--- a/deskutils/gimmie/Makefile
+++ b/deskutils/gimmie/Makefile
@@ -31,7 +31,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 1d0d6a0f238b..9b0e2863b0f5 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui \
 		desktopfileutils intlhack ltverhack
 WANT_GNOME=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile
index 463cce0cfeb9..8e56f8f99e51 100644
--- a/deskutils/global-menu/Makefile
+++ b/deskutils/global-menu/Makefile
@@ -38,7 +38,7 @@ PLIST_SUB+=		XFCE4_PANEL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=		yes
+USES+=		gettext
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/deskutils/gnome-blog/Makefile b/deskutils/gnome-blog/Makefile
index 8b1c4a17f989..823f461f1e19 100644
--- a/deskutils/gnome-blog/Makefile
+++ b/deskutils/gnome-blog/Makefile
@@ -18,7 +18,7 @@ COMMENT=	GNOME app to post to blogs
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix pygnome2 intlhack
diff --git a/deskutils/gnome-main-menu/Makefile b/deskutils/gnome-main-menu/Makefile
index bfad940002e1..b7fc99622979 100644
--- a/deskutils/gnome-main-menu/Makefile
+++ b/deskutils/gnome-main-menu/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomepanel intlhack eel2 gnomedesktop \
 		libgnomeui
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="`pkg-config --libs libgnomeui-2.0`"
 CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index bdca54a65620..ae47ae23a35e 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -25,7 +25,7 @@ CONFLICTS=	baobob-3.[0-9]* gnome-dictionary-3.[0-9]* \
 		gnome-search-tool-3.[0-9]* gnome-system-log-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index 6d21360b65c2..16cf463cfb6f 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 USE_XZ=		yes
 USE_GNOME=	gnomehack gnomeprefix gconf2 gtk20 intltool libxml2 libxslt \
 		ltverhack gnomepanel
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_OMF=	yes
 GCONF_SCHEMAS=	gnote.schemas
 USE_AUTOTOOLS=	libtool
diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile
index 5141102a12c7..a3c2a0a662bb 100644
--- a/deskutils/gourmet/Makefile
+++ b/deskutils/gourmet/Makefile
@@ -25,7 +25,7 @@ PORTDOCS=	FAQ LICENSE
 PORTSCOUT=	ignore:1
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	pygnome2 pygnomeextras pygtk2
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile
index ebb02fcc8cba..2cf420899d5e 100644
--- a/deskutils/griffith/Makefile
+++ b/deskutils/griffith/Makefile
@@ -30,7 +30,7 @@ PYGNOMEEXTRAS_DESC=	Enable python-gnome-extras support
 USE_XZ=		yes
 USE_GNOME=	pygtk2
 USE_PYTHON=	2.5+
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 NO_BUILD=	yes
 
diff --git a/deskutils/gtg/Makefile b/deskutils/gtg/Makefile
index b43b58cfd448..7546f8e882b3 100644
--- a/deskutils/gtg/Makefile
+++ b/deskutils/gtg/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}configobj>=0:${PORTSDIR}/devel/py-configobj
 
 FETCH_ARGS=	-pRr
 USE_GNOME=	desktopfileutils pygobject pygtk2
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_ICONS=	yes
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	yes
diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile
index 4b04f8449e9d..927ea0430daa 100644
--- a/deskutils/gtimer/Makefile
+++ b/deskutils/gtimer/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 USE_XORG=	xscrnsaver
 USE_GNOME=	gtk20
 USE_PERL5_BUILD=yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index d84bb7943e1f..7fcdebc497ef 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A Unicode/ISO10646 character map and font viewer
 LIB_DEPENDS=	rarian.0:${PORTSDIR}/textproc/rarian
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gtk20 gnomedocutils gconf2
 GNU_CONFIGURE=	yes
diff --git a/deskutils/gxmessage/Makefile b/deskutils/gxmessage/Makefile
index 80ce57f00a7d..cec130660640 100644
--- a/deskutils/gxmessage/Makefile
+++ b/deskutils/gxmessage/Makefile
@@ -23,7 +23,7 @@ INSTALLS_ICONS=	yes
 MAKE_ARGS+=	INSTALL="${INSTALL_PROGRAM}"
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index edbaa401b39d..84e0da15d761 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_XORG=	xscrnsaver
diff --git a/deskutils/horde3-hermes/Makefile b/deskutils/horde3-hermes/Makefile
index ad56e2a04fb4..cf12420c0f9d 100644
--- a/deskutils/horde3-hermes/Makefile
+++ b/deskutils/horde3-hermes/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Time tracking application
 
 USE_HORDE=	base pkg-message
-USE_GETTEXT=	yes
+USES=		gettext
 PORTDOCS=	README CHANGES CREDITS INSTALL TODO
 
 BUILD_DEPENDS+=	${HORBAS}/turba/minisearch.php:${PORTSDIR}/mail/horde3-turba \
diff --git a/deskutils/horde3-klutz/Makefile b/deskutils/horde3-klutz/Makefile
index bf3e2924b9ac..62f640d6be38 100644
--- a/deskutils/horde3-klutz/Makefile
+++ b/deskutils/horde3-klutz/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Comic strip viewer for horde
 
 USE_HORDE=	base
-USE_GETTEXT=	yes
+USES=		gettext
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES
 
 .include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/deskutils/horde3-kronolith/Makefile b/deskutils/horde3-kronolith/Makefile
index 187b2015011c..db9f0333ad00 100644
--- a/deskutils/horde3-kronolith/Makefile
+++ b/deskutils/horde3-kronolith/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Calendar application
 RUN_DEPENDS=	${LOCALBASE}/share/pear/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
 
 USE_HORDE=	base
-USE_GETTEXT=	yes
+USES=		gettext
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES TODO UPGRADING
 
 .include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/deskutils/horde3-mnemo/Makefile b/deskutils/horde3-mnemo/Makefile
index ec371c472d21..131fcaaea54d 100644
--- a/deskutils/horde3-mnemo/Makefile
+++ b/deskutils/horde3-mnemo/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Notes and memos application
 
 USE_HORDE=	base
-USE_GETTEXT=	yes
+USES=		gettext
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES TODO UPGRADING
 
 .include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/deskutils/horde3-nag/Makefile b/deskutils/horde3-nag/Makefile
index d74354d2fc37..d9339c2b41cf 100644
--- a/deskutils/horde3-nag/Makefile
+++ b/deskutils/horde3-nag/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Simple multiuser task list manager
 
 USE_HORDE=	base
-USE_GETTEXT=	yes
+USES=		gettext
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES TODO UPGRADING
 
 .include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/deskutils/katapult/Makefile b/deskutils/katapult/Makefile
index 44890390f9e6..eb50c41c110d 100644
--- a/deskutils/katapult/Makefile
+++ b/deskutils/katapult/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	${PREFIX}/lib/ ${PREFIX}/lib/kde3/
-USE_GETTEXT=	yes
+USES=		gettext
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/deskutils/kdissert/Makefile b/deskutils/kdissert/Makefile
index ffe180879b51..29d9d7c507fa 100644
--- a/deskutils/kdissert/Makefile
+++ b/deskutils/kdissert/Makefile
@@ -19,7 +19,7 @@ DEPRECATED=	Depends on QT3; unmaintained
 EXPIRATION_DATE=	2013-07-01
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_KDELIBS_VER=	3
diff --git a/deskutils/knowit/Makefile b/deskutils/knowit/Makefile
index 049673212b8a..ff452f2efd18 100644
--- a/deskutils/knowit/Makefile
+++ b/deskutils/knowit/Makefile
@@ -18,7 +18,7 @@ DEPRECATED=	Depends on QT3; unmaintained
 EXPIRATION_DATE=	2013-07-01
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/deskutils/kompose/Makefile b/deskutils/kompose/Makefile
index 64488e9f7271..1df407853fd7 100644
--- a/deskutils/kompose/Makefile
+++ b/deskutils/kompose/Makefile
@@ -32,7 +32,7 @@ DOCSDIR=	share/doc/HTML/en/${PORTNAME}
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
-USE_GETTEXT=	yes
+USES=		gettext
 PLIST_SUB+=	NLS=""
 .endif
 
diff --git a/deskutils/kooldock/Makefile b/deskutils/kooldock/Makefile
index 1529e873d4cf..a1bee851b155 100644
--- a/deskutils/kooldock/Makefile
+++ b/deskutils/kooldock/Makefile
@@ -19,7 +19,7 @@ WRKSRC=			${WRKDIR}/kooldock
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_AUTOTOOLS=		libtool
-USE_GETTEXT=		yes
+USES=		gettext
 USE_KDELIBS_VER=	3
 USE_BZIP2=		yes
 
diff --git a/deskutils/labyrinth/Makefile b/deskutils/labyrinth/Makefile
index d26831ce47ad..f9fb220d7d81 100644
--- a/deskutils/labyrinth/Makefile
+++ b/deskutils/labyrinth/Makefile
@@ -15,7 +15,7 @@ USE_GMAKE=	yes
 CONFIGURE_ENV=	GMSGFMT=msgfmt
 USE_GNOME=	pygnome2 gnomedesktop gnomehack
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>
diff --git a/deskutils/ljit/Makefile b/deskutils/ljit/Makefile
index a3518e5beee2..5ef612c221b4 100644
--- a/deskutils/ljit/Makefile
+++ b/deskutils/ljit/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gtk20
 
 PLIST_FILES=	bin/ljit share/locale/ru/LC_MESSAGES/ljit.mo
diff --git a/deskutils/moregroupware/Makefile b/deskutils/moregroupware/Makefile
index 67bbcfe6aef3..dab87fe612e8 100644
--- a/deskutils/moregroupware/Makefile
+++ b/deskutils/moregroupware/Makefile
@@ -26,7 +26,7 @@ ADDONS_DESC=	install additional workgroup features (addons)
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
diff --git a/deskutils/nagaina/Makefile b/deskutils/nagaina/Makefile
index 96dd9ebe67dd..80d9128445d4 100644
--- a/deskutils/nagaina/Makefile
+++ b/deskutils/nagaina/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFINE=	DOCS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_ICONV=	yes
 USE_GNOME=	glib20
 USE_QT4=	corelib gui xml moc_build qmake_build rcc_build uic_build
diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index 3490fdeaf899..118d6fa2e424 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
 
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	nautilus2 intlhack
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/deskutils/nautilus-open-terminal/Makefile b/deskutils/nautilus-open-terminal/Makefile
index 4e79dff906a8..2a3178aff5d9 100644
--- a/deskutils/nautilus-open-terminal/Makefile
+++ b/deskutils/nautilus-open-terminal/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	nautilus2 gnomeprefix intlhack gnomehack
-USE_GETTEXT=	yes
+USES=		gettext
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0`
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/deskutils/notecase/Makefile b/deskutils/notecase/Makefile
index d4d879b0594a..9cdb8a8a8c4d 100644
--- a/deskutils/notecase/Makefile
+++ b/deskutils/notecase/Makefile
@@ -19,7 +19,7 @@ LICENSE=	BSD
 
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 gtksourceview2 gnomevfs2 desktopfileutils pkgconfig
-USE_GETTEXT=	yes
+USES=		gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index 445d3a0b8361..ca1570c2a35a 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -23,7 +23,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack gtk30
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/deskutils/ontv/Makefile b/deskutils/ontv/Makefile
index 003464c3265d..b905690a668c 100644
--- a/deskutils/ontv/Makefile
+++ b/deskutils/ontv/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		tv_check:${PORTSDIR}/textproc/p5-xmltv
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gnomehack gnomeprefix pygnomedesktop pygnomeextras pygtk2
 USE_GMAKE=	yes
 USE_PYTHON=	2.5-2.7
diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile
index 444800bb7441..879ac5aa7c9c 100644
--- a/deskutils/osmo/Makefile
+++ b/deskutils/osmo/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
 		gtkhtml:${PORTSDIR}/www/libgtkhtml
 
 USE_GNOME=	gtk20
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_ICONS=	yes
 
 GNU_CONFIGURE=	yes
diff --git a/deskutils/parcellite/Makefile b/deskutils/parcellite/Makefile
index bbca75c378d7..5c304ecb1cca 100644
--- a/deskutils/parcellite/Makefile
+++ b/deskutils/parcellite/Makefile
@@ -18,7 +18,7 @@ USE_GNOME=	gtk20
 .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/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index 0ca8d7f58a74..f68255880217 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -47,7 +47,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 
 USE_DOS2UNIX=	textcat32_conf.txt
 USE_XORG=	pixman
-USE_GETTEXT=	yes
+USES=		gettext
 USE_SQLITE=	3
 USE_PYTHON=	yes
 USE_OPENSSL=	yes
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index 706af8f34008..bf273d1ffbbb 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
 		${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils \
 		${PYTHON_PKGNAMEPREFIX}chardet>0:${PORTSDIR}/textproc/py-chardet
 
-USE_GETTEXT=	yes
+USES=		gettext
 
 INSTALLS_ICONS=	yes
 USE_GNOME=	pygtk2
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index 2075ede22a16..a975fc3b7ec2 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -28,7 +28,7 @@ USE_LDCONFIG=	yes
 .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/deskutils/tel/Makefile b/deskutils/tel/Makefile
index 5ba320d0bcc5..59f9c743dac7 100644
--- a/deskutils/tel/Makefile
+++ b/deskutils/tel/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Little console-based phone book manager
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index d12bc53f2608..45d59bc61ed8 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/mono/gmime-sharp-2.4/gmime-sharp.dll:${PORTSDIR}/m
 		mautil:${PORTSDIR}/devel/mono-addins
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gnomehack intlhack gnomeprefix gnomedesktopsharp20
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/deskutils/vboxgtk/Makefile b/deskutils/vboxgtk/Makefile
index f34eb4e4686b..71050bc99a5d 100644
--- a/deskutils/vboxgtk/Makefile
+++ b/deskutils/vboxgtk/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	NLS
 .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/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile
index f802a1ce6761..cf68ec13e295 100644
--- a/deskutils/virt-manager/Makefile
+++ b/deskutils/virt-manager/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:${PORTSDIR}/devel/py-dbus \
 .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/deskutils/wammu/Makefile b/deskutils/wammu/Makefile
index 4cb1ad9e58a9..cf3e87754902 100644
--- a/deskutils/wammu/Makefile
+++ b/deskutils/wammu/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS+=		gammu:${PORTSDIR}/comms/gammu
 
 LICENSE=		GPLv2
 
-USE_GETTEXT=		yes
+USES=		gettext
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 USE_WX=			2.6+
diff --git a/deskutils/x-tile/Makefile b/deskutils/x-tile/Makefile
index 3d9b3d088a2d..9692d1fcc06b 100644
--- a/deskutils/x-tile/Makefile
+++ b/deskutils/x-tile/Makefile
@@ -27,7 +27,7 @@ post-patch:
 		${WRKSRC}/modules/cons.py
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PYDISTUTILS_BUILD_TARGET=	--without-gettext build
diff --git a/deskutils/xchm/Makefile b/deskutils/xchm/Makefile
index 4776ce4c5c04..ba03222bb6c8 100644
--- a/deskutils/xchm/Makefile
+++ b/deskutils/xchm/Makefile
@@ -23,7 +23,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 .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/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index de81ece2a477..cb614d83393e 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack glib20 gtk20 intltool intlhack desktopfileutils pkgconfig
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index c972a1638c08..9684b30d8818 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	xklavier.12:${PORTSDIR}/x11/libxklavier
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 intltool intlhack pkgconfig librsvg2
 USE_XFCE=	configenv panel