Index: arabic/kde3-i18n/Makefile
@@ -18,7 +18,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: chinese/kde3-i18n-zh_CN/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: chinese/kde3-i18n-zh_TW/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: databases/tarantool/Makefile
@@ -14,9 +14,8 @@
 LICENSE=	BSD
 
 TR_REV=		31-g9ca7fda
-USES=		cmake
+USES=		cmake gettext:build
 USE_GCC=	4.6+
-USE_GETTEXT=	build
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_PERL5=	yes
Index: devel/avr-libc/Makefile
@@ -46,7 +46,7 @@
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 HAS_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
Index: devel/gettext-lint/Makefile
@@ -20,7 +20,7 @@
 
 NO_BUILD=	yes
 
-USE_GETTEXT=	run
+USES=		gettext:run
 USE_PYTHON_RUN=	yes
 
 MAN1=		POFileChecker.1 POFileClean.1 POFileConsistency.1 \
Index: devel/kdevelop/Makefile
@@ -55,7 +55,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 USE_BDB=	yes
 USE_AUTOTOOLS=	libtool
 _NO_KDE_FINAL=	yes
Index: devel/subversion/Makefile
@@ -121,7 +121,7 @@
 
 .if ${PORT_OPTIONS:MSTATIC}
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=		build
+USES+=		gettext:build
 .endif
 .if ${PORT_OPTIONS:MBDB}
 BDB_BUILD_DEPENDS=	yes
Index: french/kde3-i18n/Makefile
@@ -22,7 +22,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: games/anki/Makefile
@@ -25,7 +25,7 @@
 
 USE_PYTHON=	-2.7
 USE_QT4=	network_run webkit_run
-USE_GETTEXT=	run
+USES=		gettext:run
 
 MAN1=		${PORTNAME}.1
 
Index: games/unknown-horizons/Makefile
@@ -22,7 +22,7 @@
 
 USE_XZ=			yes
 USE_GNOME=		intltool
-USE_GETTEXT=		build
+USES=			gettext:build
 USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	UnknownHorizons
Index: german/kde3-i18n/Makefile
@@ -22,7 +22,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: hebrew/kde3-i18n/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: hungarian/kde3-i18n/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: japanese/kde3-i18n/Makefile
@@ -22,7 +22,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: korean/kde3-i18n/Makefile
@@ -22,7 +22,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/gwenview-i18n/Makefile
@@ -22,7 +22,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
Index: misc/k3b-i18n/Makefile
@@ -20,7 +20,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
Index: misc/kde3-i18n-af/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-az/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-be/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-bg/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-bn/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-br/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-bs/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-ca/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-cs/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-csb/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-cy/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-da/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-el/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-en_GB/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-eo/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-es/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-et/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-eu/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-fa/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-fi/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-fy/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-ga/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-gl/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-hi/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-hr/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-is/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-it/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-kk/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-km/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-lt/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-lv/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-mk/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-mn/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-ms/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-nb/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-nds/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-nl/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-nn/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-pa/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-ro/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-rw/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-se/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-sk/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-sl/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-sr/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-sr_Latn/Makefile
@@ -24,7 +24,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-ss/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-sv/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-ta/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-te/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-tg/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-th/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-tr/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-uz/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-ven/Makefile
@@ -24,7 +24,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-wa/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-xh/Makefile
@@ -24,7 +24,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: misc/kde3-i18n-zu/Makefile
@@ -24,7 +24,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: polish/kde3-i18n/Makefile
@@ -22,7 +22,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: portuguese/kde3-i18n-pt_BR/Makefile
@@ -23,7 +23,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: portuguese/kde3-i18n/Makefile
@@ -22,7 +22,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: russian/kde3-i18n/Makefile
@@ -22,7 +22,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: www/gecko-mediaplayer/Makefile
@@ -47,10 +47,10 @@
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB=	NLS=""
 .else
-USE_GETTEXT=	build
+USES+=		gettext:build
 PLIST_SUB=	NLS="@comment "
 .endif
 
Index: www/kdewebdev/Makefile
@@ -30,7 +30,7 @@
 USE_BZIP2=	yes
 USE_XORG=	xpm
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 USE_AUTOTOOLS=  libtool
 
 .include <${.CURDIR}/../../x11/kde3/Makefile.kde>
Index: security/clamtk/Makefile
@@ -28,7 +28,7 @@
 
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
-USE_GETTEXT=	run
+USES=		gettext:run
 
 MAN1=		${PORTNAME}.1
 
Index: sysutils/froxlor/Makefile
@@ -19,7 +19,7 @@
 
 USE_PHP=	xml bcmath posix filter session ftp mysql mysqli gettext
 
-USE_GETTEXT=	RUN
+USES=		gettext:run
 
 OPTIONS_DEFINE=	POWERDNS LIBNSS LOGROTATE MYSQLS DKIM
 
Index: ukrainian/kde3-i18n/Makefile
@@ -22,7 +22,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
Index: vietnamese/kde3-i18n/Makefile
@@ -22,7 +22,7 @@
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	build
+USES=		gettext:build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes