- Convert USE_GETTEXT to USES (part 4)

Approved by: portmgr (bapt)
svn path=/head/; revision=316596
2024-10-18 19:49:40 +00:00 · 2013-04-26 10:44:28 +00:00 · 2013-04-26 10:44:28 +00:00 · 83f02b963c · 2021-03-31 03:12:20 +00:00
commit 83f02b963c
parent 152f30ef73
277 changed files with 277 additions and 436 deletions
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@ -24,7 +24,7 @@ MAKE_JOBS_SAFE=	yes
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 PLIST_SUB+=	NLS=""
--- a/archivers/squeeze/Makefile
+++ b/archivers/squeeze/Makefile
@ -19,14 +19,13 @@ LIB_DEPENDS=	thunar-vfs-1:${PORTSDIR}/x11-fm/thunar-vfs
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes

-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_XFCE=	configenv libutil thunar
 USE_XORG=	x11
 USE_GNOME=	gnomehack gtk20 glib20 intltool intlhack desktopfileutils
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
 MAKE_JOB_SAFE=	yes

 OPTIONS_DEFINE=		DOCS
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@ -14,10 +14,9 @@ OPTIONS_DEFINE=	GNOME PGPLOT OPENGL
 OPTIONS_DEFAULT=	PGPLOT OPENGL
 PGPLOT_DESC=	Enable PGPLOT support

-USES=        pathfix
+USES=        pathfix gettext
 USE_GNOME=	gnomehier gtk20
 USE_PERL5=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@ -48,7 +48,7 @@ GPSD_DESC=	Realtime GPS tracking
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS='@comment '
 .else
 PLIST_SUB+=	NLS=''
-USE_GETTEXT=	yes
+USES+=		gettext
 .endif

 post-configure:
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@ -82,7 +82,7 @@ PLIST_SUB+=	MTP="@comment "
 .endif

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@ -32,8 +32,7 @@ LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate \
 		cddb:${PORTSDIR}/audio/libcddb \
 		strfunc:${PORTSDIR}/devel/libstrfunc

-USES=		pkgconfig
-USE_GETTEXT=	yes
+USES=		pkgconfig gettext
 USE_GNOME=	gtk20 libxml2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@ -35,12 +35,11 @@ EXPIRATION_DATE=	2013-07-01

 PREFIX=		${KDE_PREFIX}
 WANT_GNOME=	yes
-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_QT_VER=	3
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_XORG=	ice sm x11 xau xcursor xdmcp xext xfixes xft xi \
 		xinerama xrandr xrender xt
--- a/audio/audex/Makefile
+++ b/audio/audex/Makefile
@ -29,7 +29,7 @@ EYED3_DESC=		Unicode MP3 tag support via audio/py-eyed3
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@ -21,10 +21,9 @@ RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 OPTIONS_DEFINE_i386=	SSE

 USE_BZIP2=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GCC=	4.6+
 USE_GNOME=	gnomehier libgnomecanvas
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules \
--- a/audio/cantus_3/Makefile
+++ b/audio/cantus_3/Makefile
@ -21,9 +21,8 @@ CONFLICTS=	cantus-1*

 LATEST_LINK=	${PORTNAME}3

-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USES=        pathfix
+USES=        pathfix gettext
 USE_GNOME=	gnomeprefix libglade2 glib20
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/audio/cowbell/Makefile
+++ b/audio/cowbell/Makefile
@ -12,12 +12,11 @@ COMMENT=	Elegant music organizer

 LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib

-USES=        pathfix
+USES=        pathfix gettext
 USE_GNOME=	gnomeprefix intltool gtksharp20
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_ICONV=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@ -36,8 +36,7 @@ FLTK_DESC=	Build FLTK plugin and GUI
 CONFLICTS_INSTALL=	outguess-*

 USE_PYTHON=	2.6+
-USES=		bison
-USE_GETTEXT=	yes
+USES=		bison gettext
 USE_SCONS=	yes
 SCONS_BUILDENV=	PATH=${LOCALBASE}/bin:$$PATH
 SCONS_ARGS=	prefix="${PREFIX}" CC="${CC}" CXX="${CXX}" \
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@ -18,8 +18,7 @@ LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate \
 		execinfo:${PORTSDIR}/devel/libexecinfo

 GNU_CONFIGURE=	yes
