48 files changed, 49 insertions, 49 deletions

diff --git a/x11-wm/ccsm/Makefile b/x11-wm/ccsm/Makefile
index 86d039b30b63..2d9d54f1dcd0 100644
--- a/x11-wm/ccsm/Makefile
+++ b/x11-wm/ccsm/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compizconfig-python.pc:${PORTSDIR}/x
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	pygtk2
 USE_PYTHON=	-2.7
 
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 27ce679eac10..3b33682e1041 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -15,7 +15,7 @@ SOUND_DESC=	Sound support via pulseaudio/libsndfile
 USE_XORG=	compositeproto damageproto xextproto x11 xbitmaps xcomposite xdamage \
 		xext xfixes xft xinerama xrandr xrender xxf86vm
 USE_ICONV=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_EFL=	imlib2
 USE_AUTOTOOLS=	libtool
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--disable-sound \
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/x11-wm/e17-module-alarm/Makefile b/x11-wm/e17-module-alarm/Makefile
index 2837857cd5ce..fefc428ab142 100644
--- a/x11-wm/e17-module-alarm/Makefile
+++ b/x11-wm/e17-module-alarm/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-comp-scale/Makefile b/x11-wm/e17-module-comp-scale/Makefile
index 9fe8d1bdb13b..4f4f7c5c5956 100644
--- a/x11-wm/e17-module-comp-scale/Makefile
+++ b/x11-wm/e17-module-comp-scale/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index e56a4ea56c8b..f423641ab1be 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-diskio/Makefile b/x11-wm/e17-module-diskio/Makefile
index 48f43932fa87..1add01719036 100644
--- a/x11-wm/e17-module-diskio/Makefile
+++ b/x11-wm/e17-module-diskio/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-eektool/Makefile b/x11-wm/e17-module-eektool/Makefile
index 69b358512009..332e075c947d 100644
--- a/x11-wm/e17-module-eektool/Makefile
+++ b/x11-wm/e17-module-eektool/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-engage/Makefile b/x11-wm/e17-module-engage/Makefile
index 3b5f9f741b75..c97429d9bf3d 100644
--- a/x11-wm/e17-module-engage/Makefile
+++ b/x11-wm/e17-module-engage/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-eooorg/Makefile b/x11-wm/e17-module-eooorg/Makefile
index 29aa91c23a20..6da9fbcc59fe 100644
--- a/x11-wm/e17-module-eooorg/Makefile
+++ b/x11-wm/e17-module-eooorg/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-everything-aspell/Makefile b/x11-wm/e17-module-everything-aspell/Makefile
index 5c3a698be0f4..e0de08b90f2f 100644
--- a/x11-wm/e17-module-everything-aspell/Makefile
+++ b/x11-wm/e17-module-everything-aspell/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-everything-mpris/Makefile b/x11-wm/e17-module-everything-mpris/Makefile
index f094b3b23c9c..1416603f3afe 100644
--- a/x11-wm/e17-module-everything-mpris/Makefile
+++ b/x11-wm/e17-module-everything-mpris/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-everything-pidgin/Makefile b/x11-wm/e17-module-everything-pidgin/Makefile
index 1e0eab4fb63b..1875bd7f358b 100644
--- a/x11-wm/e17-module-everything-pidgin/Makefile
+++ b/x11-wm/e17-module-everything-pidgin/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-everything-places/Makefile b/x11-wm/e17-module-everything-places/Makefile
index fb0488f39c7c..1f26cb260a3d 100644
--- a/x11-wm/e17-module-everything-places/Makefile
+++ b/x11-wm/e17-module-everything-places/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-everything-wallpaper/Makefile b/x11-wm/e17-module-everything-wallpaper/Makefile
index 70ade78e901b..c4a2553a81d8 100644
--- a/x11-wm/e17-module-everything-wallpaper/Makefile
+++ b/x11-wm/e17-module-everything-wallpaper/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-everything-websearch/Makefile b/x11-wm/e17-module-everything-websearch/Makefile
index fa45bd2edfdd..ad98d9509812 100644
--- a/x11-wm/e17-module-everything-websearch/Makefile
+++ b/x11-wm/e17-module-everything-websearch/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile
index 5114ab8f25bc..b1efee62b872 100644
--- a/x11-wm/e17-module-flame/Makefile
+++ b/x11-wm/e17-module-flame/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-forecasts/Makefile b/x11-wm/e17-module-forecasts/Makefile
index 5f87f2fa5503..f818b7803906 100644
--- a/x11-wm/e17-module-forecasts/Makefile
+++ b/x11-wm/e17-module-forecasts/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-iiirk/Makefile b/x11-wm/e17-module-iiirk/Makefile
index 1b5fc9ba9bff..9186e7f0d63b 100644
--- a/x11-wm/e17-module-iiirk/Makefile
+++ b/x11-wm/e17-module-iiirk/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index b66919af3d8c..d73104c631d7 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index e4b0ba78b2dd..a5b59a1f15ab 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index e519c5b8b09a..456549b74b7d 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-mpdule/Makefile b/x11-wm/e17-module-mpdule/Makefile
index ec51c6c00a78..6f036299afff 100644
--- a/x11-wm/e17-module-mpdule/Makefile
+++ b/x11-wm/e17-module-mpdule/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-net/Makefile b/x11-wm/e17-module-net/Makefile
index 9b51395191d5..f48213e63a0c 100644
--- a/x11-wm/e17-module-net/Makefile
+++ b/x11-wm/e17-module-net/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-news/Makefile b/x11-wm/e17-module-news/Makefile
index a2f7f09f7985..74a6eaffe4fb 100644
--- a/x11-wm/e17-module-news/Makefile
+++ b/x11-wm/e17-module-news/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-penguins/Makefile b/x11-wm/e17-module-penguins/Makefile
index 2caa3ad16bf0..2178160844c7 100644
--- a/x11-wm/e17-module-penguins/Makefile
+++ b/x11-wm/e17-module-penguins/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-photo/Makefile b/x11-wm/e17-module-photo/Makefile
index dc74b25f02e5..f4a84a17de3c 100644
--- a/x11-wm/e17-module-photo/Makefile
+++ b/x11-wm/e17-module-photo/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-places/Makefile b/x11-wm/e17-module-places/Makefile
index c85a80fa6dd2..f1a91a25b457 100644
--- a/x11-wm/e17-module-places/Makefile
+++ b/x11-wm/e17-module-places/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile
index 849c28b01ba4..18dc9a56756e 100644
--- a/x11-wm/e17-module-rain/Makefile
+++ b/x11-wm/e17-module-rain/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index b19a0e8c656e..5c62f1219754 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile
index 24c54cfaed6b..c1afcb018de9 100644
--- a/x11-wm/e17-module-slideshow/Makefile
+++ b/x11-wm/e17-module-slideshow/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile
index 00186c001dd8..b9a1c196fe97 100644
--- a/x11-wm/e17-module-snow/Makefile
+++ b/x11-wm/e17-module-snow/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-taskbar/Makefile b/x11-wm/e17-module-taskbar/Makefile
index 56ebedb43b1c..b8af47a9b347 100644
--- a/x11-wm/e17-module-taskbar/Makefile
+++ b/x11-wm/e17-module-taskbar/Makefile
@@ -25,7 +25,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-tclock/Makefile b/x11-wm/e17-module-tclock/Makefile
index de8d6d4c4e07..683bd4a890dc 100644
--- a/x11-wm/e17-module-tclock/Makefile
+++ b/x11-wm/e17-module-tclock/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile
index d9f6e7a365fe..549f50c1c9ae 100644
--- a/x11-wm/e17-module-uptime/Makefile
+++ b/x11-wm/e17-module-uptime/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-weather/Makefile b/x11-wm/e17-module-weather/Makefile
index f46708cd5d33..875355d201ef 100644
--- a/x11-wm/e17-module-weather/Makefile
+++ b/x11-wm/e17-module-weather/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-winlist-ng/Makefile b/x11-wm/e17-module-winlist-ng/Makefile
index 84e9ad827da5..1ea26c1fdb66 100644
--- a/x11-wm/e17-module-winlist-ng/Makefile
+++ b/x11-wm/e17-module-winlist-ng/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/e17-module-wlan/Makefile b/x11-wm/e17-module-wlan/Makefile
index e42bf9657d9c..b4103f6d05b1 100644
--- a/x11-wm/e17-module-wlan/Makefile
+++ b/x11-wm/e17-module-wlan/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
diff --git a/x11-wm/fvwm-crystal/Makefile b/x11-wm/fvwm-crystal/Makefile
index 5c50ab274f47..e1d94cbe7910 100644
--- a/x11-wm/fvwm-crystal/Makefile
+++ b/x11-wm/fvwm-crystal/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS=	fvwm>=2.5:${PORTSDIR}/x11-wm/fvwm2 \
 		bash:${PORTSDIR}/shells/bash
 
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_PYTHON=	yes
 MAKE_ENV=	prefix="${PREFIX}" addondir="${DOCSDIR}/addons"
 PORTDOCS=	*
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 5b0250c6eb3e..c4d4147629a1 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -109,7 +109,7 @@ WITHOUT_GNOME=	true
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 CONFIGURE_ARGS+=	--with-intl-library=${LOCALBASE}/lib \
 			--with-intl-includes=${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
diff --git a/x11-wm/lxsession/Makefile b/x11-wm/lxsession/Makefile
index c12760898a9c..f3db0dc54ca3 100644
--- a/x11-wm/lxsession/Makefile
+++ b/x11-wm/lxsession/Makefile
@@ -32,7 +32,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 55fa76d2cbc4..f1d9a3d37010 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
 
 USE_BZIP2=	yes
 USE_XORG=	x11 xcomposite xdamage
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index 884f5dcdda06..8a26f620844d 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
 
 USE_BZIP2=	yes
 USE_XORG=	x11 xext xrandr xcomposite xcursor xinerama ice sm
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 gconf2 ltverhack
diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index 191517dffc4d..83a13355ebeb 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -29,7 +29,7 @@ PORTDOCS=	ABOUT-NLS AUTHORS README TODO
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .else
-USE_GETTEXT=		yes
+USES+=		gettext
 PLIST_SUB+=		NLS=""
 .endif
 
diff --git a/x11-wm/obkey/Makefile b/x11-wm/obkey/Makefile
index fab95e76634c..b0644deb52f7 100644
--- a/x11-wm/obkey/Makefile
+++ b/x11-wm/obkey/Makefile
@@ -13,7 +13,7 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	py2[67]-gtk>=2.14:${PORTSDIR}/x11-toolkits/py-gtk2
 
-USE_GETTEXT=	yes
+USES=		gettext
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PORTDOCS=	NEWS
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index 2404971b2b0c..1a489322e4bd 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -26,7 +26,7 @@ MAN1=		openbox.1 openbox-session.1 obxprop.1 \
 PLIST_SUB=	VERSION=${PORTVERSION:C/.[0-9]+\$//}
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/x11-wm/simple-ccsm/Makefile b/x11-wm/simple-ccsm/Makefile
index 780ed2228438..66abe830d406 100644
--- a/x11-wm/simple-ccsm/Makefile
+++ b/x11-wm/simple-ccsm/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compizconfig-python.pc:${PORTSDIR}/x
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GNOME=	pygtk2
 USE_PYTHON=	-2.7
 
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 23166ea719ce..819bae359c9d 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_GNOME=	gtk20
 USE_PERL5=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 75d9ce8acc10..e53c30ade3e7 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS=	--enable-xsync \
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20 intltool intlhack pkgconfig desktopfileutils
 USE_LDCONFIG=	yes