71 files changed, 71 insertions, 71 deletions

diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile
index 17ade7123071..fa73cbc7e41b 100644
--- a/audio/alsa-utils/Makefile
+++ b/audio/alsa-utils/Makefile
@@ -47,7 +47,7 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .endif
 
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 6ade03ebcb38..90d49e977635 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_GETTEXT=	yes
+USES=		gettext
 USE_SDL=	sdl
 USE_RUBY=	yes
 USE_LDCONFIG=	yes
diff --git a/audio/ampache/Makefile b/audio/ampache/Makefile
index b636df9f415a..c621be111c83 100644
--- a/audio/ampache/Makefile
+++ b/audio/ampache/Makefile
@@ -16,7 +16,7 @@ USE_PHP=	mysql pcre session iconv hash gettext mbstring
 WANT_PHP_WEB=	yes
 
 NO_BUILD=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index 26833797a019..63ec9fb95658 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	lo:${PORTSDIR}/audio/liblo \
 		gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_SCONS=	yes
 SCONS_ENV+=	SYSLIBS=yes PREFIX=${PREFIX} NLS=yes
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index e21211950c1e..131efdedac37 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--disable-avahi
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=	--enable-nls
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/audio/asunder/Makefile b/audio/asunder/Makefile
index 1728277e0510..a681c1e04c8c 100644
--- a/audio/asunder/Makefile
+++ b/audio/asunder/Makefile
@@ -23,7 +23,7 @@ WINDOWS_CHARS_DESC=	Allow Windows special chars in filenames
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index f5e27ded5e05..c28636d7480a 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
 USE_AUTOTOOLS=	aclocal autoconf
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_XZ=		yes
 USE_WX=		2.8
 WX_UNICODE=	yes
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 4b13cbc99068..9e4991340bb5 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -35,7 +35,7 @@ OPTIONS_DEFINE=	NLS GTK2
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 
 .for ii in ca de el es fr gl it ja nl pl pt_BR ru sv uk zh_CN
 PLIST_FILES+=	share/locale/${ii}/LC_MESSAGES/aumix.mo
diff --git a/audio/blop/Makefile b/audio/blop/Makefile
index 704433b874cd..501fccd780c2 100644
--- a/audio/blop/Makefile
+++ b/audio/blop/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/audio/cplay/Makefile b/audio/cplay/Makefile
index 229a18446cc7..541883f95149 100644
--- a/audio/cplay/Makefile
+++ b/audio/cplay/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Curses-based front-end for various audio players
 
 LICENSE=	GPLv2
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 
diff --git a/audio/cuberok/Makefile b/audio/cuberok/Makefile
index 928915892ecd..d07903521a07 100644
--- a/audio/cuberok/Makefile
+++ b/audio/cuberok/Makefile
@@ -25,7 +25,7 @@ USE_LDCONFIG=	yes
 USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build \
 		network phonon-gst sql
 USE_ICONV=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_SDL=	sdl
 QMAKEFLAGS+=	"CONFIG+=player_phonon"
 MAKE_ENV+=	INSTALL_ROOT=${PREFIX}
