- USE_GETTEXT= yes
find /usr/ports/ -type f | xargs grep USE_GETTEXT | \
    grep -i yes | grep Makefile: | cut -f1-5 -d/ > /tmp/gt_yes.txt
- USES
for i in $(cat /tmp/gt_yes.txt); do grep -qw USES $i/Makefile || \
    echo $i; done > /tmp/gt_nouses.txt

> /tmp/patch-gettext-uses.txt
for i in $(cat /tmp/gt_uses.txt); do
	_incpre=$(grep -n 'include.*bsd.port.pre.mk' $i/Makefile | cut -f1 -d: | head -1)
	[ -z $_incpre ] && _incpre=99999
	_incopt=$(grep -n 'include.*bsd.port.options.mk' $i/Makefile | cut -f1 -d: | head -1)
	[ -z $_incopt ] && _incopt=99999
	_withoutnls=$(grep -n 'WITHOUT_NLS' $i/Makefile | cut -f1 -d: | head -1)
	[ -z $_withoutnls ] && _withoutnls=99999
	_gettext=$(grep -nw '^USE_GETTEXT' $i/Makefile | cut -f1 -d: | head -1)
	if [ -z $_gettext ]; then
		echo 1>&2 "$i: no USE_GETTEXT ??"
		continue
	fi

	if [ $_incpre -lt $_gettext ]; then
		echo 1>&2 "$i cannot be autoconverted"
		continue
	fi

	if [ $_incopt -gt $_gettext -a $_withoutnls -gt $_gettext ]; then
		sed '/^USE_GETTEXT/d; s/\(USES.*\)$/\1 gettext/' $i/Makefile > /tmp/_patch_.txt
	else
		sed 's/^USE_GETTEXT=.*$/USES+=		gettext/' $i/Makefile > /tmp/_patch_.txt
	fi
	diff -u $i/Makefile /tmp/_patch_.txt >> /tmp/patch-gettext-uses.txt
	rm -f /tmp/_patch_.txt
done

Index: archivers/libcomprex/Makefile
@@ -24,7 +24,7 @@
 .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=""
Index: archivers/squeeze/Makefile
@@ -19,14 +19,13 @@
 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
Index: astro/nightfall/Makefile
@@ -14,10 +14,9 @@
 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
Index: astro/viking/Makefile
@@ -48,7 +48,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: audio/abraca/Makefile
@@ -32,7 +32,7 @@
 PLIST_SUB+=	NLS='@comment '
 .else
 PLIST_SUB+=	NLS=''
-USE_GETTEXT=	yes
+USES+=		gettext
 .endif
 
 post-configure:
Index: audio/amarok-kde4/Makefile
@@ -82,7 +82,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
Index: audio/aqualung/Makefile
@@ -32,8 +32,7 @@
 		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
Index: audio/arts/Makefile
@@ -35,12 +35,11 @@
 
 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
Index: audio/audex/Makefile
@@ -29,7 +29,7 @@
 .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
Index: audio/beast/Makefile
@@ -21,10 +21,9 @@
 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 \
Index: audio/cantus_3/Makefile
@@ -21,9 +21,8 @@
 
 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
Index: audio/cowbell/Makefile
@@ -12,12 +12,11 @@
 
 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
Index: audio/csound/Makefile
@@ -36,8 +36,7 @@
 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}" \
Index: audio/deadbeef/Makefile
@@ -18,8 +18,7 @@
 		execinfo:${PORTSDIR}/devel/libexecinfo
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
-USE_GETTEXT=	yes
+USES=		pkgconfig gettext
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
Index: audio/gnome-media/Makefile
@@ -19,13 +19,12 @@
 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
Index: audio/kaudiocreator/Makefile
@@ -33,7 +33,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
Index: audio/kid3-kde4/Makefile
@@ -14,8 +14,7 @@
 
 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
Index: audio/libmp3splt/Makefile
@@ -70,7 +70,7 @@
 .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
Index: audio/linnya/Makefile
@@ -33,7 +33,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: audio/mp3splt/Makefile
@@ -31,7 +31,7 @@
 .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
Index: audio/rezound/Makefile
@@ -86,7 +86,7 @@
 # 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
Index: audio/soundkonverter/Makefile
@@ -252,7 +252,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
Index: audio/swhplugins/Makefile
@@ -36,7 +36,7 @@
 
 .include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 LDFLAGS+=	-lintl
 .else
Index: audio/vagalume/Makefile
@@ -31,7 +31,7 @@
 .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=""
Index: audio/xfce4-mixer/Makefile
@@ -17,9 +17,8 @@
 
 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
Index: audio/zinf/Makefile
@@ -13,11 +13,10 @@
 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
Index: cad/geda/Makefile
@@ -20,11 +20,10 @@
 
 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}
Index: cad/kicad-devel/Makefile
@@ -22,7 +22,6 @@
 LIBVERSION=	1.0
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 #USE_GMAKE=	yes
 USE_GL=		yes
 USE_WX=		2.8
@@ -38,7 +37,7 @@
 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" \
Index: cad/kicad/Makefile
@@ -41,7 +41,7 @@
 .if defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS="@comment "
 .else
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .endif
 
Index: cad/libgeda/Makefile
@@ -26,7 +26,7 @@
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: cad/pdnmesh/Makefile
@@ -26,10 +26,9 @@
 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 \
Index: cad/repsnapper/Makefile
@@ -47,7 +47,7 @@
 		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
Index: chinese/fcitx-configtool/Makefile
@@ -17,8 +17,7 @@
 
 USE_XZ=		yes
 USE_GNOME=	intltool gnomehack
-USE_GETTEXT=	yes
-USES=		cmake
+USES=		cmake gettext
 
 OPTIONS_DEFINE=	GTK2 GTK3
 OPTIONS_DEFAULT=GTK2
Index: chinese/fcitx/Makefile
@@ -31,10 +31,9 @@
 
 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
Index: chinese/opencc/Makefile
@@ -21,7 +21,7 @@
 USE_LDCONFIG=	yes
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 CMAKE_ARGS+=	-DENABLE_GETTEXT=On
 PLIST_SUB+=	NLS=""
 .else
Index: comms/efax-gtk/Makefile
@@ -49,7 +49,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: comms/gammu/Makefile
@@ -18,9 +18,8 @@
 
 CMAKE_ARGS+=	-DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata
 
-USES=		cmake
+USES=		cmake gettext
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
 USE_GNOME=	glib20
 
 PORTDOCS=	*
Index: comms/libticables2/Makefile
@@ -26,7 +26,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: comms/libticalcs2/Makefile
@@ -29,7 +29,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: comms/tilp2/Makefile
@@ -32,7 +32,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: databases/dbf/Makefile
@@ -27,7 +27,7 @@
 .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=""
Index: databases/evolution-data-server/Makefile
@@ -22,8 +22,7 @@
 
 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
Index: databases/gtksql/Makefile
@@ -36,7 +36,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: databases/hk_classes/Makefile
@@ -13,11 +13,10 @@
 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
Index: databases/libgda4/Makefile
@@ -24,9 +24,8 @@
 		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
Index: deskutils/cairo-dock-plugins/Makefile
@@ -20,14 +20,13 @@
 
 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//}"
