aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/libcomprex/Makefile2
-rw-r--r--archivers/squeeze/Makefile3
-rw-r--r--astro/nightfall/Makefile3
-rw-r--r--astro/viking/Makefile2
-rw-r--r--audio/abraca/Makefile2
-rw-r--r--audio/amarok-kde4/Makefile2
-rw-r--r--audio/aqualung/Makefile3
-rw-r--r--audio/arts/Makefile3
-rw-r--r--audio/audex/Makefile2
-rw-r--r--audio/beast/Makefile3
-rw-r--r--audio/cantus_3/Makefile3
-rw-r--r--audio/cowbell/Makefile3
-rw-r--r--audio/csound/Makefile3
-rw-r--r--audio/deadbeef/Makefile3
-rw-r--r--audio/gnome-media/Makefile3
-rw-r--r--audio/kaudiocreator/Makefile2
-rw-r--r--audio/kid3-kde4/Makefile3
-rw-r--r--audio/libmp3splt/Makefile2
-rw-r--r--audio/linnya/Makefile2
-rw-r--r--audio/mp3splt/Makefile2
-rw-r--r--audio/rezound/Makefile2
-rw-r--r--audio/soundkonverter/Makefile2
-rw-r--r--audio/swhplugins/Makefile2
-rw-r--r--audio/vagalume/Makefile2
-rw-r--r--audio/xfce4-mixer/Makefile3
-rw-r--r--audio/zinf/Makefile3
-rw-r--r--cad/geda/Makefile3
-rw-r--r--cad/kicad-devel/Makefile3
-rw-r--r--cad/kicad/Makefile2
-rw-r--r--cad/libgeda/Makefile2
-rw-r--r--cad/pdnmesh/Makefile3
-rw-r--r--cad/repsnapper/Makefile2
-rw-r--r--chinese/fcitx-configtool/Makefile3
-rw-r--r--chinese/fcitx/Makefile3
-rw-r--r--chinese/opencc/Makefile2
-rw-r--r--comms/efax-gtk/Makefile2
-rw-r--r--comms/gammu/Makefile3
-rw-r--r--comms/libticables2/Makefile2
-rw-r--r--comms/libticalcs2/Makefile2
-rw-r--r--comms/tilp2/Makefile2
-rw-r--r--databases/dbf/Makefile2
-rw-r--r--databases/evolution-data-server/Makefile3
-rw-r--r--databases/gtksql/Makefile2
-rw-r--r--databases/hk_classes/Makefile3
-rw-r--r--databases/libgda4/Makefile3
-rw-r--r--deskutils/cairo-dock-plugins/Makefile3
-rw-r--r--deskutils/chmsee/Makefile3
-rw-r--r--deskutils/deskbar-applet/Makefile3
-rw-r--r--deskutils/nautilus-sendto/Makefile3
-rw-r--r--deskutils/orage/Makefile3
-rw-r--r--deskutils/pal/Makefile3
-rw-r--r--deskutils/planner/Makefile3
-rw-r--r--deskutils/tpb/Makefile2
-rw-r--r--deskutils/xfce4-tumbler/Makefile2
-rw-r--r--devel/avr-gcc/Makefile3
-rw-r--r--devel/binutils/Makefile2
-rw-r--r--devel/bison/Makefile2
-rw-r--r--devel/devhelp/Makefile3
-rw-r--r--devel/ecore-main/Makefile2
-rw-r--r--devel/gamin/Makefile3
-rw-r--r--devel/gconf2/Makefile3
-rw-r--r--devel/geany/Makefile2
-rw-r--r--devel/glade2/Makefile3
-rw-r--r--devel/glib20/Makefile3
-rw-r--r--devel/gnome-vfs/Makefile3
-rw-r--r--devel/gwenhywfar/Makefile3
-rw-r--r--devel/kcachegrind/Makefile3
-rw-r--r--devel/kdbg/Makefile2
-rw-r--r--devel/kdevelop-kde4/Makefile2
-rw-r--r--devel/kdevelop-php-docs/Makefile2
-rw-r--r--devel/kdevelop-php/Makefile2
-rw-r--r--devel/kdevplatform/Makefile2
-rw-r--r--devel/libevt/Makefile3
-rw-r--r--devel/libevtx/Makefile3
-rw-r--r--devel/liblnk/Makefile3
-rw-r--r--devel/libmsiecf/Makefile3
-rw-r--r--devel/libpeas/Makefile3
-rw-r--r--devel/libpff/Makefile3
-rw-r--r--devel/libregf/Makefile3
-rw-r--r--devel/libtifiles2/Makefile2
-rw-r--r--devel/libvirt/Makefile2
-rw-r--r--devel/obby/Makefile2
-rw-r--r--devel/piklab/Makefile3
-rw-r--r--devel/popt/Makefile2
-rw-r--r--devel/py-dbus/Makefile3
-rw-r--r--devel/seed3/Makefile3
-rw-r--r--dns/dnsmasq-devel/Makefile2
-rw-r--r--editors/abiword/Makefile3
-rw-r--r--editors/gedit-plugins/Makefile3
-rw-r--r--editors/yzis/Makefile3
-rw-r--r--emulators/tme/Makefile3
-rw-r--r--finance/aqbanking/Makefile3
-rw-r--r--finance/kmymoney-kde4/Makefile2
-rw-r--r--french/verbiste/Makefile2
-rw-r--r--ftp/gftp/Makefile2
-rw-r--r--ftp/gwget/Makefile3
-rw-r--r--ftp/wget/Makefile2
-rw-r--r--games/gnome-games/Makefile3
-rw-r--r--games/hinversi/Makefile2
-rw-r--r--games/knights-kde4/Makefile2
-rw-r--r--games/lianliankan/Makefile2
-rw-r--r--games/minetest/Makefile2
-rw-r--r--games/springlobby/Makefile2
-rw-r--r--games/supertuxkart/Makefile3
-rw-r--r--games/ultimatestunts/Makefile3
-rw-r--r--games/valyriatear/Makefile3
-rw-r--r--games/violetland/Makefile3
-rw-r--r--games/warzone2100/Makefile2
-rw-r--r--games/wesnoth/Makefile2
-rw-r--r--graphics/blender/Makefile2
-rw-r--r--graphics/cbrpager/Makefile2
-rw-r--r--graphics/colord/Makefile3
-rw-r--r--graphics/dia/Makefile3
-rw-r--r--graphics/electrix/Makefile2
-rw-r--r--graphics/evince/Makefile3
-rw-r--r--graphics/exif/Makefile2
-rw-r--r--graphics/gegl/Makefile3
-rw-r--r--graphics/gimp-app/Makefile3
-rw-r--r--graphics/gphoto2/Makefile2
-rw-r--r--graphics/gthumb/Makefile3
-rw-r--r--graphics/hugin-devel/Makefile3
-rw-r--r--graphics/hugin/Makefile3
-rw-r--r--graphics/k3d/Makefile3
-rw-r--r--graphics/kphotoalbum-kde4/Makefile2
-rw-r--r--graphics/libexif-gtk/Makefile2
-rw-r--r--graphics/libexif/Makefile2
-rw-r--r--irc/kvirc/Makefile3
-rw-r--r--irc/weechat-devel/Makefile2
-rw-r--r--irc/weechat/Makefile2
-rw-r--r--irc/xchat-gnome/Makefile3
-rw-r--r--japanese/libskk/Makefile2
-rw-r--r--java/sablevm/Makefile3
-rw-r--r--korean/scim-hangul/Makefile2
-rw-r--r--lang/hiphop-php/Makefile3
-rw-r--r--lang/lafontaine/Makefile2
-rw-r--r--lang/librep/Makefile3
-rw-r--r--lang/mono/Makefile3
-rw-r--r--lang/pike76/Makefile3
-rw-r--r--lang/pike78/Makefile3
-rw-r--r--mail/balsa/Makefile3
-rw-r--r--mail/claws-mail/Makefile2
-rw-r--r--mail/evolution/Makefile3
-rw-r--r--mail/rspamd/Makefile3
-rw-r--r--math/gnumeric/Makefile3
-rw-r--r--math/gretl/Makefile2
-rw-r--r--math/libqalculate/Makefile2
-rw-r--r--math/oleo/Makefile2
-rw-r--r--math/rkward-kde4/Makefile3
-rw-r--r--misc/krecipes-kde4/Makefile3
-rw-r--r--misc/lifelines/Makefile2
-rw-r--r--misc/linm/Makefile2
-rw-r--r--misc/mc-light/Makefile2
-rw-r--r--misc/terraform/Makefile3
-rw-r--r--misc/xfce4-weather-plugin/Makefile3
-rw-r--r--multimedia/aegisub/Makefile3
-rw-r--r--multimedia/beep-media-player/Makefile2
-rw-r--r--multimedia/bino/Makefile2
-rw-r--r--multimedia/freetuxtv/Makefile2
-rw-r--r--multimedia/gmerlin-avdecoder/Makefile3
-rw-r--r--multimedia/gmerlin/Makefile3
-rw-r--r--multimedia/gmtk/Makefile2
-rw-r--r--multimedia/gstreamer-plugins/Makefile3
-rw-r--r--multimedia/gstreamer/Makefile3
-rw-r--r--multimedia/kdenlive/Makefile2
-rw-r--r--multimedia/kino/Makefile3
-rw-r--r--multimedia/libxine/Makefile2
-rw-r--r--multimedia/lives/Makefile2
-rw-r--r--multimedia/mkvtoolnix/Makefile3
-rw-r--r--multimedia/ogmrip/Makefile3
-rw-r--r--multimedia/quark/Makefile3
-rw-r--r--multimedia/sabbu/Makefile2
-rw-r--r--multimedia/totem-pl-parser/Makefile3
-rw-r--r--multimedia/totem/Makefile3
-rw-r--r--multimedia/vdr/Makefile3
-rw-r--r--multimedia/xfce4-media/Makefile3
-rw-r--r--multimedia/xfce4-parole/Makefile2
-rw-r--r--net-im/hotot/Makefile3
-rw-r--r--net-im/licq/Makefile2
-rw-r--r--net-im/mcabber/Makefile3
-rw-r--r--net-im/pidgin-guifications/Makefile3
-rw-r--r--net-p2p/amule-devel/Makefile2
-rw-r--r--net-p2p/amule/Makefile2
-rw-r--r--net-p2p/eiskaltdcpp-daemon/Makefile3
-rw-r--r--net-p2p/eiskaltdcpp-gtk/Makefile3
-rw-r--r--net-p2p/eiskaltdcpp-lib/Makefile3
-rw-r--r--net-p2p/eiskaltdcpp-qt/Makefile3
-rw-r--r--net-p2p/gtk-gnutella/Makefile2
-rw-r--r--net/net6/Makefile2
-rw-r--r--net/samba4/Makefile3
-rw-r--r--net/smb4k-kde4/Makefile3
-rw-r--r--net/tigervnc/Makefile2
-rw-r--r--net/vinagre/Makefile3
-rw-r--r--news/pan/Makefile3
-rw-r--r--palm/jpilot/Makefile2
-rw-r--r--palm/synce-trayicon/Makefile3
-rw-r--r--polish/kadu/Makefile3
-rw-r--r--print/libgnomeprint/Makefile3
-rw-r--r--print/lilypond/Makefile3
-rw-r--r--science/gramps/Makefile3
-rw-r--r--science/gwyddion/Makefile3
-rw-r--r--security/gnutls/Makefile2
-rw-r--r--security/gsasl/Makefile2
-rw-r--r--security/libprelude/Makefile3
-rw-r--r--security/prelude-lml/Makefile3
-rw-r--r--security/prelude-manager/Makefile3
-rw-r--r--security/revelation/Makefile3
-rw-r--r--security/rifiuti2/Makefile3
-rw-r--r--security/seahorse-plugins/Makefile3
-rw-r--r--security/seahorse/Makefile3
-rw-r--r--sysutils/brasero/Makefile3
-rw-r--r--sysutils/dfc/Makefile2
-rw-r--r--sysutils/eiciel/Makefile2
-rw-r--r--sysutils/fusefs-encfs/Makefile2
-rw-r--r--sysutils/garcon/Makefile2
-rw-r--r--sysutils/gnome-settings-daemon/Makefile3
-rw-r--r--sysutils/graveman/Makefile3
-rw-r--r--sysutils/grub2/Makefile3
-rw-r--r--sysutils/gsmartcontrol/Makefile3
-rw-r--r--sysutils/hal/Makefile3
-rw-r--r--sysutils/libzeitgeist/Makefile3
-rw-r--r--sysutils/polkit-kde/Makefile2
-rw-r--r--sysutils/polkit/Makefile3
-rw-r--r--sysutils/xfburn/Makefile2
-rw-r--r--sysutils/xfce4-fsguard-plugin/Makefile2
-rw-r--r--sysutils/xfce4-netload-plugin/Makefile2
-rw-r--r--textproc/ctpp2/Makefile3
-rw-r--r--textproc/diffutils/Makefile2
-rw-r--r--textproc/flex/Makefile2
-rw-r--r--textproc/gxmlviewer/Makefile3
-rw-r--r--textproc/libcroco/Makefile3
-rw-r--r--textproc/scrollkeeper/Makefile3
-rw-r--r--textproc/sdcv/Makefile2
-rw-r--r--www/aria2/Makefile2
-rw-r--r--www/cherokee/Makefile3
-rw-r--r--www/elinks/Makefile2
-rw-r--r--www/epiphany/Makefile3
-rw-r--r--www/midori/Makefile2
-rw-r--r--www/webkit-gtk2/Makefile3
-rw-r--r--www/webkit-gtk3/Makefile3
-rw-r--r--x11-fm/thunar/Makefile2
-rw-r--r--x11-themes/gtk-qt4-engine/Makefile3
-rw-r--r--x11-toolkits/elementary/Makefile2
-rw-r--r--x11-toolkits/gtkglext/Makefile3
-rw-r--r--x11-toolkits/gtkunique/Makefile3
-rw-r--r--x11-toolkits/libwnck/Makefile3
-rw-r--r--x11-toolkits/pango/Makefile3
-rw-r--r--x11-toolkits/py-gtk2/Makefile3
-rw-r--r--x11-toolkits/termit/Makefile2
-rw-r--r--x11-toolkits/vte/Makefile3
-rw-r--r--x11-wm/ede/Makefile3
-rw-r--r--x11-wm/enlightenment/Makefile2
-rw-r--r--x11-wm/xfce4-desktop/Makefile2
-rw-r--r--x11-wm/xfce4-panel/Makefile2
-rw-r--r--x11/avant-window-navigator/Makefile3
-rw-r--r--x11/gdm/Makefile3
-rw-r--r--x11/gnome-applets/Makefile3
-rw-r--r--x11/gnome-panel/Makefile3
-rw-r--r--x11/gnome-pie/Makefile2
-rw-r--r--x11/gnome-screensaver/Makefile3
-rw-r--r--x11/kde4-baseapps/Makefile3
-rw-r--r--x11/kde4-runtime/Makefile3
-rw-r--r--x11/kde4-workspace/Makefile3
-rw-r--r--x11/kdelibs4/Makefile3
-rw-r--r--x11/libexo/Makefile2
-rw-r--r--x11/libfm/Makefile2
-rw-r--r--x11/libxfce4menu/Makefile2
-rw-r--r--x11/libxfce4util/Makefile2
-rw-r--r--x11/metisse/Makefile3
-rw-r--r--x11/roxterm/Makefile3
-rw-r--r--x11/workrave/Makefile2
-rw-r--r--x11/xfce4-clipman-plugin/Makefile3
-rw-r--r--x11/xfce4-conf/Makefile2
-rw-r--r--x11/xfce4-screenshooter-plugin/Makefile2
-rw-r--r--x11/xfce4-terminal/Makefile2
-rw-r--r--x11/xkeyboard-config/Makefile2
-rw-r--r--x11/xscreensaver/Makefile3
-rw-r--r--x11/zenity/Makefile3
277 files changed, 277 insertions, 436 deletions
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index 2598e385e4da..12e57948b387 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -24,7 +24,7 @@ MAKE_JOBS_SAFE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lintl
PLIST_SUB+= NLS=""
diff --git a/archivers/squeeze/Makefile b/archivers/squeeze/Makefile
index a3dadc1f455e..dd430cfc5997 100644
--- a/archivers/squeeze/Makefile
+++ b/archivers/squeeze/Makefile
@@ -19,14 +19,13 @@ LIB_DEPENDS= thunar-vfs-1:${PORTSDIR}/x11-fm/thunar-vfs
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USES= pkgconfig
+USES= pkgconfig gettext
USE_XFCE= configenv libutil thunar
USE_XORG= x11
USE_GNOME= gnomehack gtk20 glib20 intltool intlhack desktopfileutils
USE_BZIP2= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_GETTEXT= yes
MAKE_JOB_SAFE= yes
OPTIONS_DEFINE= DOCS
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index dd0fd04a05d1..f79499fd49de 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -14,10 +14,9 @@ OPTIONS_DEFINE= GNOME PGPLOT OPENGL
OPTIONS_DEFAULT= PGPLOT OPENGL
PGPLOT_DESC= Enable PGPLOT support
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= gnomehier gtk20
USE_PERL5= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index 698f382731ff..004feb9e78d9 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -48,7 +48,7 @@ GPSD_DESC= Realtime GPS tracking
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile
index 0fe993a77007..f24c7da12bfe 100644
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS='@comment '
.else
PLIST_SUB+= NLS=''
-USE_GETTEXT= yes
+USES+= gettext
.endif
post-configure:
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index b519305c11b0..9efa6e79f7a3 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -82,7 +82,7 @@ PLIST_SUB+= MTP="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DBUILD_po:BOOL=Off
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index deb175280c90..2023172b862a 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -32,8 +32,7 @@ LIB_DEPENDS= samplerate:${PORTSDIR}/audio/libsamplerate \
cddb:${PORTSDIR}/audio/libcddb \
strfunc:${PORTSDIR}/devel/libstrfunc
-USES= pkgconfig
-USE_GETTEXT= yes
+USES= pkgconfig gettext
USE_GNOME= gtk20 libxml2
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index 46cf7da0b6d4..b59d2d4bf801 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -35,12 +35,11 @@ EXPIRATION_DATE= 2013-07-01
PREFIX= ${KDE_PREFIX}
WANT_GNOME= yes
-USES= pkgconfig
+USES= pkgconfig gettext
USE_QT_VER= 3
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
-USE_GETTEXT= yes
USE_ICONV= yes
USE_XORG= ice sm x11 xau xcursor xdmcp xext xfixes xft xi \
xinerama xrandr xrender xt
diff --git a/audio/audex/Makefile b/audio/audex/Makefile
index 7dd9465dffaf..2dd4b236e657 100644
--- a/audio/audex/Makefile
+++ b/audio/audex/Makefile
@@ -29,7 +29,7 @@ EYED3_DESC= Unicode MP3 tag support via audio/py-eyed3
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 47ebb1c0a433..6330561168e6 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -21,10 +21,9 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
OPTIONS_DEFINE_i386= SSE
USE_BZIP2= yes
-USES= pathfix
+USES= pathfix gettext
USE_GCC= 4.6+
USE_GNOME= gnomehier libgnomecanvas
-USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-silent-rules \
diff --git a/audio/cantus_3/Makefile b/audio/cantus_3/Makefile
index 323e6b34d080..b6b263331c24 100644
--- a/audio/cantus_3/Makefile
+++ b/audio/cantus_3/Makefile
@@ -21,9 +21,8 @@ CONFLICTS= cantus-1*
LATEST_LINK= ${PORTNAME}3
-USE_GETTEXT= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= gnomeprefix libglade2 glib20
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/audio/cowbell/Makefile b/audio/cowbell/Makefile
index 88b54da46be4..55aa2e368eda 100644
--- a/audio/cowbell/Makefile
+++ b/audio/cowbell/Makefile
@@ -12,12 +12,11 @@ COMMENT= Elegant music organizer
LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= gnomeprefix intltool gtksharp20
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
USE_ICONV= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index 3a056c112c27..07fbe784e726 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -36,8 +36,7 @@ FLTK_DESC= Build FLTK plugin and GUI
CONFLICTS_INSTALL= outguess-*
USE_PYTHON= 2.6+
-USES= bison
-USE_GETTEXT= yes
+USES= bison gettext
USE_SCONS= yes
SCONS_BUILDENV= PATH=${LOCALBASE}/bin:$$PATH
SCONS_ARGS= prefix="${PREFIX}" CC="${CC}" CXX="${CXX}" \
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index 7f6efc5dc511..808bd094bf6a 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= samplerate:${PORTSDIR}/audio/libsamplerate \
execinfo:${PORTSDIR}/devel/libexecinfo
GNU_CONFIGURE= yes
-USES= pkgconfig
-USE_GETTEXT= yes
+USES= pkgconfig gettext
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_BZIP2= yes
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 003a9a16b68b..bc98532fa46c 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -19,13 +19,12 @@ LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
CONFLICTS= gnome-control-center-3.[0-9]* libgnome-media-profiles-3.[0-9]*
USE_BZIP2= yes
-USE_GETTEXT= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= gnomeprefix intlhack gtk20 libxml2 gconf2
USE_GSTREAMER= gconf good
CONFIGURE_ARGS= --disable-gstmix
diff --git a/audio/kaudiocreator/Makefile b/audio/kaudiocreator/Makefile
index 4b9e1d36f8b1..371cb7dfd931 100644
--- a/audio/kaudiocreator/Makefile
+++ b/audio/kaudiocreator/Makefile
@@ -33,7 +33,7 @@ OPTIONS_DEFINE= NLS
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile
index 690602655ef7..0df2598635d6 100644
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -14,8 +14,7 @@ LATEST_LINK= ${PORTNAME}-kde4
USE_KDE4= kdelibs kdeprefix kdehier automoc4
USE_QT4= qmake_build moc_build rcc_build uic_build
-USES= cmake
-USE_GETTEXT= yes
+USES= cmake gettext
MAKE_JOBS_SAFE= yes
OPTIONS_DEFINE= FLAC ID3LIB MP4V2 VORBIS TAGLIB CHROMAPRINT
diff --git a/audio/libmp3splt/Makefile b/audio/libmp3splt/Makefile
index 3330c7021550..55e0d2525738 100644
--- a/audio/libmp3splt/Makefile
+++ b/audio/libmp3splt/Makefile
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+= --disable-id3tag
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
LANGUAGES= de_DE cs es fr_FR hr
.for language in ${LANGUAGES}
PLIST_FILES+= share/locale/${language}/LC_MESSAGES/libmp3splt0.mo
diff --git a/audio/linnya/Makefile b/audio/linnya/Makefile
index 09985cdea48f..8a330c207c95 100644
--- a/audio/linnya/Makefile
+++ b/audio/linnya/Makefile
@@ -33,7 +33,7 @@ OPTIONS_DEFINE= NLS
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index 3a2057daf793..d9fac8fa4e90 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -31,7 +31,7 @@ OPTIONS_DEFAULT= NLS
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
LANGUAGES= cs de_DE es fr_FR
.for language in ${LANGUAGES}
PLIST_FILES+= share/locale/${language}/LC_MESSAGES/mp3splt.mo
diff --git a/audio/rezound/Makefile b/audio/rezound/Makefile
index b326a93d0947..a1183efd3694 100644
--- a/audio/rezound/Makefile
+++ b/audio/rezound/Makefile
@@ -86,7 +86,7 @@ RUN_DEPENDS+= cdrdao:${PORTSDIR}/sysutils/cdrdao
# NLS support is broken as of recent versions of libstdc++; rezound dies at
# startup with "locale::facet::_S_create_c_locale name not valid" exception
.if ${PORT_OPTIONS:MBROKEN_NLS} # Enable only if you know what you're doing
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile
index 04e91e715c6e..600ae048e16b 100644
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -252,7 +252,7 @@ PLIST_SUB+= WAVPACK="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index 2a98d02375b9..ead6069c1faa 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -36,7 +36,7 @@ SSE_DESC= use SSE instructions
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
LDFLAGS+= -lintl
.else
diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile
index 64a22a029941..d1a5726d4e02 100644
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@@ -31,7 +31,7 @@ TRAY_DESC= Tray icon and libnotify support
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB+= NLS=""
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 5890b4ae93d2..0d4ce5f8c554 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USES= pkgconfig
+USES= pkgconfig gettext
USE_BZIP2= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20 gtk20 intltool intlhack desktopfileutils
USE_XFCE= configenv libmenu libutil panel xfconf
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index 552e4e441b17..aac26939f7d5 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -13,11 +13,10 @@ COMMENT= GTK-based MP3 player
LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
gdbm.4:${PORTSDIR}/databases/gdbm
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= gtk20 lthack
WANT_GNOME= yes
USE_PERL5= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-ipv6
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 656f77d17c50..13be739e5732 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -20,11 +20,10 @@ RUN_DEPENDS= gawk:${PORTSDIR}/lang/gawk
OPTIONS_DEFINE= DOCS
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= desktopfileutils gtk20
USE_PERL5_RUN= yes
USE_PYTHON= run
-USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-libstroke=${LOCALBASE}
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index d123ceef4cd6..f5ae13981ee3 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -22,7 +22,6 @@ DOCVERSION= 1.1
LIBVERSION= 1.0
USE_BZIP2= yes
-USE_GETTEXT= yes
#USE_GMAKE= yes
USE_GL= yes
USE_WX= 2.8
@@ -38,7 +37,7 @@ PLIST_SUB= OPSYS=${OPSYS} \
BINS= cvpcb eeschema gerbview kicad pcbnew
EXTRAS2RM= linux-non_unicode linux wings3d LINUX.README \
contrib_makefiles.txt running_kicad_under_W98.txt
-USES= cmake
+USES= cmake gettext
CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \
-DKICAD_TESTING_VERSION=ON \
-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index 6789efdee068..aec7adb6bfb3 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -41,7 +41,7 @@ PLIST_SUB= DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
.if defined(WITHOUT_NLS)
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index fddd0db1feef..eb597f48c8e8 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -26,7 +26,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile
index e0e13eab8346..2f4e5462c936 100644
--- a/cad/pdnmesh/Makefile
+++ b/cad/pdnmesh/Makefile
@@ -26,10 +26,9 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
OPTIONS_DEFINE= ATLAS DOCS EXAMPLES
ATLAS_DESC= Enable ATLAS support
-USES= pkgconfig
+USES= pkgconfig gettext
USE_FORTRAN= yes
USE_GL= glu
-USE_GETTEXT= yes
USE_ICONV= yes
USE_GNOME= gdkpixbuf2 gtk20
USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
diff --git a/cad/repsnapper/Makefile b/cad/repsnapper/Makefile
index da940485785a..7e4c4f125478 100644
--- a/cad/repsnapper/Makefile
+++ b/cad/repsnapper/Makefile
@@ -47,7 +47,7 @@ USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
xfixes xi xinerama xmu xrandr xrender xt xxf86vm
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/chinese/fcitx-configtool/Makefile b/chinese/fcitx-configtool/Makefile
index b018b3f6e592..5dbe4e5bf712 100644
--- a/chinese/fcitx-configtool/Makefile
+++ b/chinese/fcitx-configtool/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS= fcitx-config:${PORTSDIR}/chinese/fcitx
USE_XZ= yes
USE_GNOME= intltool gnomehack
-USE_GETTEXT= yes
-USES= cmake
+USES= cmake gettext
OPTIONS_DEFINE= GTK2 GTK3
OPTIONS_DEFAULT=GTK2
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index 7b37f94ba1bf..3f3e9b2c526a 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -31,10 +31,9 @@ CONFLICTS= zh-scim-fcitx-3.*
USE_XZ= yes
USE_GNOME= pango intltool libxml2 gnomehack
-USE_GETTEXT= yes
USE_XORG= x11 xext xkbfile
USE_LDCONFIG= yes
-USES= cmake
+USES= cmake gettext
INSTALLS_ICONS= yes
OPTIONS_DEFINE= GTK2 GTK3 QT4 OPENCC TPUNC
diff --git a/chinese/opencc/Makefile b/chinese/opencc/Makefile
index c0a997f7becb..54fe20d9485f 100644
--- a/chinese/opencc/Makefile
+++ b/chinese/opencc/Makefile
@@ -21,7 +21,7 @@ USES= cmake
USE_LDCONFIG= yes
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
CMAKE_ARGS+= -DENABLE_GETTEXT=On
PLIST_SUB+= NLS=""
.else
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index d524cda6fdc3..ef9838544e2d 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=--with-gtk-version=gtk2
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index b2e07191791a..f9025b950f5a 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -18,9 +18,8 @@ OPTIONS_DEFINE= BASH
CMAKE_ARGS+= -DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata
-USES= cmake
+USES= cmake gettext
USE_PYTHON= yes
-USE_GETTEXT= yes
USE_GNOME= glib20
PORTDOCS= *
diff --git a/comms/libticables2/Makefile b/comms/libticables2/Makefile
index 369dc2173a7e..697935522676 100644
--- a/comms/libticables2/Makefile
+++ b/comms/libticables2/Makefile
@@ -26,7 +26,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/comms/libticalcs2/Makefile b/comms/libticalcs2/Makefile
index e26aab84a6b6..cd7e3d987e3d 100644
--- a/comms/libticalcs2/Makefile
+++ b/comms/libticalcs2/Makefile
@@ -29,7 +29,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index ed7d09ead562..ad49179d8372 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -32,7 +32,7 @@ MAN1= tilp.1
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/dbf/Makefile b/databases/dbf/Makefile
index cf3cb90d278f..d4a1b8c64cc4 100644
--- a/databases/dbf/Makefile
+++ b/databases/dbf/Makefile
@@ -27,7 +27,7 @@ MAKE_JOBS_SAFE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lintl
PLIST_SUB+= NLS=""
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index a9df23fba152..574103f87bf6 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup \
USE_BZIP2= yes
USE_GMAKE= yes
-USES= bison pathfix
-USE_GETTEXT= yes
+USES= bison pathfix gettext
USE_GNOME= gnomeprefix intlhack ltverhack ltasneededhack gconf2 \
libxml2
USE_OPENLDAP= yes
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index 509dbcc8c51b..18d9d6f61979 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=--without-mysql
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index deec17afe57e..c0e16f4a5def 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -13,11 +13,10 @@ BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
xml2.5:${PORTSDIR}/textproc/libxml2
-USES= pkgconfig
+USES= pkgconfig gettext
USE_BZIP2= yes
USE_ICONV= yes
USE_PYTHON= yes
-USE_GETTEXT= yes
CXXFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
USE_AUTOTOOLS= libtool
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 2821f115797c..1c2e36fbaa2f 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -24,9 +24,8 @@ LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt \
json-glib-1.0:${PORTSDIR}/devel/json-glib
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= gnomeprefix glib20 libxslt intlhack referencehack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile
index 8a60f69d90f8..2582cf43f845 100644
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@@ -20,14 +20,13 @@ DATADIR= ${PREFIX}/share/cairo-dock
ICONS_PACKAGE= cairo-dock-plugins-png-icons
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2
USE_LDCONFIG= yes
USE_PYTHON= yes
USE_XORG= xrender
USE_DOS2UNIX= YES
-USES= cmake
+USES= cmake gettext
USE_GCC= 4.6+
MAKE_JOBS_SAFE= YES
PLIST_SUB+= PYVER="${PYTHON_VERSION:S/thon//}"
diff --git a/deskutils/chmsee/Makefile b/deskutils/chmsee/Makefile
index 9607d18f604f..671a6a349cfb 100644
--- a/deskutils/chmsee/Makefile
+++ b/deskutils/chmsee/Makefile
@@ -21,8 +21,7 @@ LICENSE= GPLv2
USE_GNOME= gnomehier libglade2
USE_GECKO= libxul19
-USE_GETTEXT= yes
-USES= cmake
+USES= cmake gettext
CMAKE_ARGS= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=TRUE
INSTALLS_ICONS= yes
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 3ecb44a387ef..c89f0ff043f3 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -16,8 +16,7 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
USE_BZIP2= yes
-USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= gnomeprefix pygnomedesktop intlhack
USE_PYTHON= yes
USE_GMAKE= yes
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index 93b695c59e78..33e5b6ebe494 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -16,9 +16,8 @@ GLIB_SCHEMAS= org.gnome.Nautilus.Sendto.gschema.xml
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= intlhack gnomeprefix nautilus2 gnomehack evolutiondataserver
-USE_GETTEXT= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-plugins="${SENDTO_PLUGINS}"
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index f52bfab30fb5..f913fb6cae72 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS= popt:${PORTSDIR}/devel/popt
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USES= pkgconfig
+USES= pkgconfig gettext
USE_BZIP2= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20 intltool intlhack desktopfileutils
USE_XFCE= configenv libmenu panel
diff --git a/deskutils/pal/Makefile b/deskutils/pal/Makefile
index 3568132f12db..25091c15c8f4 100644
--- a/deskutils/pal/Makefile
+++ b/deskutils/pal/Makefile
@@ -11,9 +11,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= h.skuhra@gmail.com
COMMENT= A calendar application
-USES= pkgconfig
+USES= pkgconfig gettext
USE_GNOME= glib20
-USE_GETTEXT= yes
USE_GMAKE= yes
ALL_TARGET=
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile
index 17c1111f4776..c009e9cbb4cc 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -14,11 +14,10 @@ COMMENT= Project management application for GNOME 2
USE_XZ= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= gnomeprefix intlhack libgnomeui libgnomeprintui \
libgsf desktopfileutils
WANT_GNOME= yes
-USE_GETTEXT= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
diff --git a/deskutils/tpb/Makefile b/deskutils/tpb/Makefile
index 0f7a61a55af3..3bba3f71bfa0 100644
--- a/deskutils/tpb/Makefile
+++ b/deskutils/tpb/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE}
MAN1= tpb.1
.ifndef(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index 12f6d8fb6087..a8939888398b 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -40,7 +40,7 @@ SUB_FILES= pkg-message
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 01b612581b34..39b4dd70de48 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -35,8 +35,7 @@ CONFIGURE_SCRIPT= ../gcc-${PORTVERSION}/configure
USE_PERL5_BUILD= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USES= bison
-USE_GETTEXT= yes
+USES= bison gettext
GNU_CONFIGURE= yes
.include <bsd.port.pre.mk>
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 29580eda2f6d..8f54d1458e15 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -75,7 +75,7 @@ PLIST_SUB+= GOLD="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 74c36b4ef6aa..f38303cbe1d7 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -29,7 +29,7 @@ INFO= bison
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 220d19ed4556..7ebaad14ed83 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -20,9 +20,8 @@ CONFLICTS= devhelp-3.[0-9]*
USE_BZIP2= yes
USE_XORG= x11
-USE_GETTEXT= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= intlhack gnomeprefix libgnomeui libwnck
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
diff --git a/devel/ecore-main/Makefile b/devel/ecore-main/Makefile
index 91d353f323bd..e7e4b7e84aa9 100644
--- a/devel/ecore-main/Makefile
+++ b/devel/ecore-main/Makefile
@@ -28,7 +28,7 @@ EXAMPLESDIR= ${PREFIX}/share/examples/ecore
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index 02a0ab80ec7c..22ceb78d29e5 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -11,10 +11,9 @@ MASTER_SITES= http://people.gnome.org/~veillard/gamin/sources/
MAINTAINER?= gnome@FreeBSD.org
COMMENT?= A file and directory monitoring system
-USES= pkgconfig
+USES= pkgconfig gettext
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
-USE_GETTEXT= yes
USE_GNOME?= gnomehack _glib20
USE_LDCONFIG= yes
CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 417886e1a3aa..3b6a07d197f8 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -25,8 +25,7 @@ LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
polkit-gobject-1:${PORTSDIR}/sysutils/polkit
USE_GMAKE= yes
-USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= gnomehier orbit2 gtk20 libxml2 ltverhack \
referencehack intlhack dconf
USE_LDCONFIG= yes
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 80f59f8286c5..9b0a91534cf4 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -31,7 +31,7 @@ MAN1= geany.1
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 19a901af3f82..1119c3614250 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -16,10 +16,9 @@ COMMENT= A user interface builder for GTK+/GNOME
LIB_DEPENDS= rarian.0:${PORTSDIR}/textproc/rarian
USE_BZIP2= yes
-USE_GETTEXT= yes
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= gnomeprefix intlhack gtk20 desktopfileutils
USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 125b60e1736e..8cde0a8189f0 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -24,11 +24,10 @@ PORTSCOUT= limitw:1,even
LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre \
ffi:${PORTSDIR}/devel/libffi
-USE_GETTEXT= yes
USE_ICONV= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-USES= pkgconfig
+USES= pkgconfig gettext
USE_GNOME= gnomehack ltverhack
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 68eb29059d1c..cf5792011f55 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -19,8 +19,7 @@ USE_BZIP2= yes
RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
USE_GMAKE= yes
-USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= gnomeprefix intlhack gnomemimedata gconf2 \
ltverhack referencehack
USE_AUTOTOOLS= libtool
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index dc0101015da5..eaf22f7dc253 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -20,9 +20,8 @@ OPTIONS_DEFINE= DOXYGEN MEMDEBUG
MEMDEBUG_DESC= Enable memory debugger statistic
.endif
-USES= pathfix pkgconfig
+USES= pathfix pkgconfig gettext
USE_GMAKE= yes
-USE_GETTEXT= yes
USE_OPENSSL= yes
USE_AUTOTOOLS= libtool
diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile
index 16c7b9d7fb9d..513fc1f628ba 100644
--- a/devel/kcachegrind/Makefile
+++ b/devel/kcachegrind/Makefile
@@ -14,11 +14,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING
ONLY_FOR_ARCHS= i386 amd64
-USES= cmake
+USES= cmake gettext
USE_KDE4= automoc4 kdehier kdelibs
USE_QT4= moc_build qmake_build rcc_build uic_build
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
OPTIONS_DEFINE= DOT VALGRIND
OPTIONS_DEFAULT= DOT
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index a5f687087b88..311f7ec20755 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -22,7 +22,7 @@ OPTIONS_DEFAULT=NLS
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile
index 77a0eb0630cd..f2456d2f232f 100644
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@@ -43,7 +43,7 @@ RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/kdevphplanguagesupport.so:${PORTSDIR}/deve
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DBUILD_po:BOOL=FALSE
diff --git a/devel/kdevelop-php-docs/Makefile b/devel/kdevelop-php-docs/Makefile
index 0274854619ac..578fa52ac50d 100644
--- a/devel/kdevelop-php-docs/Makefile
+++ b/devel/kdevelop-php-docs/Makefile
@@ -21,7 +21,7 @@ MAKE_JOBS_SAFE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DBUILD_po:BOOL=Off
diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile
index 3a764ca52d49..c0b08dc2669c 100644
--- a/devel/kdevelop-php/Makefile
+++ b/devel/kdevelop-php/Makefile
@@ -32,7 +32,7 @@ RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/kdevphpdocs.so:${PORTSDIR}/devel/kdevelop-
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DBUILD_po:BOOL=Off
diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile
index 335b513615ba..ee06f4ab40f5 100644
--- a/devel/kdevplatform/Makefile
+++ b/devel/kdevplatform/Makefile
@@ -29,7 +29,7 @@ PLIST_SUB+= SHLIB_VER=6.0.0 \
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DBUILD_po:BOOL=Off
diff --git a/devel/libevt/Makefile b/devel/libevt/Makefile
index bc356c1f0700..e8ae473dbc4c 100644
--- a/devel/libevt/Makefile
+++ b/devel/libevt/Makefile
@@ -13,8 +13,7 @@ LICENSE= LGPL3
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-python
-USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix gettext
USE_ICONV= yes
USE_PYTHON= yes
USE_LDCONFIG= yes
diff --git a/devel/libevtx/Makefile b/devel/libevtx/Makefile
index e3a8c0a78d02..0882d17cbeb9 100644
--- a/devel/libevtx/Makefile
+++ b/devel/libevtx/Makefile
@@ -13,8 +13,7 @@ LICENSE= LGPL3
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-python
-USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix gettext
USE_ICONV= yes
USE_PYTHON= yes
USE_LDCONFIG= yes
diff --git a/devel/liblnk/Makefile b/devel/liblnk/Makefile
index d0a71c2c43de..b83ce1762af1 100644
--- a/devel/liblnk/Makefile
+++ b/devel/liblnk/Makefile
@@ -14,8 +14,7 @@ LICENSE= LGPL3
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-python
-USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix gettext
USE_ICONV= yes
USE_PYTHON= yes
USE_LDCONFIG= yes
diff --git a/devel/libmsiecf/Makefile b/devel/libmsiecf/Makefile
index 6860cc69f494..7c83fecd4252 100644
--- a/devel/libmsiecf/Makefile
+++ b/devel/libmsiecf/Makefile
@@ -13,8 +13,7 @@ LICENSE= LGPL3
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-python
-USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix gettext
USE_ICONV= yes
USE_PYTHON= yes
USE_LDCONFIG= yes
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 14cee6e08edd..7029e262257f 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -17,10 +17,9 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
USE_XZ= yes
USE_PYTHON= 2.5+
USE_LDCONFIG= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= glib20 gtk30 ltverhack
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/devel/libpff/Makefile b/devel/libpff/Makefile
index 09ba4aefcf4c..60787e53e015 100644
--- a/devel/libpff/Makefile
+++ b/devel/libpff/Makefile
@@ -13,8 +13,7 @@ LICENSE= LGPL3
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-python
-USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix gettext
USE_ICONV= yes
USE_PYTHON= yes
USE_LDCONFIG= yes
diff --git a/devel/libregf/Makefile b/devel/libregf/Makefile
index 19d4acd5397a..c69f86c380c4 100644
--- a/devel/libregf/Makefile
+++ b/devel/libregf/Makefile
@@ -13,8 +13,7 @@ LICENSE= LGPL3
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-python
-USES= fuse pathfix
-USE_GETTEXT= yes
+USES= fuse pathfix gettext
USE_ICONV= yes
USE_PYTHON= yes
USE_LDCONFIG= yes
diff --git a/devel/libtifiles2/Makefile b/devel/libtifiles2/Makefile
index b67ab1780e38..c86c62dcf345 100644
--- a/devel/libtifiles2/Makefile
+++ b/devel/libtifiles2/Makefile
@@ -28,7 +28,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index a23e4d3e6a57..3ac692891615 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -60,7 +60,7 @@ PLIST_SUB+= QEMU="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CONFIGURE_ARGS+= --enable-nls \
--with-libintl-prefix=${LOCALBASE}
diff --git a/devel/obby/Makefile b/devel/obby/Makefile
index a7bfdc9c3ede..bc914345c781 100644
--- a/devel/obby/Makefile
+++ b/devel/obby/Makefile
@@ -22,7 +22,7 @@ MAKE_JOBS_SAFE= yes
.if !defined(WITHOUT_NLS)
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/devel/piklab/Makefile b/devel/piklab/Makefile
index 2e7f9cff7020..fb17fbf1d97d 100644
--- a/devel/piklab/Makefile
+++ b/devel/piklab/Makefile
@@ -20,8 +20,7 @@ USE_QT4= corelib gui qt3support qtestlib xml \
moc_build qmake_build rcc_build uic_build
USE_NCURSES= yes
USE_READLINE= yes
-USE_GETTEXT= yes
-USES= cmake
+USES= cmake gettext
MAKE_JOBS_SAFE= yes
MAN1= piklab-hex.1 piklab-prog.1
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index d3065f0055bf..e6282f454703 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -31,7 +31,7 @@ PLIST_SUB+= NLS="@comment "
.else
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.endif
.include <bsd.port.mk>
diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index 97eb5100c307..b435444ae439 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -18,8 +18,7 @@ COMMENT= Python bindings for the D-BUS messaging system
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix gettext
USE_PYTHON= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
diff --git a/devel/seed3/Makefile b/devel/seed3/Makefile
index 418293b61363..aba7dfb1c217 100644
--- a/devel/seed3/Makefile
+++ b/devel/seed3/Makefile
@@ -25,8 +25,7 @@ CONFLICTS= seed-2.[0-9]*
LATEST_LINK= seed3
USE_XZ= yes
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= gtk30 intltool libxml2
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile
index 17536a65d450..14e4d8d47925 100644
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@@ -45,7 +45,7 @@ USES+= pkgconfig
LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn
PLIST_SUB+= NLS=""
ALL_TARGET= all-i18n
-USE_GETTEXT= yes
+USES+= gettext
USE_GMAKE= yes
.else
PLIST_SUB+= NLS="@comment "
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index debea8753dbd..fcd118648b65 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -27,8 +27,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GMAKE= yes
USE_ICONV= yes
-USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= libxml2 gtk20 desktopfileutils librsvg2 libxslt
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 1e4fc89a3d2e..7109198d756c 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -22,9 +22,8 @@ CONFLICTS= gedit-plugins-3.[0-9]*
USE_LDCONFIG= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= gnomeprefix intlhack gnomevfs2
WANT_GNOME= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/editors/yzis/Makefile b/editors/yzis/Makefile
index 4fd194208c04..d389bd742c09 100644
--- a/editors/yzis/Makefile
+++ b/editors/yzis/Makefile
@@ -16,14 +16,13 @@ LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
USE_BZIP2= yes
-USE_GETTEXT= yes
USE_XORG= x11 xext ice
USE_LUA= 5.1
LUA_COMPS= lua
USE_QT4= qtestlib qmake_build rcc_build uic_build moc_build gui xml
USE_PERL5= yes
-USES= cmake
+USES= cmake gettext
CMAKE_ARGS+= -DLOCALBASE:STRING="${LOCALBASE}" \
-DLUA_INCDIR:STRING="${LUA_INCDIR}" \
-DLUA_LIBDIR:STRING="${LUA_LIBDIR}" \
diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile
index 1bbd88a1d754..932db7faaab4 100644
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@@ -22,12 +22,11 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
xcb:${PORTSDIR}/x11/libxcb
-USES= pkgconfig
+USES= pkgconfig gettext
USE_GNOME= gdkpixbuf2 gtk20
USE_PERL5= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_GETTEXT= yes
USE_AUTOTOOLS= libtool libltdl
CONFIGURE_ENV= ac_cv_have_isinff=no
CONFIGURE_ARGS= --datadir=${WRKDIR}/tmproot --disable-warnings
diff --git a/finance/aqbanking/Makefile b/finance/aqbanking/Makefile
index 48cb239f7b88..3e814ed49240 100644
--- a/finance/aqbanking/Makefile
+++ b/finance/aqbanking/Makefile
@@ -22,9 +22,8 @@ KTOBLZCHECK_DESC= Enable KtoBlzCheck support
PAYPAL_DESC= Build PayPal backend (separate license)
USE_GMAKE= yes
-USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
-USES= pathfix pkgconfig
+USES= pathfix pkgconfig gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-release="yes"
diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 9c1c56c510a3..cbb4108769e7 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -36,7 +36,7 @@ MAN1= kmymoney.1
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DENABLE_NLS:BOOL=OFF
diff --git a/french/verbiste/Makefile b/french/verbiste/Makefile
index 52bc4975e17a..82fb2df405e4 100644
--- a/french/verbiste/Makefile
+++ b/french/verbiste/Makefile
@@ -45,7 +45,7 @@ PLIST_SUB+= HASGNOME="@comment "
.endif
.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGNOME}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= HASGUI=""
.else
PLIST_SUB+= HASGUI="@comment "
diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index 6b531fc1804c..1308b4e04471 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -46,7 +46,7 @@ PLIST_SUB+= NOX11:="@comment "
MAN1= gftp.1
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/ftp/gwget/Makefile b/ftp/gwget/Makefile
index 78e37601cf32..e7e95f0bd234 100644
--- a/ftp/gwget/Makefile
+++ b/ftp/gwget/Makefile
@@ -20,8 +20,7 @@ EPIPHANY_DESC= Epiphany extension
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= desktopfileutils gnomeprefix gtk20 gconf2 libgnomeui
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 990d8bb3ebaf..44d61ed58261 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+=--disable-ipv6
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 13ca7338d68e..472e1a386c36 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -22,11 +22,10 @@ CONFLICTS= sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* gnome-games-3.[0-9]*
USE_BZIP2= yes
USE_PYTHON= yes
-USE_GETTEXT= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_GMAKE= yes
-USES= pathfix
+USES= pathfix gettext
USE_GNOME= gnomeprefix intlhack librsvg2 desktopfileutils \
pygnomedesktop gnomedocutils
USE_GSTREAMER= vorbis ogg
diff --git a/games/hinversi/Makefile b/games/hinversi/Makefile
index 2f6c194ef6fd..3d47073f9303 100644
--- a/games/hinversi/Makefile
+++ b/games/hinversi/Makefile
@@ -27,7 +27,7 @@ MAN1= hinversi-cli.1
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--with-libintl-prefix=${LOCALBASE}
PLIST_SUB+= NLS=""
.else
diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile
index 593409b0b02d..0b91995c6b61 100644
--- a/games/knights-kde4/Makefile
+++ b/games/knights-kde4/Makefile
@@ -26,7 +26,7 @@ CMAKE_ARGS+= -DBUILD_doc=FALSE
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/games/lianliankan/Makefile b/games/lianliankan/Makefile
index 54febc406972..dc1643c9296d 100644
--- a/games/lianliankan/Makefile
+++ b/games/lianliankan/Makefile
@@ -30,7 +30,7 @@ DOCSDIR= ${PREFIX}/share/doc/llk_linux
.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/games/minetest/Makefile b/games/minetest/Makefile
index ad3fb3cec1d8..f1da80eefc23 100644
--- a/games/minetest/Makefile
+++ b/games/minetest/Makefile
@@ -38,7 +38,7 @@ SOUND_DESC= Enable sound
.if ${PORT_OPTIONS:MNLS}
CMAKE_ARGS+= -DENABLE_GETTEXT:BOOL=YES
-USE_GETTEXT= yes
+USES+= gettext
LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB+= NLS=""
.else
diff --git a/games/springlobby/Makefile b/games/springlobby/Makefile
index ef83efd7f68f..4988795755c9 100644
--- a/games/springlobby/Makefile
+++ b/games/springlobby/Makefile
@@ -34,7 +34,7 @@ OPTIONS= TORRENT "Support automatic content downloads via torrent" on \
.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
diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index 9d0b3aef4196..4a364a0392d7 100644
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@@ -23,10 +23,9 @@ LIB_DEPENDS= vorbisfile:${PORTSDIR}/audio/libvorbis \
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
diff --git a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile
index 7ca923780428..cdfb857c7278 100644
--- a/games/ultimatestunts/Makefile
+++ b/games/ultimatestunts/Makefile
@@ -17,11 +17,10 @@ LIB_DEPENDS= vorbisfile.6:${PORTSDIR}/audio/libvorbis
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
diff --git a/games/valyriatear/Makefile b/games/valyriatear/Makefile
index 5e2f1d9cca42..e196225e2c88 100644
--- a/games/valyriatear/Makefile
+++ b/games/valyriatear/Makefile
@@ -21,13 +21,12 @@ LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \
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= *
diff --git a/games/violetland/Makefile b/games/violetland/Makefile
index be06985ef924..17c321f250c2 100644
--- a/games/violetland/Makefile
+++ b/games/violetland/Makefile
@@ -18,8 +18,7 @@ USE_ZIP= yes
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}"
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index 44445ec8720b..49f28fc47feb 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -51,7 +51,7 @@ IGNORE= does not build on < 8.x
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 503b3d64b144..5651e29326fe 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -90,7 +90,7 @@ CMAKE_ARGS+= -DENABLE_NOTIFICATIONS=off
.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}
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 1642e230a2b4..3025cc1c68e3 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -166,7 +166,7 @@ USE_GNOME= desktopfileutils
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
USE_ICONV= yes
CMAKE_ARGS+= -DWITH_INTERNATIONAL:BOOL=ON
.else
diff --git a/graphics/cbrpager/Makefile b/graphics/cbrpager/Makefile
index b6db86b7308c..c2dcc9e3eb69 100644
--- a/graphics/cbrpager/Makefile
+++ b/graphics/cbrpager/Makefile
@@ -37,7 +37,7 @@ DESKTOP_ENTRIES="cbrPager" "Comic book viewer" \
.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
diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index 9eceaaba2ff3..f661de822cab 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -19,9 +19,8 @@ LIB_DEPENDS= polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
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
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index aab758836587..6bd856b3edde 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -16,12 +16,11 @@ COMMENT= Diagram creation program, similar to Visio
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}"
diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile
index 5ab68ae44846..4d1c7380e03c 100644
--- a/graphics/electrix/Makefile
+++ b/graphics/electrix/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --disable-dbus
.if ${PORT_OPTIONS:MNLS}
PLIST_SUB= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.else
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB= NLS="@comment "
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index aa1bf25f0794..32efa2a7155a 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -25,10 +25,9 @@ USE_LDCONFIG= yes
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
diff --git a/graphics/exif/Makefile b/graphics/exif/Makefile
index cc0e9d0c1da6..924340d8422a 100644
--- a/graphics/exif/Makefile
+++ b/graphics/exif/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --disable-nls --without-libiconv-prefix
PLIST_SUB+= NLS="@comment "
.else
USE_ICONV= yes
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index 4b05112a4276..09e32590dde3 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -22,10 +22,9 @@ SPIRO_DESC= Spiro support
#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
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index ca8412d77978..6a656dafac34 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -33,13 +33,12 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
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
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index dba841e27e49..010befb546e8 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--without-aalib --without-jpeg
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 44ca67208d5c..3b4618a19ee2 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -15,8 +15,7 @@ LIB_DEPENDS= unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
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
diff --git a/graphics/hugin-devel/Makefile b/graphics/hugin-devel/Makefile
index 1a8456882163..c947f07fdb45 100644
--- a/graphics/hugin-devel/Makefile
+++ b/graphics/hugin-devel/Makefile
@@ -36,14 +36,13 @@ USE_BZIP2= yes
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
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 2325e9c58d76..839ed703730a 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -31,14 +31,13 @@ USE_BZIP2= yes
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
diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index da9626faf21b..61ec416b6096 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -39,8 +39,7 @@ USE_GNOME= gtksourceview2
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 \
diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile
index 59bf4cc7a4b2..1b3b9f2a7999 100644
--- a/graphics/kphotoalbum-kde4/Makefile
+++ b/graphics/kphotoalbum-kde4/Makefile
@@ -37,7 +37,7 @@ CMAKE_ARGS+= -DWITH_Marble:BOOL=Off
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DBUILD_po:BOOL=Off
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 4f86bd29687e..62558f77e6c7 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -26,7 +26,7 @@ PORTDOCS= AUTHORS ChangeLog NEWS README
.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/graphics/libexif/Makefile b/graphics/libexif/Makefile
index efcbb24e9832..7c298a9e108f 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -26,7 +26,7 @@ PORTDOCS= AUTHORS ChangeLog NEWS README
.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
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index f73bdfe22246..fff01102ea8c 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -26,12 +26,11 @@ CONFLICTS_INSTALL= kvirc-qt4-4.*
.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
diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index a12ad358654d..4c9dade22c97 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -59,7 +59,7 @@ PLIST_SUB+= CHARSET="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DENABLE_NLS=no
diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index 7aad8a535fca..dff5058b82d4 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -48,7 +48,7 @@ PLIST_SUB+= CHARSET="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DENABLE_NLS=no
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 8a1b69a95b47..4a699cb26b40 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -17,10 +17,9 @@ LIB_DEPENDS= sexy:${PORTSDIR}/x11-toolkits/libsexy \
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}"
diff --git a/japanese/libskk/Makefile b/japanese/libskk/Makefile
index c2e8502832ee..63bd8b99384c 100644
--- a/japanese/libskk/Makefile
+++ b/japanese/libskk/Makefile
@@ -29,7 +29,7 @@ OPTIONS_DEFINE= NLS
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile
index c84e9b7e873c..b56b2398c3cf 100644
--- a/java/sablevm/Makefile
+++ b/java/sablevm/Makefile
@@ -18,11 +18,10 @@ RUN_DEPENDS= fastjar:${PORTSDIR}/archivers/fastjar
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
diff --git a/korean/scim-hangul/Makefile b/korean/scim-hangul/Makefile
index 510822a4613e..7b7e2b6710a4 100644
--- a/korean/scim-hangul/Makefile
+++ b/korean/scim-hangul/Makefile
@@ -23,7 +23,7 @@ OPTIONS_DEFINE= NLS
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/lang/hiphop-php/Makefile b/lang/hiphop-php/Makefile
index cb4785d4b7d3..b8d5b571d0c2 100644
--- a/lang/hiphop-php/Makefile
+++ b/lang/hiphop-php/Makefile
@@ -64,12 +64,11 @@ WRKSRC= ${WRKDIR}/facebook-hiphop-php-${GITVERSION}
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
diff --git a/lang/lafontaine/Makefile b/lang/lafontaine/Makefile
index 3614fadb07ad..a0a4eb63e44b 100644
--- a/lang/lafontaine/Makefile
+++ b/lang/lafontaine/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE= yes
USE_CSTD= gnu89
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS= --disable-nls
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 3f377e6589f4..84c5ba80b103 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= gtar:${PORTSDIR}/archivers/gtar
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 \
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 865650a9d32f..8dc1f823b6e9 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -14,13 +14,12 @@ BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
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
diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile
index 5ae1c9d9dd68..cfa143a5afb1 100644
--- a/lang/pike76/Makefile
+++ b/lang/pike76/Makefile
@@ -83,8 +83,7 @@ CONFIGURE_ARGS+= --without-debug \
MAKE_ARGS= CONFIGUREARGS="${CONFIGURE_ARGS}"
-USE_GETTEXT= yes
-USES= bison
+USES= bison gettext
USE_GMAKE= yes
# Allow building Embedded Perl
diff --git a/lang/pike78/Makefile b/lang/pike78/Makefile
index 29727e669f52..a82e44c81b1b 100644
--- a/lang/pike78/Makefile
+++ b/lang/pike78/Makefile
@@ -74,8 +74,7 @@ CONFIGURE_ARGS+= --without-debug \
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
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 8c40b60b9f81..34d571390c9a 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -25,10 +25,9 @@ INSTALLS_OMF= yes
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
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 03ae5d8a2186..57dc148642c6 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -120,7 +120,7 @@ PLIST_SUB+= MANUAL="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 7e70f66a34cc..63e99cdee13a 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -21,8 +21,7 @@ CONFLICTS= evolution-3.[0-9]*
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
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 6ffe79e58ffa..9acfc871f35c 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -25,14 +25,13 @@ PLIST_SUB+= ETCDIR=etc/rspamd \
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
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index c207b06c8543..16309f855a66 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -22,9 +22,8 @@ LIB_DEPENDS= goffice-0.8:${PORTSDIR}/devel/goffice \
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
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index db9c0a23a441..6dcf86cbbb34 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -67,7 +67,7 @@ PLIST_SUB+= GUI="@comment "
.if ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+= --enable-nls=yes
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --enable-nls=no
diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile
index 16b58cd0033a..c33ddd39f78d 100644
--- a/math/libqalculate/Makefile
+++ b/math/libqalculate/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG= 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/math/oleo/Makefile b/math/oleo/Makefile
index e8320576e310..b404e286f9a8 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+= --without-motif
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index ec35bf158e9d..2d9a2db763f9 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -23,8 +23,7 @@ USE_QT4= qmake_build moc_build rcc_build uic_build phonon
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
diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile
index f9c480e4fff0..8447e0088033 100644
--- a/misc/krecipes-kde4/Makefile
+++ b/misc/krecipes-kde4/Makefile
@@ -22,8 +22,7 @@ OPTIONS_MULTI= DB
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
diff --git a/misc/lifelines/Makefile b/misc/lifelines/Makefile
index 7dd5967140a9..615115dc5c14 100644
--- a/misc/lifelines/Makefile
+++ b/misc/lifelines/Makefile
@@ -18,7 +18,7 @@ USES= bison
MAN1= btedit.1 dbverify.1 llines.1
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index 36791bab1fb0..96ec801c996c 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -26,7 +26,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
#PLIST_SUB+= NLS="@comment "
#.else
CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -lintl -liconv"
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
#.endif
diff --git a/misc/mc-light/Makefile b/misc/mc-light/Makefile
index 0e112e91be22..5eb782ff31be 100644
--- a/misc/mc-light/Makefile
+++ b/misc/mc-light/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=--without-subshell
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/misc/terraform/Makefile b/misc/terraform/Makefile
index 92a224eb8c0b..4c4be284ed31 100644
--- a/misc/terraform/Makefile
+++ b/misc/terraform/Makefile
@@ -19,9 +19,8 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libtrio.a:${PORTSDIR}/devel/trio
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
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 0769d991d23a..76e037d92141 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup
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
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index ac7cf0383196..b26dccb0c46d 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -28,7 +28,7 @@ EFENCE_DESC= Electric Fence (require profiling)
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_UNICODE= yes
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
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index 683a0993ce3d..675d2d19cf1b 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -33,7 +33,7 @@ OPTIONS_DEFAULT= OSS VORBIS
.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/multimedia/bino/Makefile b/multimedia/bino/Makefile
index 45a22c3a932c..6a0c2057d564 100644
--- a/multimedia/bino/Makefile
+++ b/multimedia/bino/Makefile
@@ -32,7 +32,7 @@ MAN1= bino.1
INFO= bino
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/multimedia/freetuxtv/Makefile b/multimedia/freetuxtv/Makefile
index 6d306ce6f5b0..e54364a879fd 100644
--- a/multimedia/freetuxtv/Makefile
+++ b/multimedia/freetuxtv/Makefile
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+=--with-gtk=2.0
.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/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index c838555b6fd2..321589fe30ff 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -25,8 +25,7 @@ DVDREAD_DESC= libdvdread support
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
diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index 8b84ea51c524..945d6aff373f 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -22,11 +22,10 @@ OPTIONS_DEFAULT= CDDB CDIO JACK JPEG LIBVISUAL \
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
diff --git a/multimedia/gmtk/Makefile b/multimedia/gmtk/Makefile
index 432a0a492caa..6eb33aa0d0ec 100644
--- a/multimedia/gmtk/Makefile
+++ b/multimedia/gmtk/Makefile
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+= --disable-gtk3
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index e1a41e6f0e21..671c660fdcbd 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -41,13 +41,12 @@ UGLY_DISTFILE= ${UGLY_DISTNAME}${EXTRACT_SUFX}
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
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 383aa4991c64..1ac3cc094b47 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -17,11 +17,10 @@ RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i
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 \
diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
index 88e62299ef1f..9de097d665ca 100644
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -54,7 +54,7 @@ RUN_DEPENDS+= swhplugins>=0:${PORTSDIR}/audio/swhplugins
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DBUILD_po:BOOL=FALSE
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 976618444c3b..774386024875 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -22,9 +22,8 @@ FFMPEG_KINO_DESC= With ffmpeg-kino
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
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 730e0cfa6c9b..b227474f54b6 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -97,7 +97,7 @@ IGNORE= only builds with -O1 or higher, check CFLAGS
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 4d2f2e87a9ad..c0cdc5cb8a66 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -89,7 +89,7 @@ PLIST_SUB+= FREI0R="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index ea0432a33f46..5a6de9aae401 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -24,10 +24,9 @@ LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \
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
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index 3bcbb627c3d8..a257c85448a1 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -33,9 +33,8 @@ MP4BOX_DESC= Enable Mpeg-4 container support
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
diff --git a/multimedia/quark/Makefile b/multimedia/quark/Makefile
index cd28091aa37e..4d7adfde622f 100644
--- a/multimedia/quark/Makefile
+++ b/multimedia/quark/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine
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
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index 65a7ac3364e0..65f3dd17a457 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -26,7 +26,7 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lswscale
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= WITH_NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= WITH_NLS=""
.endif
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 18dc1e58cd81..1dd2137fa2d9 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -19,9 +19,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i
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
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index c30fed86752a..16b91e045ef6 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -26,8 +26,7 @@ CONFLICTS= totem-3.[0-9]*
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
diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile
index 3ba84d7fc332..07221cf7e4e6 100644
--- a/multimedia/vdr/Makefile
+++ b/multimedia/vdr/Makefile
@@ -22,11 +22,10 @@ DVBPATCH_DESC= DVB audio patch for some countries
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
diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index 4905303aeaf5..3f40131227ad 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS= xine:${PORTSDIR}/multimedia/libxine
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
diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile
index 9da1dae47ab0..c7085ca1caee 100644
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@@ -50,7 +50,7 @@ USE_GSTREAMER+= soup
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/net-im/hotot/Makefile b/net-im/hotot/Makefile
index e8a8a8446a38..8d0769d0cfc8 100644
--- a/net-im/hotot/Makefile
+++ b/net-im/hotot/Makefile
@@ -16,8 +16,7 @@ GH_PROJECT= Hotot
GH_TAGNAME= master
GH_COMMIT= e0c78bf
-USES= cmake
-USE_GETTEXT= yes
+USES= cmake gettext
USE_PYTHON= yes
USE_GNOME= intltool
INSTALLS_ICONS= yes
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index 30a18d6a4d44..cd59f6d02e1f 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=--with-openssl-lib=${OPENSSLLIB}
CMAKE_ARGS+= -DENABLE_NLS:BOOL=OFF
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index 8073e9aef127..bdd6f265e4ab 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -19,9 +19,8 @@ GNU_CONFIGURE= yes
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
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index 1de97c4b807e..edb50afbfc43 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin
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"
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index f63016744284..a541043374cf 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=--disable-debug
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index e301e35f7b0e..9c76f51aa2e3 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+=--disable-debug
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/net-p2p/eiskaltdcpp-daemon/Makefile b/net-p2p/eiskaltdcpp-daemon/Makefile
index 3d5236563483..e777bcba775b 100644
--- a/net-p2p/eiskaltdcpp-daemon/Makefile
+++ b/net-p2p/eiskaltdcpp-daemon/Makefile
@@ -26,8 +26,7 @@ PROJECTHOST= eiskaltdc
USE_XZ= yes
USE_GCC= 4.6+
-USE_GETTEXT= yes
-USES= cmake
+USES= cmake gettext
USE_OPENSSL= yes
MAKE_JOBS_SAFE= yes
diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile
index 9be1749f3190..5e80b5f99343 100644
--- a/net-p2p/eiskaltdcpp-gtk/Makefile
+++ b/net-p2p/eiskaltdcpp-gtk/Makefile
@@ -28,8 +28,7 @@ PROJECTHOST= eiskaltdc
USE_XZ= yes
USE_GCC= 4.6+
-USES= cmake
-USE_GETTEXT= yes
+USES= cmake gettext
USE_OPENSSL= yes
MAKE_JOBS_SAFE= yes
diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile
index 2473ddf20ca4..8a80e053bef6 100644
--- a/net-p2p/eiskaltdcpp-lib/Makefile
+++ b/net-p2p/eiskaltdcpp-lib/Makefile
@@ -20,8 +20,7 @@ PROJECTHOST= eiskaltdc
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
diff --git a/net-p2p/eiskaltdcpp-qt/Makefile b/net-p2p/eiskaltdcpp-qt/Makefile
index 8385930d780e..b97aeb7f1c65 100644
--- a/net-p2p/eiskaltdcpp-qt/Makefile
+++ b/net-p2p/eiskaltdcpp-qt/Makefile
@@ -29,8 +29,7 @@ PROJECTHOST= eiskaltdc
USE_XZ= yes
USE_GCC= 4.6+
-USE_GETTEXT= yes
-USES= cmake
+USES= cmake gettext
USE_OPENSSL= yes
MAKE_JOBS_SAFE= yes
diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index ac1f496b014e..90c12a077a9d 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -100,7 +100,7 @@ CONFIGURE_ARGS+= -U d_gnutls
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= -D d_nls
PLIST_SUB+= NLS=""
.else
diff --git a/net/net6/Makefile b/net/net6/Makefile
index 9cfc1c601771..f4010d49aee6 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -24,7 +24,7 @@ USE_LDCONFIG= yes
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
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 7ea3cb1ec02d..0b96c48a3341 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -73,8 +73,7 @@ USE_PERL5_BUILD= yes
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
diff --git a/net/smb4k-kde4/Makefile b/net/smb4k-kde4/Makefile
index 1cf3ec240793..61722f1f8809 100644
--- a/net/smb4k-kde4/Makefile
+++ b/net/smb4k-kde4/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= sudo:${PORTSDIR}/security/sudo \
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
diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile
index 990ddaecb402..08e4be327768 100644
--- a/net/tigervnc/Makefile
+++ b/net/tigervnc/Makefile
@@ -62,7 +62,7 @@ CMAKE_ARGS+= -DENABLE_GNUTLS=0
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CMAKE_ARGS+= -DENABLE_NLS=1
PLIST_SUB+= NLS=""
.else
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index e33d0548a1e0..144625d09eea 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS= gtk-vnc-1.0:${PORTSDIR}/net/gtk-vnc \
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
diff --git a/news/pan/Makefile b/news/pan/Makefile
index c449b994e584..b93de8354f23 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -19,9 +19,8 @@ LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre \
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
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index bd0c55fd1566..c800b463a463 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --with-pilot-prefix=${LOCALBASE}
LICENSE= GPLv2
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB= NLS=""
.else
diff --git a/palm/synce-trayicon/Makefile b/palm/synce-trayicon/Makefile
index cc67974f016d..3b90ca055215 100644
--- a/palm/synce-trayicon/Makefile
+++ b/palm/synce-trayicon/Makefile
@@ -23,8 +23,7 @@ MAKE_JOBS_SAFE= yes
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
diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index 7034512bb5d4..281f92bf0f64 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -44,9 +44,8 @@ GG6_EMOTS_DISTFILE= kompatybilne_z_GG6.tar.gz
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
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 02ba62a60ba2..0f766255ff2a 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -21,11 +21,10 @@ USE_BZIP2= yes
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
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index f86df15bcd50..384e45c857bd 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -41,8 +41,7 @@ INFO= lilypond-notation \
music-glossary \
internals
-USES= bison:build
-USE_GETTEXT= yes
+USES= bison:build gettext
USE_GMAKE= yes
USE_GHOSTSCRIPT=9
USE_PYTHON= yes
diff --git a/science/gramps/Makefile b/science/gramps/Makefile
index 9e0f63ec481e..21eca70b12c0 100644
--- a/science/gramps/Makefile
+++ b/science/gramps/Makefile
@@ -19,9 +19,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb \
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
diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile
index ff93fcd31747..3feeda5a7bd9 100644
--- a/science/gwyddion/Makefile
+++ b/science/gwyddion/Makefile
@@ -20,10 +20,9 @@ OPTIONS_DEFAULT=PERL PYTHON UNIQUE
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 \
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 001a7b2d5a8d..b73aacb532b0 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -64,7 +64,7 @@ PLIST_SUB+= CXX=""
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index dd7fe5a35411..f69f14d9e809 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -27,7 +27,7 @@ INFO= gsasl
.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/security/libprelude/Makefile b/security/libprelude/Makefile
index 44208f72f73b..dc3c17db3b74 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -25,8 +25,7 @@ CONFIGURE_ARGS= --localstatedir=/var \
--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
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index 4d753dd9ac2f..a36d718f03f1 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -25,8 +25,7 @@ USE_AUTOTOOLS= libltdl
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
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index ca646984139e..6b322cc2b4f6 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -19,11 +19,10 @@ LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp \
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
diff --git a/security/revelation/Makefile b/security/revelation/Makefile
index 25880345e404..b533c33eb93a 100644
--- a/security/revelation/Makefile
+++ b/security/revelation/Makefile
@@ -21,10 +21,9 @@ OPTIONS_DEFINE= APPLET
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
diff --git a/security/rifiuti2/Makefile b/security/rifiuti2/Makefile
index d15dc9ccd6a3..3188e5690d98 100644
--- a/security/rifiuti2/Makefile
+++ b/security/rifiuti2/Makefile
@@ -14,8 +14,7 @@ LICENSE= BSD
LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
GNU_CONFIGURE= yes
-USES= pkgconfig
-USE_GETTEXT= yes
+USES= pkgconfig gettext
USE_ICONV= yes
USE_GNOME= glib20
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
index b31b6fbdd19b..b5ff52f92faf 100644
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS= cryptui:${PORTSDIR}/security/seahorse \
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
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 2d08cce6acab..c14661aa6d5a 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -25,9 +25,8 @@ CONFLICTS= libcryptui-3.[0-9]* seahorse-3.[0-9]*
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
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 32816776a1da..d5c3df5297a7 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -22,12 +22,11 @@ RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
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
diff --git a/sysutils/dfc/Makefile b/sysutils/dfc/Makefile
index ec670754f173..f04f0fb1be6f 100644
--- a/sysutils/dfc/Makefile
+++ b/sysutils/dfc/Makefile
@@ -26,7 +26,7 @@ MAN1= dfc.1
.if ${PORT_OPTIONS:MNLS}
CMAKE_ARGS+= -DNLS_ENABLED=true
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DNLS_ENABLED=false
diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile
index dc8b95141acc..77dcab3281d7 100644
--- a/sysutils/eiciel/Makefile
+++ b/sysutils/eiciel/Makefile
@@ -31,7 +31,7 @@ MAN1= eiciel.1
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index 3fc1675e5252..7b4c1639c139 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -31,7 +31,7 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index 9b813b1e922f..1c0516b1f852 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFINE= DOCS NLS
.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/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index c715ca43c9b0..bdfcc0255aa2 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -23,9 +23,8 @@ CONFLICTS= gnome-settings-daemon-3.[0-9]*
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
diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile
index 684a30a5a761..003870d4d90f 100644
--- a/sysutils/graveman/Makefile
+++ b/sysutils/graveman/Makefile
@@ -15,10 +15,9 @@ LIB_DEPENDS= mng:${PORTSDIR}/graphics/libmng
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
diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile
index 8165741cdc26..72a9974011b1 100644
--- a/sysutils/grub2/Makefile
+++ b/sysutils/grub2/Makefile
@@ -15,8 +15,7 @@ CONFLICTS= grub-0*
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USES= bison
-USE_GETTEXT= yes
+USES= bison gettext
ONLY_FOR_ARCHS= i386 amd64
INFO= grub
diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile
index 3a426fd7dcd1..123bf25c1e05 100644
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@@ -28,9 +28,8 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
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 \
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index fd9c6dc327ad..123fb7e90a83 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS= polkit:${PORTSDIR}/sysutils/policykit \
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
diff --git a/sysutils/libzeitgeist/Makefile b/sysutils/libzeitgeist/Makefile
index 2800938e5318..aad72b92e49f 100644
--- a/sysutils/libzeitgeist/Makefile
+++ b/sysutils/libzeitgeist/Makefile
@@ -10,11 +10,10 @@ MASTER_SITES= https://launchpadlibrarian.net/100152436/ \
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
diff --git a/sysutils/polkit-kde/Makefile b/sysutils/polkit-kde/Makefile
index 42a3a9e1c1cd..6939baaad2d0 100644
--- a/sysutils/polkit-kde/Makefile
+++ b/sysutils/polkit-kde/Makefile
@@ -24,7 +24,7 @@ MAKE_JOBS_SAFE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DBUILD_po:BOOL=FALSE
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index 5c573e2f025b..c20302b6b13f 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -19,9 +19,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i
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 \
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index 15d99c0a5db0..501423e2b6c5 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -35,7 +35,7 @@ OPTIONS_DEFAULT= DBUS HAL
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
.else
CONFIGURE_ARGS+= --disable-nls
.endif
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index cf54a06b0692..74b055fd85aa 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFINE= NLS
.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/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index ec9e68dc51c9..fd8cfc4bf368 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFINE= NLS
.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/textproc/ctpp2/Makefile b/textproc/ctpp2/Makefile
index 7093142d5789..0b9f451a5fa9 100644
--- a/textproc/ctpp2/Makefile
+++ b/textproc/ctpp2/Makefile
@@ -9,9 +9,8 @@ MASTER_SITES= http://ctpp.havoc.ru/download/
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}
diff --git a/textproc/diffutils/Makefile b/textproc/diffutils/Makefile
index e6e8ea039133..c65a8761004a 100644
--- a/textproc/diffutils/Makefile
+++ b/textproc/diffutils/Makefile
@@ -22,7 +22,7 @@ MAN1= gcmp.1 gdiff.1 gdiff3.1 gsdiff.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/textproc/flex/Makefile b/textproc/flex/Makefile
index 83fae68a7b9a..eabea8b253fd 100644
--- a/textproc/flex/Makefile
+++ b/textproc/flex/Makefile
@@ -24,7 +24,7 @@ INFO= flex
.if ${PORT_OPTIONS:MNLS}
USE_ICONV= yes
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile
index cb695578d4c1..94f9c1c1af67 100644
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-0
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}"
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 48aa9a89d046..a9d4bfba2563 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -10,12 +10,11 @@ MAINTAINER= gnome@FreeBSD.org
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"
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index a913d86037cd..7ce01fb146d5 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -27,10 +27,9 @@ DOCBOOK_VERSION=4.2
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 \
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile
index 6da70ae7dd1c..092e5b544066 100644
--- a/textproc/sdcv/Makefile
+++ b/textproc/sdcv/Makefile
@@ -19,7 +19,7 @@ USES= pkgconfig
SUB_FILES= pkg-message
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/www/aria2/Makefile b/www/aria2/Makefile
index 12c15775c055..7b57f82e65ab 100644
--- a/www/aria2/Makefile
+++ b/www/aria2/Makefile
@@ -58,7 +58,7 @@ PLIST_DIRS= %%DOCSDIR%%/xmlrpc \
.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
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index cfc9ee4c5906..f8e9e62eb4de 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -11,10 +11,9 @@ MASTER_SITE_SUBDIR=cherokee/1.2/${PORTVERSION}
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
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 54d73b63c9b2..e428d08db376 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --without-zlib
.if ${PORT_OPTIONS:MNLS}
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.else
PLIST_SUB+= NLS="@comment "
CONFIGURE_ARGS+= --disable-nls
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index d004f668717c..38afe20b1442 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -27,10 +27,9 @@ CONFLICTS= epiphany-3.[0-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
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 12d313bddd54..adc40bc7bf79 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -60,7 +60,7 @@ ZEITGEIST_DESC= User logs activities
CONFIGURE_ENV+= CC="${CC}"
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index e0f7ba3c8db7..2c6d72d31600 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -22,11 +22,10 @@ LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant \
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
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 9e573f50d320..8e050db752e4 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -21,11 +21,10 @@ LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant \
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
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 67b22e6580cf..84263fb2b074 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -57,7 +57,7 @@ PLIST_SUB+= WITH_DBUS="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index 98a7bccbfd05..9fd77f821c46 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -11,10 +11,9 @@ MAINTAINER= makc@FreeBSD.org
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
diff --git a/x11-toolkits/elementary/Makefile b/x11-toolkits/elementary/Makefile
index 43c4841ac88c..84249369e62d 100644
--- a/x11-toolkits/elementary/Makefile
+++ b/x11-toolkits/elementary/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS= --disable-quick-launch
.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-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index a88cc272983c..5db5e0c0d14e 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -26,14 +26,13 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
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
diff --git a/x11-toolkits/gtkunique/Makefile b/x11-toolkits/gtkunique/Makefile
index f7bec35f9fa8..7e11f46cab48 100644
--- a/x11-toolkits/gtkunique/Makefile
+++ b/x11-toolkits/gtkunique/Makefile
@@ -13,10 +13,9 @@ MAINTAINER= pav@FreeBSD.org
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
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 989e75710e40..f879d683a865 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -19,10 +19,9 @@ USE_BZIP2= yes
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
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 06cbf74239db..23bbbdecac90 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -23,13 +23,12 @@ RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \
${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
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 228c984d8b4f..5254ac05535c 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -21,10 +21,9 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cair
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}"
diff --git a/x11-toolkits/termit/Makefile b/x11-toolkits/termit/Makefile
index 77ccecfa5ee6..92d99452a797 100644
--- a/x11-toolkits/termit/Makefile
+++ b/x11-toolkits/termit/Makefile
@@ -46,7 +46,7 @@ CMAKE_ARGS+= -DDEBUG:BOOL=YES
.if ${PORT_OPTIONS:MNLS}
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.else
CMAKE_ARGS+= -DENABLE_NLS:BOOL=NO
PLIST_SUB+= NLS="@comment "
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 4482d638af3a..fbda9c2a3fa1 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -17,10 +17,9 @@ USE_BZIP2= yes
.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
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index a651c065d9fe..abb2e91ebf3c 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -29,10 +29,9 @@ OPTIONS_DEFINE= HAL
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}
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index aab0f394b636..571e13d5910c 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -47,7 +47,7 @@ PLIST_SUB+= ILLUME="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index dd9bf8c7b7c4..30e130c26043 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+=--disable-thunarx --without-file-manager-fallback
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 0c524e6436fd..58c5479c3855 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -34,7 +34,7 @@ OPTIONS_DEFINE= NLS DOCS
.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/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index 665892b79e81..4928a08ad91e 100644
--- a/x11/avant-window-navigator/Makefile
+++ b/x11/avant-window-navigator/Makefile
@@ -18,10 +18,9 @@ LIB_DEPENDS= wnck-1:${PORTSDIR}/x11-toolkits/libwnck \
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
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 06c3b8a7fe1b..56f743b97fd1 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -31,14 +31,13 @@ USERS= gdm
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
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 3f2e7a9f3fc3..48290d59ecb5 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -22,13 +22,12 @@ LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop \
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
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index a3c4714b0f45..37756a95d5ed 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -26,13 +26,12 @@ LIB_DEPENDS= gweather:${PORTSDIR}/net/libgweather \
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
diff --git a/x11/gnome-pie/Makefile b/x11/gnome-pie/Makefile
index 95149c54da86..f88a713aa075 100644
--- a/x11/gnome-pie/Makefile
+++ b/x11/gnome-pie/Makefile
@@ -43,7 +43,7 @@ CMAKE_ARGS+= -DNO_INSTALL_MANPAGES:BOOL=ON
.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
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index d7d155cc4ce4..7d24aac610c8 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -19,10 +19,9 @@ CONFLICTS= gnome-screensaver-3.[0-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} \
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index a77cc2defc7d..d6b183eb0df8 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -15,12 +15,11 @@ LIB_DEPENDS= tidy-0.99.0:${PORTSDIR}/www/tidy-lib
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
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 0c648d4e63d8..cc9bd873b253 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -25,10 +25,9 @@ RUN_DEPENDS= cagibid:${PORTSDIR}/net/cagibi
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
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 54f191c1d0ae..3d787908ebc2 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -42,13 +42,12 @@ RUN_DEPENDS= ${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
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
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index a760bde3428e..0b11fe18df34 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -40,11 +40,10 @@ LATEST_LINK= ${PORTNAME}4
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 \
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index bf32fcdb4e63..482a8ed117fa 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -48,7 +48,7 @@ PLIST_SUB+= APIDOCS="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 57926a7f50ed..7e76dba82625 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -31,7 +31,7 @@ OPTIONS_DEFINE= NLS
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index 30e674df812e..8ac2246679ce 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -38,7 +38,7 @@ PLIST_SUB+= APIDOCS="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 932ce83e7920..08039c3c172c 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFINE= NLS DOCS
.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/metisse/Makefile b/x11/metisse/Makefile
index f25adc3b72af..8c390419c343 100644
--- a/x11/metisse/Makefile
+++ b/x11/metisse/Makefile
@@ -24,8 +24,7 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
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
diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index a95138c8f05d..2af83129f84f 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -21,8 +21,7 @@ OPTIONS_DEFINE= DOCS
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
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 9a9ca2c7f0a6..cb67a419e5f9 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+=--disable-distribution
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index e57cc34d6c5b..850a4ad22ec1 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -20,12 +20,11 @@ UNIQUE_DESC= Enable Unique (single instance) support
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
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 89e98a1a17dc..ed190a5c8663 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -55,7 +55,7 @@ PLIST_SUB+= PERLBIND="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index 0faf8e938f68..85f2c8d570b0 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -28,7 +28,7 @@ MAN1= xfce4-screenshooter.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/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 9fdeb9e0c27e..fe0c8074c73c 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -32,7 +32,7 @@ MANLANG= "" ar ca da de el es fr gl id it ja ko lt \
.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/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 615968b03e01..16e08cc52dea 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -31,7 +31,7 @@ MAN7= xkeyboard-config.7
.if ${PORT_OPTIONS:MNLS}
USE_ICONV= yes
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index f5ddfe14799a..25cf786994bb 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -22,11 +22,10 @@ MAKE_JOBS_SAFE= yes
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 \
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 5bfbd2bc19c8..277135a2864f 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -16,10 +16,9 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
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}"