diff --git a/audio/decibel-audio-player/Makefile b/audio/decibel-audio-player/Makefile
index 9124d89b5dfb..a53e5a1caf96 100644
--- a/audio/decibel-audio-player/Makefile
+++ b/audio/decibel-audio-player/Makefile
@@ -17,7 +17,7 @@ LICENSE=	GPLv2
 USE_PYTHON=	2.5+
 USE_GNOME=	pygnome2 pygtk2
 USE_GSTREAMER=	python good bad
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 NO_BUILD=	yes
 MAN1=		decibel-audio-player.1 decibel-audio-player-remote.1
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 2e9594ff7776..ee96734268f1 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -20,7 +20,7 @@ MAN1=		easytag.1
 CONFLICTS=	easytag-devel-[0-9]*
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gnomehack gnomeprefix gtk20 desktopfileutils
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_GTK
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index a97a194d4897..af9ee2c54be7 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -53,7 +53,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:${PORTSDIR}/devel/py-notify
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git a/audio/freedesktop-sound-theme/Makefile b/audio/freedesktop-sound-theme/Makefile
index 95e86ff99718..e5eddfc4c918 100644
--- a/audio/freedesktop-sound-theme/Makefile
+++ b/audio/freedesktop-sound-theme/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Sound theme based on the FreeDesktop specification
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehier intlhack
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/audio/gigedit/Makefile b/audio/gigedit/Makefile
index 6722550e4a2e..8eb639c12a7c 100644
--- a/audio/gigedit/Makefile
+++ b/audio/gigedit/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_LDCONFIG=	yes
 USE_GNOME=	intltool
 
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index 3cf1a925f419..37554169a7e8 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ENV=	DATADIRNAME=share
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 CONFIGURE_ARGS+=	--enable-nls
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/audio/gmpc-alarm/Makefile b/audio/gmpc-alarm/Makefile
index eb6a03c31e6b..9b8c1d55aeac 100644
--- a/audio/gmpc-alarm/Makefile
+++ b/audio/gmpc-alarm/Makefile
@@ -21,6 +21,6 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig glib20 gtk20 intltool
-USE_GETTEXT=	yes
+USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-albumview/Makefile b/audio/gmpc-albumview/Makefile
index eca9050013fa..0e22515cded5 100644
--- a/audio/gmpc-albumview/Makefile
+++ b/audio/gmpc-albumview/Makefile
@@ -21,6 +21,6 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig glib20 gtk20 intltool
-USE_GETTEXT=	yes
+USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-discogs/Makefile b/audio/gmpc-discogs/Makefile
index 8ea2557e86a5..095fa945def0 100644
--- a/audio/gmpc-discogs/Makefile
+++ b/audio/gmpc-discogs/Makefile
@@ -22,6 +22,6 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig glib20 gtk20 intltool libxml2
-USE_GETTEXT=	yes
+USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-lastfm/Makefile b/audio/gmpc-lastfm/Makefile
index 31adc3cad8ab..c6895786a3fc 100644
--- a/audio/gmpc-lastfm/Makefile
+++ b/audio/gmpc-lastfm/Makefile
@@ -23,6 +23,6 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig glib20 gtk20 intltool libxml2
-USE_GETTEXT=	yes
+USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-libnotify/Makefile b/audio/gmpc-libnotify/Makefile
index 612520395d48..7ae83c3aca6a 100644
--- a/audio/gmpc-libnotify/Makefile
+++ b/audio/gmpc-libnotify/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig glib20 gtk20 intltool
-USE_GETTEXT=	yes
+USES=		gettext
 
 PLIST_FILES=	lib/gmpc/plugins/libnotifyplugin.la \
 		lib/gmpc/plugins/libnotifyplugin.so
diff --git a/audio/gmpc-lyrics/Makefile b/audio/gmpc-lyrics/Makefile
index 18a51f2159fd..1064187ced70 100644
--- a/audio/gmpc-lyrics/Makefile
+++ b/audio/gmpc-lyrics/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig intltool glib20 gtk20 libxml2
-USE_GETTEXT=	yes
+USES=		gettext
 
 PLIST_FILES=	lib/gmpc/plugins/lyricsplugin.la \
 		lib/gmpc/plugins/lyricsplugin.so
diff --git a/audio/gmpc-lyricsplugin/Makefile b/audio/gmpc-lyricsplugin/Makefile
index 7c0ee1b6f4b4..38c48cba5184 100644
--- a/audio/gmpc-lyricsplugin/Makefile
+++ b/audio/gmpc-lyricsplugin/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig intltool glib20 gtk20 libxml2
-USE_GETTEXT=	yes
+USES=		gettext
 
 PLIST_FILES=	lib/gmpc/plugins/lyricspluginplugin.la \
 		lib/gmpc/plugins/lyricspluginplugin.so