Index: deskutils/chmsee/Makefile
@@ -21,8 +21,7 @@
 
 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
 
Index: deskutils/deskbar-applet/Makefile
@@ -16,8 +16,7 @@
 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
Index: deskutils/nautilus-sendto/Makefile
@@ -16,9 +16,8 @@
 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}"
Index: deskutils/orage/Makefile
@@ -15,9 +15,8 @@
 
 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
Index: deskutils/pal/Makefile
@@ -11,9 +11,8 @@
 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
Index: deskutils/planner/Makefile
@@ -14,11 +14,10 @@
 
 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
Index: deskutils/tpb/Makefile
@@ -25,7 +25,7 @@
 MAN1=		tpb.1
 
 .ifndef(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: deskutils/xfce4-tumbler/Makefile
@@ -40,7 +40,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: devel/avr-gcc/Makefile
@@ -35,8 +35,7 @@
 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>
Index: devel/binutils/Makefile
@@ -75,7 +75,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: devel/bison/Makefile
@@ -29,7 +29,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: devel/devhelp/Makefile
@@ -20,9 +20,8 @@
 
 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
Index: devel/ecore-main/Makefile
@@ -28,7 +28,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: devel/gamin/Makefile
@@ -11,10 +11,9 @@
 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 \
Index: devel/gconf2/Makefile
@@ -25,8 +25,7 @@
 		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
Index: devel/geany/Makefile
@@ -31,7 +31,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: devel/glade2/Makefile
@@ -16,10 +16,9 @@
 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
Index: devel/glib20/Makefile
@@ -24,11 +24,10 @@
 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
Index: devel/gnome-vfs/Makefile
@@ -19,8 +19,7 @@
 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
Index: devel/gwenhywfar/Makefile
@@ -20,9 +20,8 @@
 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
 
Index: devel/kcachegrind/Makefile
@@ -14,11 +14,10 @@
 
 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
Index: devel/kdbg/Makefile
@@ -22,7 +22,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
Index: devel/kdevelop-kde4/Makefile
@@ -43,7 +43,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DBUILD_po:BOOL=FALSE
Index: devel/kdevelop-php-docs/Makefile
@@ -21,7 +21,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
Index: devel/kdevelop-php/Makefile
@@ -32,7 +32,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
Index: devel/kdevplatform/Makefile
@@ -29,7 +29,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
Index: devel/libevt/Makefile
@@ -13,8 +13,7 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
Index: devel/libevtx/Makefile
@@ -13,8 +13,7 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
Index: devel/liblnk/Makefile
@@ -14,8 +14,7 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
Index: devel/libmsiecf/Makefile
@@ -13,8 +13,7 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
Index: devel/libpeas/Makefile
@@ -17,10 +17,9 @@
 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
Index: devel/libpff/Makefile
@@ -13,8 +13,7 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
Index: devel/libregf/Makefile
@@ -13,8 +13,7 @@
 
 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
Index: devel/libtifiles2/Makefile
@@ -28,7 +28,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: devel/libvirt/Makefile
@@ -60,7 +60,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 CONFIGURE_ARGS+=	--enable-nls \
 			--with-libintl-prefix=${LOCALBASE}
Index: devel/obby/Makefile
@@ -22,7 +22,7 @@
 .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
Index: devel/piklab/Makefile
@@ -20,8 +20,7 @@
 		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
Index: devel/popt/Makefile
@@ -31,7 +31,7 @@
 .else
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
-USE_GETTEXT=	yes
+USES+=		gettext
 .endif
 
 .include <bsd.port.mk>
Index: devel/py-dbus/Makefile
@@ -18,8 +18,7 @@
 
 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
Index: devel/seed3/Makefile
@@ -25,8 +25,7 @@
 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
Index: dns/dnsmasq-devel/Makefile
@@ -45,7 +45,7 @@
 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 "
Index: editors/abiword/Makefile
@@ -27,8 +27,7 @@
 
 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
Index: editors/gedit-plugins/Makefile
@@ -22,9 +22,8 @@
 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
Index: editors/yzis/Makefile
@@ -16,14 +16,13 @@
 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}" \
Index: emulators/tme/Makefile
@@ -22,12 +22,11 @@
 		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
Index: finance/aqbanking/Makefile
@@ -22,9 +22,8 @@
 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"
Index: finance/kmymoney-kde4/Makefile
@@ -36,7 +36,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DENABLE_NLS:BOOL=OFF
Index: french/verbiste/Makefile
@@ -45,7 +45,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGNOME}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	HASGUI=""
 .else
 PLIST_SUB+=	HASGUI="@comment "
Index: ftp/gftp/Makefile
@@ -46,7 +46,7 @@
 MAN1=		gftp.1
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: ftp/gwget/Makefile
@@ -20,8 +20,7 @@
 
 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
Index: ftp/wget/Makefile
@@ -45,7 +45,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: games/gnome-games/Makefile
@@ -22,11 +22,10 @@
 
 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
Index: games/hinversi/Makefile
@@ -27,7 +27,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--with-libintl-prefix=${LOCALBASE}
 PLIST_SUB+=	NLS=""
 .else
Index: games/knights-kde4/Makefile
@@ -26,7 +26,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
Index: games/lianliankan/Makefile
@@ -30,7 +30,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
Index: games/minetest/Makefile
@@ -38,7 +38,7 @@
 
 .if ${PORT_OPTIONS:MNLS}
 CMAKE_ARGS+=	-DENABLE_GETTEXT:BOOL=YES
-USE_GETTEXT=	yes
+USES+=		gettext
 LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB+=	NLS=""
 .else
Index: games/springlobby/Makefile
@@ -34,7 +34,7 @@
 .include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DOPTION_TRANSLATION_SUPPORT:BOOL=OFF
Index: games/supertuxkart/Makefile
@@ -23,10 +23,9 @@
 USE_BZIP2=	yes
 USE_GL=		gl glu glut
 USE_OPENAL=	al alut
-USES=		cmake
+USES=		cmake gettext
 USE_GMAKE=	yes
 USE_SDL=	sdl
-USE_GETTEXT=	yes
 USE_DOS2UNIX=	lib/irrlicht/source/Irrlicht/Makefile
 MAKE_JOBS_SAFE=	yes
 
Index: games/ultimatestunts/Makefile
@@ -17,11 +17,10 @@
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_OPENAL=	al alut
 USE_GL=		gl glu
 USE_SDL=	sdl image
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openal
 MAKE_JOBS_UNSAFE=	yes
Index: games/valyriatear/Makefile
@@ -21,13 +21,12 @@
 		png15:${PORTSDIR}/graphics/png \
 		jpeg:${PORTSDIR}/graphics/jpeg
 
-USES=		cmake
+USES=		cmake gettext
 USE_SDL=	sdl image ttf
 USE_GL=		gl
 USE_OPENAL=	yes
 USE_LUA=	5.1
 MAKE_JOBS_SAFE=	yes
-USE_GETTEXT=	yes
 
 PORTDOCS=	*
 
Index: games/violetland/Makefile
@@ -18,8 +18,7 @@
 USE_SDL=	sdl mixer image ttf
 USE_GL=		gl glu
 MAKE_JOBS_SAFE=	yes
-USES=		cmake
-USE_GETTEXT=	yes
+USES=		cmake gettext
 USE_DOS2UNIX=	yes
 CMAKE_ARGS=	-DDATA_INSTALL_DIR="${DATADIR}"
 
Index: games/warzone2100/Makefile
@@ -51,7 +51,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: games/wesnoth/Makefile
@@ -90,7 +90,7 @@
 
 .if ${PORT_OPTIONS:MNLS}
 CMAKE_ARGS+=	-DENABLE_NLS=on -DLOCALEDIR=${PREFIX}/share/locale
-USE_GETTEXT=	yes
+USES+=		gettext
 MANLANG=	"" cs de en_GB es et fi fr gl hu id it lt pl ru sk \
 		sr sr@ijekavian sr@ijekavianlatin sr@latin vi zh_CN zh_TW
 .if ${PORT_OPTIONS:MSERVER}
Index: graphics/blender/Makefile
@@ -166,7 +166,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 USE_ICONV=	yes
 CMAKE_ARGS+=	-DWITH_INTERNATIONAL:BOOL=ON
 .else
Index: graphics/cbrpager/Makefile
@@ -37,7 +37,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 PLIST_FILES+=	share/locale/es/LC_MESSAGES/${PORTNAME}.mo \
 		share/locale/fr/LC_MESSAGES/${PORTNAME}.mo
Index: graphics/colord/Makefile
@@ -19,9 +19,8 @@
 
 USE_XZ=		yes
 USE_GNOME=	gnomehier glib20 intlhack
-USES=		pathfix
+USES=		pathfix gettext
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_SQLITE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
Index: graphics/dia/Makefile
@@ -16,12 +16,11 @@
 LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt \
 		png15:${PORTSDIR}/graphics/png
 
-USES=		pathfix desktop-file-utils
+USES=		pathfix desktop-file-utils gettext
 USE_XZ=		yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 gnomeprefix libxslt libartlgpl2 intlhack
 INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl" \
 		LOCALBASE="${LOCALBASE}"
Index: graphics/electrix/Makefile
@@ -36,7 +36,7 @@
 
 .if ${PORT_OPTIONS:MNLS}
 PLIST_SUB=	NLS=""
-USE_GETTEXT=	yes
+USES+=		gettext
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB=	NLS="@comment "
Index: graphics/evince/Makefile
@@ -25,10 +25,9 @@
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	intlhack gnomeprefix desktopfileutils \
 		gnomedocutils ltasneededhack gconf2
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: graphics/exif/Makefile
@@ -24,7 +24,7 @@
 PLIST_SUB+=	NLS="@comment "
 .else
 USE_ICONV=	yes
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .endif
 
Index: graphics/gegl/Makefile
@@ -22,10 +22,9 @@
 #UMFPACK_DESC=	UMFpack support
 
 USE_GNOME=	glib20 intltool
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig gettext
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_LDCONFIG=	${PREFIX}/lib/gegl-0.2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	ac_cv_header_execinfo_h=no
Index: graphics/gimp-app/Makefile
@@ -33,13 +33,12 @@
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_XORG=	xpm xmu xext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME+=	intltool intlhack gtk20 libartlgpl2 ltverhack gnomehier \
 		desktopfileutils
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig gettext
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
Index: graphics/gphoto2/Makefile
@@ -38,7 +38,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: graphics/gthumb/Makefile
@@ -15,8 +15,7 @@
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 
 USE_XZ=	yes
-USE_GETTEXT=	yes
-USES=		bison pathfix pkgconfig
+USES=		bison pathfix pkgconfig gettext
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomedocutils gconf2
 WANT_GSTREAMER=	yes
Index: graphics/hugin-devel/Makefile
@@ -36,14 +36,13 @@
 OPTIONS=	PANOMATIC "Install graphics/panomatic" on \
 		AUTOPANOSIFTC "Install graphics/autopano-sift-c" on
 
-USES=		cmake
+USES=		cmake gettext
 
 CMAKE_ARGS=	-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}
 
 USE_WX=		2.8+
 WX_UNICODE=	yes
 
-USE_GETTEXT=	yes
 
 USE_GL=		glew glut
 
Index: graphics/hugin/Makefile
@@ -31,14 +31,13 @@
 OPTIONS=	PANOMATIC "Install graphics/panomatic" on \
 		AUTOPANOSIFTC "Install graphics/autopano-sift-c" on
 
-USES=		cmake
+USES=		cmake gettext
 
 CMAKE_ARGS=	-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}
 
 USE_WX=		2.8+
 WX_UNICODE=	yes
 
-USE_GETTEXT=	yes
 
 USE_GL=		glew glut
 
Index: graphics/k3d/Makefile
@@ -39,8 +39,7 @@
 USE_DOS2UNIX=	*.hpp
 USE_GCC=	4.6+
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
-USES=		cmake:outsource
+USES=		cmake:outsource gettext
 CMAKE_ARGS=	-DK3D_INTL_INCLUDE_DIRS:STRING="-I${LOCALBASE}/include" \
 		-DK3D_INTL_LIBS:STRING="-L${LOCALBASE}/lib -lintl" \
 		-DK3D_BUILD_CARVE_MODULE:BOOL=OFF \
Index: graphics/kphotoalbum-kde4/Makefile
@@ -37,7 +37,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
Index: graphics/libexif-gtk/Makefile
@@ -26,7 +26,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: graphics/libexif/Makefile
@@ -26,7 +26,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ENV+=	am_cv_func_iconv=no
Index: irc/kvirc/Makefile
@@ -26,12 +26,11 @@
 .endif
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_OPENSSL=	yes
 USE_PERL5_BUILD=	yes
 USE_QT4=	moc_build qmake_build rcc_build uic_build \
 		dbus gui network sql xml
-USES=		cmake
+USES=		cmake gettext
 CMAKE_ARGS=	-DWANT_ESD=no -DWANT_DOXYGEN=no \
 		-DMANDIR=${MANPREFIX}
 INSTALLS_ICONS=	yes
Index: irc/weechat-devel/Makefile
@@ -59,7 +59,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DENABLE_NLS=no
Index: irc/weechat/Makefile
@@ -48,7 +48,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DENABLE_NLS=no
Index: irc/xchat-gnome/Makefile
@@ -17,10 +17,9 @@
 		canberra-gtk:${PORTSDIR}/audio/libcanberra \
 		notify:${PORTSDIR}/devel/libnotify
 
-USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=		pathfix desktop-file-utils
+USES=		pathfix desktop-file-utils gettext
 USE_GNOME=	gnomeprefix libgnomeui gnomedocutils
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
Index: japanese/libskk/Makefile
@@ -29,7 +29,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: java/sablevm/Makefile
@@ -18,11 +18,10 @@
 
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libltdl
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
-USES=		pkgconfig
+USES=		pkgconfig gettext
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: korean/scim-hangul/Makefile
@@ -23,7 +23,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: lang/hiphop-php/Makefile
@@ -64,12 +64,11 @@
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
-USES=		cmake
+USES=		cmake gettext
 USE_MYSQL=	yes
 USE_GNOME=	libxml2
 USE_OPENSSL=	yes
 USE_OPENLDAP=	yes
-USE_GETTEXT=	yes
 USE_GCC=	4.4+
 
 GITVERSION=	96532ec
Index: lang/lafontaine/Makefile
@@ -20,7 +20,7 @@
 USE_CSTD=	gnu89
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS=	--disable-nls
Index: lang/librep/Makefile
@@ -23,8 +23,7 @@
 USE_CSTD=	gnu89
 
 USE_XZ=		yes
-USES=	pathfix
-USE_GETTEXT=	yes
+USES=	pathfix gettext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-aclocaldir=${PREFIX}/share/aclocal \
Index: lang/mono/Makefile
@@ -14,13 +14,12 @@
     		bash:${PORTSDIR}/shells/bash
 
 USE_BZIP2=	yes
-USES=		bison pathfix
+USES=		bison pathfix gettext
 USE_GNOME=	glib20
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
 MAKE_JOBS_UNSAFE=yes
 
 # Moonlight is installed as part of www/moonlight
Index: lang/pike76/Makefile
@@ -83,8 +83,7 @@
 
 MAKE_ARGS=	CONFIGUREARGS="${CONFIGURE_ARGS}"
 
-USE_GETTEXT=	yes
-USES=		bison
+USES=		bison gettext
 USE_GMAKE=	yes
 
 # Allow building Embedded Perl
Index: lang/pike78/Makefile
@@ -74,8 +74,7 @@
 MAKE_ARGS=	"CONFIGUREARGS=${CONFIGURE_ARGS}"
 MAKE_ENV=	"ac_cv_lib_nettle_nettle_md5_init=no"
 
-USE_GETTEXT=	yes
-USES=		bison
+USES=		bison gettext
 USE_GMAKE=	yes
 
 # Allow building Embedded Perl
Index: mail/balsa/Makefile
@@ -25,10 +25,9 @@
 INSTALLS_ICONS=	yes
 USE_PERL5=	yes
 USE_OPENSSL=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack libgnomeui gtkhtml3 \
 		libgnomeprintui
-USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 USE_ICONV=	yes
Index: mail/claws-mail/Makefile
@@ -120,7 +120,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=		yes
+USES+=		gettext
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: mail/evolution/Makefile
@@ -21,8 +21,7 @@
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=		bison pathfix
-USE_GETTEXT=	yes
+USES=		bison pathfix gettext
 USE_GNOME=	gnomeprefix intlhack evolutiondataserver gtkhtml3 \
 		desktopfileutils gnomedocutils ltasneededhack gnomedesktop
 USE_AUTOTOOLS=	libtool
Index: mail/rspamd/Makefile
@@ -25,14 +25,13 @@
 CMAKE_ARGS+=	-DETC_PREFIX=${PREFIX}/etc -DPREFIX=${PREFIX} \
 		-DBUILD_PORT=yes
 
-USES=		cmake
+USES=		cmake gettext
 USE_LDCONFIG=	yes
 
 USE_GNOME=	glib20
 USE_LUA=	5.1-
 USE_SQLITE=	yes
 USE_ICONV=	yes
-USE_GETTEXT=	yes
 USE_OPENSSL=	yes
 
 MAN8=	rspamd.8
Index: math/gnumeric/Makefile
@@ -22,9 +22,8 @@
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack gnomehier pygtk2 \
 		desktopfileutils libgsf
 USE_PYTHON=	yes
Index: math/gretl/Makefile
@@ -67,7 +67,7 @@
 
 .if ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=	--enable-nls=yes
-USE_GETTEXT=		yes
+USES+=		gettext
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--enable-nls=no
Index: math/libqalculate/Makefile
@@ -21,7 +21,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=		yes
+USES+=		gettext
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: math/oleo/Makefile
@@ -37,7 +37,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: math/rkward-kde4/Makefile
@@ -23,8 +23,7 @@
 USE_KDE4=	kdehier kdeprefix automoc4 kdelibs
 USE_PHP=	yes
 WANT_PHP_CLI=	yes
-USE_GETTEXT=	yes
-USES=		cmake
+USES=		cmake gettext
 INSTALLS_ICONS=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
Index: misc/krecipes-kde4/Makefile
@@ -22,8 +22,7 @@
 OPTIONS_MULTI_DB=	SQLITE MYSQL PGSQL
 OPTIONS_DEFAULT=	SQLITE
 
-USES=		cmake
-USE_GETTEXT=	yes
+USES=		cmake gettext
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 USE_KDE4=	automoc4 kdeprefix kdelibs qimageblitz sharedmime
 MAKE_JOBS_SAFE=	yes
Index: misc/lifelines/Makefile
@@ -18,7 +18,7 @@
 MAN1=		btedit.1 dbverify.1 llines.1
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: misc/linm/Makefile
@@ -26,7 +26,7 @@
 #PLIST_SUB+=	NLS="@comment "
 #.else
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -lintl -liconv"
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 #.endif
 
Index: misc/mc-light/Makefile
@@ -40,7 +40,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: misc/terraform/Makefile
@@ -19,9 +19,8 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=        pathfix
+USES=        pathfix gettext
 USE_GNOME=	gnomehier libgnomeprintui libgnomeui
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:env
 GNU_CONFIGURE=	yes
Index: misc/xfce4-weather-plugin/Makefile
@@ -16,9 +16,8 @@
 
 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 libxml2
 USE_XFCE=	configenv libmenu libutil panel
Index: multimedia/aegisub/Makefile
@@ -28,7 +28,7 @@
 ASS_DESC=	libASS subtitle provider
 HUNSPELL_DESC=	Spell checking via Hunspell
 
-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_GNOME=	intltool
 USE_WX=		2.8
 WX_COMPS=	wx contrib
@@ -36,7 +36,6 @@
 WX_CONF_ARGS=	absolute
 USE_GL=		glu
 USE_ICONV=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gcc-prec --without-lua50
Index: multimedia/beep-media-player/Makefile
@@ -33,7 +33,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: multimedia/bino/Makefile
@@ -32,7 +32,7 @@
 INFO=	bino
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: multimedia/freetuxtv/Makefile
@@ -39,7 +39,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: multimedia/gmerlin-avdecoder/Makefile
@@ -25,8 +25,7 @@
 GMERLIN_DESC=	gmerlin support
 SAMBA_DESC=	Samba support using libsmbclient
 
-USES=	pathfix pkgconfig
-USE_GETTEXT=	yes
+USES=	pathfix pkgconfig gettext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cpuflags=none --without-doxygen
 USE_LDCONFIG=	yes
Index: multimedia/gmerlin/Makefile
@@ -22,11 +22,10 @@
 		OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME \
 		TIFF
 
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-v4l --disable-v4l2 --disable-v4lconvert \
 		--without-doxygen --with-cpuflags=none --disable-musicbrainz
-USES=        pathfix
+USES=        pathfix gettext
 USE_GNOME=	gtk20 libxml2
 USE_XORG=	x11 xext xfixes xinerama xv
 USE_GL=		gl
Index: multimedia/gmtk/Makefile
@@ -56,7 +56,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: multimedia/gstreamer-plugins/Makefile
@@ -41,13 +41,12 @@
 DIST?=		good
 
 SHLIB_VERSION=	1
-USE_GETTEXT=	yes
 VERSION=	${GST_VERSION}
 WANT_GSTREAMER=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME+=	gnomehack ltverhack ltasneededhack
-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_AUTOTOOLS=	libtool
 GST_PLUGIN?=	base
 
Index: multimedia/gstreamer/Makefile
@@ -17,11 +17,10 @@
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 CFLAGS:=	${CFLAGS} -O2 -Wno-format
-USES=		bison pathfix pkgconfig
+USES=		bison pathfix pkgconfig gettext
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 libxml2 ltverhack ltasneededhack
-USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-tests \
 		--disable-examples \
Index: multimedia/kdenlive/Makefile
@@ -54,7 +54,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DBUILD_po:BOOL=FALSE
Index: multimedia/kino/Makefile
@@ -22,9 +22,8 @@
 
 USE_XORG=	x11 xv ice
 USE_AUTOTOOLS=	autoconf
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USES=        pathfix
+USES=        pathfix gettext
 USE_GNOME=	gnomeprefix libglade2 libxml2
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
Index: multimedia/libxine/Makefile
@@ -97,7 +97,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
Index: multimedia/lives/Makefile
@@ -89,7 +89,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: multimedia/mkvtoolnix/Makefile
@@ -24,10 +24,9 @@
 		ebml:${PORTSDIR}/textproc/libebml \
 		matroska:${PORTSDIR}/multimedia/libmatroska
 
-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_BZIP2=	yes
 USE_GCC=	4.6+
-USE_GETTEXT=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_RAKE=	yes
Index: multimedia/ogmrip/Makefile
@@ -33,9 +33,8 @@
 THEORA_DESC=	Enable Ogg Theora video codec support
 SRT_DESC=	Enable SRT text subtitles support
 
-USES=        pathfix
+USES=        pathfix gettext
 USE_GNOME=	glib20 intlhack libxml2
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
Index: multimedia/quark/Makefile
@@ -15,9 +15,8 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=        pathfix
+USES=        pathfix gettext
 USE_GNOME=	gnomeprefix gnomevfs2
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: multimedia/sabbu/Makefile
@@ -26,7 +26,7 @@
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	WITH_NLS="@comment "
 .else
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	WITH_NLS=""
 .endif
 
Index: multimedia/totem-pl-parser/Makefile
@@ -19,9 +19,8 @@
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix glib20 libxml2 intlhack ltverhack
-USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: multimedia/totem/Makefile
@@ -26,8 +26,7 @@
 
 USE_PYTHON=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack desktopfileutils \
 		nautilus2 ltverhack pygtk2 gnomehier
 USE_GSTREAMER=	core gconf hal good mpeg2dec soup ugly python gio
Index: multimedia/vdr/Makefile
@@ -22,11 +22,10 @@
 STB0899_SIGNAL_DESC=	STB0899 signal strength patch
 OPTIONS_DEFAULT=	IPTVPATCH TTXPATCH
 
-USES=		pkgconfig
+USES=		pkgconfig gettext
 DIST_SUBDIR=	vdr
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_ICONV=	yes
 PORTDOCS=	COPYING INSTALL MANUAL README HISTORY
 MAKE_JOBS_SAFE=	yes
Index: multimedia/xfce4-media/Makefile
@@ -17,9 +17,8 @@
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig gettext
 USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_XFCE=	configenv libexo libgui libutil panel
 USE_XORG=	x11 sm
Index: multimedia/xfce4-parole/Makefile
@@ -50,7 +50,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: net-im/hotot/Makefile
@@ -16,8 +16,7 @@
 GH_TAGNAME=	master
 GH_COMMIT=	e0c78bf
 
-USES=		cmake
-USE_GETTEXT=	yes
+USES=		cmake gettext
 USE_PYTHON=	yes
 USE_GNOME=	intltool
 INSTALLS_ICONS=	yes
Index: net-im/licq/Makefile
@@ -35,7 +35,7 @@
 CMAKE_ARGS+=	-DENABLE_NLS:BOOL=OFF
 PLIST_SUB+=	NLS="@comment "
 .else
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .endif
 
Index: net-im/mcabber/Makefile
@@ -19,9 +19,8 @@
 CONFIGURE_ARGS=	--enable-sigwinch --libdir=${PREFIX}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_ICONV=	yes
-USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_NCURSES=	yes
 USE_GNOME=	glib20
Index: net-im/pidgin-guifications/Makefile
@@ -15,8 +15,7 @@
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USES=        pathfix
+USES=        pathfix gettext
 USE_GNOME=	gnomeprefix gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
Index: net-p2p/amule-devel/Makefile
@@ -69,7 +69,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: net-p2p/amule/Makefile
@@ -68,7 +68,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: net-p2p/eiskaltdcpp-daemon/Makefile
@@ -26,8 +26,7 @@
 
 USE_XZ=		yes
 USE_GCC=	4.6+
-USE_GETTEXT=	yes
-USES=		cmake
+USES=		cmake gettext
 USE_OPENSSL=	yes
 MAKE_JOBS_SAFE=	yes
 
Index: net-p2p/eiskaltdcpp-gtk/Makefile
@@ -28,8 +28,7 @@
 
 USE_XZ=		yes
 USE_GCC=	4.6+
-USES=		cmake
-USE_GETTEXT=	yes
+USES=		cmake gettext
 USE_OPENSSL=	yes
 MAKE_JOBS_SAFE=	yes
 
Index: net-p2p/eiskaltdcpp-lib/Makefile
@@ -20,8 +20,7 @@
 
 USE_XZ=		yes
 USE_GCC=	4.6+
-USES=		cmake
-USE_GETTEXT=	yes
+USES=		cmake gettext
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
Index: net-p2p/eiskaltdcpp-qt/Makefile
@@ -29,8 +29,7 @@
 
 USE_XZ=		yes
 USE_GCC=	4.6+
-USE_GETTEXT=	yes
-USES=		cmake
+USES=		cmake gettext
 USE_OPENSSL=	yes
 MAKE_JOBS_SAFE=	yes
 
Index: net-p2p/gtk-gnutella/Makefile
@@ -100,7 +100,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=		yes
+USES+=		gettext
 CONFIGURE_ARGS+=	-D d_nls
 PLIST_SUB+=		NLS=""
 .else
Index: net/net6/Makefile
@@ -24,7 +24,7 @@
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: net/samba4/Makefile
@@ -73,8 +73,7 @@
 USE_GCC=		4.2+
 USE_PYTHON=		yes
 USE_ICONV=		yes
-USE_GETTEXT=		yes
-USES=			pkgconfig
+USES=			pkgconfig gettext
 USE_LDCONFIG=		${SAMBA4_LIBDIR}
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
Index: net/smb4k-kde4/Makefile
@@ -21,8 +21,7 @@
 
 SAMBA_PORT?=	net/samba36
 
-USES=		cmake
-USE_GETTEXT=	yes
+USES=		cmake gettext
 USE_BZIP2=	yes
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/kde4
 USE_KDE4=	kdehier kdeprefix kdelibs automoc4 runtime
Index: net/tigervnc/Makefile
@@ -62,7 +62,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CMAKE_ARGS+=	-DENABLE_NLS=1
 PLIST_SUB+=	NLS=""
 .else
Index: net/vinagre/Makefile
@@ -21,8 +21,7 @@
 CONFLICTS=	vinagre-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack vte gconf2 gnomedocutils gnomepanel
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
Index: news/pan/Makefile
@@ -19,9 +19,8 @@
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	intlhack
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lgnuregex
Index: palm/jpilot/Makefile
@@ -27,7 +27,7 @@
 LICENSE=	GPLv2
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB=		NLS=""
 .else
Index: palm/synce-trayicon/Makefile
@@ -23,8 +23,7 @@
 BROKEN=		fails to build
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USES=        pathfix
+USES=        pathfix gettext
 USE_GNOME=	gnomeprefix libgnomeui desktopfileutils
 INSTALLS_ICONS=	yes
 GCONF_SCHEMAS=	${PORTNAME}.schemas
Index: polish/kadu/Makefile
@@ -44,9 +44,8 @@
 GG7_EMOTS_DISTFILE=	dodatkowe_emoty_GG7.tar.gz
 
 USE_BZIP2=	yes
-USES=		cmake pkgconfig
+USES=		cmake pkgconfig gettext
 USE_ICONV=	yes
-USE_GETTEXT=	yes
 USE_XORG=	ice sm x11 xau xdmcp xext xfixes xrender xscrnsaver
 CMAKE_ARGS=	-DKADU_VERSION:STRING="${DISTVERSION}" -DWITH_ENCHANT=ON
 # Setting KADU_VERSION disables git invocation
Index: print/libgnomeprint/Makefile
@@ -21,11 +21,10 @@
 LIB_DEPENDS=	fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		popt:${PORTSDIR}/devel/popt
 
-USES=		bison pathfix
+USES=		bison pathfix gettext
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehier glib20 pango libxml2 \
 		libartlgpl2 ltverhack
-USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: print/lilypond/Makefile
@@ -41,8 +41,7 @@
 		music-glossary \
 		internals
 
-USES=		bison:build
-USE_GETTEXT=	yes
+USES=		bison:build gettext
 USE_GMAKE=	yes
 USE_GHOSTSCRIPT=9
 USE_PYTHON=	yes
Index: science/gramps/Makefile
@@ -19,9 +19,8 @@
 
 USE_BDB=	43
 USE_PYTHON=	2.6+
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	pygnome2 pygnomeextras desktopfileutils gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
Index: science/gwyddion/Makefile
@@ -20,10 +20,9 @@
 UNIQUE_DESC=	Remote controle backend support
 
 USE_XZ=		yes
-USES=        pathfix
+USES=        pathfix gettext
 USE_GNOME=	desktopfileutils gconf2 gtk20 libxml2
 USE_GL=		glu
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules --disable-gtk-doc \
Index: security/gnutls/Makefile
@@ -64,7 +64,7 @@
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .else
-USE_GETTEXT=		yes
+USES+=		gettext
 PLIST_SUB+=		NLS=""
 .endif
 
Index: security/gsasl/Makefile
@@ -27,7 +27,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: security/libprelude/Makefile
@@ -25,8 +25,7 @@
 		--with-html-dir=${PREFIX}/share/doc
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_GETTEXT=	yes
-USES=	pathfix pkgconfig
+USES=	pathfix pkgconfig gettext
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
Index: security/prelude-lml/Makefile
@@ -25,8 +25,7 @@
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	prelude-lml
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
-USES=		pkgconfig
-USE_GETTEXT=	yes
+USES=		pkgconfig gettext
 USE_ICONV=	yes
 
 OPTIONS_DEFINE=	FAM
Index: security/prelude-manager/Makefile
@@ -19,11 +19,10 @@
 		nettle:${PORTSDIR}/security/nettle \
 		p11-kit:${PORTSDIR}/security/p11-kit
 
-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
Index: security/revelation/Makefile
@@ -21,10 +21,9 @@
 APPLET_DESC=	Build with applet
 
 USE_BZIP2=	yes
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig gettext
 USE_GNOME=	desktopfileutils gnomeprefix pygnome2
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
Index: security/rifiuti2/Makefile
@@ -14,8 +14,7 @@
 LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
-USE_GETTEXT=	yes
+USES=		pkgconfig gettext
 USE_ICONV=	yes
 USE_GNOME=	glib20
 
Index: security/seahorse-plugins/Makefile
@@ -16,9 +16,8 @@
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	intlhack gnomeprefix gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
Index: security/seahorse/Makefile
@@ -25,9 +25,8 @@
 USE_XORG=	sm
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	intlhack gnomeprefix gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
Index: sysutils/brasero/Makefile
@@ -22,12 +22,11 @@
 
 CONFLICTS=	brasero-3.[0-9]*
 
-USE_GETTEXT=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_XORG=	sm
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	intlhack gnomeprefix gnomedocutils
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	gconf core
Index: sysutils/dfc/Makefile
@@ -26,7 +26,7 @@
 
 .if ${PORT_OPTIONS:MNLS}
 CMAKE_ARGS+=	-DNLS_ENABLED=true
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DNLS_ENABLED=false
Index: sysutils/eiciel/Makefile
@@ -31,7 +31,7 @@
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .endif
 
Index: sysutils/hal/Makefile
@@ -17,9 +17,8 @@
 		ck-connector:${PORTSDIR}/sysutils/consolekit
 RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
 
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	intlhack ltverhack
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
Index: sysutils/fusefs-encfs/Makefile
@@ -31,7 +31,7 @@
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .endif
 
Index: sysutils/garcon/Makefile
@@ -25,7 +25,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: sysutils/gnome-settings-daemon/Makefile
@@ -23,9 +23,8 @@
 USE_XORG=	xxf86misc
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack gnomedesktop libgnomekbd
-USE_GETTEXT=	yes
 USE_GSTREAMER=	good
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
Index: sysutils/graveman/Makefile
@@ -15,10 +15,9 @@
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_CDRTOOLS=	yes
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig gettext
 USE_GNOME=	libglade2 intlhack gnomeprefix
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: sysutils/grub2/Makefile
@@ -15,8 +15,7 @@
 
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USES=			bison
-USE_GETTEXT=		yes
+USES=			bison gettext
 ONLY_FOR_ARCHS=		i386 amd64
 
 INFO=		grub
Index: sysutils/gsmartcontrol/Makefile
@@ -28,9 +28,8 @@
 		smartctl:${PORTSDIR}/sysutils/smartmontools
 
 USE_AUTOTOOLS=	libtool
-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_GNOME=	gtk20
 USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
Index: sysutils/libzeitgeist/Makefile
@@ -10,11 +10,10 @@
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Zeitgeist client library
 
-USES=	pathfix pkgconfig
+USES=	pathfix pkgconfig gettext
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 intltool intlhack
-USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS
Index: sysutils/polkit-kde/Makefile
@@ -24,7 +24,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CMAKE_ARGS+=	-DBUILD_po:BOOL=FALSE
Index: sysutils/polkit/Makefile
@@ -19,9 +19,8 @@
 
 USE_GNOME=	gnomehack glib20 intlhack gnomehier
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-authfw=pam \
Index: sysutils/xfburn/Makefile
@@ -35,7 +35,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 .else
 CONFIGURE_ARGS+=	--disable-nls
 .endif