-USES=		pkgconfig
-USE_GETTEXT=	yes
+USES=		pkgconfig gettext
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@ -19,13 +19,12 @@ LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
 CONFLICTS=	gnome-control-center-3.[0-9]* libgnome-media-profiles-3.[0-9]*

 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack gtk20 libxml2 gconf2
 USE_GSTREAMER=	gconf good
 CONFIGURE_ARGS=	--disable-gstmix
--- a/audio/kaudiocreator/Makefile
+++ b/audio/kaudiocreator/Makefile
@ -33,7 +33,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 "
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@ -14,8 +14,7 @@ LATEST_LINK=	${PORTNAME}-kde4

 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USE_QT4=	qmake_build moc_build rcc_build uic_build
-USES=		cmake
-USE_GETTEXT=	yes
+USES=		cmake gettext
 MAKE_JOBS_SAFE=	yes

 OPTIONS_DEFINE=	FLAC ID3LIB MP4V2 VORBIS TAGLIB CHROMAPRINT
--- a/audio/libmp3splt/Makefile
+++ b/audio/libmp3splt/Makefile
@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-id3tag
 .endif

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 LANGUAGES=	de_DE cs es fr_FR hr
 .for language in ${LANGUAGES}
 PLIST_FILES+=	share/locale/${language}/LC_MESSAGES/libmp3splt0.mo
--- a/audio/linnya/Makefile
+++ b/audio/linnya/Makefile
@ -33,7 +33,7 @@ OPTIONS_DEFINE=	NLS
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@ -31,7 +31,7 @@ OPTIONS_DEFAULT=	NLS
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 LANGUAGES=	cs de_DE es fr_FR
 .for language in ${LANGUAGES}
 PLIST_FILES+=	share/locale/${language}/LC_MESSAGES/mp3splt.mo
--- a/audio/rezound/Makefile
+++ b/audio/rezound/Makefile
@ -86,7 +86,7 @@ RUN_DEPENDS+=	cdrdao:${PORTSDIR}/sysutils/cdrdao
 # NLS support is broken as of recent versions of libstdc++; rezound dies at
 # startup with "locale::facet::_S_create_c_locale name not valid" exception
 .if ${PORT_OPTIONS:MBROKEN_NLS}	# Enable only if you know what you're doing
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@ -252,7 +252,7 @@ PLIST_SUB+=	WAVPACK="@comment "
 .endif

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@ -36,7 +36,7 @@ SSE_DESC=	use SSE instructions

 .include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 LDFLAGS+=	-lintl
 .else
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@ -31,7 +31,7 @@ TRAY_DESC=	Tray icon and libnotify support
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB+=	NLS=""
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@ -17,9 +17,8 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \

 GNU_CONFIGURE=	yes
 INSTALLS_ICONS= yes
-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20 gtk20 intltool intlhack desktopfileutils
 USE_XFCE=	configenv libmenu libutil panel xfconf
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@ -13,11 +13,10 @@ COMMENT=	GTK-based MP3 player
 LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		gdbm.4:${PORTSDIR}/databases/gdbm

-USES=        pathfix
+USES=        pathfix gettext
 USE_GNOME=	gtk20 lthack
 WANT_GNOME=	yes
 USE_PERL5=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-ipv6
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@ -20,11 +20,10 @@ RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk

 OPTIONS_DEFINE=	DOCS

-USES=        pathfix
+USES=        pathfix gettext
 USE_GNOME=	desktopfileutils gtk20
 USE_PERL5_RUN=	yes
 USE_PYTHON=	run
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-libstroke=${LOCALBASE}
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@ -22,7 +22,6 @@ DOCVERSION=	1.1
 LIBVERSION=	1.0

 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 #USE_GMAKE=	yes
 USE_GL=		yes
 USE_WX=		2.8
@ -38,7 +37,7 @@ PLIST_SUB=	OPSYS=${OPSYS}	\
 BINS=		cvpcb eeschema gerbview kicad pcbnew
 EXTRAS2RM=	linux-non_unicode linux wings3d LINUX.README	\
 		contrib_makefiles.txt running_kicad_under_W98.txt