diff --git a/audio/gmpc-lyricwiki/Makefile b/audio/gmpc-lyricwiki/Makefile
index 8c4bc5f1760b..340beee0e558 100644
--- a/audio/gmpc-lyricwiki/Makefile
+++ b/audio/gmpc-lyricwiki/Makefile
@@ -21,6 +21,6 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig intltool glib20 gtk20 libxml2
-USE_GETTEXT=	yes
+USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-magnatune/Makefile b/audio/gmpc-magnatune/Makefile
index a93764c9cabd..effa8790eaf4 100644
--- a/audio/gmpc-magnatune/Makefile
+++ b/audio/gmpc-magnatune/Makefile
@@ -22,6 +22,6 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig intltool glib20 gtk20 libglade2
-USE_GETTEXT=	yes
+USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-mdcover/Makefile b/audio/gmpc-mdcover/Makefile
index a3ec327f05ab..e2d486f27c35 100644
--- a/audio/gmpc-mdcover/Makefile
+++ b/audio/gmpc-mdcover/Makefile
@@ -22,6 +22,6 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig intltool glib20 gtk20 libxml2
-USE_GETTEXT=	yes
+USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-mserver/Makefile b/audio/gmpc-mserver/Makefile
index 229e6a4e07e2..59cb8b263ac3 100644
--- a/audio/gmpc-mserver/Makefile
+++ b/audio/gmpc-mserver/Makefile
@@ -26,6 +26,6 @@ USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	gnomehack pkgconfig glib20 gtk20 libxml2
-USE_GETTEXT=	yes
+USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-shout/Makefile b/audio/gmpc-shout/Makefile
index 5f1145b27cfd..dc3ccd37d10e 100644
--- a/audio/gmpc-shout/Makefile
+++ b/audio/gmpc-shout/Makefile
@@ -24,6 +24,6 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc \
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig intltool glib20 gtk20 libxml2
-USE_GETTEXT=	yes
+USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc-wikipedia/Makefile b/audio/gmpc-wikipedia/Makefile
index c2c463b3becc..99ebff91295a 100644
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@@ -23,6 +23,6 @@ RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig intltool glib20 gtk20
-USE_GETTEXT=	yes
+USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index fa5c073299ae..9197257492f3 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -28,7 +28,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig glib20 gtk20 libglade2
 INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 CONFIGURE_ARGS=	--enable-system-libsexy
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/audio/gmtp/Makefile b/audio/gmtp/Makefile
index aea5349f11d5..d44a9f4cdd5c 100644
--- a/audio/gmtp/Makefile
+++ b/audio/gmtp/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/gMTP
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	glib20
 
 PORTDOCS=	*
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index 374b53a42ba9..e1ce397e70c7 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	discid:${PORTSDIR}/audio/libdiscid \
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 
 USE_XORG=	x11
-USE_GETTEXT=	yes
+USES=		gettext
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 gconf2 desktopfileutils
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index ed9f840ad66f..bd7a2793ea57 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS+=	mpg123:${PORTSDIR}/audio/mpg123
 .endif
 
 USE_GNOME=	gdkpixbuf
-USE_GETTEXT=	yes
+USES=		gettext
 WANT_GNOME=	yes
 USE_AUTOTOOLS=	autoconf213 libtool
 
diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile
index cf1f931b3e8c..ba76017edacb 100644
--- a/audio/gtick/Makefile
+++ b/audio/gtick/Makefile
@@ -23,7 +23,7 @@ MAN1=	gtick.1
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 62e6bee478d6..71bce0e8565b 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	id3tag:${PORTSDIR}/audio/libid3tag \
 		gpod:${PORTSDIR}/audio/libgpod
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 libglade2
 GNU_CONFIGURE=	yes
diff --git a/audio/gvolwheel/Makefile b/audio/gvolwheel/Makefile
index 85c351104f5d..4ad3a4c4bb6f 100644
--- a/audio/gvolwheel/Makefile
+++ b/audio/gvolwheel/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
 PLIST_SUB+=	NLS=""
-USE_GETTEXT=	yes
+USES+=		gettext
 .endif
 
 pre-configure:
diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile
index 9043a26ae0cb..39cafd9b5322 100644
--- a/audio/herrie/Makefile
+++ b/audio/herrie/Makefile
@@ -75,7 +75,7 @@ CONFIGURE_ARGS+=no_xspf
 .endif
 .if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
-USE_GETTEXT=	yes
+USES+=		gettext
 .else
 PLIST_SUB+=	NLS="@comment "
 CONFIGURE_ARGS+=no_nls
diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index 5bf258158133..cfd9b87f86d9 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 
 USE_BZIP2=	yes
 USE_GNOME=	libgnomeui libxml2