Index: sysutils/xfce4-fsguard-plugin/Makefile
@@ -25,7 +25,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: sysutils/xfce4-netload-plugin/Makefile
@@ -24,7 +24,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=  yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+= NLS=""
 .else
Index: textproc/ctpp2/Makefile
@@ -9,9 +9,8 @@
 MAINTAINER=	reki@reki.ru
 COMMENT=	C++ library to use templates in C/C++ projects, version 2
 
-USES=		cmake
+USES=		cmake gettext
 USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
 USE_ICONV=	yes
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
Index: textproc/diffutils/Makefile
@@ -22,7 +22,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: textproc/flex/Makefile
@@ -24,7 +24,7 @@
 
 .if ${PORT_OPTIONS:MNLS}
 USE_ICONV=	yes
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: textproc/gxmlviewer/Makefile
@@ -10,9 +10,8 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An xmlviewer with a netscape plugin, and now a bonobo control as well
 
-USES=        pathfix
+USES=        pathfix gettext
 USE_GNOME=	bonobo gnomelibs gnomeprefix libxml2
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libiconv-prefix="${LOCALBASE}"
 
Index: textproc/libcroco/Makefile
@@ -10,12 +10,11 @@
 COMMENT=	CSS2 parsing library
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack glib20 libxml2 ltverhack
-USES=		pkgconfig
+USES=		pkgconfig gettext
 CONFIGURE_ARGS=	--disable-gtk-doc-html
 
 PLIST_SUB=	VERSION="0.6"
Index: textproc/scrollkeeper/Makefile
@@ -27,10 +27,9 @@
 CONFLICTS=	rarian-[0-9]*
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USES=		bison pathfix
+USES=		bison pathfix gettext
 USE_GNOME=	gnomehier libxslt intlhack
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --datadir=${PREFIX}/share \
Index: textproc/sdcv/Makefile
@@ -19,7 +19,7 @@
 SUB_FILES=	pkg-message
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: www/aria2/Makefile
@@ -58,7 +58,7 @@
 
 .if ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=--with-libintl-prefix=${LOCALBASE}
-USE_GETTEXT=	yes
+USES+=		gettext
 LANGS=		en@boldquot en@quot fil kk oc zh_HK
 LANGS_MTREE=	ar bg bn ca da de el es fa fi fr he hr hu id it ja ko ms nb nl \
 		nn pl pt pt_BR ro ru sk sr sv th tr uk vi zh_CN zh_TW
Index: www/cherokee/Makefile
@@ -11,10 +11,9 @@
 MAINTAINER=	c.petrik.sosa@gmail.com
 COMMENT=	Extremely fast and flexible web server
 
-USES=	pathfix pkgconfig
+USES=	pathfix pkgconfig gettext
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
 USE_RC_SUBR=	cherokee
 SUB_FILES=	pkg-install pkg-message
 USE_GMAKE=	yes
Index: www/elinks/Makefile
@@ -46,7 +46,7 @@
 
 .if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
-USE_GETTEXT=	yes
+USES+=		gettext
 .else
 PLIST_SUB+=	NLS="@comment "
 CONFIGURE_ARGS+=	--disable-nls
Index: www/epiphany/Makefile
@@ -27,10 +27,9 @@
 
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_PYTHON=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack gnomedesktop desktopfileutils
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
Index: www/midori/Makefile
@@ -60,7 +60,7 @@
 CONFIGURE_ENV+=	CC="${CC}"
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: www/webkit-gtk2/Makefile
@@ -22,11 +22,10 @@
 		soup-2.4:${PORTSDIR}/devel/libsoup
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
 USE_GSTREAMER=	yes
 MAKE_JOBS_SAFE=	yes
 USE_XORG=	xt
-USES=		bison pkgconfig
+USES=		bison pkgconfig gettext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20 libxslt ltverhack
Index: www/webkit-gtk3/Makefile
@@ -21,11 +21,10 @@
 		soup-2.4:${PORTSDIR}/devel/libsoup
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
 USE_GSTREAMER=	yes
 MAKE_JOBS_SAFE=	yes
 USE_XORG=	xt
-USES=		bison pkgconfig
+USES=		bison pkgconfig gettext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk30 libxslt ltverhack
Index: x11-fm/thunar/Makefile
@@ -57,7 +57,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: x11-themes/gtk-qt4-engine/Makefile
@@ -11,10 +11,9 @@
 COMMENT=	GTK+ 2.x theme engine allowing to use Qt/KDE styles
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_QT4=	corelib gui moc_build rcc_build uic_build qmake_build
-USES=		cmake
+USES=		cmake gettext
 USE_KDE4=	kdelibs kdeprefix automoc4
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_JOBS_SAFE=	yes
Index: x11-toolkits/elementary/Makefile
@@ -27,7 +27,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: x11-toolkits/gtkglext/Makefile
@@ -26,14 +26,13 @@
 OPTIONS_DEFINE=	DOCS
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 USE_GL=		glu
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig gettext
 USE_GNOME=	gdkpixbuf2 gtk20
 USE_LDCONFIG=	yes
 
Index: x11-toolkits/gtkunique/Makefile
@@ -13,10 +13,9 @@
 COMMENT=	Single instance application library
 
 USE_AUTOTOOLS=	libtool
-USE_GETTEXT=	yes
 USE_GNOME=	gtk20 ltverhack
 USE_LDCONFIG=	yes
-USES=		pkgconfig
+USES=		pkgconfig gettext
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: x11-toolkits/libwnck/Makefile
@@ -19,10 +19,9 @@
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 RUN_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
-USE_GETTEXT=	yes
 USE_XORG=	xres
 USE_GMAKE=	yes
-USES=		bison pathfix
+USES=		bison pathfix gettext
 USE_GNOME=	gtk20 ltverhack referencehack intlhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