-USES=		cmake
+USES=		cmake gettext
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DKICAD_TESTING_VERSION=ON \
 		-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@ -41,7 +41,7 @@ PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
 .if defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS="@comment "
 .else
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .endif

--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@ -26,7 +26,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
--- a/cad/pdnmesh/Makefile
+++ b/cad/pdnmesh/Makefile
@ -26,10 +26,9 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
 ATLAS_DESC=	Enable ATLAS support

-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_FORTRAN=	yes
 USE_GL=		glu
-USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_GNOME=	gdkpixbuf2 gtk20
 USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
--- a/cad/repsnapper/Makefile
+++ b/cad/repsnapper/Makefile
@ -47,7 +47,7 @@ USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xmu xrandr xrender xt xxf86vm

 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
--- a/chinese/fcitx-configtool/Makefile
+++ b/chinese/fcitx-configtool/Makefile
@ -17,8 +17,7 @@ LIB_DEPENDS=	fcitx-config:${PORTSDIR}/chinese/fcitx

 USE_XZ=		yes
 USE_GNOME=	intltool gnomehack
-USE_GETTEXT=	yes
-USES=		cmake
+USES=		cmake gettext

 OPTIONS_DEFINE=	GTK2 GTK3
 OPTIONS_DEFAULT=GTK2
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@ -31,10 +31,9 @@ CONFLICTS=	zh-scim-fcitx-3.*

 USE_XZ=		yes
 USE_GNOME=	pango intltool libxml2 gnomehack
-USE_GETTEXT=	yes
 USE_XORG=	x11 xext xkbfile
 USE_LDCONFIG=	yes
-USES=		cmake
+USES=		cmake gettext
 INSTALLS_ICONS=	yes

 OPTIONS_DEFINE=	GTK2 GTK3 QT4 OPENCC TPUNC
--- a/chinese/opencc/Makefile
+++ b/chinese/opencc/Makefile
@ -21,7 +21,7 @@ USES=		cmake
 USE_LDCONFIG=	yes

 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 CMAKE_ARGS+=	-DENABLE_GETTEXT=On
 PLIST_SUB+=	NLS=""
 .else
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@ -49,7 +49,7 @@ CONFIGURE_ARGS+=--with-gtk-version=gtk2
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@ -18,9 +18,8 @@ OPTIONS_DEFINE=	BASH

 CMAKE_ARGS+=	-DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata

-USES=		cmake
+USES=		cmake gettext
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
 USE_GNOME=	glib20

 PORTDOCS=	*
--- a/comms/libticables2/Makefile
+++ b/comms/libticables2/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
--- a/comms/libticalcs2/Makefile
+++ b/comms/libticalcs2/Makefile
@ -29,7 +29,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
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@ -32,7 +32,7 @@ MAN1=		tilp.1
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
--- a/databases/dbf/Makefile
+++ b/databases/dbf/Makefile
@ -27,7 +27,7 @@ MAKE_JOBS_SAFE=	yes
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 PLIST_SUB+=	NLS=""
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@ -22,8 +22,7 @@ LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup \

 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=		bison pathfix