-USE_GETTEXT=	yes
+USES=		gettext
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index d1bc41ee9825..b964e018d9d1 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -29,7 +29,7 @@ PORTSCOUT=	limit:^1\.
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-musicbrainz
 MAKE_JOBS_SAFE=	yes
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 358d6b890380..b058be6bd8fd 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	plist.1:${PORTSDIR}/devel/libplist \
 
 USE_CSTD=	gnu89
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_SQLITE=	3
diff --git a/audio/lingot/Makefile b/audio/lingot/Makefile
index b6a06458acda..a700fa16f9c2 100644
--- a/audio/lingot/Makefile
+++ b/audio/lingot/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USE_GNOME=	gtk20 libglade2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/audio/lxmusic/Makefile b/audio/lxmusic/Makefile
index a4043e5cf895..0feb82094163 100644
--- a/audio/lxmusic/Makefile
+++ b/audio/lxmusic/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	xmmsclient:${PORTSDIR}/audio/xmms2 \
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index a01e8b9e24ed..048d28187ec0 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -34,7 +34,7 @@ TCL82_MAN_DESC= Install tcl 8.3 manpages
 .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/audio/mp3c/Makefile b/audio/mp3c/Makefile
index 449d4f726a1d..5f01bcf01e81 100644
--- a/audio/mp3c/Makefile
+++ b/audio/mp3c/Makefile
@@ -30,7 +30,7 @@ MANCOMPRESSED=	no
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .else
-USE_GETTEXT=		yes
+USES=		gettext
 PLIST_SUB+=		NLS=""
 .endif
 
diff --git a/audio/mp3splt-gtk/Makefile b/audio/mp3splt-gtk/Makefile
index e15fcae44a28..6786eb097658 100644
--- a/audio/mp3splt-gtk/Makefile
+++ b/audio/mp3splt-gtk/Makefile
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=	--disable-doxygen-doc
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .endif
 
diff --git a/audio/mpdbrowser/Makefile b/audio/mpdbrowser/Makefile
index ad8b331bf513..2ee2d9a94264 100644
--- a/audio/mpdbrowser/Makefile
+++ b/audio/mpdbrowser/Makefile
@@ -16,7 +16,7 @@ COMMENT=	GTK+ client for the Music Player Daemon (MPD)
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:${PORTSDIR}/audio/py-mpd
 
 PYDISTUTILS_PKGNAME=	mpdBrowser
-USE_GETTEXT=	yes
+USES=		gettext
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index 7a88aa3d7e47..5cc2c4c8c12f 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gnomeprefix gnomehack intltool libgnomeui gnomesharp20
 USE_GSTREAMER=	gconf
 USE_LDCONFIG=	yes
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 1b1a8fd951f4..3788ffa5f1c0 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
 OPTIONS_DEFINE=	X11 LAME SNDFILE DOCS
 OPTIONS_DEFAULT=X11
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug --disable-lubrify --disable-rpath
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index e7956e82d429..2d0234277b2c 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -30,7 +30,7 @@ PLIST_FILES=	bin/ncmpc \
 PLIST_DIRS=%%EXAMPLESDIR%%
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 LANGUAGES=cs da de eo es fi fr gl he hu it ko nb nl pl pt_BR ru sk sv uk zh_CN
 .for language in ${LANGUAGES}
 PLIST_FILES+=share/locale/${language}/LC_MESSAGES/ncmpc.mo
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 2cf36c2480c1..84b44a915d64 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -48,7 +48,7 @@ RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile
index 481ba4e31cd4..0078865eebf6 100644
--- a/audio/osd-lyrics/Makefile
+++ b/audio/osd-lyrics/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ENV=	DATADIRNAME=share
 # Cannot enable -Werror yet: Clang does not like the code `printf(_("..."))',
 # see this bug for details: http://llvm.org/bugs/show_bug.cgi?id=3814
 #CONFIGURE_ARGS=	--with-werror
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_SQLITE=	yes
diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile
index e24563de6c16..f07fca2b1b8b 100644
--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS+=	packagekit-glib2.14:${PORTSDIR}/ports-mgmt/packagekit
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index cb26ed944bc0..2a95a10f820a 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=0:${PORTSDIR}/audio/py-mutagen \
 		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \
 		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
 INSTALLS_ICONS=	yes
diff --git a/audio/prokyon3/Makefile b/audio/prokyon3/Makefile
index 72b83bc64109..3256ebb05aac 100644
--- a/audio/prokyon3/Makefile
+++ b/audio/prokyon3/Makefile
@@ -25,7 +25,7 @@ USE_XORG=	x11 xft
 USE_QT_VER=	3
 USE_MYSQL=	yes
 USE_PERL5_BUILD=yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-other-includes=${LOCALBASE}/include \
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index c291f22547a0..b086a14fa725 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \
 USE_GNOME=	gnomehack glib20 intltool ltverhack
 USE_XORG=	x11 sm xtst ice
 USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libltdl libtool
 USE_GMAKE=	yes
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index dff625a8d5fa..5083716d760e 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
 CONFLICTS=	rhythmbox-2.[0-9]* rhythmbox-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix gtk20 nautilus2