Index: x11-toolkits/pango/Makefile
@@ -23,13 +23,12 @@
 		${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \
 		${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
 
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack glib20 ltverhack referencehack
-USES=		pkgconfig
+USES=		pkgconfig gettext
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
Index: x11-toolkits/py-gtk2/Makefile
@@ -21,10 +21,9 @@
 LATEST_LINK=	py-gtk2
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	libglade2 pygobject
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-lintl" \
 		PYTHON="${PYTHON_VERSION}"
Index: x11-toolkits/termit/Makefile
@@ -46,7 +46,7 @@
 
 .if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
-USE_GETTEXT=	yes
+USES+=		gettext
 .else
 CMAKE_ARGS+=	-DENABLE_NLS:BOOL=NO
 PLIST_SUB+=	NLS="@comment "
Index: x11-toolkits/vte/Makefile
@@ -17,10 +17,9 @@
 .if !defined(REFERENCE_PORT)
 
 USE_GMAKE=	yes
-USES=		bison pathfix
+USES=		bison pathfix gettext
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GETTEXT=	yes
 USE_GNOME?=	gnomeprefix gtk20 ltverhack referencehack
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: x11-wm/ede/Makefile
@@ -29,10 +29,9 @@
 HAL_DESC=	Enable HAL support
 
 USE_XORG=	xcomposite xft xinerama xpm xrandr
-USES=	pathfix
+USES=	pathfix gettext
 USE_PYTHON=	yes
 USE_FAM=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-edelib_path=${EDELIB_WRKSRC} \
 		--with-fltk-path=${LOCALBASE}
Index: x11-wm/enlightenment/Makefile
@@ -47,7 +47,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: x11-wm/xfce4-desktop/Makefile
@@ -45,7 +45,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: x11-wm/xfce4-panel/Makefile
@@ -34,7 +34,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: x11/avant-window-navigator/Makefile
@@ -18,10 +18,9 @@
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig gettext
 USE_GNOME=	glib20 gtk20 pygtk2
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_XORG=	x11 xproto xcomposite xrender
Index: x11/gdm/Makefile
@@ -31,14 +31,13 @@
 GROUPS=		gdm
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	dmx dmxproto
 INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	intlhack gnomehier gconf2 librsvg2 \
 		gnomedocutils gnomeprefix gnomepanel
 GCONF_SCHEMAS=	gdm-simple-greeter.schemas
Index: x11/gnome-applets/Makefile
@@ -22,13 +22,12 @@
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
 
-USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack gnomepanel gnomedocutils libgnomekbd
 WANT_GNOME=	yes
 USE_GSTREAMER=	yes
Index: x11/gnome-panel/Makefile
@@ -26,13 +26,12 @@
 
 CONFLICTS=	gnome-panel-3.[0-9]*
 
-USE_GETTEXT=	yes
 USE_XORG=	ice sm x11 xau xrandr
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack gnomedesktop libwnck gnomemenus \
 		gnomedocutils ltverhack referencehack librsvg2
 USE_GMAKE=	yes
Index: x11/gnome-pie/Makefile
@@ -43,7 +43,7 @@
 
 .if ${PORT_OPTIONS:MNLS}
 CMAKE_ARGS+=	-DINSTALL_NLS:BOOL=ON
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB=	NLS=""
 .else
 CMAKE_ARGS+=	-DINSTALL_NLS:BOOL=OFF
Index: x11/gnome-screensaver/Makefile
@@ -19,10 +19,9 @@
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	xtst xxf86vm
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix intlhack gnomemenus libgnomekbd gnomedesktop
 CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
 		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
Index: x11/kde4-baseapps/Makefile
@@ -15,12 +15,11 @@
 CONFLICTS=	kdebase-4.[0-6].* konq-plugins-4.[0-6].*
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
 USE_GNOME=	glib20
 USE_KDE4=	kdehier kdelibs kdeprefix libkonq \
 		automoc4 soprano strigi nepomuk-core \
 		nepomuk-widgets kactivities
-USES=		cmake:outsource
+USES=		cmake:outsource gettext
 USE_QT4=	corelib dbus gui script xml \
 		moc_build qmake_build rcc_build uic_build
 USE_XORG=	x11 xt
Index: x11/kde4-runtime/Makefile
@@ -25,10 +25,9 @@
 CONFLICTS=	kdebase-runtime-4.[0-6].* kdebase-workspace-4.5.[0-5] nepomukcontroller-0.2
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
 USE_KDE4=	kactivities kdehier kdelibs kdeprefix oxygen \
 		attica automoc4 pimlibs sharedmime strigi nepomuk-core
-USES=		cmake:outsource
+USES=		cmake:outsource gettext
 USE_QT4=	corelib dbus declarative designer_build gui phonon \
 		network qtestlib script svg webkit xml \
 		moc_build qmake_build rcc_build uic_build
Index: x11/kde4-workspace/Makefile
@@ -42,13 +42,12 @@
 
 CONFLICTS=	kdeaccessibility-4.[0-6].* kdebase-workspace-4.[0-6].*
 
-USE_GETTEXT=	yes
 USE_GL=		glu
 USE_GNOME=	glib20
 USE_ICONV=	yes
 USE_KDE4=	kactivities kdehier kdelibs kdeprefix oxygen pimlibs \
 		akonadi automoc4 ontologies qimageblitz soprano strigi
-USES=		cmake:outsource pkgconfig
+USES=		cmake:outsource pkgconfig gettext
 USE_QT4=	corelib dbus declarative designer_build gui network \
 		opengl phonon qtestlib script sql webkit xml \
 		moc_build qmake_build rcc_build uic_build
Index: x11/kdelibs4/Makefile
@@ -40,11 +40,10 @@
 
 USE_XZ=		yes
 USE_FAM=	yes
-USE_GETTEXT=	yes
 USE_GNOME=	libxml2 libxslt
 USE_KDE4=	kdehier kdeprefix oxygen \
 		attica automoc4 ontologies sharedmime soprano strigi
-USES=		cmake:outsource
+USES=		cmake:outsource gettext
 USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_QT4=	corelib dbus declarative designer_build gui \
Index: x11/libexo/Makefile
@@ -48,7 +48,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: x11/libfm/Makefile
@@ -31,7 +31,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: x11/libxfce4menu/Makefile
@@ -38,7 +38,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: x11/libxfce4util/Makefile
@@ -27,7 +27,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: x11/metisse/Makefile
@@ -24,8 +24,7 @@
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-fontdir=${LOCALBASE}/lib/X11/fonts
 MAKE_ARGS=	METISSE_DOC_DIR="${DOCSDIR}"
-USE_GETTEXT=	yes
-USES=		pathfix
+USES=		pathfix gettext
 WANT_GNOME=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
Index: x11/roxterm/Makefile
@@ -21,8 +21,7 @@
 USE_BZIP2=	yes
 USE_GNOME=	libglade2 vte
 USE_PYTHON_BUILD=	yes
-USE_GETTEXT=	yes
-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_AUTOTOOLS=	libtool:env
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
Index: x11/workrave/Makefile
@@ -53,7 +53,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
Index: x11/xfce4-clipman-plugin/Makefile
@@ -20,12 +20,11 @@
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20 intltool intlhack glib20 desktopfileutils
 USE_XFCE=	configenv libexo libmenu libutil panel xfconf
 USE_XORG=	xtst
-USES=		pkgconfig
+USES=		pkgconfig gettext
 
 INSTALLS_ICONS=	yes
 
Index: x11/xfce4-conf/Makefile
@@ -55,7 +55,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: x11/xfce4-screenshooter-plugin/Makefile
@@ -28,7 +28,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: x11/xfce4-terminal/Makefile
@@ -32,7 +32,7 @@
 .include  <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
Index: x11/xkeyboard-config/Makefile
@@ -31,7 +31,7 @@
 
 .if ${PORT_OPTIONS:MNLS}
 USE_ICONV=	yes
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
Index: x11/xscreensaver/Makefile
@@ -22,11 +22,10 @@
 
 CONFLICTS=	xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
 
-USES=		pkgconfig
+USES=		pkgconfig gettext
 USE_XORG=	xpm
 USE_GL=		yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \
 		--with-jpeg=${LOCALBASE} --with-xshm-ext --with-xdbe-ext \
Index: x11/zenity/Makefile
@@ -16,10 +16,9 @@
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_GMAKE=	yes
-USES=		pathfix
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix gtk20 gnomedocutils intlhack
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"