-USE_GETTEXT=	yes
+USES=		bison pathfix gettext
 USE_GNOME=	gnomeprefix intlhack ltverhack ltasneededhack gconf2 \
 		libxml2
 USE_OPENLDAP=	yes
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@ -36,7 +36,7 @@ CONFIGURE_ARGS+=--without-mysql
 .endif

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@ -13,11 +13,10 @@ BUILD_DEPENDS=	${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
 LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		xml2.5:${PORTSDIR}/textproc/libxml2

-USES=	pkgconfig
+USES=	pkgconfig gettext
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
 CXXFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
 USE_AUTOTOOLS=	libtool
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@ -24,9 +24,8 @@ LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
 		json-glib-1.0:${PORTSDIR}/devel/json-glib

 USE_AUTOTOOLS=	libtool
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix glib20 libxslt intlhack referencehack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@ -20,14 +20,13 @@ DATADIR=	${PREFIX}/share/cairo-dock

 ICONS_PACKAGE=	cairo-dock-plugins-png-icons
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_XORG=	xrender
 USE_DOS2UNIX=	YES
-USES=		cmake
+USES=		cmake gettext
 USE_GCC=	4.6+
 MAKE_JOBS_SAFE=	YES
 PLIST_SUB+=	PYVER="${PYTHON_VERSION:S/thon//}"
--- a/deskutils/chmsee/Makefile
+++ b/deskutils/chmsee/Makefile
@ -21,8 +21,7 @@ LICENSE=	GPLv2

 USE_GNOME=	gnomehier libglade2
 USE_GECKO=	libxul19
-USE_GETTEXT=	yes
-USES=		cmake
+USES=		cmake gettext
 CMAKE_ARGS=	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=TRUE
 INSTALLS_ICONS=	yes

--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@ -16,8 +16,7 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus

 USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix pygnomedesktop intlhack
 USE_PYTHON=	yes
 USE_GMAKE=	yes
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@ -16,9 +16,8 @@ GLIB_SCHEMAS=	org.gnome.Nautilus.Sendto.gschema.xml
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	intlhack gnomeprefix nautilus2 gnomehack evolutiondataserver
-USE_GETTEXT=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-plugins="${SENDTO_PLUGINS}"
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@ -15,9 +15,8 @@ LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt

 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20 intltool intlhack desktopfileutils
 USE_XFCE=	configenv libmenu panel
--- a/deskutils/pal/Makefile
+++ b/deskutils/pal/Makefile
@ -11,9 +11,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	h.skuhra@gmail.com
 COMMENT=	A calendar application

-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_GNOME=	glib20
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 ALL_TARGET=
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@ -14,11 +14,10 @@ COMMENT=	Project management application for GNOME 2

 USE_XZ=		yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack libgnomeui libgnomeprintui \
 		libgsf desktopfileutils
 WANT_GNOME=	yes
-USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
--- a/deskutils/tpb/Makefile
+++ b/deskutils/tpb/Makefile
@ -25,7 +25,7 @@ CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
 MAN1=		tpb.1

 .ifndef(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@ -40,7 +40,7 @@ SUB_FILES=	pkg-message
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@ -35,8 +35,7 @@ CONFIGURE_SCRIPT=	../gcc-${PORTVERSION}/configure
 USE_PERL5_BUILD=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=		bison
-USE_GETTEXT=	yes
+USES=		bison gettext
 GNU_CONFIGURE=	yes

 .include <bsd.port.pre.mk>
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@ -75,7 +75,7 @@ PLIST_SUB+=	GOLD="@comment "
 .endif

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@ -29,7 +29,7 @@ INFO=		bison
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@ -20,9 +20,8 @@ CONFLICTS=	devhelp-3.[0-9]*

 USE_BZIP2=	yes
 USE_XORG=	x11
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	intlhack gnomeprefix libgnomeui libwnck
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
--- a/devel/ecore-main/Makefile
+++ b/devel/ecore-main/Makefile
@ -28,7 +28,7 @@ EXAMPLESDIR=	${PREFIX}/share/examples/ecore
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@ -11,10 +11,9 @@ MASTER_SITES=	http://people.gnome.org/~veillard/gamin/sources/
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	A file and directory monitoring system

-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_GNOME?=	gnomehack _glib20
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@ -25,8 +25,7 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		polkit-gobject-1:${PORTSDIR}/sysutils/polkit

 USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomehier orbit2 gtk20 libxml2 ltverhack \
 		referencehack intlhack dconf
 USE_LDCONFIG=	yes
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@ -31,7 +31,7 @@ MAN1=		geany.1
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@ -16,10 +16,9 @@ COMMENT=	A user interface builder for GTK+/GNOME
 LIB_DEPENDS=	rarian.0:${PORTSDIR}/textproc/rarian

 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack gtk20 desktopfileutils
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@ -24,11 +24,10 @@ PORTSCOUT=	limitw:1,even
 LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre \
 		ffi:${PORTSDIR}/devel/libffi

-USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_GNOME=	gnomehack ltverhack
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@ -19,8 +19,7 @@ USE_BZIP2=	yes
 RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info

 USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack gnomemimedata gconf2 \
 		ltverhack referencehack
 USE_AUTOTOOLS=	libtool
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@ -20,9 +20,8 @@ OPTIONS_DEFINE=	DOXYGEN MEMDEBUG
 MEMDEBUG_DESC=	Enable memory debugger statistic
 .endif

-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig gettext
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_OPENSSL=	yes
 USE_AUTOTOOLS=	libtool

--- a/devel/kcachegrind/Makefile
+++ b/devel/kcachegrind/Makefile
@ -14,11 +14,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 ONLY_FOR_ARCHS=	i386 amd64

-USES=		cmake
+USES=		cmake gettext
 USE_KDE4=	automoc4 kdehier kdelibs
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes

 OPTIONS_DEFINE=	DOT VALGRIND
 OPTIONS_DEFAULT=	DOT
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@ -22,7 +22,7 @@ OPTIONS_DEFAULT=NLS
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@ -43,7 +43,7 @@ RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/kdevphplanguagesupport.so:${PORTSDIR}/deve
 .endif

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DBUILD_po:BOOL=FALSE
--- a/devel/kdevelop-php-docs/Makefile
+++ b/devel/kdevelop-php-docs/Makefile
@ -21,7 +21,7 @@ MAKE_JOBS_SAFE=	yes
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
--- a/devel/kdevelop-php/Makefile
+++ b/devel/kdevelop-php/Makefile
@ -32,7 +32,7 @@ RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/kdevphpdocs.so:${PORTSDIR}/devel/kdevelop-
 .endif

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
--- a/devel/kdevplatform/Makefile
+++ b/devel/kdevplatform/Makefile
@ -29,7 +29,7 @@ PLIST_SUB+=	SHLIB_VER=6.0.0 \
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
--- a/devel/libevt/Makefile
+++ b/devel/libevt/Makefile
@ -13,8 +13,7 @@ LICENSE=	LGPL3

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
--- a/devel/libevtx/Makefile
+++ b/devel/libevtx/Makefile
@ -13,8 +13,7 @@ LICENSE=	LGPL3

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
--- a/devel/liblnk/Makefile
+++ b/devel/liblnk/Makefile
@ -14,8 +14,7 @@ LICENSE=	LGPL3

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
--- a/devel/libmsiecf/Makefile
+++ b/devel/libmsiecf/Makefile
@ -13,8 +13,7 @@ LICENSE=	LGPL3

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@ -17,10 +17,9 @@ BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 USE_XZ=		yes
 USE_PYTHON=	2.5+
 USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	glib20 gtk30 ltverhack
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
--- a/devel/libpff/Makefile
+++ b/devel/libpff/Makefile
@ -13,8 +13,7 @@ LICENSE=	LGPL3

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
--- a/devel/libregf/Makefile
+++ b/devel/libregf/Makefile
@ -13,8 +13,7 @@ LICENSE=	LGPL3

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python
-USES=		fuse pathfix
-USE_GETTEXT=	yes
+USES=		fuse pathfix gettext
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
--- a/devel/libtifiles2/Makefile
+++ b/devel/libtifiles2/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
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@ -60,7 +60,7 @@ PLIST_SUB+=	QEMU="@comment "
 .endif

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 CONFIGURE_ARGS+=	--enable-nls \
 			--with-libintl-prefix=${LOCALBASE}
--- a/devel/obby/Makefile
+++ b/devel/obby/Makefile
@ -22,7 +22,7 @@ MAKE_JOBS_SAFE=	yes
 .if !defined(WITHOUT_NLS)
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
--- a/devel/piklab/Makefile
+++ b/devel/piklab/Makefile
@ -20,8 +20,7 @@ USE_QT4=	corelib gui qt3support qtestlib xml \
 		moc_build qmake_build rcc_build uic_build
 USE_NCURSES=	yes
 USE_READLINE=	yes
-USE_GETTEXT=	yes
-USES=		cmake
+USES=		cmake gettext
 MAKE_JOBS_SAFE=	yes

 MAN1=		piklab-hex.1 piklab-prog.1
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@ -31,7 +31,7 @@ PLIST_SUB+=	NLS="@comment "
 .else
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
-USE_GETTEXT=	yes
+USES+=		gettext
 .endif

 .include <bsd.port.mk>
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@ -18,8 +18,7 @@ COMMENT=	Python bindings for the D-BUS messaging system

 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib

-USE_GETTEXT=	yes
-USES=	pathfix
+USES=	pathfix gettext
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
--- a/devel/seed3/Makefile
+++ b/devel/seed3/Makefile
@ -25,8 +25,7 @@ CONFLICTS=	seed-2.[0-9]*
 LATEST_LINK=	seed3
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gtk30 intltool libxml2
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@ -45,7 +45,7 @@ USES+=		pkgconfig
 LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
 PLIST_SUB+=	NLS=""
 ALL_TARGET=	all-i18n
-USE_GETTEXT=	yes
+USES+=		gettext
 USE_GMAKE=	yes
 .else
 PLIST_SUB+=	NLS="@comment "
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@ -27,8 +27,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	libxml2 gtk20 desktopfileutils librsvg2 libxslt
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@ -22,9 +22,8 @@ CONFLICTS=	gedit-plugins-3.[0-9]*
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack gnomevfs2
 WANT_GNOME=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/editors/yzis/Makefile
+++ b/editors/yzis/Makefile
@ -16,14 +16,13 @@ LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi

 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_XORG=	x11 xext ice
 USE_LUA=	5.1
 LUA_COMPS=	lua
 USE_QT4=	qtestlib qmake_build rcc_build uic_build moc_build gui xml
 USE_PERL5=	yes

-USES=		cmake
+USES=		cmake gettext
 CMAKE_ARGS+=	-DLOCALBASE:STRING="${LOCALBASE}" \
 		-DLUA_INCDIR:STRING="${LUA_INCDIR}" \
 		-DLUA_LIBDIR:STRING="${LUA_LIBDIR}" \
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@ -22,12 +22,11 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		xcb:${PORTSDIR}/x11/libxcb

-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_GNOME=	gdkpixbuf2 gtk20
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool libltdl
 CONFIGURE_ENV=	ac_cv_have_isinff=no
 CONFIGURE_ARGS=	--datadir=${WRKDIR}/tmproot --disable-warnings
--- a/finance/aqbanking/Makefile
+++ b/finance/aqbanking/Makefile
@ -22,9 +22,8 @@ KTOBLZCHECK_DESC=	Enable KtoBlzCheck support
 PAYPAL_DESC=		Build PayPal backend (separate license)

 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
-USES=	pathfix pkgconfig
+USES=	pathfix pkgconfig gettext

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-release="yes"
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@ -36,7 +36,7 @@ MAN1=		kmymoney.1
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DENABLE_NLS:BOOL=OFF
--- a/french/verbiste/Makefile
+++ b/french/verbiste/Makefile
@ -45,7 +45,7 @@ PLIST_SUB+=	HASGNOME="@comment "
 .endif

 .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGNOME}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	HASGUI=""
 .else
 PLIST_SUB+=	HASGUI="@comment "
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@ -46,7 +46,7 @@ PLIST_SUB+=	NOX11:="@comment "
 MAN1=		gftp.1

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
--- a/ftp/gwget/Makefile
+++ b/ftp/gwget/Makefile
@ -20,8 +20,7 @@ EPIPHANY_DESC=	Epiphany extension

 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	desktopfileutils gnomeprefix gtk20 gconf2 libgnomeui
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@ -45,7 +45,7 @@ CONFIGURE_ARGS+=--disable-ipv6
 .endif

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@ -22,11 +22,10 @@ CONFLICTS=	sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* gnome-games-3.[0-9]*

 USE_BZIP2=	yes
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack librsvg2 desktopfileutils \
 		pygnomedesktop gnomedocutils
 USE_GSTREAMER=	vorbis ogg
--- a/games/hinversi/Makefile
+++ b/games/hinversi/Makefile
@ -27,7 +27,7 @@ MAN1=		hinversi-cli.1
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--with-libintl-prefix=${LOCALBASE}
 PLIST_SUB+=	NLS=""
 .else
--- a/games/knights-kde4/Makefile
+++ b/games/knights-kde4/Makefile
@ -26,7 +26,7 @@ CMAKE_ARGS+=	-DBUILD_doc=FALSE
 .endif

 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
--- a/Show More
+++ b/Show More