diff --git a/audio/rubyripper/Makefile b/audio/rubyripper/Makefile
index 4af7bbaa2c81..dd7646aa6581 100644
--- a/audio/rubyripper/Makefile
+++ b/audio/rubyripper/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		cd-discid:${PORTSDIR}/audio/cd-discid
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_RUBY=	yes
 INSTALLS_ICONS=	yes
 
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 746e5f6089d3..18e76e50bea4 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	${STYLESHEET}:${PORTSDIR}/textproc/docbook-xsl \
 USE_GNOME=	gnomehack pygtk2
 WANT_GNOME=	yes
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_XML2PO=""
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index f9f7710bd2a1..bf08b2d44470 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -18,7 +18,7 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:${PORTSDIR}/audio/py-mpd
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	pygtk2
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index f4735394717b..0addb1a03017 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
 		brasero-media.3:${PORTSDIR}/sysutils/brasero
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix gconf2 libglade2 gnomedocutils
diff --git a/audio/soundconverter/Makefile b/audio/soundconverter/Makefile
index e7f01a5de455..49b4f9d19a64 100644
--- a/audio/soundconverter/Makefile
+++ b/audio/soundconverter/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedi
 LICENSE=	GPLv3
 
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
 USE_GNOME=	pygtk2 pygnome2
diff --git a/audio/spek/Makefile b/audio/spek/Makefile
index 0b96e6329a61..0d841e70fdd3 100644
--- a/audio/spek/Makefile
+++ b/audio/spek/Makefile
@@ -18,7 +18,7 @@ MAN1=		spek.1
 USE_XZ=		yes
 USE_GCC=	4.7+
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	desktopfileutils intltool
 USE_WX=	2.8+
 WX_UNICODE=	yes
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 63264fb14766..e130034a5d5c 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -28,7 +28,7 @@ MAKE_JOBS_SAFE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=    yes
+USES+=		gettext
 PLIST_SUB+=     NLS=""
 .else
 USE_ICONV=	yes
diff --git a/audio/wavbreaker/Makefile b/audio/wavbreaker/Makefile
index e644a604dd8a..6fb01c2107ca 100644
--- a/audio/wavbreaker/Makefile
+++ b/audio/wavbreaker/Makefile
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--disable-pulse
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/audio/wxguitar/Makefile b/audio/wxguitar/Makefile
index 829abace5943..8438c472741d 100644
--- a/audio/wxguitar/Makefile
+++ b/audio/wxguitar/Makefile
@@ -28,7 +28,7 @@ MAKE_JOBS_SAFE=	yes
 WRKSRC=		${WRKDIR}/wxGuitar
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile
index e34dd2442219..aa2ca4c0bc77 100644
--- a/audio/xfmpc/Makefile
+++ b/audio/xfmpc/Makefile
@@ -22,7 +22,7 @@ MAKE_JOBS_SAFE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 intltool intlhack pkgconfig desktopfileutils
 USE_XFCE=	configenv libmenu libutil
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 45a55a926f18..7bc3aaec0cbc 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	id3tag:${PORTSDIR}/audio/libid3tag
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
 USE_GNOME=	gtk20
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtk2
 MAKE_JOBS_SAFE=	yes
diff --git a/audio/xmms-curses/Makefile b/audio/xmms-curses/Makefile
index c6295c5606d4..559af795034d 100644
--- a/audio/xmms-curses/Makefile
+++ b/audio/xmms-curses/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 		xcb.2:${PORTSDIR}/x11/libxcb
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gtk12
 USE_ICONV=	yes
 USE_XORG=	x11 xau xdmcp xext xi
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index c3df6566503c..f3cb2d41d046 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
 		xcb.2:${PORTSDIR}/x11/libxcb
 
 USE_AUTOTOOLS=	libtool
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gtk12
 USE_ICONV=	yes
 USE_XORG=	x11 xau xdmcp xext xi
diff --git a/audio/xmms-sid/Makefile b/audio/xmms-sid/Makefile
index 90c611cfa3ca..fe1bef9495ee 100644
--- a/audio/xmms-sid/Makefile
+++ b/audio/xmms-sid/Makefile
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes