76 files changed, 78 insertions, 78 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index a55537f7f8d0..6059c2d00423 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	High-performance CORBA ORB with support for the C language
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	glib12
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index e2ab28e87eed..a0a5d13da238 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Transaction-based software configuration management system
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	tkdiff:${PORTSDIR}/textproc/tkdiff
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	libxml2
 USE_PERL5=	yes
 USE_TK=		yes
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 06979898bead..157b63396db6 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -32,7 +32,7 @@ CONFLICTS=	anjuta-3.[0-9]*
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_PERL5=	yes
diff --git a/devel/arm-elf-binutils/Makefile b/devel/arm-elf-binutils/Makefile
index 6b80552a126f..a4ddc1ef3687 100644
--- a/devel/arm-elf-binutils/Makefile
+++ b/devel/arm-elf-binutils/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GNU binutils for vanilla ARM cross-development
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} CFLAGS="-I/usr/local/include"
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile
index 6aeffe86b956..4e822800ce58 100644
--- a/devel/avr-binutils/Makefile
+++ b/devel/avr-binutils/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/binutils-${PORTVERSION}
 USE_BZIP2=	yes
 USE_GCC=	any
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 CONFIGURE_ARGS=	--target=avr
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/baz/Makefile b/devel/baz/Makefile
index a6d8ff897e83..43762b066541 100644
--- a/devel/baz/Makefile
+++ b/devel/baz/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	neon.27:${PORTSDIR}/www/neon29 \
 CONFLICTS=	gd-2.*
 
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index ceee7afe8265..c7dddd974cf4 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A cross platform RAD GUI Building IDE for wxPython
 WRKSRC=		${WRKDIR}/boa-constructor-${PORTVERSION}
 
 USE_ZIP=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_PYTHON=	yes
 USE_WX=		2.6
 WX_COMPS=	python
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index a988b96e3d40..39fa7da271b1 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix oaf gnomehier gnomeprint
-USE_GETTEXT=	yes
+USES=		gettext
 GNOME_HTML_DIR=	${PREFIX}/share/doc/bonobo
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 6862705d1926..46505e6537af 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/bzr-explorer/Makefile b/devel/bzr-explorer/Makefile
index 253ad732ce05..d0a1df9fd2bc 100644
--- a/devel/bzr-explorer/Makefile
+++ b/devel/bzr-explorer/Makefile
@@ -23,6 +23,6 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bzrlib/plugins/qbzr/__init__.py:${PORTSDIR}/de
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	explorer
-USE_GETTEXT=	yes
+USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 997e8ac64667..cdc7a005d66f 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -23,7 +23,7 @@ OPTIONS=	SFTP "Enable Paramiko for SFTP support" on \
 USE_PYTHON=	2.6+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	bzr
-USE_GETTEXT=	yes
+USES=		gettext
 
 MAN1=		bzr.1
 
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index c14e4f1422cc..9f1d097d9997 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -25,7 +25,7 @@ MAKE_JOBS_UNSAFE=	yes
 MAN1=	c_incl.1 cook.1 cook_bom.1 cook_lic.1 cook_rsh.1 cookfp.1 cooktime.1 \
 	find_libs.1 make2cook.1 roffpp.1
 MANCOMPRESSED=	no
-USE_GETTEXT=	yes
+USES=		gettext
 
 # Make sure that the whole directory tree exists.
 pre-install:
diff --git a/devel/cppi/Makefile b/devel/cppi/Makefile
index 113f3379c48e..e2f9aab8b65a 100644
--- a/devel/cppi/Makefile
+++ b/devel/cppi/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	johans@FreeBSD.org
 COMMENT=	A tool to indent the C preprocessor directives
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 
@@ -19,7 +19,7 @@ MAN1=		cppi.1
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/devel/cutter/Makefile b/devel/cutter/Makefile
index e4df0c661e40..9ef21f038cbc 100644
--- a/devel/cutter/Makefile
+++ b/devel/cutter/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-gtk-doc-html --with-html-dir=${PREFIX}/share/doc
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_GNOME=	intltool gnomehack glib20 gtk20
 USE_LDCONFIG=	yes
@@ -71,7 +71,7 @@ PLIST_SUB+=	SOUP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile
index b67da0d568b0..9c76db212a02 100644
--- a/devel/dbus-glib/Makefile
+++ b/devel/dbus-glib/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GLib bindings for the D-BUS messaging system
 LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
 
 USE_GNOME=	gnomehack glib20 ltverhack
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index 146adb4c4f9b..84c234b35ff3 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -44,7 +44,7 @@ PLIST_SUB+=	MENU="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 TRANSLATIONS=	de es it ja ko ru zh_CN
 MANLANG=	"" it ru
 PLIST_SUB+=	NLS=""
diff --git a/devel/ding-libs/Makefile b/devel/ding-libs/Makefile
index 7f873006fe1e..65d2a36710a9 100644
--- a/devel/ding-libs/Makefile
+++ b/devel/ding-libs/Makefile
@@ -18,7 +18,7 @@ LICENSE=	GPLv3
 GNU_CONFIGURE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile
index a98a7c99670f..8345ab80d8f6 100644
--- a/devel/eggdbus/Makefile
+++ b/devel/eggdbus/Makefile
@@ -14,7 +14,7 @@ COMMENT=	D-Bus bindings for GObject
 LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
 USE_GNOME=	glib20 gnomehack
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=yes
 GNU_CONFIGURE=	yes
diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile
index 76b578bd3d5a..7da25c5ce55c 100644
--- a/devel/fhist/Makefile
+++ b/devel/fhist/Makefile
@@ -34,7 +34,7 @@ PLIST_FILES=	bin/fcomp bin/fhist bin/fmerge
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 .for file in fcomp fhist fmerge
 PLIST_FILES+=	share/locale/en/LC_MESSAGES/${file}.mo
 .endfor
diff --git a/devel/fnccheck/Makefile b/devel/fnccheck/Makefile
index 8c1b06fc2a98..a7dd2e2d3672 100644
--- a/devel/fnccheck/Makefile
+++ b/devel/fnccheck/Makefile
@@ -32,7 +32,7 @@ INFO=		libfc
 
 # should be same as binutils
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 LDFLAGS+=	-lintl
 .endif
 
diff --git a/devel/gazpacho/Makefile b/devel/gazpacho/Makefile
index 46db51f3e425..22815aa009e1 100644
--- a/devel/gazpacho/Makefile
+++ b/devel/gazpacho/Makefile
@@ -23,7 +23,7 @@ NO_BUILD=	yes
 USE_GNOME=	pygtk2
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 
 PORTDOCS=	AUTHORS ChangeLog CONTRIBUTORS COPYING README NEWS
 
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index ba57720a4454..58342c3f42bd 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -24,7 +24,7 @@ USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack glib12 gtk12 oaf libxml orbit
-USE_GETTEXT=	yes
+USES=		gettext
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile
index 6fd252b355ea..d031a2b22386 100644
--- a/devel/gdb66/Makefile
+++ b/devel/gdb66/Makefile
@@ -29,7 +29,7 @@ MAKE_JOBS_SAFE=	yes
 USE_BZIP2=	yes
 USE_GCC=	any
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile
index 9b7cbb7b1e45..ce4ac2e482fa 100644
--- a/devel/giggle/Makefile
+++ b/devel/giggle/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	glib20 gtk20 gtksourceview2 libglade2
-USE_GETTEXT=	yes
+USES=		gettext
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 01d9aec01d0b..b90b417e2eda 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -26,7 +26,7 @@ MAKE_JOBS_UNSAFE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 8007496ae1b7..2edd49b288ff 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -217,7 +217,7 @@ ETCSHELLS_DESC=	Modify /etc/shells
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index 0f3f76597db7..151136fd0990 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gconf2 gtk20 gtksourceview2 gnomehack
-USE_GETTEXT=	yes
+USES=		gettext
 MAKE_JOBS_SAFE=	yes
 
 INSTALLS_ICONS=	yes
diff --git a/devel/gitphp/Makefile b/devel/gitphp/Makefile
index 08a949b9a26f..881b1bb8c15d 100644
--- a/devel/gitphp/Makefile
+++ b/devel/gitphp/Makefile
@@ -11,7 +11,7 @@ COMMENT=	A web based git repository browser written in PHP
 LICENSE=	GPLv2
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_PHP=	bz2 fileinfo mbstring memcache posix simplexml spl zlib
 WANT_PHP_WEB=	yes
 NO_BUILD=	yes
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index b8fc1ab79c56..314078196241 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk20 libxml2 gnomeprefix gnomehack \
 		gnomedocutils desktopfileutils ltverhack:10
 WANT_GNOME=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 6432c1153944..9cee30684374 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--program-prefix=g
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
 PLIST_SUB=	NLS=""
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 27837fc71f7b..655559bab403 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix glib12 libxml gtk12 orbit gconf \
 		gnomemimedata gnomelibs
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/gnucflow/Makefile b/devel/gnucflow/Makefile
index 0f5787fa0e82..0d9d85f12aa4 100644
--- a/devel/gnucflow/Makefile
+++ b/devel/gnucflow/Makefile
@@ -28,7 +28,7 @@ PLIST_FILES=	bin/cflow
 
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--with-libintl-prefix="${LOCALBASE}"
 PLIST_FILES+= 	share/locale/da/LC_MESSAGES/cflow.mo \
 		share/locale/fi/LC_MESSAGES/cflow.mo \
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index be322a4dd3a4..74feefa1719f 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre
 USE_XZ=		yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 libgsf ltverhack
-USE_GETTEXT=	yes
+USES=		gettext
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index e88906658fc2..d9d48c0adde0 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix gnomevfs2 libgnomeui
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/horde3-chora/Makefile b/devel/horde3-chora/Makefile
index 7d33060bb0a3..7a7a6fe23802 100644
--- a/devel/horde3-chora/Makefile
+++ b/devel/horde3-chora/Makefile
@@ -42,7 +42,7 @@ CVSROOT=	/home/cvs
 .endif
 
 USE_HORDE=	base pkg-message
-USE_GETTEXT=	yes
+USES=		gettext
 PORTDOCS=	README BUGS CHANGES CREDITS INSTALL RELEASE_NOTES TODO
 
 pre-configure:
diff --git a/devel/horde3-whups/Makefile b/devel/horde3-whups/Makefile
index cb4d18ed957e..54c0fd31540f 100644
--- a/devel/horde3-whups/Makefile
+++ b/devel/horde3-whups/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Bug tracking/ticketing system
 
 USE_HORDE=	base pkg-message
-USE_GETTEXT=	yes
+USES=		gettext
 PORTDOCS=	README CHANGES CREDITS INSTALL TODO lighttpd-whups.conf
 NO_BUILD=	yes
 
diff --git a/devel/idutils/Makefile b/devel/idutils/Makefile
index 9638684dbb45..22cfb93fc4cd 100644
--- a/devel/idutils/Makefile
+++ b/devel/idutils/Makefile
@@ -28,7 +28,7 @@ MAN1=		aid.1 defid.1 eid.1 fid.1 fnid.1 gid.1 lid.1 mkid.1 xtokid.1
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
-USE_GETTEXT=	yes
+USES=		gettext
 PLIST_SUB+=	NLS=""
 .endif
 
diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile
index 8d830426fe4a..0823a69b7be0 100644
--- a/devel/ixlib/Makefile
+++ b/devel/ixlib/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A small C++ tools library based on STL
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/jtag/Makefile b/devel/jtag/Makefile
index 0afa326452f0..fe20a90f7168 100644
--- a/devel/jtag/Makefile
+++ b/devel/jtag/Makefile
@@ -34,7 +34,7 @@ OPENWINCE_INCLUDE_DEP=${OPENWINCE_INCLUDE}/common.h
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile
index ca6b36517308..dd6624472214 100644
--- a/devel/libelf/Makefile
+++ b/devel/libelf/Makefile
@@ -30,7 +30,7 @@ NOMAN=		defined
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 CONFIGURE_ARGS+=	--enable-nls
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	GETTEXT=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index 8cf5f2a7c65e..ef51bb8ea0c6 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome
 
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index f7d4df4afee1..9165e3a8a04a 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_LDCONFIG=	yes
 USE_GNOME?=	gnomehack gnomeprefix glib20 libxml2 ltverhack intlhack
 USE_AUTOTOOLS=	libtool
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 8042ba10d66d..81f090c0bdc1 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 USE_BZIP2=	yes
 USE_PERL5_BUILD=yes
 USE_XORG=	xau
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20 ltverhack intlhack
 USE_LDCONFIG=	yes
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index 604ac3eb14b9..5591b1968926 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -22,7 +22,7 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack intlhack glib20 gtk20 ltverhack
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 7c097bad6d50..a06b091b7fa1 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -20,7 +20,7 @@ USE_XZ=		yes
 
 .if !defined(REFERENCE_PORT)
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gnomehier gnomehack glib20 libxml2 ltverhack referencehack \
 		intltool
 USE_LDCONFIG=	yes
diff --git a/devel/libticalcs/Makefile b/devel/libticalcs/Makefile
index 84c3b6d2e2b5..3d4af7e76970 100644
--- a/devel/libticalcs/Makefile
+++ b/devel/libticalcs/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	ticables.12:${PORTSDIR}/comms/libticables \
 DEPRECATED=	Superseded by comms/libticalcs2
 EXPIRATION_DATE=2013-07-01
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gnomehack pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
diff --git a/devel/libtifiles/Makefile b/devel/libtifiles/Makefile
index f7e6b73ae9d0..bfbcd345c51c 100644
--- a/devel/libtifiles/Makefile
+++ b/devel/libtifiles/Makefile
@@ -17,7 +17,7 @@ COMMENT=	TI calculator file types library
 DEPRECATED=	Superseded by devel/libtifiles2
 EXPIRATION_DATE=2013-07-01
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gnomehack pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index b416eabbe0d9..97e2fd1e54a3 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Routines to access raw VBI capture devices
 LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png \
 		unicode.0:${PORTSDIR}/devel/libunicode
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/devel/lua-gettext/Makefile b/devel/lua-gettext/Makefile
index e1a26f5010f6..3aef909108bc 100644
--- a/devel/lua-gettext/Makefile
+++ b/devel/lua-gettext/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gettext binding for Lua 5
 
 USE_LUA?=	5.1
-USE_GETTEXT=	yes
+USES=		gettext
 
 CVER=		1.15
 LVER=		${PORTVERSION}
diff --git a/devel/m17n-db/Makefile b/devel/m17n-db/Makefile
index dcad079bba77..59db927e3a8f 100644
--- a/devel/m17n-db/Makefile
+++ b/devel/m17n-db/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-charmaps=${CHARMAPSDIR}
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 0b646f9ec16d..8a9dcec027ef 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -64,7 +64,7 @@ SUB_FILES=	pkg-message
 
 post-patch:
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-setup.py
diff --git a/devel/monodevelop-database/Makefile b/devel/monodevelop-database/Makefile
index 3331107a2574..30b2ca7ecd17 100644
--- a/devel/monodevelop-database/Makefile
+++ b/devel/monodevelop-database/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/monodevelop.pc:${PORTSDIR}/devel/mon
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gnomehack gtksharp20
 
 post-patch:
diff --git a/devel/monodevelop-java/Makefile b/devel/monodevelop-java/Makefile
index f84813b2d870..a777c8f0e9e3 100644
--- a/devel/monodevelop-java/Makefile
+++ b/devel/monodevelop-java/Makefile
@@ -23,7 +23,7 @@ BROKEN=		does not build
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 USE_GNOME=	gtksharp20
 
diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index c9c1044f8a46..7bd8faa0187f 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 MAN1=		mdtool.1 monodevelop.1
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_ICONS=	yes
 
 OPTIONS=	MONOEXT "Enable extensions for Mono development" on \
diff --git a/devel/motor/Makefile b/devel/motor/Makefile
index 1436d8d8285e..5a5b3dd9cfc0 100644
--- a/devel/motor/Makefile
+++ b/devel/motor/Makefile
@@ -20,7 +20,7 @@ USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--with-libintl-prefix=${LOCALBASE}
 PLIST_SUB=	NLS=""
 .else
diff --git a/devel/nemiver/Makefile b/devel/nemiver/Makefile
index e9733fd586df..f6a285e45248 100644
--- a/devel/nemiver/Makefile
+++ b/devel/nemiver/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intltool gnomedocutils gconf2 vte
 USE_GCC=	4.4+
 USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 MAN1=		nemiver.1
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index c63e334c000a..31488be42554 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -34,7 +34,7 @@ SOVERSION=	${PORTVERSION:R:E}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index b3c9aac0b39a..b0068731a687 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -23,7 +23,7 @@ USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gtk12 orbit libxml
-USE_GETTEXT=	yes
+USES=		gettext
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index 3c8e98fde73e..8ed5e6be2526 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Message handling functions
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
-USE_GETTEXT=	yes
+USES=		gettext
 
 MAN3=		Locale::gettext.3
 
diff --git a/devel/p5-Locale-libintl/Makefile b/devel/p5-Locale-libintl/Makefile
index f7a584a1f5be..0811dfd976f8 100644
--- a/devel/p5-Locale-libintl/Makefile
+++ b/devel/p5-Locale-libintl/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Internationalization library for Perl
 
 PERL_CONFIGURE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 
 MAN3=		Locale::Messages.3 \
 		Locale::Recode.3 \
diff --git a/devel/py-mwlib.rl/Makefile b/devel/py-mwlib.rl/Makefile
index 6250526a066a..9cfba537e749 100644
--- a/devel/py-mwlib.rl/Makefile
+++ b/devel/py-mwlib.rl/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/texvc:${PORTSDIR}/print/texvc \
 		${PYTHON_PKGNAMEPREFIX}pygments>=1.0:${PORTSDIR}/textproc/py-pygments
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_GETTEXT=		yes
+USES=		gettext
 USE_PYTHON=		2.5+
 USE_PYDISTUTILS=	easy_install
 
diff --git a/devel/py-zope.i18n/Makefile b/devel/py-zope.i18n/Makefile
index 816250b62e0e..cb509a14669d 100644
--- a/devel/py-zope.i18n/Makefile
+++ b/devel/py-zope.i18n/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.even
 		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:${PORTSDIR}/devel/py-zope.interface \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
 
-USE_GETTEXT=		yes
+USES=		gettext
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
 
diff --git a/devel/qbzr/Makefile b/devel/qbzr/Makefile
index 122f98f1e369..283f2b4ed957 100644
--- a/devel/qbzr/Makefile
+++ b/devel/qbzr/Makefile
@@ -28,7 +28,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_PYTHON=	yes
 USE_QT4=	# empty
 USE_PYDISTUTILS=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/quilt/Makefile b/devel/quilt/Makefile
index dac79a2a0e85..40d9d91e245d 100644
--- a/devel/quilt/Makefile
+++ b/devel/quilt/Makefile
@@ -51,7 +51,7 @@ PLIST_SUB+=	RPMBUILD="@comment "
 
 .if !defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS=""
-USE_GETTEXT=	yes
+USES+=		gettext
 .else
 PLIST_SUB+=	NLS="@comment "
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index 95fb714780cd..13bc15ba63d6 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -24,7 +24,7 @@ USE_WX=	2.6
 WX_CONF_ARGS=	absolute
 
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_AUTOTOOLS=	autoconf libtool automake
 CONFIGURE_TARGET=
 CONFIGURE_ARGS=	--with-apr-config=apr-1-config \
diff --git a/devel/remake/Makefile b/devel/remake/Makefile
index d2d4f4c08013..01ec0c1f6c0e 100644
--- a/devel/remake/Makefile
+++ b/devel/remake/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Fork of gmake with debugger
 
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 MAN1=		remake.1
 INFO=		remake
 
diff --git a/devel/rsvndump/Makefile b/devel/rsvndump/Makefile
index 4db40cf9850f..719acedf578f 100644
--- a/devel/rsvndump/Makefile
+++ b/devel/rsvndump/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Remote Subversion repository dumpfile generator
 GNU_CONFIGURE=	yes
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=		yes
+USES+=		gettext
 PLIST_FILES+=		share/locale/de/LC_MESSAGES/rsvndump.mo
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/devel/ruby-intl/Makefile b/devel/ruby-intl/Makefile
index 0d63c36ccc43..09101d2f1c2a 100644
--- a/devel/ruby-intl/Makefile
+++ b/devel/ruby-intl/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A simple wrapper of GNU gettext for Ruby
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/devel/ruby-rbbr/Makefile b/devel/ruby-rbbr/Makefile
index 154ff5bac0a7..f1822aa6ddba 100644
--- a/devel/ruby-rbbr/Makefile
+++ b/devel/ruby-rbbr/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	rubygem-gettext>0:${PORTSDIR}/devel/rubygem-gettext
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
 		rubygem-gettext>0:${PORTSDIR}/devel/rubygem-gettext
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
 RUBY_SETUP=	install.rb
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index 54ee5bfe655e..ec7b11fa5fd5 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -25,7 +25,7 @@ CONFLICTS=	seed-3.[0-9]*
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gnomehack gtk20 intltool libxml2
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile
index c2870878e79a..24372ef31a0b 100644
--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
 		xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26
 
 USE_GNOME=	gnomehack glib20
-USE_GETTEXT=	yes
+USES=		gettext
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/tortoisehg2/Makefile b/devel/tortoisehg2/Makefile
index 4445eefbb3c9..c9095d414c4b 100644
--- a/devel/tortoisehg2/Makefile
+++ b/devel/tortoisehg2/Makefile
@@ -36,7 +36,7 @@ SUB_FILES=	pkg-message
 
 .if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
-USE_GETTEXT=	yes
+USES+=		gettext
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
diff --git a/devel/valide/Makefile b/devel/valide/Makefile
index f42d6b68e3ce..72a0f79b2f37 100644
--- a/devel/valide/Makefile
+++ b/devel/valide/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 BROKEN=		Doesn't build with vala 0.12+
 
 INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	gtk20 gtksourceview2
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
diff --git a/devel/xdg-user-dirs/Makefile b/devel/xdg-user-dirs/Makefile
index f5bfa94b6773..f652febaf789 100644
--- a/devel/xdg-user-dirs/Makefile
+++ b/devel/xdg-user-dirs/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Tool to help manage personal user directories
 
 GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_ICONV=	yes
 USE_GMAKE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/zpu-binutils/Makefile b/devel/zpu-binutils/Makefile
index 8a4afb70c30e..7e7d0cb6fef7 100644
--- a/devel/zpu-binutils/Makefile
+++ b/devel/zpu-binutils/Makefile
@@ -14,7 +14,7 @@ USE_GMAKE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/toolchain
 
-USE_GETTEXT=	yes
+USES=		gettext
 MANPREFIX=	${PREFIX}/zpu
 MANCOMPRESSED=	no
 MAN1=		zpu-elf-addr2line.1 zpu-elf-ar.1 zpu-elf-dlltool.1 \
diff --git a/devel/zpu-gcc/Makefile b/devel/zpu-gcc/Makefile
index b4b352c3d026..8f878a0bda6a 100644
--- a/devel/zpu-gcc/Makefile
+++ b/devel/zpu-gcc/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${LOCALBASE}/zpu/bin/zpu-elf-as:${PORTSDIR}/devel/zpu-binutils
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/toolchain
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 MANPREFIX=	${PREFIX}/zpu
 MAN1=		zpu-elf-cpp.1 zpu-elf-gcc.1 zpu-elf-gcov.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7