aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/accerciser/Makefile2
-rw-r--r--accessibility/at-spi/Makefile2
-rw-r--r--accessibility/dasher/Makefile2
-rw-r--r--accessibility/gnome-mag/Makefile2
-rw-r--r--accessibility/gnopernicus/Makefile2
-rw-r--r--accessibility/gok/Makefile2
-rw-r--r--accessibility/mousetweaks/Makefile2
-rw-r--r--accessibility/orca/Makefile2
-rw-r--r--accessibility/py-atspi/Makefile2
-rw-r--r--accessibility/redshift/Makefile2
-rw-r--r--accessibility/yasr/Makefile2
-rw-r--r--archivers/dpkg/Makefile2
-rw-r--r--archivers/file-roller/Makefile2
-rw-r--r--archivers/gcpio/Makefile2
-rw-r--r--archivers/grzip/Makefile2
-rw-r--r--archivers/gtar/Makefile2
-rw-r--r--archivers/kbackup/Makefile2
-rw-r--r--archivers/rpm/Makefile2
-rw-r--r--archivers/rpm4/Makefile2
-rw-r--r--archivers/rpm5/Makefile2
-rw-r--r--archivers/star/Makefile2
-rw-r--r--archivers/thunar-archive-plugin/Makefile2
-rw-r--r--archivers/xarchiver/Makefile2
-rw-r--r--astro/celestia/Makefile2
-rw-r--r--astro/foxtrotgps/Makefile2
-rw-r--r--astro/gpsdrive/Makefile2
-rw-r--r--audio/alsa-utils/Makefile2
-rw-r--r--audio/amarok/Makefile2
-rw-r--r--audio/ampache/Makefile2
-rw-r--r--audio/ardour/Makefile2
-rw-r--r--audio/ario/Makefile2
-rw-r--r--audio/asunder/Makefile2
-rw-r--r--audio/audacity/Makefile2
-rw-r--r--audio/aumix/Makefile2
-rw-r--r--audio/blop/Makefile2
-rw-r--r--audio/cplay/Makefile2
-rw-r--r--audio/cuberok/Makefile2
-rw-r--r--audio/decibel-audio-player/Makefile2
-rw-r--r--audio/easytag/Makefile2
-rw-r--r--audio/exaile/Makefile2
-rw-r--r--audio/freedesktop-sound-theme/Makefile2
-rw-r--r--audio/gigedit/Makefile2
-rw-r--r--audio/gimmix/Makefile2
-rw-r--r--audio/gmpc-alarm/Makefile2
-rw-r--r--audio/gmpc-albumview/Makefile2
-rw-r--r--audio/gmpc-discogs/Makefile2
-rw-r--r--audio/gmpc-lastfm/Makefile2
-rw-r--r--audio/gmpc-libnotify/Makefile2
-rw-r--r--audio/gmpc-lyrics/Makefile2
-rw-r--r--audio/gmpc-lyricsplugin/Makefile2
-rw-r--r--audio/gmpc-lyricwiki/Makefile2
-rw-r--r--audio/gmpc-magnatune/Makefile2
-rw-r--r--audio/gmpc-mdcover/Makefile2
-rw-r--r--audio/gmpc-mserver/Makefile2
-rw-r--r--audio/gmpc-shout/Makefile2
-rw-r--r--audio/gmpc-wikipedia/Makefile2
-rw-r--r--audio/gmpc/Makefile2
-rw-r--r--audio/gmtp/Makefile2
-rw-r--r--audio/goobox/Makefile2
-rw-r--r--audio/gqmpeg/Makefile2
-rw-r--r--audio/gtick/Makefile2
-rw-r--r--audio/gtkpod/Makefile2
-rw-r--r--audio/gvolwheel/Makefile2
-rw-r--r--audio/herrie/Makefile2
-rw-r--r--audio/jack-rack/Makefile2
-rw-r--r--audio/kid3/Makefile2
-rw-r--r--audio/libgpod/Makefile2
-rw-r--r--audio/lingot/Makefile2
-rw-r--r--audio/lxmusic/Makefile2
-rw-r--r--audio/madplay/Makefile2
-rw-r--r--audio/mp3c/Makefile2
-rw-r--r--audio/mp3splt-gtk/Makefile2
-rw-r--r--audio/mpdbrowser/Makefile2
-rw-r--r--audio/muine/Makefile2
-rw-r--r--audio/muse/Makefile2
-rw-r--r--audio/ncmpc/Makefile2
-rw-r--r--audio/normalize/Makefile2
-rw-r--r--audio/osd-lyrics/Makefile2
-rw-r--r--audio/paprefs/Makefile2
-rw-r--r--audio/picard/Makefile2
-rw-r--r--audio/prokyon3/Makefile2
-rw-r--r--audio/pulseaudio/Makefile2
-rw-r--r--audio/rhythmbox/Makefile2
-rw-r--r--audio/rubyripper/Makefile2
-rw-r--r--audio/solfege/Makefile2
-rw-r--r--audio/sonata/Makefile2
-rw-r--r--audio/sound-juicer/Makefile2
-rw-r--r--audio/soundconverter/Makefile2
-rw-r--r--audio/spek/Makefile2
-rw-r--r--audio/vorbis-tools/Makefile2
-rw-r--r--audio/wavbreaker/Makefile2
-rw-r--r--audio/wxguitar/Makefile2
-rw-r--r--audio/xfmpc/Makefile2
-rw-r--r--audio/xhippo/Makefile2
-rw-r--r--audio/xmms-curses/Makefile2
-rw-r--r--audio/xmms-flac/Makefile2
-rw-r--r--audio/xmms-sid/Makefile2
-rw-r--r--benchmarks/gtkperf/Makefile2
-rw-r--r--biology/gperiodic/Makefile2
-rw-r--r--cad/electric/Makefile2
-rw-r--r--cad/geda-gattrib/Makefile2
-rw-r--r--cad/geda-gschem/Makefile2
-rw-r--r--chinese/ibus-pinyin/Makefile2
-rw-r--r--chinese/libpinyin/Makefile2
-rw-r--r--chinese/oxim/Makefile2
-rw-r--r--chinese/pcmanx/Makefile2
-rw-r--r--chinese/reciteword/Makefile2
-rw-r--r--chinese/scim-array/Makefile2
-rw-r--r--chinese/scim-pinyin/Makefile2
-rw-r--r--chinese/wenju/Makefile2
-rw-r--r--chinese/zhcon/Makefile2
-rw-r--r--comms/gnocky/Makefile2
-rw-r--r--comms/gnokii/Makefile2
-rw-r--r--comms/gpredict/Makefile2
-rw-r--r--comms/grig/Makefile2
-rw-r--r--comms/gsmlib/Makefile2
-rw-r--r--comms/ktrack/Makefile2
-rw-r--r--comms/libticables/Makefile2
-rw-r--r--comms/minicom/Makefile2
-rw-r--r--comms/scmxx/Makefile2
-rw-r--r--comms/xastir/Makefile2
-rw-r--r--comms/xlog/Makefile2
-rw-r--r--converters/ascii2binary/Makefile2
-rw-r--r--converters/recode/Makefile2
-rw-r--r--databases/drizzle/Makefile2
-rw-r--r--databases/glom/Makefile2
-rw-r--r--databases/gnome-db/Makefile2
-rw-r--r--databases/grass/Makefile2
-rw-r--r--databases/kmysqladmin/Makefile2
-rw-r--r--databases/libgda/Makefile2
-rw-r--r--databases/libgda2/Makefile2
-rw-r--r--databases/libgda3/Makefile2
-rw-r--r--databases/libgnomedb/Makefile2
-rw-r--r--databases/namazu2/Makefile2
-rw-r--r--databases/opendbx/Makefile2
-rw-r--r--databases/p5-DBD-Sybase/Makefile2
-rw-r--r--databases/pgadmin3/Makefile2
-rw-r--r--databases/pxlib/Makefile2
-rw-r--r--databases/pxtools/Makefile2
-rw-r--r--databases/py-sqlkit/Makefile2
-rw-r--r--databases/recutils/Makefile2
-rw-r--r--deskutils/alacarte/Makefile2
-rw-r--r--deskutils/bmp-docklet/Makefile2
-rw-r--r--deskutils/calcurse/Makefile2
-rw-r--r--deskutils/clipit/Makefile2
-rw-r--r--deskutils/conduit/Makefile2
-rw-r--r--deskutils/conkyforecast/Makefile2
-rw-r--r--deskutils/drivel/Makefile2
-rw-r--r--deskutils/easystroke/Makefile2
-rw-r--r--deskutils/evolution-jescs/Makefile2
-rw-r--r--deskutils/ganyremote/Makefile2
-rw-r--r--deskutils/gbirthday/Makefile2
-rw-r--r--deskutils/gcal/Makefile4
-rw-r--r--deskutils/gdesklets/Makefile2
-rw-r--r--deskutils/genius/Makefile2
-rw-r--r--deskutils/gimmie/Makefile2
-rw-r--r--deskutils/glabels/Makefile2
-rw-r--r--deskutils/global-menu/Makefile2
-rw-r--r--deskutils/gnome-blog/Makefile2
-rw-r--r--deskutils/gnome-main-menu/Makefile2
-rw-r--r--deskutils/gnome-utils/Makefile2
-rw-r--r--deskutils/gnote/Makefile2
-rw-r--r--deskutils/gourmet/Makefile2
-rw-r--r--deskutils/griffith/Makefile2
-rw-r--r--deskutils/gtg/Makefile2
-rw-r--r--deskutils/gtimer/Makefile2
-rw-r--r--deskutils/gucharmap/Makefile2
-rw-r--r--deskutils/gxmessage/Makefile2
-rw-r--r--deskutils/hamster-applet/Makefile2
-rw-r--r--deskutils/horde3-hermes/Makefile2
-rw-r--r--deskutils/horde3-klutz/Makefile2
-rw-r--r--deskutils/horde3-kronolith/Makefile2
-rw-r--r--deskutils/horde3-mnemo/Makefile2
-rw-r--r--deskutils/horde3-nag/Makefile2
-rw-r--r--deskutils/katapult/Makefile2
-rw-r--r--deskutils/kdissert/Makefile2
-rw-r--r--deskutils/knowit/Makefile2
-rw-r--r--deskutils/kompose/Makefile2
-rw-r--r--deskutils/kooldock/Makefile2
-rw-r--r--deskutils/labyrinth/Makefile2
-rw-r--r--deskutils/ljit/Makefile2
-rw-r--r--deskutils/moregroupware/Makefile2
-rw-r--r--deskutils/nagaina/Makefile2
-rw-r--r--deskutils/nautilus-actions/Makefile2
-rw-r--r--deskutils/nautilus-open-terminal/Makefile2
-rw-r--r--deskutils/notecase/Makefile2
-rw-r--r--deskutils/notification-daemon/Makefile2
-rw-r--r--deskutils/ontv/Makefile2
-rw-r--r--deskutils/osmo/Makefile2
-rw-r--r--deskutils/parcellite/Makefile2
-rw-r--r--deskutils/pinot/Makefile2
-rw-r--r--deskutils/rednotebook/Makefile2
-rw-r--r--deskutils/semantik/Makefile2
-rw-r--r--deskutils/tel/Makefile2
-rw-r--r--deskutils/tomboy/Makefile2
-rw-r--r--deskutils/vboxgtk/Makefile2
-rw-r--r--deskutils/virt-manager/Makefile2
-rw-r--r--deskutils/wammu/Makefile2
-rw-r--r--deskutils/x-tile/Makefile2
-rw-r--r--deskutils/xchm/Makefile2
-rw-r--r--deskutils/xfce4-notes-plugin/Makefile2
-rw-r--r--deskutils/xfce4-xkb-plugin/Makefile2
-rw-r--r--devel/ORBit/Makefile2
-rw-r--r--devel/aegis/Makefile2
-rw-r--r--devel/anjuta/Makefile2
-rw-r--r--devel/arm-elf-binutils/Makefile2
-rw-r--r--devel/avr-binutils/Makefile2
-rw-r--r--devel/baz/Makefile2
-rw-r--r--devel/boaconstructor/Makefile2
-rw-r--r--devel/bonobo/Makefile2
-rw-r--r--devel/bug-buddy/Makefile2
-rw-r--r--devel/bzr-explorer/Makefile2
-rw-r--r--devel/bzr/Makefile2
-rw-r--r--devel/cook/Makefile2
-rw-r--r--devel/cppi/Makefile4
-rw-r--r--devel/cutter/Makefile4
-rw-r--r--devel/dbus-glib/Makefile2
-rw-r--r--devel/diffuse/Makefile2
-rw-r--r--devel/ding-libs/Makefile2
-rw-r--r--devel/eggdbus/Makefile2
-rw-r--r--devel/fhist/Makefile2
-rw-r--r--devel/fnccheck/Makefile2
-rw-r--r--devel/gazpacho/Makefile2
-rw-r--r--devel/gconf/Makefile2
-rw-r--r--devel/gdb66/Makefile2
-rw-r--r--devel/giggle/Makefile2
-rw-r--r--devel/gindent/Makefile2
-rw-r--r--devel/git/Makefile2
-rw-r--r--devel/gitg/Makefile2
-rw-r--r--devel/gitphp/Makefile2
-rw-r--r--devel/glade3/Makefile2
-rw-r--r--devel/gmake/Makefile2
-rw-r--r--devel/gnome-vfs1/Makefile2
-rw-r--r--devel/gnucflow/Makefile2
-rw-r--r--devel/goffice/Makefile2
-rw-r--r--devel/gtranslator/Makefile2
-rw-r--r--devel/horde3-chora/Makefile2
-rw-r--r--devel/horde3-whups/Makefile2
-rw-r--r--devel/idutils/Makefile2
-rw-r--r--devel/ixlib/Makefile2
-rw-r--r--devel/jtag/Makefile2
-rw-r--r--devel/libelf/Makefile2
-rw-r--r--devel/libgdata/Makefile2
-rw-r--r--devel/libgsf/Makefile2
-rw-r--r--devel/libgtop/Makefile2
-rw-r--r--devel/libnotify/Makefile2
-rw-r--r--devel/libsoup/Makefile2
-rw-r--r--devel/libticalcs/Makefile2
-rw-r--r--devel/libtifiles/Makefile2
-rw-r--r--devel/libzvbi/Makefile2
-rw-r--r--devel/lua-gettext/Makefile2
-rw-r--r--devel/m17n-db/Makefile2
-rw-r--r--devel/mercurial/Makefile2
-rw-r--r--devel/monodevelop-database/Makefile2
-rw-r--r--devel/monodevelop-java/Makefile2
-rw-r--r--devel/monodevelop/Makefile2
-rw-r--r--devel/motor/Makefile2
-rw-r--r--devel/nemiver/Makefile2
-rw-r--r--devel/newt/Makefile2
-rw-r--r--devel/oaf/Makefile2
-rw-r--r--devel/p5-Locale-gettext/Makefile2
-rw-r--r--devel/p5-Locale-libintl/Makefile2
-rw-r--r--devel/py-mwlib.rl/Makefile2
-rw-r--r--devel/py-zope.i18n/Makefile2
-rw-r--r--devel/qbzr/Makefile2
-rw-r--r--devel/quilt/Makefile2
-rw-r--r--devel/rapidsvn/Makefile2
-rw-r--r--devel/remake/Makefile2
-rw-r--r--devel/rsvndump/Makefile2
-rw-r--r--devel/ruby-intl/Makefile2
-rw-r--r--devel/ruby-rbbr/Makefile2
-rw-r--r--devel/seed/Makefile2
-rw-r--r--devel/synfig/Makefile2
-rw-r--r--devel/tortoisehg2/Makefile2
-rw-r--r--devel/valide/Makefile2
-rw-r--r--devel/xdg-user-dirs/Makefile2
-rw-r--r--devel/zpu-binutils/Makefile2
-rw-r--r--devel/zpu-gcc/Makefile2
-rw-r--r--dns/libidn/Makefile2
-rw-r--r--dns/mydns-ng/Makefile2
-rw-r--r--dns/mydns/Makefile2
-rw-r--r--editors/codelite/Makefile2
-rw-r--r--editors/cooledit/Makefile2
-rw-r--r--editors/gedit/Makefile2
-rw-r--r--editors/ghex/Makefile2
-rw-r--r--editors/gnotepad+/Makefile2
-rw-r--r--editors/gobby/Makefile2
-rw-r--r--editors/leafpad/Makefile2
-rw-r--r--editors/madedit/Makefile2
-rw-r--r--editors/morla/Makefile2
-rw-r--r--editors/mp/Makefile2
-rw-r--r--editors/p5-Padre/Makefile2
-rw-r--r--editors/poedit/Makefile2
-rw-r--r--editors/py-room/Makefile2
-rw-r--r--editors/setedit/Makefile2
-rw-r--r--editors/ssed/Makefile2
-rw-r--r--editors/vim/Makefile2
-rw-r--r--editors/xemacs21-mule/Makefile2
-rw-r--r--editors/xmlcopyeditor/Makefile2
-rw-r--r--editors/zim/Makefile2
-rw-r--r--editors/zoinks/Makefile2
-rw-r--r--emulators/catapult/Makefile2
-rw-r--r--emulators/desmume/Makefile2
-rw-r--r--emulators/hercules/Makefile2
-rw-r--r--emulators/kcemu/Makefile2
-rw-r--r--emulators/loemu/Makefile2
-rw-r--r--emulators/qemu-launcher/Makefile2
-rw-r--r--emulators/snes9express/Makefile2
-rw-r--r--emulators/snes9x-gtk/Makefile2
-rw-r--r--emulators/tiemu3/Makefile2
-rw-r--r--emulators/vba/Makefile2
-rw-r--r--emulators/xcpc/Makefile2
-rw-r--r--emulators/xgngeo/Makefile2
-rw-r--r--emulators/xsystem35/Makefile2
-rw-r--r--finance/eqonomize-kde3/Makefile2
-rw-r--r--finance/frontaccounting/Makefile2
-rw-r--r--finance/gnofin/Makefile2
-rw-r--r--finance/gnucash/Makefile2
-rw-r--r--finance/grisbi/Makefile2
-rw-r--r--finance/homebank/Makefile2
-rw-r--r--finance/kmymoney2/Makefile2
-rw-r--r--finance/openerp-web/Makefile2
-rw-r--r--finance/weberp/Makefile2
-rw-r--r--ftp/axel/Makefile2
-rw-r--r--ftp/bareftp/Makefile2
-rw-r--r--ftp/filezilla/Makefile2
-rw-r--r--ftp/horde3-gollem/Makefile2
-rw-r--r--ftp/kpum/Makefile2
-rw-r--r--ftp/lftp/Makefile2
-rw-r--r--ftp/wput/Makefile2
-rw-r--r--ftp/wxdfast/Makefile2
-rw-r--r--ftp/yafc/Makefile2
-rw-r--r--games/adonthell/Makefile2
-rw-r--r--games/allacrost/Makefile2
-rw-r--r--games/assaultcube/Makefile2
-rw-r--r--games/atomix/Makefile2
-rw-r--r--games/balazar/Makefile2
-rw-r--r--games/balazarbrothers/Makefile2
-rw-r--r--games/bomberinstinct/Makefile2
-rw-r--r--games/bombermaze/Makefile2
-rw-r--r--games/bombherman/Makefile2
-rw-r--r--games/briquolo/Makefile2
-rw-r--r--games/capitalism/Makefile2
-rw-r--r--games/chroma/Makefile2
-rw-r--r--games/chromium-bsu/Makefile2
-rw-r--r--games/csmash/Makefile2
-rw-r--r--games/dopewars/Makefile2
-rw-r--r--games/enigma/Makefile4
-rw-r--r--games/fgrun/Makefile2
-rw-r--r--games/freeciv/Makefile4
-rw-r--r--games/galaxymage/Makefile2
-rw-r--r--games/gbrainy/Makefile2
-rw-r--r--games/gcompris/Makefile2
-rw-r--r--games/ggz-client-libs/Makefile2
-rw-r--r--games/ggz-gtk-client/Makefile2
-rw-r--r--games/ggz-gtk-games/Makefile2
-rw-r--r--games/ggz-txt-client/Makefile2
-rw-r--r--games/glchess/Makefile2
-rw-r--r--games/glightoff/Makefile2
-rw-r--r--games/gnono/Makefile2
-rw-r--r--games/gnubg/Makefile2
-rw-r--r--games/grhino/Makefile2
-rw-r--r--games/gtkballs/Makefile2
-rw-r--r--games/gturing/Makefile2
-rw-r--r--games/gtypist/Makefile2
-rw-r--r--games/heroes/Makefile2
-rw-r--r--games/hex-a-hop/Makefile2
-rw-r--r--games/hitori/Makefile2
-rw-r--r--games/kamikaze/Makefile2
-rw-r--r--games/kanatest/Makefile2
-rw-r--r--games/kbilliards/Makefile2
-rw-r--r--games/knights/Makefile2
-rw-r--r--games/kwappen/Makefile2
-rw-r--r--games/lander/Makefile2
-rw-r--r--games/latrine/Makefile2
-rw-r--r--games/lexter/Makefile2
-rw-r--r--games/lgeneral/Makefile2
-rw-r--r--games/lincity/Makefile2
-rw-r--r--games/lordsawar/Makefile2
-rw-r--r--games/lpairs/Makefile2
-rw-r--r--games/macopix/Makefile2
-rw-r--r--games/mt_gtk_client/Makefile2
-rw-r--r--games/neverball/Makefile2
-rw-r--r--games/pioneers/Makefile2
-rw-r--r--games/pushover/Makefile2
-rw-r--r--games/py-pychess/Makefile2
-rw-r--r--games/pysolfc/Makefile2
-rw-r--r--games/secretmaryochronicles/Makefile2
-rw-r--r--games/slune/Makefile2
-rw-r--r--games/spellathon/Makefile2
-rw-r--r--games/tinymux/Makefile2
-rw-r--r--games/toppler/Makefile2
-rw-r--r--games/tornado/Makefile2
-rw-r--r--games/trackballs/Makefile4
-rw-r--r--games/tuxmath/Makefile2
-rw-r--r--games/tuxpaint-config/Makefile2
-rw-r--r--games/tuxpaint/Makefile2
-rw-r--r--games/tuxtype/Makefile2
-rw-r--r--games/typespeed/Makefile2
-rw-r--r--games/ufoai/Makefile2
-rw-r--r--games/volleyball/Makefile2
-rw-r--r--games/warmux/Makefile2
-rw-r--r--games/xblast/Makefile2
-rw-r--r--games/xboard/Makefile2
-rw-r--r--games/xbubble/Makefile2
-rw-r--r--games/xcowsay/Makefile2
-rw-r--r--games/xinvaders/Makefile2
-rw-r--r--games/xqf/Makefile2
-rw-r--r--games/zaz/Makefile2
-rw-r--r--graphics/aeskulap/Makefile2
-rw-r--r--graphics/agave/Makefile2
-rw-r--r--graphics/amide/Makefile2
-rw-r--r--graphics/chbg/Makefile2
-rw-r--r--graphics/cinepaint/Makefile2
-rw-r--r--graphics/clutter-gtk/Makefile2
-rw-r--r--graphics/comix/Makefile2
-rw-r--r--graphics/danpei/Makefile2
-rw-r--r--graphics/digikam-kde4-l10n/Makefile2
-rw-r--r--graphics/digikam/Makefile2
-rw-r--r--graphics/driconf/Makefile2
-rw-r--r--graphics/electriceyes/Makefile2
-rw-r--r--graphics/eog-plugins/Makefile2
-rw-r--r--graphics/eog/Makefile2
-rw-r--r--graphics/exiv2/Makefile2
-rw-r--r--graphics/f-spot/Makefile2
-rw-r--r--graphics/frontline/Makefile2
-rw-r--r--graphics/gdk-pixbuf2/Makefile4
-rw-r--r--graphics/geeqie/Makefile2
-rw-r--r--graphics/geomorph/Makefile2
-rw-r--r--graphics/gimmage/Makefile2
-rw-r--r--graphics/gimp-focusblur-plugin/Makefile2
-rw-r--r--graphics/gimp-gap/Makefile2
-rw-r--r--graphics/gimp-lqr-plugin/Makefile2
-rw-r--r--graphics/gimp-resynthesizer/Makefile2
-rw-r--r--graphics/gimp-save-for-web/Makefile2
-rw-r--r--graphics/giram/Makefile2
-rw-r--r--graphics/gliv/Makefile2
-rw-r--r--graphics/gnash/Makefile2
-rw-r--r--graphics/gpicview/Makefile2
-rw-r--r--graphics/gqview/Makefile2
-rw-r--r--graphics/gscan2pdf/Makefile2
-rw-r--r--graphics/gtk-update-icon-cache/Makefile2
-rw-r--r--graphics/gtkdps/Makefile2
-rw-r--r--graphics/gtkgraph/Makefile2
-rw-r--r--graphics/gx/Makefile2
-rw-r--r--graphics/inkscape/Makefile2
-rw-r--r--graphics/kbarcode/Makefile2
-rw-r--r--graphics/kipi-plugins/Makefile2
-rw-r--r--graphics/libgnomecanvas/Makefile2
-rw-r--r--graphics/libgphoto2/Makefile2
-rw-r--r--graphics/libkdcraw/Makefile2
-rw-r--r--graphics/libkexif/Makefile2
-rw-r--r--graphics/libkipi/Makefile2
-rw-r--r--graphics/liblqr-1/Makefile2
-rw-r--r--graphics/libvisual04/Makefile2
-rw-r--r--graphics/mirage/Makefile2
-rw-r--r--graphics/mtpaint/Makefile2
-rw-r--r--graphics/mypaint/Makefile2
-rw-r--r--graphics/ocre/Makefile2
-rw-r--r--graphics/ocrfeeder/Makefile4
-rw-r--r--graphics/pencil/Makefile2
-rw-r--r--graphics/pinta/Makefile2
-rw-r--r--graphics/py-clutter/Makefile2
-rw-r--r--graphics/rawstudio/Makefile2
-rw-r--r--graphics/rgbpaint/Makefile2
-rw-r--r--graphics/ruby-tgif/Makefile2
-rw-r--r--graphics/shotwell/Makefile2
-rw-r--r--graphics/skencil/Makefile2
-rw-r--r--graphics/sodipodi/Makefile2
-rw-r--r--graphics/synfigstudio/Makefile2
-rw-r--r--graphics/tgif/Makefile2
-rw-r--r--graphics/ufraw/Makefile2
-rw-r--r--graphics/viewnior/Makefile2
-rw-r--r--graphics/vips/Makefile2
-rw-r--r--graphics/xaos/Makefile2
-rw-r--r--graphics/xsane/Makefile2
-rw-r--r--graphics/zathura/Makefile2
-rw-r--r--irc/dxirc/Makefile2
-rw-r--r--irc/smuxi/Makefile2
-rw-r--r--irc/xchat/Makefile2
-rw-r--r--japanese/eb/Makefile4
-rw-r--r--japanese/gjiten/Makefile2
-rw-r--r--japanese/ibus-anthy/Makefile2
-rw-r--r--japanese/ibus-skk/Makefile4
-rw-r--r--japanese/kana-no-quiz/Makefile2
-rw-r--r--japanese/kasumi/Makefile2
-rw-r--r--japanese/mailman/Makefile2
-rw-r--r--japanese/scim-honoka-plugin-romkan/Makefile2
-rw-r--r--japanese/scim-honoka-plugin-wnn/Makefile2
-rw-r--r--japanese/scim-honoka/Makefile2
-rw-r--r--japanese/scim-tomoe/Makefile2
-rw-r--r--japanese/tomoe/Makefile2
-rw-r--r--japanese/uim-tomoe-gtk/Makefile2
-rw-r--r--korean/ami/Makefile2
-rw-r--r--korean/ibus-hangul/Makefile2
-rw-r--r--korean/imhangul/Makefile2
-rw-r--r--korean/libhangul/Makefile2
-rw-r--r--korean/nabi/Makefile2
-rw-r--r--lang/gambas/Makefile2
-rw-r--r--lang/gawk/Makefile2
-rw-r--r--lang/guile/Makefile2
-rw-r--r--lang/lush/Makefile2
-rw-r--r--lang/mdk/Makefile2
-rw-r--r--lang/open-cobol/Makefile2
-rw-r--r--lang/pypy/Makefile2
-rw-r--r--mail/abook/Makefile2
-rw-r--r--mail/althea/Makefile2
-rw-r--r--mail/anubis/Makefile2
-rw-r--r--mail/claws-mail-address_keeper/Makefile2
-rw-r--r--mail/claws-mail-attach_warner/Makefile2
-rw-r--r--mail/claws-mail-bsfilter/Makefile2
-rw-r--r--mail/claws-mail-clamd/Makefile2
-rw-r--r--mail/claws-mail-fancy/Makefile2
-rw-r--r--mail/claws-mail-fetchinfo/Makefile2
-rw-r--r--mail/claws-mail-gdata/Makefile2
-rw-r--r--mail/claws-mail-gtkhtml2_viewer/Makefile2
-rw-r--r--mail/claws-mail-notification/Makefile2
-rw-r--r--mail/claws-mail-pdf_viewer/Makefile2
-rw-r--r--mail/claws-mail-python/Makefile2
-rw-r--r--mail/claws-mail-rssyl/Makefile2
-rw-r--r--mail/claws-mail-spamreport/Makefile2
-rw-r--r--mail/claws-mail-tnef/Makefile2
-rw-r--r--mail/claws-mail-vcalendar/Makefile2
-rw-r--r--mail/clawsker/Makefile2
-rw-r--r--mail/cone/Makefile2
-rw-r--r--mail/courier/Makefile2
-rw-r--r--mail/crm114/Makefile2
-rw-r--r--mail/elm/Makefile2
-rw-r--r--mail/elmo-devel/Makefile2
-rw-r--r--mail/elmo/Makefile2
-rw-r--r--mail/evolution-exchange/Makefile2
-rw-r--r--mail/evolution-mapi/Makefile2
-rw-r--r--mail/fetchmail/Makefile2
-rw-r--r--mail/gnome-gmail-notifier/Makefile2
-rw-r--r--mail/gnubiff/Makefile2
-rw-r--r--mail/horde3-dimp/Makefile2
-rw-r--r--mail/horde3-forwards/Makefile2
-rw-r--r--mail/horde3-imp/Makefile2
-rw-r--r--mail/horde3-ingo/Makefile2
-rw-r--r--mail/horde3-mimp/Makefile2
-rw-r--r--mail/horde3-turba/Makefile2
-rw-r--r--mail/horde3-vacation/Makefile2
-rw-r--r--mail/kcheckgmail/Makefile2
-rw-r--r--mail/mail-notification/Makefile2
-rw-r--r--mail/mailman/Makefile2
-rw-r--r--mail/mailutils/Makefile2
-rw-r--r--mail/mpop/Makefile2
-rw-r--r--mail/msmtp/Makefile2
-rw-r--r--mail/mutt/Makefile2
-rw-r--r--mail/perdition/Makefile2
-rw-r--r--mail/squirrelmail-change_ldappass-plugin/Makefile2
-rw-r--r--mail/squirrelmail/Makefile2
-rw-r--r--mail/sqwebmail/Makefile2
-rw-r--r--mail/sympa/Makefile2
-rw-r--r--mail/vexim/Makefile2
-rw-r--r--mail/xfce4-mailwatch-plugin/Makefile2
-rw-r--r--math/R/Makefile2
-rw-r--r--math/drgeo/Makefile2
-rw-r--r--math/fricas/Makefile2
-rw-r--r--math/giacxcas/Makefile2
-rw-r--r--math/open-axiom/Makefile2
-rw-r--r--math/pspp/Makefile2
-rw-r--r--math/qalculate/Makefile2
-rw-r--r--math/rkward/Makefile2
-rw-r--r--math/scilab/Makefile2
-rw-r--r--math/tablix/Makefile2
-rw-r--r--math/wxMaxima/Makefile2
-rw-r--r--misc/diary-hercules/Makefile2
-rw-r--r--misc/findutils/Makefile2
-rw-r--r--misc/gman/Makefile2
-rw-r--r--misc/gnome-mime-data/Makefile2
-rw-r--r--misc/gonvert/Makefile2
-rw-r--r--misc/hello/Makefile2
-rw-r--r--misc/help2man/Makefile2
-rw-r--r--misc/kcd/Makefile2
-rw-r--r--misc/kwatch/Makefile2
-rw-r--r--misc/metromap/Makefile2
-rw-r--r--misc/pdmenu/Makefile2
-rw-r--r--misc/pinfo/Makefile4
-rw-r--r--misc/rabbit/Makefile2
-rw-r--r--misc/upclient/Makefile2
-rw-r--r--misc/xfce4-appfinder/Makefile2
-rw-r--r--misc/xiphos/Makefile2
-rw-r--r--multimedia/arista/Makefile2
-rw-r--r--multimedia/audacious-plugins/Makefile2
-rw-r--r--multimedia/audacious/Makefile2
-rw-r--r--multimedia/banshee/Makefile2
-rw-r--r--multimedia/bmp-extra-plugins/Makefile2
-rw-r--r--multimedia/cheese/Makefile2
-rw-r--r--multimedia/dvdrip/Makefile2
-rw-r--r--multimedia/freevo/Makefile2
-rw-r--r--multimedia/gaupol/Makefile2
-rw-r--r--multimedia/gnome-mplayer/Makefile2
-rw-r--r--multimedia/gnome-subtitles/Makefile2
-rw-r--r--multimedia/gopchop/Makefile2
-rw-r--r--multimedia/gpodder/Makefile2
-rw-r--r--multimedia/gtk-recordmydesktop/Makefile2
-rw-r--r--multimedia/gxmms/Makefile2
-rw-r--r--multimedia/k9copy/Makefile2
-rw-r--r--multimedia/kplayer/Makefile2
-rw-r--r--multimedia/miro/Makefile2
-rw-r--r--multimedia/openshot/Makefile2
-rw-r--r--multimedia/photofilmstrip/Makefile2
-rw-r--r--multimedia/pyjama/Makefile2
-rw-r--r--multimedia/quodlibet/Makefile2
-rw-r--r--multimedia/swfdec-gnome/Makefile2
-rw-r--r--multimedia/transkode/Makefile2
-rw-r--r--multimedia/w_scan/Makefile2
-rw-r--r--multimedia/xfce4-xmms-plugin/Makefile2
-rw-r--r--multimedia/xine/Makefile4
-rw-r--r--multimedia/xmms/Makefile2
-rw-r--r--net-im/emesene/Makefile2
-rw-r--r--net-im/empathy/Makefile2
-rw-r--r--net-im/folks/Makefile2
-rw-r--r--net-im/freetalk/Makefile2
-rw-r--r--net-im/gajim/Makefile2
-rw-r--r--net-im/jabber/Makefile2
-rw-r--r--net-im/jggtrans/Makefile2
-rw-r--r--net-im/libpurple/Makefile2
-rw-r--r--net-im/loudmouth/Makefile2
-rw-r--r--net-im/pidgin-birthday-reminder/Makefile2
-rw-r--r--net-im/pidgin-libnotify/Makefile2
-rw-r--r--net-im/pidgin-msn-pecan/Makefile2
-rw-r--r--net-im/pidgin-sipe/Makefile2
-rw-r--r--net-im/pwytter/Makefile2
-rw-r--r--net-im/sim-im-devel/Makefile2
-rw-r--r--net-im/sim-im/Makefile2
-rw-r--r--net-im/xfce4-messenger-plugin/Makefile2
-rw-r--r--net-mgmt/ap-utils/Makefile2
-rw-r--r--net-mgmt/etherape/Makefile2
-rw-r--r--net-mgmt/horde3-nic/Makefile2
-rw-r--r--net-mgmt/ipv6calc/Makefile2
-rw-r--r--net-mgmt/nagiosql/Makefile2
-rw-r--r--net-mgmt/netustad/Makefile2
-rw-r--r--net-mgmt/tork/Makefile2
-rw-r--r--net-mgmt/virtinst/Makefile2
-rw-r--r--net-mgmt/wifimgr/Makefile2
-rw-r--r--net-p2p/deluge/Makefile2
-rw-r--r--net-p2p/gnunet-gtk/Makefile2
-rw-r--r--net-p2p/gnunet/Makefile2
-rw-r--r--net-p2p/jigdo/Makefile2
-rw-r--r--net-p2p/microdc2/Makefile2
-rw-r--r--net-p2p/moodriver/Makefile2
-rw-r--r--net-p2p/nicotine-plus/Makefile2
-rw-r--r--net-p2p/retroshare/Makefile2
-rw-r--r--net-p2p/transmission-gtk/Makefile2
-rw-r--r--net/avahi-app/Makefile2
-rw-r--r--net/blam/Makefile2
-rw-r--r--net/desktop-data-model/Makefile2
-rw-r--r--net/ekiga/Makefile2
-rw-r--r--net/ekiga3/Makefile2
-rw-r--r--net/glib-networking/Makefile2
-rw-r--r--net/gnetcat/Makefile2
-rw-r--r--net/gnome-netstatus/Makefile2
-rw-r--r--net/gnome-nettool/Makefile2
-rw-r--r--net/gnu-dico/Makefile2
-rw-r--r--net/gnu-radius/Makefile2
-rw-r--r--net/gq/Makefile2
-rw-r--r--net/grsync/Makefile2
-rw-r--r--net/gtk-vnc/Makefile2
-rw-r--r--net/heybuddy/Makefile2
-rw-r--r--net/jwhois/Makefile2
-rw-r--r--net/libgnetwork/Makefile2
-rw-r--r--net/libgweather/Makefile2
-rw-r--r--net/libmms/Makefile2
-rw-r--r--net/link-monitor-applet/Makefile2
-rw-r--r--net/miredo/Makefile2
-rw-r--r--net/morebalance/Makefile2
-rw-r--r--net/nc6/Makefile2
-rw-r--r--net/netdude/Makefile2
-rw-r--r--net/netspeed_applet/Makefile2
-rw-r--r--net/nxserver/Makefile2
-rw-r--r--net/online-desktop/Makefile2
-rw-r--r--net/opennx/Makefile2
-rw-r--r--net/phamm/Makefile2
-rw-r--r--net/py-ldaptor/Makefile2
-rw-r--r--net/remmina-applet/Makefile2
-rw-r--r--net/remmina-plugin-i18n/Makefile2
-rw-r--r--net/remmina/Makefile2
-rw-r--r--net/service-discovery-applet/Makefile2
-rw-r--r--net/smb4k/Makefile2
-rw-r--r--net/tcpreen/Makefile2
-rw-r--r--net/tucan/Makefile2
-rw-r--r--net/twitux/Makefile2
-rw-r--r--net/ushare/Makefile2
-rw-r--r--net/vino/Makefile2
-rw-r--r--net/wol/Makefile2
-rw-r--r--net/x11vnc/Makefile2
-rw-r--r--news/klibido/Makefile2
-rw-r--r--news/sabnzbdplus/Makefile2
-rw-r--r--news/slrn/Makefile2
-rw-r--r--news/tin/Makefile2
-rw-r--r--news/xpn/Makefile2
-rw-r--r--news/yencode/Makefile2
-rw-r--r--polish/ekg2/Makefile2
-rw-r--r--polish/gnugadu2/Makefile2
-rw-r--r--polish/qnapi/Makefile2
-rw-r--r--ports-mgmt/gnome-packagekit/Makefile2
-rw-r--r--ports-mgmt/packagekit/Makefile2
-rw-r--r--print/a2ps-letter/Makefile2
-rw-r--r--print/cjk-lyx/Makefile2
-rw-r--r--print/cups-pk-helper/Makefile2
-rw-r--r--print/fontforge/Makefile2
-rw-r--r--print/frescobaldi/Makefile2
-rw-r--r--print/ggv/Makefile2
-rw-r--r--print/gnome-cups-manager/Makefile2
-rw-r--r--print/gnome-print/Makefile2
-rw-r--r--print/gnome-specimen/Makefile2
-rw-r--r--print/gnomephotoprinter/Makefile2
-rw-r--r--print/gtklp/Makefile2
-rw-r--r--print/gutenprint-base/Makefile2
-rw-r--r--print/lilypond-devel/Makefile2
-rw-r--r--print/lyx/Makefile2
-rw-r--r--print/lyx16/Makefile2
-rw-r--r--print/openprinting/Makefile2
-rw-r--r--print/pdfmod/Makefile2
-rw-r--r--print/photoprint/Makefile2
-rw-r--r--print/system-config-printer/Makefile2
-rw-r--r--print/texinfo/Makefile2
-rw-r--r--print/trueprint/Makefile2
-rw-r--r--print/xfce4-print/Makefile2
-rw-r--r--science/chemtool-devel/Makefile2
-rw-r--r--science/ecs/Makefile2
-rw-r--r--science/kst/Makefile2
-rw-r--r--science/linsmith/Makefile2
-rw-r--r--science/meep/Makefile2
-rw-r--r--science/ncs/Makefile2
-rw-r--r--science/v_sim/Makefile2
-rw-r--r--security/authforce/Makefile2
-rw-r--r--security/bsp_upektfmess/Makefile2
-rw-r--r--security/ccrypt/Makefile2
-rw-r--r--security/fwlogwatch/Makefile2
-rw-r--r--security/gnome-keyring/Makefile2
-rw-r--r--security/gnupg/Makefile2
-rw-r--r--security/gss/Makefile2
-rw-r--r--security/heimdal/Makefile2
-rw-r--r--security/horde3-jeta/Makefile2
-rw-r--r--security/hotssh/Makefile2
-rw-r--r--security/klamav/Makefile2
-rw-r--r--security/kovpn/Makefile2
-rw-r--r--security/krb5/Makefile2
-rw-r--r--security/libgnome-keyring/Makefile2
-rw-r--r--security/libgpg-error/Makefile2
-rw-r--r--security/libpreludedb/Makefile2
-rw-r--r--security/mcrypt/Makefile2
-rw-r--r--security/openvas-server/Makefile2
-rw-r--r--security/p5-openxpki-i18n/Makefile2
-rw-r--r--security/pam_krb5-rh/Makefile2
-rw-r--r--security/parano/Makefile2
-rw-r--r--security/pidgin-encryption/Makefile4
-rw-r--r--security/pidgin-otr/Makefile2
-rw-r--r--security/shishi/Makefile2
-rw-r--r--security/sssd/Makefile2
-rw-r--r--security/steghide/Makefile2
-rw-r--r--security/sudo/Makefile2
-rw-r--r--security/tpm-tools/Makefile2
-rw-r--r--security/w3af/Makefile2
-rw-r--r--security/zenmap/Makefile2
-rw-r--r--shells/fish/Makefile2
-rw-r--r--sysutils/apt/Makefile2
-rw-r--r--sysutils/battfink/Makefile2
-rw-r--r--sysutils/cog/Makefile2
-rw-r--r--sysutils/coreutils/Makefile2
-rw-r--r--sysutils/dar/Makefile2
-rw-r--r--sysutils/dc3dd/Makefile2
-rw-r--r--sysutils/di/Makefile2
-rw-r--r--sysutils/dircomp/Makefile2
-rw-r--r--sysutils/dtc/Makefile2
-rw-r--r--sysutils/duff/Makefile2
-rw-r--r--sysutils/duplicity/Makefile2
-rw-r--r--sysutils/dvdisaster/Makefile2
-rw-r--r--sysutils/empower/Makefile2
-rw-r--r--sysutils/filelight/Makefile2
-rw-r--r--sysutils/gcombust/Makefile2
-rw-r--r--sysutils/gconf-editor/Makefile2
-rw-r--r--sysutils/gigolo/Makefile2
-rw-r--r--sysutils/gkrellm/Makefile2
-rw-r--r--sysutils/gkrellm2/Makefile2
-rw-r--r--sysutils/gnome-control-center/Makefile2
-rw-r--r--sysutils/gnome-mount/Makefile2
-rw-r--r--sysutils/gnome-pkgview/Makefile2
-rw-r--r--sysutils/gnome-power-manager/Makefile2
-rw-r--r--sysutils/gnome-schedule/Makefile2
-rw-r--r--sysutils/gnome-system-monitor/Makefile2
-rw-r--r--sysutils/gnome-system-tools/Makefile2
-rw-r--r--sysutils/gnomebaker/Makefile2
-rw-r--r--sysutils/heartbeat/Makefile2
-rw-r--r--sysutils/isomaster/Makefile2
-rw-r--r--sysutils/keep/Makefile2
-rw-r--r--sysutils/kleansweep/Makefile2
-rw-r--r--sysutils/knutclient/Makefile2
-rw-r--r--sysutils/komparator/Makefile2
-rw-r--r--sysutils/lavaps/Makefile2
-rw-r--r--sysutils/ldap-account-manager/Makefile2
-rw-r--r--sysutils/lxinput/Makefile2
-rw-r--r--sysutils/lxtask/Makefile2
-rw-r--r--sysutils/lxterminal/Makefile2
-rw-r--r--sysutils/mount.app/Makefile2
-rw-r--r--sysutils/nautilus-cd-burner/Makefile2
-rw-r--r--sysutils/nitrogen/Makefile2
-rw-r--r--sysutils/pacman/Makefile2
-rw-r--r--sysutils/pessulus/Makefile2
-rw-r--r--sysutils/policykit-gnome/Makefile2
-rw-r--r--sysutils/polkit-gnome/Makefile2
-rw-r--r--sysutils/progsreiserfs/Makefile2
-rw-r--r--sysutils/psmisc/Makefile2
-rw-r--r--sysutils/relaxconf/Makefile2
-rw-r--r--sysutils/sge62/Makefile2
-rw-r--r--sysutils/shmcat/Makefile2
-rw-r--r--sysutils/tracker-client/Makefile2
-rw-r--r--sysutils/uniutils/Makefile2
-rw-r--r--sysutils/upower/Makefile2
-rw-r--r--sysutils/xcdroast/Makefile2
-rw-r--r--sysutils/xfce4-battery-plugin/Makefile2
-rw-r--r--sysutils/xfce4-cpugraph-plugin/Makefile2
-rw-r--r--sysutils/xfce4-minicmd-plugin/Makefile2
-rw-r--r--sysutils/xfce4-mount-plugin/Makefile2
-rw-r--r--sysutils/xfce4-power-manager/Makefile2
-rw-r--r--sysutils/xfce4-settings/Makefile2
-rw-r--r--sysutils/xfce4-systemload-plugin/Makefile2
-rw-r--r--sysutils/xfce4-wavelan-plugin/Makefile2
-rw-r--r--sysutils/xfsprogs/Makefile2
-rw-r--r--sysutils/xvidcap/Makefile2
-rw-r--r--sysutils/yum/Makefile2
-rw-r--r--sysutils/zeitgeist/Makefile2
-rw-r--r--textproc/aspell/Makefile2
-rw-r--r--textproc/dwdiff/Makefile2
-rw-r--r--textproc/gnome-doc-utils/Makefile2
-rw-r--r--textproc/gnome-spell/Makefile2
-rw-r--r--textproc/gnugrep/Makefile2
-rw-r--r--textproc/gtkspell/Makefile2
-rw-r--r--textproc/ibus-kmfl/Makefile2
-rw-r--r--textproc/ibus-m17n/Makefile2
-rw-r--r--textproc/ibus-table/Makefile2
-rw-r--r--textproc/ibus/Makefile2
-rw-r--r--textproc/libcue/Makefile2
-rw-r--r--textproc/m17n-contrib/Makefile2
-rw-r--r--textproc/m17n-im-config/Makefile4
-rw-r--r--textproc/meld/Makefile2
-rw-r--r--textproc/modlogan/Makefile2
-rw-r--r--textproc/msort/Makefile2
-rw-r--r--textproc/openjade/Makefile2
-rw-r--r--textproc/opensp/Makefile2
-rw-r--r--textproc/ots/Makefile2
-rw-r--r--textproc/po4a/Makefile2
-rw-r--r--textproc/pootle/Makefile2
-rw-r--r--textproc/rotix/Makefile2
-rw-r--r--textproc/scim-bridge-qt4/Makefile2
-rw-r--r--textproc/scim-bridge/Makefile2
-rw-r--r--textproc/scim-input-pad/Makefile2
-rw-r--r--textproc/scim-kmfl-imengine/Makefile2
-rw-r--r--textproc/scim-table-imengine/Makefile2
-rw-r--r--textproc/scim/Makefile2
-rw-r--r--textproc/spellutils/Makefile2
-rw-r--r--textproc/stardict2/Makefile2
-rw-r--r--textproc/stardict3/Makefile2
-rw-r--r--textproc/texi2html/Makefile2
-rw-r--r--textproc/translate-toolkit/Makefile2
-rw-r--r--textproc/uim/Makefile2
-rw-r--r--textproc/wdiff/Makefile2
-rw-r--r--textproc/xfce4-dict-plugin/Makefile2
-rw-r--r--www/aria/Makefile2
-rw-r--r--www/awffull/Makefile2
-rw-r--r--www/cadaver/Makefile2
-rw-r--r--www/cakephp12/Makefile2
-rw-r--r--www/cakephp13/Makefile2
-rw-r--r--www/cakephp21/Makefile2
-rw-r--r--www/cakephp22/Makefile2
-rw-r--r--www/diamanda/Makefile2
-rw-r--r--www/dillo-i18n/Makefile2
-rw-r--r--www/elgg/Makefile2
-rw-r--r--www/epiphany-extensions/Makefile2
-rw-r--r--www/evolution-webcal/Makefile2
-rw-r--r--www/gallery/Makefile2
-rw-r--r--www/gallery2/Makefile2
-rw-r--r--www/gallery3/Makefile2
-rw-r--r--www/gnome-user-share/Makefile2
-rw-r--r--www/gnome-web-photo/Makefile2
-rw-r--r--www/google-appengine/Makefile2
-rw-r--r--www/gtkhtml3/Makefile2
-rw-r--r--www/horde3-ansel/Makefile2
-rw-r--r--www/horde3-base/Makefile2
-rw-r--r--www/horde3-passwd/Makefile2
-rw-r--r--www/horde3-trean/Makefile2
-rw-r--r--www/horde3-wicked/Makefile2
-rw-r--r--www/ikiwiki/Makefile2
-rw-r--r--www/libepc/Makefile2
-rw-r--r--www/linkchecker/Makefile2
-rw-r--r--www/llgal/Makefile2
-rw-r--r--www/lynx-current/Makefile2
-rw-r--r--www/lynx/Makefile2
-rw-r--r--www/neon29/Makefile2
-rw-r--r--www/newsbeuter/Makefile2
-rw-r--r--www/nscache/Makefile2
-rw-r--r--www/pivotx/Makefile2
-rw-r--r--www/py-django-devel/Makefile2
-rw-r--r--www/py-django-mezzanine-filebrowser/Makefile2
-rw-r--r--www/py-django-mezzanine-grappelli/Makefile2
-rw-r--r--www/py-django-mptt/Makefile2
-rw-r--r--www/py-django-registration/Makefile2
-rw-r--r--www/py-django/Makefile2
-rw-r--r--www/py-django13/Makefile2
-rw-r--r--www/py-django14/Makefile2
-rw-r--r--www/py-formencode/Makefile2
-rw-r--r--www/py-nevow/Makefile2
-rw-r--r--www/py-prewikka/Makefile2
-rw-r--r--www/py-satchmo/Makefile2
-rw-r--r--www/py-turbogears/Makefile2
-rw-r--r--www/retawq/Makefile2
-rw-r--r--www/roundup/Makefile2
-rw-r--r--www/sitecopy/Makefile2
-rw-r--r--www/snownews/Makefile2
-rw-r--r--www/w3m/Makefile2
-rw-r--r--www/wml/Makefile2
-rw-r--r--www/zend-framework/Makefile2
-rw-r--r--x11-clocks/alarm-clock/Makefile4
-rw-r--r--x11-clocks/cairo-clock/Makefile2
-rw-r--r--x11-clocks/xfce4-timer-out-plugin/Makefile2
-rw-r--r--x11-fm/emelfm2/Makefile2
-rw-r--r--x11-fm/gentoo/Makefile2
-rw-r--r--x11-fm/gnome-commander2/Makefile2
-rw-r--r--x11-fm/gprename/Makefile2
-rw-r--r--x11-fm/krusader/Makefile2
-rw-r--r--x11-fm/nautilus/Makefile2
-rw-r--r--x11-fm/pcmanfm/Makefile2
-rw-r--r--x11-fm/rodent/Makefile2
-rw-r--r--x11-fm/xfe/Makefile2
-rw-r--r--x11-fm/xnc/Makefile2
-rw-r--r--x11-fonts/fntsample/Makefile2
-rw-r--r--x11-fonts/font-manager/Makefile2
-rw-r--r--x11-fonts/gbdfed/Makefile2
-rw-r--r--x11-themes/gnome-backgrounds/Makefile2
-rw-r--r--x11-themes/gnome-themes-extras/Makefile2
-rw-r--r--x11-themes/gnome-themes/Makefile2
-rw-r--r--x11-themes/gtk-engines2/Makefile2
-rw-r--r--x11-themes/kde-style-polyester/Makefile2
-rw-r--r--x11-themes/lxappearance/Makefile2
-rw-r--r--x11-toolkits/bakery/Makefile2
-rw-r--r--x11-toolkits/eel/Makefile2
-rw-r--r--x11-toolkits/gdl/Makefile2
-rw-r--r--x11-toolkits/girara/Makefile2
-rw-r--r--x11-toolkits/gtk12/Makefile2
-rw-r--r--x11-toolkits/gtk20/Makefile2
-rw-r--r--x11-toolkits/gtk30/Makefile2
-rw-r--r--x11-toolkits/gtkmm24/Makefile2
-rw-r--r--x11-toolkits/gtksourceview/Makefile2
-rw-r--r--x11-toolkits/gtksourceview2/Makefile2
-rw-r--r--x11-toolkits/libbonoboui/Makefile2
-rw-r--r--x11-toolkits/libunique3/Makefile2
-rw-r--r--x11-toolkits/libxfce4gui/Makefile2
-rw-r--r--x11-toolkits/py-gnome2/Makefile2
-rw-r--r--x11-toolkits/py-kiwi/Makefile2
-rw-r--r--x11-toolkits/py-wxPython28/Makefile2
-rw-r--r--x11-toolkits/unique/Makefile2
-rw-r--r--x11-wm/ccsm/Makefile2
-rw-r--r--x11-wm/e16/Makefile4
-rw-r--r--x11-wm/e17-module-alarm/Makefile2
-rw-r--r--x11-wm/e17-module-comp-scale/Makefile2
-rw-r--r--x11-wm/e17-module-cpu/Makefile2
-rw-r--r--x11-wm/e17-module-diskio/Makefile2
-rw-r--r--x11-wm/e17-module-eektool/Makefile2
-rw-r--r--x11-wm/e17-module-engage/Makefile2
-rw-r--r--x11-wm/e17-module-eooorg/Makefile2
-rw-r--r--x11-wm/e17-module-everything-aspell/Makefile2
-rw-r--r--x11-wm/e17-module-everything-mpris/Makefile2
-rw-r--r--x11-wm/e17-module-everything-pidgin/Makefile2
-rw-r--r--x11-wm/e17-module-everything-places/Makefile2
-rw-r--r--x11-wm/e17-module-everything-wallpaper/Makefile2
-rw-r--r--x11-wm/e17-module-everything-websearch/Makefile2
-rw-r--r--x11-wm/e17-module-flame/Makefile2
-rw-r--r--x11-wm/e17-module-forecasts/Makefile2
-rw-r--r--x11-wm/e17-module-iiirk/Makefile2
-rw-r--r--x11-wm/e17-module-mail/Makefile2
-rw-r--r--x11-wm/e17-module-mem/Makefile2
-rw-r--r--x11-wm/e17-module-moon/Makefile2
-rw-r--r--x11-wm/e17-module-mpdule/Makefile2
-rw-r--r--x11-wm/e17-module-net/Makefile2
-rw-r--r--x11-wm/e17-module-news/Makefile2
-rw-r--r--x11-wm/e17-module-penguins/Makefile2
-rw-r--r--x11-wm/e17-module-photo/Makefile2
-rw-r--r--x11-wm/e17-module-places/Makefile2
-rw-r--r--x11-wm/e17-module-rain/Makefile2
-rw-r--r--x11-wm/e17-module-screenshot/Makefile2
-rw-r--r--x11-wm/e17-module-slideshow/Makefile2
-rw-r--r--x11-wm/e17-module-snow/Makefile2
-rw-r--r--x11-wm/e17-module-taskbar/Makefile2
-rw-r--r--x11-wm/e17-module-tclock/Makefile2
-rw-r--r--x11-wm/e17-module-uptime/Makefile2
-rw-r--r--x11-wm/e17-module-weather/Makefile2
-rw-r--r--x11-wm/e17-module-winlist-ng/Makefile2
-rw-r--r--x11-wm/e17-module-wlan/Makefile2
-rw-r--r--x11-wm/fvwm-crystal/Makefile2
-rw-r--r--x11-wm/fvwm2/Makefile2
-rw-r--r--x11-wm/lxsession/Makefile2
-rw-r--r--x11-wm/metacity/Makefile2
-rw-r--r--x11-wm/mutter/Makefile2
-rw-r--r--x11-wm/obconf/Makefile2
-rw-r--r--x11-wm/obkey/Makefile2
-rw-r--r--x11-wm/openbox/Makefile2
-rw-r--r--x11-wm/simple-ccsm/Makefile2
-rw-r--r--x11-wm/wmakerconf/Makefile2
-rw-r--r--x11-wm/xfce4-wm/Makefile2
-rw-r--r--x11/florence/Makefile2
-rw-r--r--x11/gnome-session/Makefile2
-rw-r--r--x11/gnome-shell/Makefile2
-rw-r--r--x11/gnome-terminal/Makefile2
-rw-r--r--x11/guake/Makefile2
-rw-r--r--x11/kdelibs3/Makefile2
-rw-r--r--x11/libgnomekbd/Makefile2
-rw-r--r--x11/lxmenu-data/Makefile2
-rw-r--r--x11/lxrandr/Makefile2
-rw-r--r--x11/mlterm/Makefile4
-rw-r--r--x11/rsibreak/Makefile2
-rw-r--r--x11/wbar/Makefile2
-rw-r--r--x11/wbarconf/Makefile4
-rw-r--r--x11/xdialog/Makefile2
-rw-r--r--x11/xfce4-quicklauncher-plugin/Makefile2
-rw-r--r--x11/xfce4-taskmanager/Makefile2
-rw-r--r--x11/xfce4-wmdock-plugin/Makefile2
-rw-r--r--x11/xfce4-xfapplet-plugin/Makefile2
-rw-r--r--x11/xfree86_xkb_xml/Makefile2
-rw-r--r--x11/xnee/Makefile2
-rw-r--r--x11/xscreensaver-gnome/Makefile2
-rw-r--r--x11/xtermcontrol/Makefile2
-rw-r--r--x11/yad/Makefile2
-rw-r--r--x11/yakuake/Makefile2
-rw-r--r--x11/yelp/Makefile2
1027 files changed, 1045 insertions, 1045 deletions
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index b0ee637029fe..07a1369cec14 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= pygnomedesktop atspi intlhack
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 72056ff76eb9..a12d62223386 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2= yes
RUN_DEPENDS= at-spi2-atk>2.6.0:${PORTSDIR}/accessibility/at-spi2-atk
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gnomehack gnomehier intlhack gtk20 gconf2 libbonobo
USE_XORG= x11 xtst
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 04887588b693..c16edcc91ae1 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg
RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \
libwnck gnomedocutils
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 631ccc785b06..2499f5feb225 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_XORG= xfixes xdamage ice xcomposite sm
USE_GNOME= gnomehack gnomeprefix atspi libbonobo intlhack ltverhack
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index 0f4b9094dc63..122303b916ce 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -19,7 +19,7 @@ COMMENT= Collection of accessibility apps for GNOME 2
LIB_DEPENDS= gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 7a2fdca4ae0f..ac7fc0f812f4 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \
gnomespeech libxml2
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index 8086a1f0949b..9d0d2524d1c9 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -20,7 +20,7 @@ USE_XORG= x11 xfixes xcursor xtst
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index b8c6de0c6f0f..cc2d570a19b5 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \
LATEST_LINK= gnome-orca
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui gnomespeech pygnome2 \
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index 6055411df8d3..b8daae1eaa4d 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
RUN_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gnomehack gnomehier intlhack gtk20 libxml2
GNU_CONFIGURE= yes
diff --git a/accessibility/redshift/Makefile b/accessibility/redshift/Makefile
index 16924d6e20d7..75307e0b4044 100644
--- a/accessibility/redshift/Makefile
+++ b/accessibility/redshift/Makefile
@@ -34,7 +34,7 @@ VIDMODE_DESC= Support VIDMODE for changing colors (NVIDIA)
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
PLIST_SUB= NLS=""
diff --git a/accessibility/yasr/Makefile b/accessibility/yasr/Makefile
index c4f07ebc7099..f671ae670c42 100644
--- a/accessibility/yasr/Makefile
+++ b/accessibility/yasr/Makefile
@@ -22,7 +22,7 @@ SUB_FILES= pkg-message
.if !defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.else
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 4322b5bf324f..f4a52bddc8b4 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -42,7 +42,7 @@ CONFIGURE_ENV+= PERL_LIBDIR="${PREFIX}/${SITE_PERL_REL}"
.if ${PORT_OPTIONS:MNLS}
MANLANG= "" de fr hu ja pl sv
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 0dbc0bcb872f..e164ea3f5fd0 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar \
USE_LDCONFIG= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_GMAKE= yes
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index b624f80be354..c6a3d9cddf1e 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -24,7 +24,7 @@ MAN1= gcpio.1
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CONFIGURE_ARGS+=--with-libintl-prefix="${LOCALBASE}"
.else
diff --git a/archivers/grzip/Makefile b/archivers/grzip/Makefile
index e06bc63f28b1..2f8c23472366 100644
--- a/archivers/grzip/Makefile
+++ b/archivers/grzip/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Efficient file compressor
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
CFLAGS+= -I${LOCALBASE}/include -fPIC
LDFLAGS+= -L${LOCALBASE}/lib -lintl
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index a44b733892c3..2221562370f5 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -40,7 +40,7 @@ LDSTATIC=
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/archivers/kbackup/Makefile b/archivers/kbackup/Makefile
index 10952b92b12f..0d2ffdc1da75 100644
--- a/archivers/kbackup/Makefile
+++ b/archivers/kbackup/Makefile
@@ -15,7 +15,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_KDELIBS_VER=3
INSTALLS_ICONS= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index ebab38035cdd..9171838cf1ba 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -26,7 +26,7 @@ MAKE_ENV= OLD_PO_FILE_INPUT=1
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl -liconv"
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index cc46fcf981f2..df1230c34c6a 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -61,7 +61,7 @@ PLIST_SUB+= PYTHON="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
USE_ICONV= yes
PLIST_SUB+= NLS=""
.else
diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile
index 249ab1b9c9ba..982c3aeb37c6 100644
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@@ -76,7 +76,7 @@ PLIST_SUB+= PYTHON="@comment "
.if ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+=--enable-nls
-USE_GETTEXT= yes
+USES+= gettext
USE_ICONV= yes
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index ee9e2ec66bff..22d16c650a9e 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -12,7 +12,7 @@ COMMENT= Unique standard tape archiver with many enhancements
BUILD_DEPENDS= smake:${PORTSDIR}/devel/smake
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
.if !defined(NO_INSTALL_MANPAGES)
diff --git a/archivers/thunar-archive-plugin/Makefile b/archivers/thunar-archive-plugin/Makefile
index 5fdee985632f..80b7df2734be 100644
--- a/archivers/thunar-archive-plugin/Makefile
+++ b/archivers/thunar-archive-plugin/Makefile
@@ -16,7 +16,7 @@ COMMENT= Archive plugin for the Thunar File Manager
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_XFCE= configenv libexo thunar
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
USE_GNOME= desktopfileutils intltool
USE_GMAKE= yes
diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile
index 3310cc87aea5..09ed5fbc8b63 100644
--- a/archivers/xarchiver/Makefile
+++ b/archivers/xarchiver/Makefile
@@ -25,7 +25,7 @@ INSTALLS_ICONS= yes
.include <bsd.port.options.mk>
.if !empty(PORT_OPTIONS:MNLS)
-USE_GETTEXT= yes
+USES+= gettext
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB+= NLS=""
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 4fc6b0d632bb..1d1199894008 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GL= gl
USE_LUA= 5.0+ # should be optional, but the build fails without it
WANT_GNOME= yes
diff --git a/astro/foxtrotgps/Makefile b/astro/foxtrotgps/Makefile
index a9882c7f37f5..8d3882a0bc50 100644
--- a/astro/foxtrotgps/Makefile
+++ b/astro/foxtrotgps/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk20 gconf2 libxml2 intltool pkgconfig libglade2
USE_SQLITE= 3
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index d8a2f2bd47f1..35cb6db9c7c3 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -34,7 +34,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/alsa-utils/Makefile b/audio/alsa-utils/Makefile
index 17ade7123071..fa73cbc7e41b 100644
--- a/audio/alsa-utils/Makefile
+++ b/audio/alsa-utils/Makefile
@@ -47,7 +47,7 @@ CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 6ade03ebcb38..90d49e977635 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_KDEBASE_VER=3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
+USES= gettext
USE_SDL= sdl
USE_RUBY= yes
USE_LDCONFIG= yes
diff --git a/audio/ampache/Makefile b/audio/ampache/Makefile
index b636df9f415a..c621be111c83 100644
--- a/audio/ampache/Makefile
+++ b/audio/ampache/Makefile
@@ -16,7 +16,7 @@ USE_PHP= mysql pcre session iconv hash gettext mbstring
WANT_PHP_WEB= yes
NO_BUILD= yes
-USE_GETTEXT= yes
+USES= gettext
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index 26833797a019..63ec9fb95658 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= lo:${PORTSDIR}/audio/liblo \
gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_SCONS= yes
SCONS_ENV+= SYSLIBS=yes PREFIX=${PREFIX} NLS=yes
CFLAGS+= -I${LOCALBASE}/include
diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index e21211950c1e..131efdedac37 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --disable-avahi
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/audio/asunder/Makefile b/audio/asunder/Makefile
index 1728277e0510..a681c1e04c8c 100644
--- a/audio/asunder/Makefile
+++ b/audio/asunder/Makefile
@@ -23,7 +23,7 @@ WINDOWS_CHARS_DESC= Allow Windows special chars in filenames
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index f5e27ded5e05..c28636d7480a 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
USE_AUTOTOOLS= aclocal autoconf
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_XZ= yes
USE_WX= 2.8
WX_UNICODE= yes
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 4b13cbc99068..9e4991340bb5 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -35,7 +35,7 @@ OPTIONS_DEFINE= NLS GTK2
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
.for ii in ca de el es fr gl it ja nl pl pt_BR ru sv uk zh_CN
PLIST_FILES+= share/locale/${ii}/LC_MESSAGES/aumix.mo
diff --git a/audio/blop/Makefile b/audio/blop/Makefile
index 704433b874cd..501fccd780c2 100644
--- a/audio/blop/Makefile
+++ b/audio/blop/Makefile
@@ -27,7 +27,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/audio/cplay/Makefile b/audio/cplay/Makefile
index 229a18446cc7..541883f95149 100644
--- a/audio/cplay/Makefile
+++ b/audio/cplay/Makefile
@@ -12,7 +12,7 @@ COMMENT= Curses-based front-end for various audio players
LICENSE= GPLv2
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_PYTHON= yes
diff --git a/audio/cuberok/Makefile b/audio/cuberok/Makefile
index 928915892ecd..d07903521a07 100644
--- a/audio/cuberok/Makefile
+++ b/audio/cuberok/Makefile
@@ -25,7 +25,7 @@ USE_LDCONFIG= yes
USE_QT4= gui xml qmake_build uic_build moc_build rcc_build \
network phonon-gst sql
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
USE_SDL= sdl
QMAKEFLAGS+= "CONFIG+=player_phonon"
MAKE_ENV+= INSTALL_ROOT=${PREFIX}
diff --git a/audio/decibel-audio-player/Makefile b/audio/decibel-audio-player/Makefile
index 9124d89b5dfb..a53e5a1caf96 100644
--- a/audio/decibel-audio-player/Makefile
+++ b/audio/decibel-audio-player/Makefile
@@ -17,7 +17,7 @@ LICENSE= GPLv2
USE_PYTHON= 2.5+
USE_GNOME= pygnome2 pygtk2
USE_GSTREAMER= python good bad
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
NO_BUILD= yes
MAN1= decibel-audio-player.1 decibel-audio-player-remote.1
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 2e9594ff7776..ee96734268f1 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -20,7 +20,7 @@ MAN1= easytag.1
CONFLICTS= easytag-devel-[0-9]*
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack gnomeprefix gtk20 desktopfileutils
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_GTK
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index a97a194d4897..af9ee2c54be7 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -53,7 +53,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:${PORTSDIR}/devel/py-notify
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/audio/freedesktop-sound-theme/Makefile b/audio/freedesktop-sound-theme/Makefile
index 95e86ff99718..e5eddfc4c918 100644
--- a/audio/freedesktop-sound-theme/Makefile
+++ b/audio/freedesktop-sound-theme/Makefile
@@ -19,7 +19,7 @@ COMMENT= Sound theme based on the FreeDesktop specification
USE_BZIP2= yes
USE_GNOME= gnomehier intlhack
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/gigedit/Makefile b/audio/gigedit/Makefile
index 6722550e4a2e..8eb639c12a7c 100644
--- a/audio/gigedit/Makefile
+++ b/audio/gigedit/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
USE_GNOME= intltool
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index 3cf1a925f419..37554169a7e8 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ENV= DATADIRNAME=share
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lintl
CONFIGURE_ARGS+= --enable-nls
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/audio/gmpc-alarm/Makefile b/audio/gmpc-alarm/Makefile
index eb6a03c31e6b..9b8c1d55aeac 100644
--- a/audio/gmpc-alarm/Makefile
+++ b/audio/gmpc-alarm/Makefile
@@ -21,6 +21,6 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig glib20 gtk20 intltool
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.mk>
diff --git a/audio/gmpc-albumview/Makefile b/audio/gmpc-albumview/Makefile
index eca9050013fa..0e22515cded5 100644
--- a/audio/gmpc-albumview/Makefile
+++ b/audio/gmpc-albumview/Makefile
@@ -21,6 +21,6 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig glib20 gtk20 intltool
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.mk>
diff --git a/audio/gmpc-discogs/Makefile b/audio/gmpc-discogs/Makefile
index 8ea2557e86a5..095fa945def0 100644
--- a/audio/gmpc-discogs/Makefile
+++ b/audio/gmpc-discogs/Makefile
@@ -22,6 +22,6 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig glib20 gtk20 intltool libxml2
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.mk>
diff --git a/audio/gmpc-lastfm/Makefile b/audio/gmpc-lastfm/Makefile
index 31adc3cad8ab..c6895786a3fc 100644
--- a/audio/gmpc-lastfm/Makefile
+++ b/audio/gmpc-lastfm/Makefile
@@ -23,6 +23,6 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig glib20 gtk20 intltool libxml2
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.mk>
diff --git a/audio/gmpc-libnotify/Makefile b/audio/gmpc-libnotify/Makefile
index 612520395d48..7ae83c3aca6a 100644
--- a/audio/gmpc-libnotify/Makefile
+++ b/audio/gmpc-libnotify/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig glib20 gtk20 intltool
-USE_GETTEXT= yes
+USES= gettext
PLIST_FILES= lib/gmpc/plugins/libnotifyplugin.la \
lib/gmpc/plugins/libnotifyplugin.so
diff --git a/audio/gmpc-lyrics/Makefile b/audio/gmpc-lyrics/Makefile
index 18a51f2159fd..1064187ced70 100644
--- a/audio/gmpc-lyrics/Makefile
+++ b/audio/gmpc-lyrics/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig intltool glib20 gtk20 libxml2
-USE_GETTEXT= yes
+USES= gettext
PLIST_FILES= lib/gmpc/plugins/lyricsplugin.la \
lib/gmpc/plugins/lyricsplugin.so
diff --git a/audio/gmpc-lyricsplugin/Makefile b/audio/gmpc-lyricsplugin/Makefile
index 7c0ee1b6f4b4..38c48cba5184 100644
--- a/audio/gmpc-lyricsplugin/Makefile
+++ b/audio/gmpc-lyricsplugin/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig intltool glib20 gtk20 libxml2
-USE_GETTEXT= yes
+USES= gettext
PLIST_FILES= lib/gmpc/plugins/lyricspluginplugin.la \
lib/gmpc/plugins/lyricspluginplugin.so
diff --git a/audio/gmpc-lyricwiki/Makefile b/audio/gmpc-lyricwiki/Makefile
index 8c4bc5f1760b..340beee0e558 100644
--- a/audio/gmpc-lyricwiki/Makefile
+++ b/audio/gmpc-lyricwiki/Makefile
@@ -21,6 +21,6 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig intltool glib20 gtk20 libxml2
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.mk>
diff --git a/audio/gmpc-magnatune/Makefile b/audio/gmpc-magnatune/Makefile
index a93764c9cabd..effa8790eaf4 100644
--- a/audio/gmpc-magnatune/Makefile
+++ b/audio/gmpc-magnatune/Makefile
@@ -22,6 +22,6 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig intltool glib20 gtk20 libglade2
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.mk>
diff --git a/audio/gmpc-mdcover/Makefile b/audio/gmpc-mdcover/Makefile
index a3ec327f05ab..e2d486f27c35 100644
--- a/audio/gmpc-mdcover/Makefile
+++ b/audio/gmpc-mdcover/Makefile
@@ -22,6 +22,6 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig intltool glib20 gtk20 libxml2
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.mk>
diff --git a/audio/gmpc-mserver/Makefile b/audio/gmpc-mserver/Makefile
index 229e6a4e07e2..59cb8b263ac3 100644
--- a/audio/gmpc-mserver/Makefile
+++ b/audio/gmpc-mserver/Makefile
@@ -26,6 +26,6 @@ USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_GNOME= gnomehack pkgconfig glib20 gtk20 libxml2
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.mk>
diff --git a/audio/gmpc-shout/Makefile b/audio/gmpc-shout/Makefile
index 5f1145b27cfd..dc3ccd37d10e 100644
--- a/audio/gmpc-shout/Makefile
+++ b/audio/gmpc-shout/Makefile
@@ -24,6 +24,6 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc \
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig intltool glib20 gtk20 libxml2
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.mk>
diff --git a/audio/gmpc-wikipedia/Makefile b/audio/gmpc-wikipedia/Makefile
index c2c463b3becc..99ebff91295a 100644
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@@ -23,6 +23,6 @@ RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig intltool glib20 gtk20
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.mk>
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index fa5c073299ae..9197257492f3 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -28,7 +28,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig glib20 gtk20 libglade2
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
CONFIGURE_ARGS= --enable-system-libsexy
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/audio/gmtp/Makefile b/audio/gmtp/Makefile
index aea5349f11d5..d44a9f4cdd5c 100644
--- a/audio/gmtp/Makefile
+++ b/audio/gmtp/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/gMTP
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= glib20
PORTDOCS= *
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index 374b53a42ba9..e1ce397e70c7 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= discid:${PORTSDIR}/audio/libdiscid \
RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
USE_XORG= x11
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 desktopfileutils
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index ed9f840ad66f..bd7a2793ea57 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS+= mpg123:${PORTSDIR}/audio/mpg123
.endif
USE_GNOME= gdkpixbuf
-USE_GETTEXT= yes
+USES= gettext
WANT_GNOME= yes
USE_AUTOTOOLS= autoconf213 libtool
diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile
index cf1f931b3e8c..ba76017edacb 100644
--- a/audio/gtick/Makefile
+++ b/audio/gtick/Makefile
@@ -23,7 +23,7 @@ MAN1= gtick.1
.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/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 62e6bee478d6..71bce0e8565b 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv2
LIB_DEPENDS= id3tag:${PORTSDIR}/audio/libid3tag \
gpod:${PORTSDIR}/audio/libgpod
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20 libglade2
GNU_CONFIGURE= yes
diff --git a/audio/gvolwheel/Makefile b/audio/gvolwheel/Makefile
index 85c351104f5d..4ad3a4c4bb6f 100644
--- a/audio/gvolwheel/Makefile
+++ b/audio/gvolwheel/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.endif
pre-configure:
diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile
index 9043a26ae0cb..39cafd9b5322 100644
--- a/audio/herrie/Makefile
+++ b/audio/herrie/Makefile
@@ -75,7 +75,7 @@ CONFIGURE_ARGS+=no_xspf
.endif
.if ${PORT_OPTIONS:MNLS}
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.else
PLIST_SUB+= NLS="@comment "
CONFIGURE_ARGS+=no_nls
diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index 5bf258158133..cfd9b87f86d9 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
USE_BZIP2= yes
USE_GNOME= libgnomeui libxml2
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index d1bc41ee9825..b964e018d9d1 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -29,7 +29,7 @@ PORTSCOUT= limit:^1\.
USE_KDELIBS_VER=3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-musicbrainz
MAKE_JOBS_SAFE= yes
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 358d6b890380..b058be6bd8fd 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= plist.1:${PORTSDIR}/devel/libplist \
USE_CSTD= gnu89
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20
USE_SQLITE= 3
diff --git a/audio/lingot/Makefile b/audio/lingot/Makefile
index b6a06458acda..a700fa16f9c2 100644
--- a/audio/lingot/Makefile
+++ b/audio/lingot/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GNOME= gtk20 libglade2
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/audio/lxmusic/Makefile b/audio/lxmusic/Makefile
index a4043e5cf895..0feb82094163 100644
--- a/audio/lxmusic/Makefile
+++ b/audio/lxmusic/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= xmmsclient:${PORTSDIR}/audio/xmms2 \
USE_GNOME= gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index a01e8b9e24ed..048d28187ec0 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -34,7 +34,7 @@ TCL82_MAN_DESC= Install tcl 8.3 manpages
.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/mp3c/Makefile b/audio/mp3c/Makefile
index 449d4f726a1d..5f01bcf01e81 100644
--- a/audio/mp3c/Makefile
+++ b/audio/mp3c/Makefile
@@ -30,7 +30,7 @@ MANCOMPRESSED= no
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/audio/mp3splt-gtk/Makefile b/audio/mp3splt-gtk/Makefile
index e15fcae44a28..6786eb097658 100644
--- a/audio/mp3splt-gtk/Makefile
+++ b/audio/mp3splt-gtk/Makefile
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --disable-doxygen-doc
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/audio/mpdbrowser/Makefile b/audio/mpdbrowser/Makefile
index ad8b331bf513..2ee2d9a94264 100644
--- a/audio/mpdbrowser/Makefile
+++ b/audio/mpdbrowser/Makefile
@@ -16,7 +16,7 @@ COMMENT= GTK+ client for the Music Player Daemon (MPD)
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:${PORTSDIR}/audio/py-mpd
PYDISTUTILS_PKGNAME= mpdBrowser
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index 7a88aa3d7e47..5cc2c4c8c12f 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomeprefix gnomehack intltool libgnomeui gnomesharp20
USE_GSTREAMER= gconf
USE_LDCONFIG= yes
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 1b1a8fd951f4..3788ffa5f1c0 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \
OPTIONS_DEFINE= X11 LAME SNDFILE DOCS
OPTIONS_DEFAULT=X11
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug --disable-lubrify --disable-rpath
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index e7956e82d429..2d0234277b2c 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -30,7 +30,7 @@ PLIST_FILES= bin/ncmpc \
PLIST_DIRS=%%EXAMPLESDIR%%
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
LANGUAGES=cs da de eo es fi fr gl he hu it ko nb nl pl pt_BR ru sk sv uk zh_CN
.for language in ${LANGUAGES}
PLIST_FILES+=share/locale/${language}/LC_MESSAGES/ncmpc.mo
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 2cf36c2480c1..84b44a915d64 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -48,7 +48,7 @@ RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile
index 481ba4e31cd4..0078865eebf6 100644
--- a/audio/osd-lyrics/Makefile
+++ b/audio/osd-lyrics/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ENV= DATADIRNAME=share
# Cannot enable -Werror yet: Clang does not like the code `printf(_("..."))',
# see this bug for details: http://llvm.org/bugs/show_bug.cgi?id=3814
#CONFIGURE_ARGS= --with-werror
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20
USE_SQLITE= yes
diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile
index e24563de6c16..f07fca2b1b8b 100644
--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS+= packagekit-glib2.14:${PORTSDIR}/ports-mgmt/packagekit
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index cb26ed944bc0..2a95a10f820a 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=0:${PORTSDIR}/audio/py-mutagen \
${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \
${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= -2.7
USE_PYDISTUTILS=yes
INSTALLS_ICONS= yes
diff --git a/audio/prokyon3/Makefile b/audio/prokyon3/Makefile
index 72b83bc64109..3256ebb05aac 100644
--- a/audio/prokyon3/Makefile
+++ b/audio/prokyon3/Makefile
@@ -25,7 +25,7 @@ USE_XORG= x11 xft
USE_QT_VER= 3
USE_MYSQL= yes
USE_PERL5_BUILD=yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-other-includes=${LOCALBASE}/include \
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index c291f22547a0..b086a14fa725 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \
USE_GNOME= gnomehack glib20 intltool ltverhack
USE_XORG= x11 sm xtst ice
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libltdl libtool
USE_GMAKE= yes
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index dff625a8d5fa..5083716d760e 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
CONFLICTS= rhythmbox-2.[0-9]* rhythmbox-3.[0-9]*
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomeprefix gtk20 nautilus2
diff --git a/audio/rubyripper/Makefile b/audio/rubyripper/Makefile
index 4af7bbaa2c81..dd7646aa6581 100644
--- a/audio/rubyripper/Makefile
+++ b/audio/rubyripper/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \
cd-discid:${PORTSDIR}/audio/cd-discid
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_RUBY= yes
INSTALLS_ICONS= yes
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 746e5f6089d3..18e76e50bea4 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= ${STYLESHEET}:${PORTSDIR}/textproc/docbook-xsl \
USE_GNOME= gnomehack pygtk2
WANT_GNOME= yes
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_path_XML2PO=""
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index f9f7710bd2a1..bf08b2d44470 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -18,7 +18,7 @@ LICENSE= GPLv3
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:${PORTSDIR}/audio/py-mpd
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= pygtk2
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index f4735394717b..0addb1a03017 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
brasero-media.3:${PORTSDIR}/sysutils/brasero
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack intlhack gnomeprefix gconf2 libglade2 gnomedocutils
diff --git a/audio/soundconverter/Makefile b/audio/soundconverter/Makefile
index e7f01a5de455..49b4f9d19a64 100644
--- a/audio/soundconverter/Makefile
+++ b/audio/soundconverter/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedi
LICENSE= GPLv3
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_PYTHON= yes
USE_GNOME= pygtk2 pygnome2
diff --git a/audio/spek/Makefile b/audio/spek/Makefile
index 0b96e6329a61..0d841e70fdd3 100644
--- a/audio/spek/Makefile
+++ b/audio/spek/Makefile
@@ -18,7 +18,7 @@ MAN1= spek.1
USE_XZ= yes
USE_GCC= 4.7+
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= desktopfileutils intltool
USE_WX= 2.8+
WX_UNICODE= yes
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 63264fb14766..e130034a5d5c 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -28,7 +28,7 @@ MAKE_JOBS_SAFE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
USE_ICONV= yes
diff --git a/audio/wavbreaker/Makefile b/audio/wavbreaker/Makefile
index e644a604dd8a..6fb01c2107ca 100644
--- a/audio/wavbreaker/Makefile
+++ b/audio/wavbreaker/Makefile
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+= --disable-pulse
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/audio/wxguitar/Makefile b/audio/wxguitar/Makefile
index 829abace5943..8438c472741d 100644
--- a/audio/wxguitar/Makefile
+++ b/audio/wxguitar/Makefile
@@ -28,7 +28,7 @@ MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/wxGuitar
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile
index e34dd2442219..aa2ca4c0bc77 100644
--- a/audio/xfmpc/Makefile
+++ b/audio/xfmpc/Makefile
@@ -22,7 +22,7 @@ MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
USE_GMAKE= yes
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_GNOME= gtk20 intltool intlhack pkgconfig desktopfileutils
USE_XFCE= configenv libmenu libutil
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 45a55a926f18..7bc3aaec0cbc 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS= id3tag:${PORTSDIR}/audio/libid3tag
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
USE_GNOME= gtk20
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gtk2
MAKE_JOBS_SAFE= yes
diff --git a/audio/xmms-curses/Makefile b/audio/xmms-curses/Makefile
index c6295c5606d4..559af795034d 100644
--- a/audio/xmms-curses/Makefile
+++ b/audio/xmms-curses/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
LIB_DEPENDS= pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
xcb.2:${PORTSDIR}/x11/libxcb
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk12
USE_ICONV= yes
USE_XORG= x11 xau xdmcp xext xi
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index c3df6566503c..f3cb2d41d046 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
xcb.2:${PORTSDIR}/x11/libxcb
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk12
USE_ICONV= yes
USE_XORG= x11 xau xdmcp xext xi
diff --git a/audio/xmms-sid/Makefile b/audio/xmms-sid/Makefile
index 90c611cfa3ca..fe1bef9495ee 100644
--- a/audio/xmms-sid/Makefile
+++ b/audio/xmms-sid/Makefile
@@ -14,7 +14,7 @@ BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/benchmarks/gtkperf/Makefile b/benchmarks/gtkperf/Makefile
index 198d85769b57..dad2fa93c264 100644
--- a/benchmarks/gtkperf/Makefile
+++ b/benchmarks/gtkperf/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE= yes
USE_GNOME= gtk20 gnomeprefix
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
USE_ICONV= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/biology/gperiodic/Makefile b/biology/gperiodic/Makefile
index a9b4caaa18ef..ba4d2e5cd209 100644
--- a/biology/gperiodic/Makefile
+++ b/biology/gperiodic/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Displays a periodic table of the elements
USE_GNOME= gtk20
-USE_GETTEXT= yes
+USES= gettext
LANGS= da fr gl it pl ru sv tr
diff --git a/cad/electric/Makefile b/cad/electric/Makefile
index d0d62e44afec..c6c10ddcb45e 100644
--- a/cad/electric/Makefile
+++ b/cad/electric/Makefile
@@ -39,7 +39,7 @@ FEATURES+= T1LIB
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
FEATURES+= INT
.endif
diff --git a/cad/geda-gattrib/Makefile b/cad/geda-gattrib/Makefile
index e5b97aaaa49f..d88b63969d50 100644
--- a/cad/geda-gattrib/Makefile
+++ b/cad/geda-gattrib/Makefile
@@ -34,7 +34,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/geda-gschem/Makefile b/cad/geda-gschem/Makefile
index a748426e922a..dcce41c40c69 100644
--- a/cad/geda-gschem/Makefile
+++ b/cad/geda-gschem/Makefile
@@ -37,7 +37,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gschem.1
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile
index 4b71430b5b86..237736fc87f4 100644
--- a/chinese/ibus-pinyin/Makefile
+++ b/chinese/ibus-pinyin/Makefile
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+= --disable-opencc
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/chinese/libpinyin/Makefile b/chinese/libpinyin/Makefile
index 237217dad7bf..d0833d49dbc3 100644
--- a/chinese/libpinyin/Makefile
+++ b/chinese/libpinyin/Makefile
@@ -14,7 +14,7 @@ MAN1= libpinyin.1 gen_binary_files.1 gen_unigram.1 \
USE_BDB= yes
USE_GNOME= glib20 gnomehack pkgconfig
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index 978eab85484b..bd7612059b3e 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -70,7 +70,7 @@ PLIST_SUB+= UNICODE="@comment "
# TODO WITHOUT_NLS knob
#.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
LDFLAGS+= -lintl
PLIST_SUB+= NLS=""
#.else
diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index 78d2267d386d..1e806aa2af01 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -35,7 +35,7 @@ MAN1= pcmanx.1
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/chinese/reciteword/Makefile b/chinese/reciteword/Makefile
index 576fcbefe44d..a603d90e58d5 100644
--- a/chinese/reciteword/Makefile
+++ b/chinese/reciteword/Makefile
@@ -17,7 +17,7 @@ COMMENT= Education software to help people to study English
GNU_CONFIGURE= yes
CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk20 esound
USE_GMAKE= yes
CPPFLAGS+= "-I${LOCALBASE}/include"
diff --git a/chinese/scim-array/Makefile b/chinese/scim-array/Makefile
index b93c698e8ff9..ff06883999d5 100644
--- a/chinese/scim-array/Makefile
+++ b/chinese/scim-array/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= scim:${PORTSDIR}/textproc/scim
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
CFLAGS+= -fPIC
diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile
index 4d83afcb6913..d23f3c1b381e 100644
--- a/chinese/scim-pinyin/Makefile
+++ b/chinese/scim-pinyin/Makefile
@@ -27,7 +27,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/chinese/wenju/Makefile b/chinese/wenju/Makefile
index 85730a5c100f..c08491e53b61 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/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/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index 62c655c2bace..7c3156f1a353 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
ONLY_FOR_ARCHS= i386
USE_ICONV= yes
# Don't bother to add ".if !defined(WITHOUT_NLS)", zhcon requires libintl
-USE_GETTEXT= yes
+USES= gettext
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/comms/gnocky/Makefile b/comms/gnocky/Makefile
index 03b951ee1950..9fee1a8e70b5 100644
--- a/comms/gnocky/Makefile
+++ b/comms/gnocky/Makefile
@@ -27,7 +27,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/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 99395e00ebb0..30661da03d94 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
GROUPS= ${PORTNAME}
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
USE_CSTD= gnu89
MAKE_JOBS_SAFE= yes
diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile
index 349c3b7a988e..be804c71b11c 100644
--- a/comms/gpredict/Makefile
+++ b/comms/gpredict/Makefile
@@ -31,7 +31,7 @@ LICENSE= GPLv2
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/comms/grig/Makefile b/comms/grig/Makefile
index c22d4375601b..c883175388ee 100644
--- a/comms/grig/Makefile
+++ b/comms/grig/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= hamlib:${PORTSDIR}/comms/hamlib
USE_GNOME= gtk20
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
MAN1= grig.1
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index 972de6a56626..2193ea39cfb1 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -35,7 +35,7 @@ LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/comms/ktrack/Makefile b/comms/ktrack/Makefile
index 1176bb66ae31..66b0ce65c4d6 100644
--- a/comms/ktrack/Makefile
+++ b/comms/ktrack/Makefile
@@ -25,7 +25,7 @@ USE_KDEBASE_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
+USES= gettext
post-patch:
@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile
index 55f0b9f68c00..9f70a457a1ba 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -19,7 +19,7 @@ EXPIRATION_DATE=2013-07-01
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack pkgconfig
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index a59541ba7e6e..1b208349cc28 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -34,7 +34,7 @@ RUN_DEPENDS+= lrz:${PORTSDIR}/comms/lrzsz
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index 20fdc626d5d1..51d087f86887 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -13,7 +13,7 @@ COMMENT= Data exchange utility for Siemens mobile phones
USE_BZIP2= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 7774211d67fc..486761cfa522 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_MOTIF= yes
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_SAFE= yes
MAN1= xastir.1 \
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 4a173ae5c0ae..d16bb741b38e 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= xlog
MAINTAINER= matt@chronos.org.uk
COMMENT= Amateur Radio logging application
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-mime-update \
diff --git a/converters/ascii2binary/Makefile b/converters/ascii2binary/Makefile
index 09c284f8bcac..0c0df897d9b6 100644
--- a/converters/ascii2binary/Makefile
+++ b/converters/ascii2binary/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= thierry@FreeBSD.org
COMMENT= Convert between textual representations of numbers and binary
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
LICENSE= GPLv3
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index 5f70158099d8..da28ae276d42 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= recode
MAINTAINER= demon@FreeBSD.org
COMMENT= Converts files between character sets and usages
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
USE_PERL5= yes
USE_LDCONFIG= yes
diff --git a/databases/drizzle/Makefile b/databases/drizzle/Makefile
index dc59ff2d1063..4b6e370fdbd8 100644
--- a/databases/drizzle/Makefile
+++ b/databases/drizzle/Makefile
@@ -62,7 +62,7 @@ CONFIGURE_ARGS+=--disable-64bit
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index bc3b4188da9d..3a9d4093f2ab 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -35,7 +35,7 @@ BROKEN= bad-plist
USE_BZIP2= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gnomedocutils gnomehack gnomeprefix pygnomeextras
USE_LDCONFIG= yes
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index ba120d552fda..013b74404b0a 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GCC= any
USE_GNOME= gnomehack gnomeprefix gnomehier libgda
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index 1e5c6499f593..7fe074581afa 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -33,7 +33,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
USE_GMAKE= yes
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
USE_READLINE= yes
USE_PERL5= yes
USE_XORG= sm ice xi x11 xt xmu xext
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index a82d0b6d9310..cfbe7ab3bca7 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -17,7 +17,7 @@ USE_AUTOTOOLS= libtool
USE_MYSQL= yes
USE_QT_VER= 3
USE_KDELIBS_VER=3
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
CONFIGURE_ARGS+=--with-mysql-include=${LOCALBASE}/include/mysql \
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index ad1f72967c1c..16fafb49b068 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= libgda2*-[0-9]*
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix gnomehier gconf bonobo
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index d90bda2d32f1..53bd2cd1bfff 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -30,7 +30,7 @@ CONFLICTS= libgda-0*
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack glib20 libxslt referencehack intlhack
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 1c6c0014e761..775e75045772 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_AUTOTOOLS= libtool
USE_GCC= any
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack
USE_LDCONFIG= yes
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index d0a6b6d19269..c1e8cee4aa4c 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -24,7 +24,7 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui libgda3 gtksourceview \
intlhack referencehack
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index b41121f6e39f..75e2ed465682 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic
USE_PERL5= yes
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-perl5="${PERL}" \
--with-libintl-prefix=${LOCALBASE} \
diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile
index ea57a649d30b..a80fd1cf01a2 100644
--- a/databases/opendbx/Makefile
+++ b/databases/opendbx/Makefile
@@ -80,7 +80,7 @@ PLIST_SUB+= WITHSYBASE="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index 7a3667fc87cf..ae99a3cfe3f7 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
CONFIGURE_ENV= SYBASE=${LOCALBASE}
PERL_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
.if defined(BATCH)
CONFIGURE_ARGS= < /dev/null
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index 724ffeb541ea..65f998636204 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx
IGNORE_WITH_PGSQL= 82 83
MAKE_JOBS_SAFE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PGSQL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile
index efbe35e8a211..7ddb617c6fe3 100644
--- a/databases/pxlib/Makefile
+++ b/databases/pxlib/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/databases/pxtools/Makefile b/databases/pxtools/Makefile
index 4a29e9865f39..d66c8fc74230 100644
--- a/databases/pxtools/Makefile
+++ b/databases/pxtools/Makefile
@@ -13,7 +13,7 @@ COMMENT= Collection of tools to work with Paradox databases
LICENSE= GPLv2
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/databases/py-sqlkit/Makefile b/databases/py-sqlkit/Makefile
index d917f46bdf79..fa2c5af28b56 100644
--- a/databases/py-sqlkit/Makefile
+++ b/databases/py-sqlkit/Makefile
@@ -19,7 +19,7 @@ LICENSE= GPLv3
USE_PYTHON= yes
USE_PYDISTUTILS=easy_install
USE_GNOME= pygtk2 desktopfileutils
-USE_GETTEXT= yes
+USES= gettext
OPTIONS_DEFINE= FIREBIRD MSSQL MYSQL PGSQL SQLITE SYBASE
OPTIONS_DEFAULT=MYSQL PGSQL SQLITE
diff --git a/databases/recutils/Makefile b/databases/recutils/Makefile
index 706bc393bf51..af8934ccd6ae 100644
--- a/databases/recutils/Makefile
+++ b/databases/recutils/Makefile
@@ -24,7 +24,7 @@ PORTDOCS= 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/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index 023d14880526..aaf6e152fae6 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -19,7 +19,7 @@ COMMENT= An editor for the freedesktop.org menu specification
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix pygnomedesktop intlhack
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/bmp-docklet/Makefile b/deskutils/bmp-docklet/Makefile
index 5221e1c26031..567d89b2564c 100644
--- a/deskutils/bmp-docklet/Makefile
+++ b/deskutils/bmp-docklet/Makefile
@@ -31,7 +31,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment"
.else
-USE_GETTEXT= yes
+USES= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/deskutils/calcurse/Makefile b/deskutils/calcurse/Makefile
index 0e2bc663a2bf..90c1cd58fb7b 100644
--- a/deskutils/calcurse/Makefile
+++ b/deskutils/calcurse/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --disable-docs
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/deskutils/clipit/Makefile b/deskutils/clipit/Makefile
index 529571bbb922..de100fb2be33 100644
--- a/deskutils/clipit/Makefile
+++ b/deskutils/clipit/Makefile
@@ -19,7 +19,7 @@ XDOTOOL_DESC= Automatic paste functionality
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CONFIGURE_ARGS+= --localedir=${LOCALBASE}/share/locale
.else
diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile
index 170d5e80c0f8..6874ca114462 100644
--- a/deskutils/conduit/Makefile
+++ b/deskutils/conduit/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goo
USE_PYTHON= 2.5+
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/deskutils/conkyforecast/Makefile b/deskutils/conkyforecast/Makefile
index 408f200df79e..c82e46f7249c 100644
--- a/deskutils/conkyforecast/Makefile
+++ b/deskutils/conkyforecast/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= conky:${PORTSDIR}/sysutils/conky \
USE_PYTHON= yes
USE_PYDISTUTILS=yes
INSTALL_EGGINFO=yes
-USE_GETTEXT= yes
+USES= gettext
SUB_FILES= pkg-message
SUB_LIST+= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 63cd29f4aad5..9653864a3c3e 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -25,7 +25,7 @@ LICENSE_COMB= dual
USE_BZIP2= yes
USE_GNOME= gconf2 gnomedocutils gnomevfs2 gtksourceview2
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
diff --git a/deskutils/easystroke/Makefile b/deskutils/easystroke/Makefile
index 1d2bd8b55d36..8145974e1717 100644
--- a/deskutils/easystroke/Makefile
+++ b/deskutils/easystroke/Makefile
@@ -26,7 +26,7 @@ OPTIONS_DEFINE= NLS
.include <bsd.port.options.mk>
-USE_GETTEXT= yes
+USES+= gettext
.if ${PORT_OPTIONS:MNLS}
BUILD_DEPENDS+= intltool-merge:${PORTSDIR}/textproc/intltool
diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index 59c61b026169..ffa7d31365c5 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -23,7 +23,7 @@ IGNORE= Doesn't build or work with Evolution 2.30
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomeprefix gnomehack intlhack
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/ganyremote/Makefile b/deskutils/ganyremote/Makefile
index 5556d28aeade..5d261575ac67 100644
--- a/deskutils/ganyremote/Makefile
+++ b/deskutils/ganyremote/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFINE= DOCS
USE_GNOME= pygtk2
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/deskutils/gbirthday/Makefile b/deskutils/gbirthday/Makefile
index eceb81f28138..6d6553c0238b 100644
--- a/deskutils/gbirthday/Makefile
+++ b/deskutils/gbirthday/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pygtk2 desktopfileutils
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
USE_GNOME+= intltool
LANGUAGES= de en es fr gl it pl pt ru sk
PLIST_SUB+= NLS=""
diff --git a/deskutils/gcal/Makefile b/deskutils/gcal/Makefile
index 7ba0d86bb4c1..5218b34faaba 100644
--- a/deskutils/gcal/Makefile
+++ b/deskutils/gcal/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= johans@FreeBSD.org
COMMENT= The GNU Gregorian calendar program
USE_XZ= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
@@ -25,7 +25,7 @@ INFO= gcal
.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/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 50e6a4b9f51e..50867da0276b 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/gDesklets-${PORTVERSION}
USE_GNOME= gnomehack gnomeprefix intlhack librsvg2 pygnomeextras
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index c62dff85ab42..2e78f71d9549 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -37,7 +37,7 @@ INSTALLS_OMF= yes
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES= gettext
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
.endif
diff --git a/deskutils/gimmie/Makefile b/deskutils/gimmie/Makefile
index 5d21ee21b2a8..ec63435d06fc 100644
--- a/deskutils/gimmie/Makefile
+++ b/deskutils/gimmie/Makefile
@@ -31,7 +31,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 1d0d6a0f238b..9b0e2863b0f5 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui \
desktopfileutils intlhack ltverhack
WANT_GNOME= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile
index 463cce0cfeb9..8e56f8f99e51 100644
--- a/deskutils/global-menu/Makefile
+++ b/deskutils/global-menu/Makefile
@@ -38,7 +38,7 @@ PLIST_SUB+= XFCE4_PANEL="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/deskutils/gnome-blog/Makefile b/deskutils/gnome-blog/Makefile
index 8b1c4a17f989..823f461f1e19 100644
--- a/deskutils/gnome-blog/Makefile
+++ b/deskutils/gnome-blog/Makefile
@@ -18,7 +18,7 @@ COMMENT= GNOME app to post to blogs
USE_BZIP2= yes
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix pygnome2 intlhack
diff --git a/deskutils/gnome-main-menu/Makefile b/deskutils/gnome-main-menu/Makefile
index bfad940002e1..b7fc99622979 100644
--- a/deskutils/gnome-main-menu/Makefile
+++ b/deskutils/gnome-main-menu/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack eel2 gnomedesktop \
libgnomeui
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`"
CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index bdca54a65620..ae47ae23a35e 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -25,7 +25,7 @@ CONFLICTS= baobob-3.[0-9]* gnome-dictionary-3.[0-9]* \
gnome-search-tool-3.[0-9]* gnome-system-log-3.[0-9]*
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index 6d21360b65c2..16cf463cfb6f 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_XZ= yes
USE_GNOME= gnomehack gnomeprefix gconf2 gtk20 intltool libxml2 libxslt \
ltverhack gnomepanel
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
GCONF_SCHEMAS= gnote.schemas
USE_AUTOTOOLS= libtool
diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile
index 5141102a12c7..a3c2a0a662bb 100644
--- a/deskutils/gourmet/Makefile
+++ b/deskutils/gourmet/Makefile
@@ -25,7 +25,7 @@ PORTDOCS= FAQ LICENSE
PORTSCOUT= ignore:1
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= pygnome2 pygnomeextras pygtk2
USE_PYTHON= -2.7
USE_PYDISTUTILS=yes
diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile
index ebb02fcc8cba..2cf420899d5e 100644
--- a/deskutils/griffith/Makefile
+++ b/deskutils/griffith/Makefile
@@ -30,7 +30,7 @@ PYGNOMEEXTRAS_DESC= Enable python-gnome-extras support
USE_XZ= yes
USE_GNOME= pygtk2
USE_PYTHON= 2.5+
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
NO_BUILD= yes
diff --git a/deskutils/gtg/Makefile b/deskutils/gtg/Makefile
index b43b58cfd448..7546f8e882b3 100644
--- a/deskutils/gtg/Makefile
+++ b/deskutils/gtg/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=0:${PORTSDIR}/devel/py-configobj
FETCH_ARGS= -pRr
USE_GNOME= desktopfileutils pygobject pygtk2
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
USE_PYTHON= -2.7
USE_PYDISTUTILS= yes
diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile
index 4b04f8449e9d..927ea0430daa 100644
--- a/deskutils/gtimer/Makefile
+++ b/deskutils/gtimer/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
USE_XORG= xscrnsaver
USE_GNOME= gtk20
USE_PERL5_BUILD=yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index d84bb7943e1f..7fcdebc497ef 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -19,7 +19,7 @@ COMMENT= A Unicode/ISO10646 character map and font viewer
LIB_DEPENDS= rarian.0:${PORTSDIR}/textproc/rarian
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils gconf2
GNU_CONFIGURE= yes
diff --git a/deskutils/gxmessage/Makefile b/deskutils/gxmessage/Makefile
index 80ce57f00a7d..cec130660640 100644
--- a/deskutils/gxmessage/Makefile
+++ b/deskutils/gxmessage/Makefile
@@ -23,7 +23,7 @@ INSTALLS_ICONS= yes
MAKE_ARGS+= INSTALL="${INSTALL_PROGRAM}"
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index edbaa401b39d..84e0da15d761 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_PYTHON= yes
USE_XORG= xscrnsaver
diff --git a/deskutils/horde3-hermes/Makefile b/deskutils/horde3-hermes/Makefile
index ad56e2a04fb4..cf12420c0f9d 100644
--- a/deskutils/horde3-hermes/Makefile
+++ b/deskutils/horde3-hermes/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Time tracking application
USE_HORDE= base pkg-message
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL TODO
BUILD_DEPENDS+= ${HORBAS}/turba/minisearch.php:${PORTSDIR}/mail/horde3-turba \
diff --git a/deskutils/horde3-klutz/Makefile b/deskutils/horde3-klutz/Makefile
index bf3e2924b9ac..62f640d6be38 100644
--- a/deskutils/horde3-klutz/Makefile
+++ b/deskutils/horde3-klutz/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Comic strip viewer for horde
USE_HORDE= base
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL RELEASE_NOTES
.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/deskutils/horde3-kronolith/Makefile b/deskutils/horde3-kronolith/Makefile
index 187b2015011c..db9f0333ad00 100644
--- a/deskutils/horde3-kronolith/Makefile
+++ b/deskutils/horde3-kronolith/Makefile
@@ -18,7 +18,7 @@ COMMENT= Calendar application
RUN_DEPENDS= ${LOCALBASE}/share/pear/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
USE_HORDE= base
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL RELEASE_NOTES TODO UPGRADING
.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/deskutils/horde3-mnemo/Makefile b/deskutils/horde3-mnemo/Makefile
index ec371c472d21..131fcaaea54d 100644
--- a/deskutils/horde3-mnemo/Makefile
+++ b/deskutils/horde3-mnemo/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Notes and memos application
USE_HORDE= base
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL RELEASE_NOTES TODO UPGRADING
.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/deskutils/horde3-nag/Makefile b/deskutils/horde3-nag/Makefile
index d74354d2fc37..d9339c2b41cf 100644
--- a/deskutils/horde3-nag/Makefile
+++ b/deskutils/horde3-nag/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Simple multiuser task list manager
USE_HORDE= base
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL RELEASE_NOTES TODO UPGRADING
.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/deskutils/katapult/Makefile b/deskutils/katapult/Makefile
index 44890390f9e6..eb50c41c110d 100644
--- a/deskutils/katapult/Makefile
+++ b/deskutils/katapult/Makefile
@@ -19,7 +19,7 @@ USE_GMAKE= yes
USE_KDELIBS_VER=3
USE_AUTOTOOLS= libtool
USE_LDCONFIG= ${PREFIX}/lib/ ${PREFIX}/lib/kde3/
-USE_GETTEXT= yes
+USES= gettext
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/deskutils/kdissert/Makefile b/deskutils/kdissert/Makefile
index ffe180879b51..29d9d7c507fa 100644
--- a/deskutils/kdissert/Makefile
+++ b/deskutils/kdissert/Makefile
@@ -19,7 +19,7 @@ DEPRECATED= Depends on QT3; unmaintained
EXPIRATION_DATE= 2013-07-01
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
USE_KDELIBS_VER= 3
diff --git a/deskutils/knowit/Makefile b/deskutils/knowit/Makefile
index 049673212b8a..ff452f2efd18 100644
--- a/deskutils/knowit/Makefile
+++ b/deskutils/knowit/Makefile
@@ -18,7 +18,7 @@ DEPRECATED= Depends on QT3; unmaintained
EXPIRATION_DATE= 2013-07-01
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_KDELIBS_VER= 3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
diff --git a/deskutils/kompose/Makefile b/deskutils/kompose/Makefile
index 64488e9f7271..1df407853fd7 100644
--- a/deskutils/kompose/Makefile
+++ b/deskutils/kompose/Makefile
@@ -32,7 +32,7 @@ DOCSDIR= share/doc/HTML/en/${PORTNAME}
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/deskutils/kooldock/Makefile b/deskutils/kooldock/Makefile
index 1529e873d4cf..a1bee851b155 100644
--- a/deskutils/kooldock/Makefile
+++ b/deskutils/kooldock/Makefile
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/kooldock
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
+USES= gettext
USE_KDELIBS_VER= 3
USE_BZIP2= yes
diff --git a/deskutils/labyrinth/Makefile b/deskutils/labyrinth/Makefile
index d26831ce47ad..f9fb220d7d81 100644
--- a/deskutils/labyrinth/Makefile
+++ b/deskutils/labyrinth/Makefile
@@ -15,7 +15,7 @@ USE_GMAKE= yes
CONFIGURE_ENV= GMSGFMT=msgfmt
USE_GNOME= pygnome2 gnomedesktop gnomehack
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
.include <bsd.port.mk>
diff --git a/deskutils/ljit/Makefile b/deskutils/ljit/Makefile
index a3518e5beee2..5ef612c221b4 100644
--- a/deskutils/ljit/Makefile
+++ b/deskutils/ljit/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk20
PLIST_FILES= bin/ljit share/locale/ru/LC_MESSAGES/ljit.mo
diff --git a/deskutils/moregroupware/Makefile b/deskutils/moregroupware/Makefile
index 67bbcfe6aef3..dab87fe612e8 100644
--- a/deskutils/moregroupware/Makefile
+++ b/deskutils/moregroupware/Makefile
@@ -26,7 +26,7 @@ ADDONS_DESC= install additional workgroup features (addons)
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
.endif
.if ${PORT_OPTIONS:MPGSQL}
diff --git a/deskutils/nagaina/Makefile b/deskutils/nagaina/Makefile
index 96dd9ebe67dd..80d9128445d4 100644
--- a/deskutils/nagaina/Makefile
+++ b/deskutils/nagaina/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFINE= DOCS
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_GNOME= glib20
USE_QT4= corelib gui xml moc_build qmake_build rcc_build uic_build
diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index 3490fdeaf899..118d6fa2e424 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= nautilus2 intlhack
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/nautilus-open-terminal/Makefile b/deskutils/nautilus-open-terminal/Makefile
index 4e79dff906a8..2a3178aff5d9 100644
--- a/deskutils/nautilus-open-terminal/Makefile
+++ b/deskutils/nautilus-open-terminal/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= nautilus2 gnomeprefix intlhack gnomehack
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0`
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/deskutils/notecase/Makefile b/deskutils/notecase/Makefile
index d4d879b0594a..9cdb8a8a8c4d 100644
--- a/deskutils/notecase/Makefile
+++ b/deskutils/notecase/Makefile
@@ -19,7 +19,7 @@ LICENSE= BSD
USE_GMAKE= yes
USE_GNOME= gtk20 gtksourceview2 gnomevfs2 desktopfileutils pkgconfig
-USE_GETTEXT= yes
+USES= gettext
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index 445d3a0b8361..ca1570c2a35a 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -23,7 +23,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix intlhack gtk30
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_XORG= x11
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/ontv/Makefile b/deskutils/ontv/Makefile
index 003464c3265d..b905690a668c 100644
--- a/deskutils/ontv/Makefile
+++ b/deskutils/ontv/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \
tv_check:${PORTSDIR}/textproc/p5-xmltv
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack gnomeprefix pygnomedesktop pygnomeextras pygtk2
USE_GMAKE= yes
USE_PYTHON= 2.5-2.7
diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile
index 444800bb7441..879ac5aa7c9c 100644
--- a/deskutils/osmo/Makefile
+++ b/deskutils/osmo/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 \
gtkhtml:${PORTSDIR}/www/libgtkhtml
USE_GNOME= gtk20
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/parcellite/Makefile b/deskutils/parcellite/Makefile
index bbca75c378d7..5c304ecb1cca 100644
--- a/deskutils/parcellite/Makefile
+++ b/deskutils/parcellite/Makefile
@@ -18,7 +18,7 @@ USE_GNOME= gtk20
.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/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index 0ca8d7f58a74..f68255880217 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -47,7 +47,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
USE_DOS2UNIX= textcat32_conf.txt
USE_XORG= pixman
-USE_GETTEXT= yes
+USES= gettext
USE_SQLITE= 3
USE_PYTHON= yes
USE_OPENSSL= yes
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index 706af8f34008..bf273d1ffbbb 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils \
${PYTHON_PKGNAMEPREFIX}chardet>0:${PORTSDIR}/textproc/py-chardet
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
USE_GNOME= pygtk2
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index 2075ede22a16..a975fc3b7ec2 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -28,7 +28,7 @@ USE_LDCONFIG= yes
.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/deskutils/tel/Makefile b/deskutils/tel/Makefile
index 5ba320d0bcc5..59f9c743dac7 100644
--- a/deskutils/tel/Makefile
+++ b/deskutils/tel/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Little console-based phone book manager
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS=yes
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index d12bc53f2608..45d59bc61ed8 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/mono/gmime-sharp-2.4/gmime-sharp.dll:${PORTSDIR}/m
mautil:${PORTSDIR}/devel/mono-addins
USE_XZ= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack intlhack gnomeprefix gnomedesktopsharp20
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/deskutils/vboxgtk/Makefile b/deskutils/vboxgtk/Makefile
index f34eb4e4686b..71050bc99a5d 100644
--- a/deskutils/vboxgtk/Makefile
+++ b/deskutils/vboxgtk/Makefile
@@ -21,7 +21,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/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile
index f802a1ce6761..cf68ec13e295 100644
--- a/deskutils/virt-manager/Makefile
+++ b/deskutils/virt-manager/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:${PORTSDIR}/devel/py-dbus \
.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/deskutils/wammu/Makefile b/deskutils/wammu/Makefile
index 4cb1ad9e58a9..cf3e87754902 100644
--- a/deskutils/wammu/Makefile
+++ b/deskutils/wammu/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS+= gammu:${PORTSDIR}/comms/gammu
LICENSE= GPLv2
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_WX= 2.6+
diff --git a/deskutils/x-tile/Makefile b/deskutils/x-tile/Makefile
index 3d9b3d088a2d..9692d1fcc06b 100644
--- a/deskutils/x-tile/Makefile
+++ b/deskutils/x-tile/Makefile
@@ -27,7 +27,7 @@ post-patch:
${WRKSRC}/modules/cons.py
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PYDISTUTILS_BUILD_TARGET= --without-gettext build
diff --git a/deskutils/xchm/Makefile b/deskutils/xchm/Makefile
index 4776ce4c5c04..ba03222bb6c8 100644
--- a/deskutils/xchm/Makefile
+++ b/deskutils/xchm/Makefile
@@ -23,7 +23,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
.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/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index de81ece2a477..cb614d83393e 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack glib20 gtk20 intltool intlhack desktopfileutils pkgconfig
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index c972a1638c08..9684b30d8818 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20 intltool intlhack pkgconfig librsvg2
USE_XFCE= configenv panel
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index a55537f7f8d0..6059c2d00423 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= High-performance CORBA ORB with support for the C language
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= glib12
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index e2ab28e87eed..a0a5d13da238 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -16,7 +16,7 @@ COMMENT= Transaction-based software configuration management system
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
RUN_DEPENDS= tkdiff:${PORTSDIR}/textproc/tkdiff
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= libxml2
USE_PERL5= yes
USE_TK= yes
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 06979898bead..157b63396db6 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -32,7 +32,7 @@ CONFLICTS= anjuta-3.[0-9]*
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_PERL5= yes
diff --git a/devel/arm-elf-binutils/Makefile b/devel/arm-elf-binutils/Makefile
index 6b80552a126f..a4ddc1ef3687 100644
--- a/devel/arm-elf-binutils/Makefile
+++ b/devel/arm-elf-binutils/Makefile
@@ -13,7 +13,7 @@ COMMENT= GNU binutils for vanilla ARM cross-development
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} CFLAGS="-I/usr/local/include"
INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/info
diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile
index 6aeffe86b956..4e822800ce58 100644
--- a/devel/avr-binutils/Makefile
+++ b/devel/avr-binutils/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/binutils-${PORTVERSION}
USE_BZIP2= yes
USE_GCC= any
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
CONFIGURE_ARGS= --target=avr
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/devel/baz/Makefile b/devel/baz/Makefile
index a6d8ff897e83..43762b066541 100644
--- a/devel/baz/Makefile
+++ b/devel/baz/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= neon.27:${PORTSDIR}/www/neon29 \
CONFLICTS= gd-2.*
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index ceee7afe8265..c7dddd974cf4 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -19,7 +19,7 @@ COMMENT= A cross platform RAD GUI Building IDE for wxPython
WRKSRC= ${WRKDIR}/boa-constructor-${PORTVERSION}
USE_ZIP= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_WX= 2.6
WX_COMPS= python
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index a988b96e3d40..39fa7da271b1 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix oaf gnomehier gnomeprint
-USE_GETTEXT= yes
+USES= gettext
GNOME_HTML_DIR= ${PREFIX}/share/doc/bonobo
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 6862705d1926..46505e6537af 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
soup-2.4.1:${PORTSDIR}/devel/libsoup
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/bzr-explorer/Makefile b/devel/bzr-explorer/Makefile
index 253ad732ce05..d0a1df9fd2bc 100644
--- a/devel/bzr-explorer/Makefile
+++ b/devel/bzr-explorer/Makefile
@@ -23,6 +23,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bzrlib/plugins/qbzr/__init__.py:${PORTSDIR}/de
USE_PYTHON= yes
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= explorer
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.mk>
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 997e8ac64667..cdc7a005d66f 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -23,7 +23,7 @@ OPTIONS= SFTP "Enable Paramiko for SFTP support" on \
USE_PYTHON= 2.6+
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= bzr
-USE_GETTEXT= yes
+USES= gettext
MAN1= bzr.1
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index c14e4f1422cc..9f1d097d9997 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -25,7 +25,7 @@ MAKE_JOBS_UNSAFE= yes
MAN1= c_incl.1 cook.1 cook_bom.1 cook_lic.1 cook_rsh.1 cookfp.1 cooktime.1 \
find_libs.1 make2cook.1 roffpp.1
MANCOMPRESSED= no
-USE_GETTEXT= yes
+USES= gettext
# Make sure that the whole directory tree exists.
pre-install:
diff --git a/devel/cppi/Makefile b/devel/cppi/Makefile
index 113f3379c48e..e2f9aab8b65a 100644
--- a/devel/cppi/Makefile
+++ b/devel/cppi/Makefile
@@ -10,7 +10,7 @@ MAINTAINER= johans@FreeBSD.org
COMMENT= A tool to indent the C preprocessor directives
USE_XZ= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
@@ -19,7 +19,7 @@ MAN1= cppi.1
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/devel/cutter/Makefile b/devel/cutter/Makefile
index e4df0c661e40..9ef21f038cbc 100644
--- a/devel/cutter/Makefile
+++ b/devel/cutter/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \
CPPFLAGS+= "-I${LOCALBASE}/include"
CONFIGURE_ARGS= --disable-gtk-doc-html --with-html-dir=${PREFIX}/share/doc
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= intltool gnomehack glib20 gtk20
USE_LDCONFIG= yes
@@ -71,7 +71,7 @@ PLIST_SUB+= SOUP="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile
index b67da0d568b0..9c76db212a02 100644
--- a/devel/dbus-glib/Makefile
+++ b/devel/dbus-glib/Makefile
@@ -14,7 +14,7 @@ COMMENT= GLib bindings for the D-BUS messaging system
LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus
USE_GNOME= gnomehack glib20 ltverhack
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index 146adb4c4f9b..84c234b35ff3 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -44,7 +44,7 @@ PLIST_SUB+= MENU="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
TRANSLATIONS= de es it ja ko ru zh_CN
MANLANG= "" it ru
PLIST_SUB+= NLS=""
diff --git a/devel/ding-libs/Makefile b/devel/ding-libs/Makefile
index 7f873006fe1e..65d2a36710a9 100644
--- a/devel/ding-libs/Makefile
+++ b/devel/ding-libs/Makefile
@@ -18,7 +18,7 @@ LICENSE= GPLv3
GNU_CONFIGURE= yes
CPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile
index a98a7c99670f..8345ab80d8f6 100644
--- a/devel/eggdbus/Makefile
+++ b/devel/eggdbus/Makefile
@@ -14,7 +14,7 @@ COMMENT= D-Bus bindings for GObject
LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib
USE_GNOME= glib20 gnomehack
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
MAKE_JOBS_UNSAFE=yes
GNU_CONFIGURE= yes
diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile
index 76b578bd3d5a..7da25c5ce55c 100644
--- a/devel/fhist/Makefile
+++ b/devel/fhist/Makefile
@@ -34,7 +34,7 @@ PLIST_FILES= bin/fcomp bin/fhist bin/fmerge
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
.for file in fcomp fhist fmerge
PLIST_FILES+= share/locale/en/LC_MESSAGES/${file}.mo
.endfor
diff --git a/devel/fnccheck/Makefile b/devel/fnccheck/Makefile
index 8c1b06fc2a98..a7dd2e2d3672 100644
--- a/devel/fnccheck/Makefile
+++ b/devel/fnccheck/Makefile
@@ -32,7 +32,7 @@ INFO= libfc
# should be same as binutils
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
LDFLAGS+= -lintl
.endif
diff --git a/devel/gazpacho/Makefile b/devel/gazpacho/Makefile
index 46db51f3e425..22815aa009e1 100644
--- a/devel/gazpacho/Makefile
+++ b/devel/gazpacho/Makefile
@@ -23,7 +23,7 @@ NO_BUILD= yes
USE_GNOME= pygtk2
USE_PYTHON= yes
USE_PYDISTUTILS= yes
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= AUTHORS ChangeLog CONTRIBUTORS COPYING README NEWS
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index ba57720a4454..58342c3f42bd 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -24,7 +24,7 @@ USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack glib12 gtk12 oaf libxml orbit
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile
index 6fd252b355ea..d031a2b22386 100644
--- a/devel/gdb66/Makefile
+++ b/devel/gdb66/Makefile
@@ -29,7 +29,7 @@ MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
USE_GCC= any
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile
index 9b7cbb7b1e45..ce4ac2e482fa 100644
--- a/devel/giggle/Makefile
+++ b/devel/giggle/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
USE_GNOME= glib20 gtk20 gtksourceview2 libglade2
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 01d9aec01d0b..b90b417e2eda 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -26,7 +26,7 @@ MAKE_JOBS_UNSAFE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 8007496ae1b7..2edd49b288ff 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -217,7 +217,7 @@ ETCSHELLS_DESC= Modify /etc/shells
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index 0f3f76597db7..151136fd0990 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gconf2 gtk20 gtksourceview2 gnomehack
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_SAFE= yes
INSTALLS_ICONS= yes
diff --git a/devel/gitphp/Makefile b/devel/gitphp/Makefile
index 08a949b9a26f..881b1bb8c15d 100644
--- a/devel/gitphp/Makefile
+++ b/devel/gitphp/Makefile
@@ -11,7 +11,7 @@ COMMENT= A web based git repository browser written in PHP
LICENSE= GPLv2
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PHP= bz2 fileinfo mbstring memcache posix simplexml spl zlib
WANT_PHP_WEB= yes
NO_BUILD= yes
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index b8fc1ab79c56..314078196241 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_GNOME= gtk20 libxml2 gnomeprefix gnomehack \
gnomedocutils desktopfileutils ltverhack:10
WANT_GNOME= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 6432c1153944..9cee30684374 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--program-prefix=g
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
PLIST_SUB= NLS=""
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 27837fc71f7b..655559bab403 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix glib12 libxml gtk12 orbit gconf \
gnomemimedata gnomelibs
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/gnucflow/Makefile b/devel/gnucflow/Makefile
index 0f5787fa0e82..0d9d85f12aa4 100644
--- a/devel/gnucflow/Makefile
+++ b/devel/gnucflow/Makefile
@@ -28,7 +28,7 @@ PLIST_FILES= bin/cflow
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--with-libintl-prefix="${LOCALBASE}"
PLIST_FILES+= share/locale/da/LC_MESSAGES/cflow.mo \
share/locale/fi/LC_MESSAGES/cflow.mo \
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index be322a4dd3a4..74feefa1719f 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= pcre.3:${PORTSDIR}/devel/pcre
USE_XZ= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libgsf ltverhack
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index e88906658fc2..d9d48c0adde0 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell
USE_BZIP2= yes
USE_GNOME= gnomehack intlhack gnomeprefix gnomevfs2 libgnomeui
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/horde3-chora/Makefile b/devel/horde3-chora/Makefile
index 7d33060bb0a3..7a7a6fe23802 100644
--- a/devel/horde3-chora/Makefile
+++ b/devel/horde3-chora/Makefile
@@ -42,7 +42,7 @@ CVSROOT= /home/cvs
.endif
USE_HORDE= base pkg-message
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README BUGS CHANGES CREDITS INSTALL RELEASE_NOTES TODO
pre-configure:
diff --git a/devel/horde3-whups/Makefile b/devel/horde3-whups/Makefile
index cb4d18ed957e..54c0fd31540f 100644
--- a/devel/horde3-whups/Makefile
+++ b/devel/horde3-whups/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Bug tracking/ticketing system
USE_HORDE= base pkg-message
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL TODO lighttpd-whups.conf
NO_BUILD= yes
diff --git a/devel/idutils/Makefile b/devel/idutils/Makefile
index 9638684dbb45..22cfb93fc4cd 100644
--- a/devel/idutils/Makefile
+++ b/devel/idutils/Makefile
@@ -28,7 +28,7 @@ MAN1= aid.1 defid.1 eid.1 fid.1 fnid.1 gid.1 lid.1 mkid.1 xtokid.1
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile
index 8d830426fe4a..0823a69b7be0 100644
--- a/devel/ixlib/Makefile
+++ b/devel/ixlib/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A small C++ tools library based on STL
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
diff --git a/devel/jtag/Makefile b/devel/jtag/Makefile
index 0afa326452f0..fe20a90f7168 100644
--- a/devel/jtag/Makefile
+++ b/devel/jtag/Makefile
@@ -34,7 +34,7 @@ OPENWINCE_INCLUDE_DEP=${OPENWINCE_INCLUDE}/common.h
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile
index ca6b36517308..dd6624472214 100644
--- a/devel/libelf/Makefile
+++ b/devel/libelf/Makefile
@@ -30,7 +30,7 @@ NOMAN= defined
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lintl
CONFIGURE_ARGS+= --enable-nls
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index 8cf5f2a7c65e..ef51bb8ea0c6 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome
USE_BZIP2= yes
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
USE_AUTOTOOLS= libtool
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index f7d4df4afee1..9165e3a8a04a 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 ltverhack intlhack
USE_AUTOTOOLS= libtool
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 8042ba10d66d..81f090c0bdc1 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
USE_BZIP2= yes
USE_PERL5_BUILD=yes
USE_XORG= xau
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gnomehack glib20 ltverhack intlhack
USE_LDCONFIG= yes
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index 604ac3eb14b9..5591b1968926 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -22,7 +22,7 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
USE_GNOME= gnomehack intlhack glib20 gtk20 ltverhack
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 7c097bad6d50..a06b091b7fa1 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -20,7 +20,7 @@ USE_XZ= yes
.if !defined(REFERENCE_PORT)
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehier gnomehack glib20 libxml2 ltverhack referencehack \
intltool
USE_LDCONFIG= yes
diff --git a/devel/libticalcs/Makefile b/devel/libticalcs/Makefile
index 84c3b6d2e2b5..3d4af7e76970 100644
--- a/devel/libticalcs/Makefile
+++ b/devel/libticalcs/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= ticables.12:${PORTSDIR}/comms/libticables \
DEPRECATED= Superseded by comms/libticalcs2
EXPIRATION_DATE=2013-07-01
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack pkgconfig
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
diff --git a/devel/libtifiles/Makefile b/devel/libtifiles/Makefile
index f7e6b73ae9d0..bfbcd345c51c 100644
--- a/devel/libtifiles/Makefile
+++ b/devel/libtifiles/Makefile
@@ -17,7 +17,7 @@ COMMENT= TI calculator file types library
DEPRECATED= Superseded by devel/libtifiles2
EXPIRATION_DATE=2013-07-01
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack pkgconfig
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index b416eabbe0d9..97e2fd1e54a3 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -18,7 +18,7 @@ COMMENT= Routines to access raw VBI capture devices
LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
unicode.0:${PORTSDIR}/devel/libunicode
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
USE_GNOME= gnomehack pkgconfig
GNU_CONFIGURE= yes
diff --git a/devel/lua-gettext/Makefile b/devel/lua-gettext/Makefile
index e1a26f5010f6..3aef909108bc 100644
--- a/devel/lua-gettext/Makefile
+++ b/devel/lua-gettext/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Gettext binding for Lua 5
USE_LUA?= 5.1
-USE_GETTEXT= yes
+USES= gettext
CVER= 1.15
LVER= ${PORTVERSION}
diff --git a/devel/m17n-db/Makefile b/devel/m17n-db/Makefile
index dcad079bba77..59db927e3a8f 100644
--- a/devel/m17n-db/Makefile
+++ b/devel/m17n-db/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-charmaps=${CHARMAPSDIR}
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 0b646f9ec16d..8a9dcec027ef 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -64,7 +64,7 @@ SUB_FILES= pkg-message
post-patch:
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-setup.py
diff --git a/devel/monodevelop-database/Makefile b/devel/monodevelop-database/Makefile
index 3331107a2574..30b2ca7ecd17 100644
--- a/devel/monodevelop-database/Makefile
+++ b/devel/monodevelop-database/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/monodevelop.pc:${PORTSDIR}/devel/mon
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack gtksharp20
post-patch:
diff --git a/devel/monodevelop-java/Makefile b/devel/monodevelop-java/Makefile
index f84813b2d870..a777c8f0e9e3 100644
--- a/devel/monodevelop-java/Makefile
+++ b/devel/monodevelop-java/Makefile
@@ -23,7 +23,7 @@ BROKEN= does not build
USE_BZIP2= yes
HAS_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
CONFIGURE_ARGS= --prefix=${PREFIX}
USE_GNOME= gtksharp20
diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index c9c1044f8a46..7bd8faa0187f 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_BZIP2= yes
MAN1= mdtool.1 monodevelop.1
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
OPTIONS= MONOEXT "Enable extensions for Mono development" on \
diff --git a/devel/motor/Makefile b/devel/motor/Makefile
index 1436d8d8285e..5a5b3dd9cfc0 100644
--- a/devel/motor/Makefile
+++ b/devel/motor/Makefile
@@ -20,7 +20,7 @@ USE_ICONV= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE}
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--with-libintl-prefix=${LOCALBASE}
PLIST_SUB= NLS=""
.else
diff --git a/devel/nemiver/Makefile b/devel/nemiver/Makefile
index e9733fd586df..f6a285e45248 100644
--- a/devel/nemiver/Makefile
+++ b/devel/nemiver/Makefile
@@ -30,7 +30,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intltool gnomedocutils gconf2 vte
USE_GCC= 4.4+
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
MAN1= nemiver.1
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index c63e334c000a..31488be42554 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -34,7 +34,7 @@ SOVERSION= ${PORTVERSION:R:E}
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index b3c9aac0b39a..b0068731a687 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -23,7 +23,7 @@ USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gtk12 orbit libxml
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index 3c8e98fde73e..8ed5e6be2526 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -18,7 +18,7 @@ COMMENT= Message handling functions
PERL_CONFIGURE= yes
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
-USE_GETTEXT= yes
+USES= gettext
MAN3= Locale::gettext.3
diff --git a/devel/p5-Locale-libintl/Makefile b/devel/p5-Locale-libintl/Makefile
index f7a584a1f5be..0811dfd976f8 100644
--- a/devel/p5-Locale-libintl/Makefile
+++ b/devel/p5-Locale-libintl/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= perl@FreeBSD.org
COMMENT= Internationalization library for Perl
PERL_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
MAN3= Locale::Messages.3 \
Locale::Recode.3 \
diff --git a/devel/py-mwlib.rl/Makefile b/devel/py-mwlib.rl/Makefile
index 6250526a066a..9cfba537e749 100644
--- a/devel/py-mwlib.rl/Makefile
+++ b/devel/py-mwlib.rl/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/texvc:${PORTSDIR}/print/texvc \
${PYTHON_PKGNAMEPREFIX}pygments>=1.0:${PORTSDIR}/textproc/py-pygments
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= 2.5+
USE_PYDISTUTILS= easy_install
diff --git a/devel/py-zope.i18n/Makefile b/devel/py-zope.i18n/Makefile
index 816250b62e0e..cb509a14669d 100644
--- a/devel/py-zope.i18n/Makefile
+++ b/devel/py-zope.i18n/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.even
${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS= easy_install
diff --git a/devel/qbzr/Makefile b/devel/qbzr/Makefile
index 122f98f1e369..283f2b4ed957 100644
--- a/devel/qbzr/Makefile
+++ b/devel/qbzr/Makefile
@@ -28,7 +28,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_PYTHON= yes
USE_QT4= # empty
USE_PYDISTUTILS= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
.include <bsd.port.mk>
diff --git a/devel/quilt/Makefile b/devel/quilt/Makefile
index dac79a2a0e85..40d9d91e245d 100644
--- a/devel/quilt/Makefile
+++ b/devel/quilt/Makefile
@@ -51,7 +51,7 @@ PLIST_SUB+= RPMBUILD="@comment "
.if !defined(WITHOUT_NLS)
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.else
PLIST_SUB+= NLS="@comment "
CONFIGURE_ARGS+= --disable-nls
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index 95fb714780cd..13bc15ba63d6 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -24,7 +24,7 @@ USE_WX= 2.6
WX_CONF_ARGS= absolute
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= autoconf libtool automake
CONFIGURE_TARGET=
CONFIGURE_ARGS= --with-apr-config=apr-1-config \
diff --git a/devel/remake/Makefile b/devel/remake/Makefile
index d2d4f4c08013..01ec0c1f6c0e 100644
--- a/devel/remake/Makefile
+++ b/devel/remake/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= arved@FreeBSD.org
COMMENT= Fork of gmake with debugger
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
MAN1= remake.1
INFO= remake
diff --git a/devel/rsvndump/Makefile b/devel/rsvndump/Makefile
index 4db40cf9850f..719acedf578f 100644
--- a/devel/rsvndump/Makefile
+++ b/devel/rsvndump/Makefile
@@ -16,7 +16,7 @@ COMMENT= Remote Subversion repository dumpfile generator
GNU_CONFIGURE= yes
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_FILES+= share/locale/de/LC_MESSAGES/rsvndump.mo
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/devel/ruby-intl/Makefile b/devel/ruby-intl/Makefile
index 0d63c36ccc43..09101d2f1c2a 100644
--- a/devel/ruby-intl/Makefile
+++ b/devel/ruby-intl/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= ruby
MAINTAINER= ruby@FreeBSD.org
COMMENT= A simple wrapper of GNU gettext for Ruby
-USE_GETTEXT= yes
+USES= gettext
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
diff --git a/devel/ruby-rbbr/Makefile b/devel/ruby-rbbr/Makefile
index 154ff5bac0a7..f1822aa6ddba 100644
--- a/devel/ruby-rbbr/Makefile
+++ b/devel/ruby-rbbr/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= rubygem-gettext>0:${PORTSDIR}/devel/rubygem-gettext
RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
rubygem-gettext>0:${PORTSDIR}/devel/rubygem-gettext
-USE_GETTEXT= yes
+USES= gettext
USE_RUBY= yes
USE_RUBY_SETUP= yes
RUBY_SETUP= install.rb
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index 54ee5bfe655e..ec7b11fa5fd5 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -25,7 +25,7 @@ CONFLICTS= seed-3.[0-9]*
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack gtk20 intltool libxml2
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile
index c2870878e79a..24372ef31a0b 100644
--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26
USE_GNOME= gnomehack glib20
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/tortoisehg2/Makefile b/devel/tortoisehg2/Makefile
index 4445eefbb3c9..c9095d414c4b 100644
--- a/devel/tortoisehg2/Makefile
+++ b/devel/tortoisehg2/Makefile
@@ -36,7 +36,7 @@ SUB_FILES= pkg-message
.if ${PORT_OPTIONS:MNLS}
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.else
PLIST_SUB+= NLS="@comment "
.endif
diff --git a/devel/valide/Makefile b/devel/valide/Makefile
index f42d6b68e3ce..72a0f79b2f37 100644
--- a/devel/valide/Makefile
+++ b/devel/valide/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
BROKEN= Doesn't build with vala 0.12+
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk20 gtksourceview2
USE_LDCONFIG= yes
USE_PYTHON= yes
diff --git a/devel/xdg-user-dirs/Makefile b/devel/xdg-user-dirs/Makefile
index f5bfa94b6773..f652febaf789 100644
--- a/devel/xdg-user-dirs/Makefile
+++ b/devel/xdg-user-dirs/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Tool to help manage personal user directories
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_GMAKE= yes
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/devel/zpu-binutils/Makefile b/devel/zpu-binutils/Makefile
index 8a4afb70c30e..7e7d0cb6fef7 100644
--- a/devel/zpu-binutils/Makefile
+++ b/devel/zpu-binutils/Makefile
@@ -14,7 +14,7 @@ USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/toolchain
-USE_GETTEXT= yes
+USES= gettext
MANPREFIX= ${PREFIX}/zpu
MANCOMPRESSED= no
MAN1= zpu-elf-addr2line.1 zpu-elf-ar.1 zpu-elf-dlltool.1 \
diff --git a/devel/zpu-gcc/Makefile b/devel/zpu-gcc/Makefile
index b4b352c3d026..8f878a0bda6a 100644
--- a/devel/zpu-gcc/Makefile
+++ b/devel/zpu-gcc/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/zpu/bin/zpu-elf-as:${PORTSDIR}/devel/zpu-binutils
WRKSRC= ${WRKDIR}/${DISTNAME}/toolchain
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
MANPREFIX= ${PREFIX}/zpu
MAN1= zpu-elf-cpp.1 zpu-elf-gcc.1 zpu-elf-gcov.1
MAN7= fsf-funding.7 gfdl.7 gpl.7
diff --git a/dns/libidn/Makefile b/dns/libidn/Makefile
index 15d82bdf6d3d..3d7ae6a3b8a0 100644
--- a/dns/libidn/Makefile
+++ b/dns/libidn/Makefile
@@ -21,7 +21,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
INFO= libidn
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile
index 5396dcbe6418..3c8fe7ada997 100644
--- a/dns/mydns-ng/Makefile
+++ b/dns/mydns-ng/Makefile
@@ -62,7 +62,7 @@ CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
CONFIGURE_ARGS+=--with-included-gettext
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile
index fdc188b079c8..c0485fc0585f 100644
--- a/dns/mydns/Makefile
+++ b/dns/mydns/Makefile
@@ -56,7 +56,7 @@ USE_MYSQL= yes
.endif
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index f5562596baca..72225f26c6e8 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -23,7 +23,7 @@ CLANG_DESC= Clang code-completion
USE_WX= 2.9
WX_UNICODE= yes
USE_DOS2UNIX= *.cpp
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= lib/codelite
USE_CMAKE= yes
CMAKE_OUTSOURCE=yes
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index dd0cce34cbcb..c5c8d1c1ce30 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -17,7 +17,7 @@ COMMENT= Suite of utilities, including a GUI editor
USE_AUTOTOOLS= libtool
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_XORG= x11 xt
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 6a1bda362d7d..ed8747ddb332 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
USE_XORG= sm
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 882099d9dd63..b7691dd78ed7 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \
gnomedocutils
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index 932d07cff14c..71d9d74fe2cf 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -25,7 +25,7 @@ LICENSE_COMB= dual
USE_XORG= xpm
WANT_GNOME= yes
USE_GNOME= gnomeprefix gtk12
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index 38c9049df017..f3a497f50cbf 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=--without-gtkspell
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lintl
CONFIGURE_ARGS+= --enable-nls
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index b03e5f234c57..5194b671fdeb 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -12,7 +12,7 @@ MAINTAINER= wen@FreeBSD.org
COMMENT= GTK+ based simple text editor
USE_GNOME= gtk20 desktopfileutils intlhack
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-chooser
diff --git a/editors/madedit/Makefile b/editors/madedit/Makefile
index c4474e97bb15..9a7c6a6df64d 100644
--- a/editors/madedit/Makefile
+++ b/editors/madedit/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/MadEdit/MadEdit-${PORTVERSION}
MAINTAINER= delphij@FreeBSD.org
COMMENT= An open-source and cross-platform text/hex editor
-USE_GETTEXT= yes
+USES= gettext
USE_WX= 2.6+
WANT_UNICODE= yes
MAKE_JOBS_SAFE= yes
diff --git a/editors/morla/Makefile b/editors/morla/Makefile
index d228ba9b6787..415b3b30bb7c 100644
--- a/editors/morla/Makefile
+++ b/editors/morla/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-gconf=auto
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gconf2 libgtkhtml libxslt
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
diff --git a/editors/mp/Makefile b/editors/mp/Makefile
index 739f8d65ecc5..b46f60d51375 100644
--- a/editors/mp/Makefile
+++ b/editors/mp/Makefile
@@ -29,7 +29,7 @@ DATADIR= ${PREFIX}/share/mp-5
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --without-gettext
diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile
index be7c2b1195b1..b0607c6dd73e 100644
--- a/editors/p5-Padre/Makefile
+++ b/editors/p5-Padre/Makefile
@@ -71,7 +71,7 @@ WX_COMPS= wx contrib
WX_UNICODE= yes
USE_DISPLAY= yes
PERL_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_UNSAFE= yes
PLIST_SUB= WX_VERSION="${WX_VERSION}"
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index c1d2aa1c37ee..e7dddbcd8d7a 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -25,7 +25,7 @@ WX_CONF_ARGS= absolute
WX_UNICODE= yes
USE_BDB= yes
WITH_BDB_HIGHEST= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= WXRC="${WXRC_CMD}"
diff --git a/editors/py-room/Makefile b/editors/py-room/Makefile
index 767bf07f2b5a..8c79e6ee24b0 100644
--- a/editors/py-room/Makefile
+++ b/editors/py-room/Makefile
@@ -19,7 +19,7 @@ COMMENT= PyRoom is a clone of WriteRoom and features "distraction-free writing"
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
FETCH_ARGS=
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_GNOME= pygtk2
USE_PYDISTUTILS= yes
diff --git a/editors/setedit/Makefile b/editors/setedit/Makefile
index aca0101ea732..7d0b4ab6cdab 100644
--- a/editors/setedit/Makefile
+++ b/editors/setedit/Makefile
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+= --without-calendar
.if ! ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+= --no-intl
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_FILES= share/locale/es/LC_MESSAGES/setedit.mo \
share/locale/de/LC_MESSAGES/setedit.mo
.endif
diff --git a/editors/ssed/Makefile b/editors/ssed/Makefile
index f85952811433..e1343fda9876 100644
--- a/editors/ssed/Makefile
+++ b/editors/ssed/Makefile
@@ -24,7 +24,7 @@ MAN1= ssed.1
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE}
PLIST_SUB+= NLS=""
.endif
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index b15a5e6aa8c9..5f7a7a87eb66 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -75,7 +75,7 @@ MLINKS+= vim.1 gvim.1 vim.1 gview.1 vimdiff.1 gvimdiff.1 \
.if ${PORT_OPTIONS:MNLS}
MANLANG= "" ru.KOI8-R ru.UTF-8 pl.ISO8859-2 pl.UTF-8 pl fr.ISO8859-1 \
fr.UTF-8 fr it.ISO8859-1 it.UTF-8 it
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
MAKE_ARGS+= CONF_OPT_NLS="--disable-nls"
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 5dcc16919c7d..c97100a666cf 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -43,7 +43,7 @@ XEMACS_VER= ${XEMACS_REL}.22
XEMACS_ARCH= ${CONFIGURE_TARGET}
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_CSTD= gnu89
USE_XORG= xpm xbitmaps xaw
STRIP=
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index 3f865817fee5..4c343b4f8600 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -16,7 +16,7 @@ USE_WX= 2.8+
WX_COMPS= wx contrib
WX_CONF_ARGS= absolute
WX_UNICODE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_DOS2UNIX= src/templates/DTD.dtd \
src/templates/OpenLearn_document.xml \
src/rng/docbookxi.rnc \
diff --git a/editors/zim/Makefile b/editors/zim/Makefile
index 18775001afc6..a373773c5a82 100644
--- a/editors/zim/Makefile
+++ b/editors/zim/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0:${PORTSDIR}/devel/py-xdg \
${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= desktopfileutils gtk20 pygtk2 pygobject
USE_PYTHON= -2.7
USE_PYDISTUTILS= yes
diff --git a/editors/zoinks/Makefile b/editors/zoinks/Makefile
index 6c832f6622e4..e7e93b4ef277 100644
--- a/editors/zoinks/Makefile
+++ b/editors/zoinks/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --disable-imlib
.endif
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index 0fa48e30220b..e87dd033c682 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -34,7 +34,7 @@ USE_GNOME= gdkpixbuf2 glib20 gtk20 libxml2
USE_WX= 2.6+
USE_PYTHON_BUILD=yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp \
xext xfixes xi xinerama xrandr xrender xxf86vm
diff --git a/emulators/desmume/Makefile b/emulators/desmume/Makefile
index ecaaad1f4573..c6ad0de3793e 100644
--- a/emulators/desmume/Makefile
+++ b/emulators/desmume/Makefile
@@ -22,7 +22,7 @@ USE_GL= gl
USE_SDL= sdl
USE_GMAKE= yes
USE_GNOME= gtk20 libglade2
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= GMSGFMT=msgfmt DATADIRNAME=share
diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index a328a019bfbb..2d93f66c9237 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= GETTEXT="@comment "
.else
CONFIGURE_ARGS+= --with-libintl-prefix=${LOCALBASE}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= GETTEXT=""
.endif
diff --git a/emulators/kcemu/Makefile b/emulators/kcemu/Makefile
index 402789808dd3..2ba15c235511 100644
--- a/emulators/kcemu/Makefile
+++ b/emulators/kcemu/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS= audiofile:${PORTSDIR}/audio/libaudiofile \
GNU_CONFIGURE= yes
USE_XORG= xmu
USE_GNOME= gtk20
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_SAFE= yes
MAN1= kctape.1 kc2raw.1 kc2img.1 kc2tap.1 tdtodump.1 \
diff --git a/emulators/loemu/Makefile b/emulators/loemu/Makefile
index 94d9e709f3ef..e632ea12da8a 100644
--- a/emulators/loemu/Makefile
+++ b/emulators/loemu/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolki
${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
${PYTHON_SITELIBDIR}/libxslt.py:${PORTSDIR}/textproc/py-libxslt
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS= yes
NO_BUILD= yes
diff --git a/emulators/qemu-launcher/Makefile b/emulators/qemu-launcher/Makefile
index c2cf6d16b5e6..f2b1ff00b399 100644
--- a/emulators/qemu-launcher/Makefile
+++ b/emulators/qemu-launcher/Makefile
@@ -19,7 +19,7 @@ USE_PERL5= yes
NO_BUILD= yes
USE_GNOME= gtk20
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
MAN1= qemu-launcher.1
diff --git a/emulators/snes9express/Makefile b/emulators/snes9express/Makefile
index 25d184f4620a..251f2f1952a0 100644
--- a/emulators/snes9express/Makefile
+++ b/emulators/snes9express/Makefile
@@ -17,7 +17,7 @@ COMMENT= GTK interface for snes9x
RUN_DEPENDS= snes9x:${PORTSDIR}/emulators/snes9x
USE_GNOME= gtk20
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile
index 045e722ba259..69d8746915da 100644
--- a/emulators/snes9x-gtk/Makefile
+++ b/emulators/snes9x-gtk/Makefile
@@ -24,7 +24,7 @@ USE_XORG= x11 sm ice xext
USE_GMAKE= yes
USE_GNOME= gtk20 desktopfileutils pkgconfig intltool libglade2 libxml2
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_SDL= sdl
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/emulators/tiemu3/Makefile b/emulators/tiemu3/Makefile
index 824fabf0f198..2439f729d47a 100644
--- a/emulators/tiemu3/Makefile
+++ b/emulators/tiemu3/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ARGS= --disable-gdb
MAN1= tiemu.1
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index df0c17d77d32..8b38a18b601b 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -21,7 +21,7 @@ WANT_GNOME= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_SDL= sdl
-USE_GETTEXT= yes
+USES= gettext
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" LIBS="-lintl"
diff --git a/emulators/xcpc/Makefile b/emulators/xcpc/Makefile
index a2d8dea6bdef..15e4173e107e 100644
--- a/emulators/xcpc/Makefile
+++ b/emulators/xcpc/Makefile
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX}
USE_XORG= ice
USE_GNOME= pkgconfig glib20
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
LIB_DEPENDS+= icui18n:${PORTSDIR}/devel/icu \
pcre.3:${PORTSDIR}/devel/pcre \
diff --git a/emulators/xgngeo/Makefile b/emulators/xgngeo/Makefile
index ed1f33a357db..f7cda403c60f 100644
--- a/emulators/xgngeo/Makefile
+++ b/emulators/xgngeo/Makefile
@@ -25,7 +25,7 @@ BROKEN= does not build
USE_BZIP2= yes
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= XGngeo
NO_BUILD= yes
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index 70696e70cf28..8beeefeb9387 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \
jpeg.11:${PORTSDIR}/graphics/jpeg
USE_AUTOTOOLS= autoconf libtool
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk12
WANT_GNOME= yes
diff --git a/finance/eqonomize-kde3/Makefile b/finance/eqonomize-kde3/Makefile
index 63e84f8bb2fa..880cae110abc 100644
--- a/finance/eqonomize-kde3/Makefile
+++ b/finance/eqonomize-kde3/Makefile
@@ -14,7 +14,7 @@ COMMENT= A personal accounting software package
DEPRECATED= Depends on QT3; unmaintained
EXPIRATION_DATE= 2013-07-01
-USE_GETTEXT= yes
+USES= gettext
USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
USE_PERL5= yes
diff --git a/finance/frontaccounting/Makefile b/finance/frontaccounting/Makefile
index b86aafb52b94..9e83396f6a2b 100644
--- a/finance/frontaccounting/Makefile
+++ b/finance/frontaccounting/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simple, powerful system for the entire ERP chain
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/doc/license.txt
-USE_GETTEXT= yes
+USES= gettext
USE_MYSQL= yes
USE_PHP+= mysql mysqli openssl session
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index 99196047d86f..74dabe8475bf 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -23,7 +23,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/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 560dd7ac533d..a8bb6e817eed 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -31,7 +31,7 @@ LOCALE_TAX_DESC= Enable localized tax categories
WEBKIT_DESC= Use webkit instead of gtkhtml for the HTML engine
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
USE_PERL5= yes
diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index c04dbe648fd1..9895c1a9028f 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -36,7 +36,7 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile
index 08e1377af300..5f031e8102c0 100644
--- a/finance/homebank/Makefile
+++ b/finance/homebank/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
xi xinerama xrandr xrender
USE_GNOME= desktopfileutils gnomehier gtk20
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index 9bd6e975c6a9..c8c0dc940c6c 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -29,7 +29,7 @@ USE_AUTOTOOLS= libtool
USE_PERL5= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
USE_XORG= xext
INSTALLS_ICONS= yes
diff --git a/finance/openerp-web/Makefile b/finance/openerp-web/Makefile
index 1bc5f9110fa9..255c3ba987a6 100644
--- a/finance/openerp-web/Makefile
+++ b/finance/openerp-web/Makefile
@@ -25,7 +25,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>0:${PORTSDIR}/www/py-cherrypy \
${PYTHON_PKGNAMEPREFIX}xlwt>0:${PORTSDIR}/textproc/py-xlwt
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS= easy_install
diff --git a/finance/weberp/Makefile b/finance/weberp/Makefile
index ff2cf0ae97b2..59c6bf2e8d32 100644
--- a/finance/weberp/Makefile
+++ b/finance/weberp/Makefile
@@ -18,7 +18,7 @@ PORTSCOUT= skipv:3.12
USE_ZIP= yes
USE_PHP= mysql gettext
-USE_GETTEXT= yes
+USES= gettext
WRKSRC= ${WRKDIR}/webERP${PORTVERSION}
NO_BUILD= yes
diff --git a/ftp/axel/Makefile b/ftp/axel/Makefile
index ee3300825d59..d3017241541e 100644
--- a/ftp/axel/Makefile
+++ b/ftp/axel/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE= NLS DEBUG
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
USE_ICONV= yes
PLIST_SUB+= NLS=""
CONFIGURE_ARGS+=--i18n=1
diff --git a/ftp/bareftp/Makefile b/ftp/bareftp/Makefile
index 3754eb739c07..f3558b4092a4 100644
--- a/ftp/bareftp/Makefile
+++ b/ftp/bareftp/Makefile
@@ -14,7 +14,7 @@ CONFIGURE_ARGS= --datarootdir="${PREFIX}/share" --libdir="${PREFIX}/lib" \
--localedir="${PREFIX}/share/locale" --includedir="${LOCALBASE}/include"
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtksharp20 gnomesharp20
USE_GMAKE= yes
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index f95aa64e1c1e..03cb93cecb5a 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --without-dbus
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-locales
diff --git a/ftp/horde3-gollem/Makefile b/ftp/horde3-gollem/Makefile
index 5216c7246f8c..a111e45626ee 100644
--- a/ftp/horde3-gollem/Makefile
+++ b/ftp/horde3-gollem/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Web-based File Manager
USE_HORDE= base
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL RELEASE_NOTES
.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/ftp/kpum/Makefile b/ftp/kpum/Makefile
index a61554845cc5..6c9d9d909f3c 100644
--- a/ftp/kpum/Makefile
+++ b/ftp/kpum/Makefile
@@ -24,6 +24,6 @@ USE_KDELIBS_VER=3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.mk>
diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index 3e6430a6a22d..29c34621c415 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+= --without-gnutls
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/ftp/wput/Makefile b/ftp/wput/Makefile
index e2b3eef8fdc1..e0a37e41933c 100644
--- a/ftp/wput/Makefile
+++ b/ftp/wput/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --without-ssl
.if ${PORT_OPTIONS:MNLS}
USE_ICONV= yes
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls \
--with-libintl-prefix=${LOCALBASE} \
--with-libiconv-prefix=${LOCALBASE}
diff --git a/ftp/wxdfast/Makefile b/ftp/wxdfast/Makefile
index 08be7fbe4e18..8ca06581783e 100644
--- a/ftp/wxdfast/Makefile
+++ b/ftp/wxdfast/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_WX= 2.6+
WX_CONF_ARGS= relative
WX_UNICODE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= aclocal automake autoconf libtoolize
ACLOCAL_ARGS= -I ${LOCALBASE}/share/locale
AUTOMAKE_ARGS= --add-missing --copy --force-missing --foreign
diff --git a/ftp/yafc/Makefile b/ftp/yafc/Makefile
index 99d8ccd22d87..88c25ebeb90a 100644
--- a/ftp/yafc/Makefile
+++ b/ftp/yafc/Makefile
@@ -35,7 +35,7 @@ PLIST_FILES= bin/yafc
.if ${PORT_OPTIONS:MNLS}
USE_GNOME+= intltool
-USE_GETTEXT= yes
+USES+= gettext
PLIST_FILES+= share/locale/de/LC_MESSAGES/yafc.mo \
share/locale/sv/LC_MESSAGES/yafc.mo
.else
diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile
index 00c81fdddac8..ad4b3c505fc7 100644
--- a/games/adonthell/Makefile
+++ b/games/adonthell/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \
USE_SDL= mixer ttf sdl
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= PYPACKAGE="${PYTHON_CMD}" ac_cv_path_P_SWIG=no
diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile
index d35ed1a6f33c..8b27b054fad3 100644
--- a/games/allacrost/Makefile
+++ b/games/allacrost/Makefile
@@ -26,7 +26,7 @@ USE_LUA= 5.1
USE_SDL= sdl ttf net
USE_GL= yes
USE_GCC= 4.2+
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --datadir=${DATADIR}
diff --git a/games/assaultcube/Makefile b/games/assaultcube/Makefile
index fb58671df756..eeffc83d90f5 100644
--- a/games/assaultcube/Makefile
+++ b/games/assaultcube/Makefile
@@ -49,7 +49,7 @@ MASTER_DESC= Build master server
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MCLIENT}
-USE_GETTEXT= yes
+USES+= gettext
USE_GL= yes
USE_SDL= image mixer sdl
ALL_TARGET+= client
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index f7e01983d206..11f27321b460 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -18,7 +18,7 @@ COMMENT= A yet another little mind game
USE_GMAKE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/games/balazar/Makefile b/games/balazar/Makefile
index 9967c7609abd..28ea8d45ed45 100644
--- a/games/balazar/Makefile
+++ b/games/balazar/Makefile
@@ -29,7 +29,7 @@ USE_PYDISTUTILS= yes
USE_TWISTED= yes
USE_GL= glew
USE_SDL= sdl mixer
-USE_GETTEXT= yes
+USES= gettext
PYDISTUTILS_PKGNAME= Balazar
PYDISTUTILS_EGGINFODIR= ${PREFIX}/share
diff --git a/games/balazarbrothers/Makefile b/games/balazarbrothers/Makefile
index a0a93bc63395..058f61e0a97d 100644
--- a/games/balazarbrothers/Makefile
+++ b/games/balazarbrothers/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cerealizer/__init__.py:${PORTSDIR}/security/py
${PYTHON_SITELIBDIR}/ogg/__init__.py:${PORTSDIR}/audio/py-vorbis
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS=yes
USE_TWISTED= yes
diff --git a/games/bomberinstinct/Makefile b/games/bomberinstinct/Makefile
index 2d16b475e5d5..f0949862d37b 100644
--- a/games/bomberinstinct/Makefile
+++ b/games/bomberinstinct/Makefile
@@ -18,7 +18,7 @@ COMMENT= A nice Bomberman-like multiplayer game
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_SDL= mixer sdl
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_PERL5_BUILD=yes
diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile
index f5833f85dd14..e1e1743c9b00 100644
--- a/games/bombermaze/Makefile
+++ b/games/bombermaze/Makefile
@@ -16,7 +16,7 @@ COMMENT= A multiplayer game, strategy place bombs to kill enemies and obstacles
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/games/bombherman/Makefile b/games/bombherman/Makefile
index 968909c98a78..542a8af0b88b 100644
--- a/games/bombherman/Makefile
+++ b/games/bombherman/Makefile
@@ -51,7 +51,7 @@ PORTSCOUT= ignore: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/games/briquolo/Makefile b/games/briquolo/Makefile
index 9ccbe3ec882e..013d07cebebe 100644
--- a/games/briquolo/Makefile
+++ b/games/briquolo/Makefile
@@ -36,7 +36,7 @@ PLIST_SUB= VERSION="${PORTVERSION}"
#CONFIGURE_ARGS+= --disable-nls
#PLIST_SUB+= NLS="@comment "
#.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
#.endif
diff --git a/games/capitalism/Makefile b/games/capitalism/Makefile
index 9d5f8f933dbf..ac20b91f86d9 100644
--- a/games/capitalism/Makefile
+++ b/games/capitalism/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
xcb:${PORTSDIR}/x11/libxcb
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_XORG= ice sm x11 xau xdmcp xext xrender
USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats \
diff --git a/games/chroma/Makefile b/games/chroma/Makefile
index 7047a7e8c3e6..7296417ab168 100644
--- a/games/chroma/Makefile
+++ b/games/chroma/Makefile
@@ -12,7 +12,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Abstract puzzle game
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-lintl"
diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile
index 2d6b30febef7..6c4deff098fd 100644
--- a/games/chromium-bsu/Makefile
+++ b/games/chromium-bsu/Makefile
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+=--disable-sdlmixer
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/games/csmash/Makefile b/games/csmash/Makefile
index 9186509b9292..c48370090dbf 100644
--- a/games/csmash/Makefile
+++ b/games/csmash/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF/cannonsmash/CannonSmash/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A 3D tabletennis game
-USE_GETTEXT= yes
+USES= gettext
USE_SDL= image mixer sdl
USE_GL= yes
USE_GNOME= gtk20
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 3d34013a308b..c195a9067e32 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= c.petrik.sosa@gmail.com
COMMENT= UNIX rewrite of a game originally based on "Drug Wars"
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk12
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index a9f76c103d83..ecb42e2505f4 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
BUILD_DEPENDS= ${LOCALBASE}/lib/libenet.a:${PORTSDIR}/net/enet
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LUA= 5.1
LUA_COMPS= lua toluaxx
USE_SDL= image mixer sdl ttf
@@ -41,7 +41,7 @@ PORTDOCS= *
.if !defined(WITHOUT_NLS)
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.else
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
diff --git a/games/fgrun/Makefile b/games/fgrun/Makefile
index 12b8e5dd33b3..3c7c57ba248a 100644
--- a/games/fgrun/Makefile
+++ b/games/fgrun/Makefile
@@ -30,7 +30,7 @@ USE_GL= gl
PLIST_SUB+= NLS="@comment "
CONFIGURE_ARGS+= --disable-nls
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 3d5cbd8f3449..ac7d05ce36ac 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -11,7 +11,7 @@ COMMENT= Free turn-based multiplayer strategy
RUN_DEPENDS= hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_BZIP2= yes
USE_PYTHON= yes
@@ -71,7 +71,7 @@ CONFIGURE_ARGS+=--disable-ipv6
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/games/galaxymage/Makefile b/games/galaxymage/Makefile
index efa115e483bc..3a14c7872157 100644
--- a/games/galaxymage/Makefile
+++ b/games/galaxymage/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Numeric/_numpy.so:${PORTSDIR}/math/py-numeric
USE_PYTHON= yes
USE_TWISTED= yes
-USE_GETTEXT= yes
+USES= gettext
NO_BUILD= yes
OPTIONS= PSYCO "Use just-in-time Python compiler" off
diff --git a/games/gbrainy/Makefile b/games/gbrainy/Makefile
index 88b496111ab4..75f46dda372b 100644
--- a/games/gbrainy/Makefile
+++ b/games/gbrainy/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_GNOME= desktopfileutils gnomehack gtksharp20 gnomesharp20
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index f204ffaa883b..9d28d9449a74 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= gnuchess:${PORTSDIR}/games/gnuchess \
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_GSTREAMER= yes
USE_PYTHON= -2.7
diff --git a/games/ggz-client-libs/Makefile b/games/ggz-client-libs/Makefile
index 911ab9a58a92..af9fb1a0cc59 100644
--- a/games/ggz-client-libs/Makefile
+++ b/games/ggz-client-libs/Makefile
@@ -35,7 +35,7 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/games/ggz-gtk-client/Makefile b/games/ggz-gtk-client/Makefile
index 97f9331ab53e..8eb33dd6df2d 100644
--- a/games/ggz-gtk-client/Makefile
+++ b/games/ggz-gtk-client/Makefile
@@ -29,7 +29,7 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/games/ggz-gtk-games/Makefile b/games/ggz-gtk-games/Makefile
index 79dd92712838..ab8852fc4285 100644
--- a/games/ggz-gtk-games/Makefile
+++ b/games/ggz-gtk-games/Makefile
@@ -28,7 +28,7 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/games/ggz-txt-client/Makefile b/games/ggz-txt-client/Makefile
index 1b2320231ef4..aebf6b871823 100644
--- a/games/ggz-txt-client/Makefile
+++ b/games/ggz-txt-client/Makefile
@@ -27,7 +27,7 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 2de22cdfaae8..8f5b3ec8af36 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -28,7 +28,7 @@ PLIST_SUB+= NLS="@comment"
CONFIGURE_ARGS+= --disable-nls
.else
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.endif
post-patch:
diff --git a/games/glightoff/Makefile b/games/glightoff/Makefile
index 6a9594f6acd5..68f6e64e6234 100644
--- a/games/glightoff/Makefile
+++ b/games/glightoff/Makefile
@@ -27,7 +27,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/games/gnono/Makefile b/games/gnono/Makefile
index 51f4273da4ea..019693e4ea1e 100644
--- a/games/gnono/Makefile
+++ b/games/gnono/Makefile
@@ -17,7 +17,7 @@ COMMENT= Uno card game
USE_BZIP2= yes
USE_GNOME= gtk20 libgnomeui
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile
index bce9dbc0bd14..5431ce7d6a48 100644
--- a/games/gnubg/Makefile
+++ b/games/gnubg/Makefile
@@ -51,7 +51,7 @@ CONFIGURE_ENV+= ac_cv_path_AUDIOFILE_CONFIG=no ac_cv_path_ESD_CONFIG=no
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CONFIGURE_ARGS+= --enable-nls
.else
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index 63d863ac9c0b..0f09d03a9304 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/rhino/GRhino/${PORTVERSION}
MAINTAINER= umeno@rr.iij4u.or.jp
COMMENT= GRhino Othello/Reversi Program
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomeprefix libgnomeui
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 20a553ce6afa..77aa362c279b 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://gtkballs.antex.ru/dist/
MAINTAINER= ports@FreeBSD.org
COMMENT= Lines-like simple logic game for X Window System
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 021ddbef1e4d..861b61a0d069 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -16,7 +16,7 @@ COMMENT= Simple Turing machine simulator for GNOME 2
USE_GNOME= gnomeprefix gnomehack libgnomeui
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/games/gtypist/Makefile b/games/gtypist/Makefile
index ed725fcc7823..289ea813069c 100644
--- a/games/gtypist/Makefile
+++ b/games/gtypist/Makefile
@@ -20,7 +20,7 @@ MAN1= gtypist.1 typefortune.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/games/heroes/Makefile b/games/heroes/Makefile
index d61c947d409d..705965bfaa81 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -37,7 +37,7 @@ MUSICSRC= ${WRKDIR}/${MUSICDISTNAME}
USE_SDL= mixer sdl
USE_GMAKE= yes
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
CONFIGURE_ARGS= --with-sdl_mixer=${LOCALBASE} --without-gii --without-ggi
diff --git a/games/hex-a-hop/Makefile b/games/hex-a-hop/Makefile
index 6acef6ad5096..452000ad5ec9 100644
--- a/games/hex-a-hop/Makefile
+++ b/games/hex-a-hop/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=--disable-debug
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ENV+= ac_cv_header_libintl_h=yes
LDFLAGS+= -lintl
.else
diff --git a/games/hitori/Makefile b/games/hitori/Makefile
index 8b271c26e276..fc8b7eeede89 100644
--- a/games/hitori/Makefile
+++ b/games/hitori/Makefile
@@ -34,7 +34,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/games/kamikaze/Makefile b/games/kamikaze/Makefile
index 18b3bfd5fac5..f33b7863fd81 100644
--- a/games/kamikaze/Makefile
+++ b/games/kamikaze/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-server
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
MAN6= kamikaze.6 kamikaze-editor.6
diff --git a/games/kanatest/Makefile b/games/kanatest/Makefile
index b0328dbb64b6..fd4cf3e6264f 100644
--- a/games/kanatest/Makefile
+++ b/games/kanatest/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A Japanese kana (Hiragana and Katakana) simple flashcard tool
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk20 libxml2
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
diff --git a/games/kbilliards/Makefile b/games/kbilliards/Makefile
index 23a51fbe2ac2..225182d29c97 100644
--- a/games/kbilliards/Makefile
+++ b/games/kbilliards/Makefile
@@ -21,7 +21,7 @@ EXPIRATION_DATE= 2013-07-01
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_PERL5_BUILD=yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
MAKE_JOBS_SAFE= yes
diff --git a/games/knights/Makefile b/games/knights/Makefile
index 28e23f35636e..be82260fb7c3 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= crafty:${PORTSDIR}/games/crafty
DEPRECATED= Depends on QT3; unmaintained
EXPIRATION_DATE= 2013-07-01
-USE_GETTEXT= yes
+USES= gettext
USE_KDELIBS_VER=3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
diff --git a/games/kwappen/Makefile b/games/kwappen/Makefile
index e7bdbbb822db..099b2aac8921 100644
--- a/games/kwappen/Makefile
+++ b/games/kwappen/Makefile
@@ -18,7 +18,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
DEPRECATED= Depends on QT3; unmaintained
EXPIRATION_DATE= 2013-07-01
-USE_GETTEXT= yes
+USES= gettext
USE_KDELIBS_VER=3
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
diff --git a/games/lander/Makefile b/games/lander/Makefile
index c55b241e3cfa..5976d3ee76b2 100644
--- a/games/lander/Makefile
+++ b/games/lander/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
boost_filesystem:${PORTSDIR}/devel/boost-libs
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_SDL= sdl image mixer
USE_GL= gl glu
MAKE_JOBS_SAFE= yes
diff --git a/games/latrine/Makefile b/games/latrine/Makefile
index 49a22dabec34..1b5c0ce4f526 100644
--- a/games/latrine/Makefile
+++ b/games/latrine/Makefile
@@ -23,7 +23,7 @@ USE_CSTD= gnu89
USE_SQLITE= 3
USE_PERL5_BUILD=yes
USE_NCURSES= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/games/lexter/Makefile b/games/lexter/Makefile
index fa12242e4971..4ec134468018 100644
--- a/games/lexter/Makefile
+++ b/games/lexter/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --localstatedir=/var/games
-USE_GETTEXT= yes
+USES= gettext
MAN6= lexter.6
diff --git a/games/lgeneral/Makefile b/games/lgeneral/Makefile
index e08e860b136e..d7b47d2d024d 100644
--- a/games/lgeneral/Makefile
+++ b/games/lgeneral/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=--disable-sound
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ENV+= am_cv_func_iconv=no
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index 3c46acf3f25f..2555d8ffc660 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -41,7 +41,7 @@ PLIST_SUB= PROG="bin/xlincity"
.endif
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/games/lordsawar/Makefile b/games/lordsawar/Makefile
index 1882aac506ae..937267894261 100644
--- a/games/lordsawar/Makefile
+++ b/games/lordsawar/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= glademm-2:${PORTSDIR}/devel/libglademm24 \
BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost-jam \
${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= intltool
USE_SDL= sdl image mixer
diff --git a/games/lpairs/Makefile b/games/lpairs/Makefile
index 20ef56239a57..f0291129dfdc 100644
--- a/games/lpairs/Makefile
+++ b/games/lpairs/Makefile
@@ -21,7 +21,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(WITHOUT_NLS)
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE}
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index d08df5c350bb..16037e499d93 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -34,7 +34,7 @@ RESTRICTED_FILES= \
macopix-mascot-HxB-euc-ja-0.30.tar.gz
WANT_GNOME= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/mt_gtk_client/Makefile b/games/mt_gtk_client/Makefile
index 6ef7d2e7e495..d58a376ec03c 100644
--- a/games/mt_gtk_client/Makefile
+++ b/games/mt_gtk_client/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/cardpics/images/78.png:${PORTSDIR}/games/cardpi
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= glib20 gtk20 libxml2
.if !defined(WITHOUT_SERVER)
diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index e4908ef1ee08..64553dcbd0f7 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -26,7 +26,7 @@ PORTDOCS= CHANGES COPYING README
MAN6= neverball.6 neverputt.6
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
MAKE_ENV+= ENABLE_NLS=1
LOCALE_DIRS= ca de es fi fr lv nn
PLIST_SUB+= NLS=""
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 8e710bbb45be..574948d37186 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -17,7 +17,7 @@ COMMENT= An Internet playable version of the Settlers of Catan for GNOME/GTK+
RUN_DEPENDS= yelp:${PORTSDIR}/x11/yelp
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack gnomeprefix gtk20 libgnome
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
diff --git a/games/pushover/Makefile b/games/pushover/Makefile
index f01751900552..bdd059458e61 100644
--- a/games/pushover/Makefile
+++ b/games/pushover/Makefile
@@ -22,7 +22,7 @@ USE_SDL= sdl mixer ttf
USE_LUA= 5.1
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_SAFE= yes
PORTDOCS= *
diff --git a/games/py-pychess/Makefile b/games/py-pychess/Makefile
index 8d1ec5fdf597..af2059ca0184 100644
--- a/games/py-pychess/Makefile
+++ b/games/py-pychess/Makefile
@@ -34,7 +34,7 @@ OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
PYDISTUTILS_PKGVERSION= ${DISTVERSION}
USE_GNOME= pygnomedesktop
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index 09601e9ee2f2..04cf0254d23b 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -45,7 +45,7 @@ PLIST_SUB+= CARDSETS="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/games/secretmaryochronicles/Makefile b/games/secretmaryochronicles/Makefile
index af6d122401a0..1c275e050b4d 100644
--- a/games/secretmaryochronicles/Makefile
+++ b/games/secretmaryochronicles/Makefile
@@ -22,7 +22,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl image mixer ttf
USE_GL= gl glu
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/games/slune/Makefile b/games/slune/Makefile
index 7e4c5b6eac89..6bcbf393a511 100644
--- a/games/slune/Makefile
+++ b/games/slune/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= cal3d.12:${PORTSDIR}/graphics/cal3d
USE_BZIP2= yes
USE_DOS2UNIX= *.po *.mo
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_GL= glew
diff --git a/games/spellathon/Makefile b/games/spellathon/Makefile
index 6588e7f012b9..c6aa8fdedd83 100644
--- a/games/spellathon/Makefile
+++ b/games/spellathon/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
xcb:${PORTSDIR}/x11/libxcb
CXXFLAGS+= -fPIC
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_GNOME= glib20
USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build
diff --git a/games/tinymux/Makefile b/games/tinymux/Makefile
index 5c363c4f9f71..2136894c9274 100644
--- a/games/tinymux/Makefile
+++ b/games/tinymux/Makefile
@@ -17,7 +17,7 @@ COMMENT= A Multi-Player FreeForm adventure Program
WRKSRC= ${WRKDIR}/mux2.6/src
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/games/toppler/Makefile b/games/toppler/Makefile
index 05816ac1fcee..e94ac4e20ecb 100644
--- a/games/toppler/Makefile
+++ b/games/toppler/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= makc@FreeBSD.org
COMMENT= A game where you have to climb the tower and avoid the monsters
USE_SDL= mixer sdl
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share
diff --git a/games/tornado/Makefile b/games/tornado/Makefile
index ca841cfa6b01..9e80e7e3fc60 100644
--- a/games/tornado/Makefile
+++ b/games/tornado/Makefile
@@ -17,7 +17,7 @@ COMMENT= A curses-based game of weather destruction
MAN6= tornado.6
MANLANG= "" de fr it nl no ru
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile
index 13f0c8301f95..4797afdc8fc9 100644
--- a/games/trackballs/Makefile
+++ b/games/trackballs/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
USE_GL= gl
USE_SDL= image mixer sdl ttf
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= desktopfileutils
@@ -44,7 +44,7 @@ OPTIONS_DEFAULT= NLS MUSIC
.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/games/tuxmath/Makefile b/games/tuxmath/Makefile
index 5b010b007e23..a80e7a74ecaa 100644
--- a/games/tuxmath/Makefile
+++ b/games/tuxmath/Makefile
@@ -48,7 +48,7 @@ T4K_WRKSRC= ${WRKDIR}/${T4K_NAME}-${T4K_VERSION}
.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/games/tuxpaint-config/Makefile b/games/tuxpaint-config/Makefile
index 04642f5e9e28..7bb27ef94042 100644
--- a/games/tuxpaint-config/Makefile
+++ b/games/tuxpaint-config/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= paper.2:${PORTSDIR}/print/libpaper \
fltk.1:${PORTSDIR}/x11-toolkits/fltk
RUN_DEPENDS= tuxpaint:${PORTSDIR}/games/tuxpaint
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
MAKE_ARGS= PREFIX="${PREFIX}" \
MAN_PREFIX="${MANPREFIX}/man" \
diff --git a/games/tuxpaint/Makefile b/games/tuxpaint/Makefile
index 6187d643d274..173158ec1c40 100644
--- a/games/tuxpaint/Makefile
+++ b/games/tuxpaint/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= fribidi.3:${PORTSDIR}/converters/fribidi \
USE_GNOME= librsvg2
USE_SDL= image mixer sdl ttf pango
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
MAKE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index 9aed938ab272..4bd48001f704 100644
--- a/games/tuxtype/Makefile
+++ b/games/tuxtype/Makefile
@@ -49,7 +49,7 @@ T4K_WRKSRC= ${WRKDIR}/${T4K_NAME}-${T4K_VERSION}
.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/games/typespeed/Makefile b/games/typespeed/Makefile
index 8ce27666f0cd..ffba651e1041 100644
--- a/games/typespeed/Makefile
+++ b/games/typespeed/Makefile
@@ -32,7 +32,7 @@ MAN1= typespeed.1
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index 924e3d2c8e22..1ddef2a5078d 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/base/default.cfg:${PORTSDIR}/games/u
USE_BZIP2= yes
USE_GL= yes
USE_SDL= sdl image mixer ttf
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= pkgconfig
USE_OPENAL= soft
diff --git a/games/volleyball/Makefile b/games/volleyball/Makefile
index 794b141125e1..45a55533126f 100644
--- a/games/volleyball/Makefile
+++ b/games/volleyball/Makefile
@@ -20,7 +20,7 @@ COMMENT= A game similar to GNU Arcade Volleyball
USE_SDL= sdl image mixer
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
LDFLAGS+= -L${LOCALBASE}/lib -lintl
CONFIGURE_ARGS= --mandir="${MANPREFIX}/man" --disable-nls # strangeness in nls support
MAKE_JOBS_SAFE= yes
diff --git a/games/warmux/Makefile b/games/warmux/Makefile
index 6a3277c798a8..a15c193a2ff4 100644
--- a/games/warmux/Makefile
+++ b/games/warmux/Makefile
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --enable-debug \
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index f3e2779b0fe5..33524ea13b89 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -67,7 +67,7 @@ SOUNDS_DATE= 2004-04-29
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 41745ab2c15f..06516bc5097f 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -55,7 +55,7 @@ RUN_DEPENDS+= phalanx:${PORTSDIR}/games/phalanx
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index 818487b7d9fd..b58627335930 100644
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -21,7 +21,7 @@ MAN6= xbubble.6
USE_XORG= x11 xmu
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
CPPFLAGS+= -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib -lintl
diff --git a/games/xcowsay/Makefile b/games/xcowsay/Makefile
index b3319ec005bd..061a990c62da 100644
--- a/games/xcowsay/Makefile
+++ b/games/xcowsay/Makefile
@@ -14,7 +14,7 @@ COMMENT= A graphical configurable talking cow
OPTIONS_DEFINE= DBUS
USE_GNOME= gtk20
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 3a4a0b66d793..d336e7e913f5 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -15,7 +15,7 @@ ONLY_FOR_ARCHS= i386
NO_CDROM= don't sell for profit
-USE_GETTEXT= yes
+USES= gettext
USE_XORG= x11 xmu xaw xt
USE_AUTOTOOLS= automake14 autoconf213
AUTOMAKE_ARGS= --include-deps
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index 05041a02c262..e47e36338f3b 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -17,7 +17,7 @@ COMMENT= A server browser for many popular 3D action games
RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat
USE_GNOME= intlhack
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/zaz/Makefile b/games/zaz/Makefile
index c6512ef452c8..fcc534e1ef7d 100644
--- a/games/zaz/Makefile
+++ b/games/zaz/Makefile
@@ -33,7 +33,7 @@ PORTDOCS= *
# Unconditially disable NLS for now: the game segfaults with 8bit locales
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/graphics/aeskulap/Makefile b/graphics/aeskulap/Makefile
index c9e7075d7bed..aba1c3fa371d 100644
--- a/graphics/aeskulap/Makefile
+++ b/graphics/aeskulap/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
glademm-2.4:${PORTSDIR}/devel/libglademm24 \
gconfmm-2.6:${PORTSDIR}/devel/gconfmm26
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gconf2
GCONF_SCHEMAS= aeskulap.schemas
USE_LDCONFIG= ${PREFIX}/lib/aeskulap
diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile
index 5c82f7a80a70..2e0b38ad7e9b 100644
--- a/graphics/agave/Makefile
+++ b/graphics/agave/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
#OPTIONS= GNOME "Adds GNOME support" on
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomedocutils intlhack
GCONF_SCHEMAS= agave.schemas
diff --git a/graphics/amide/Makefile b/graphics/amide/Makefile
index dd403fc04ffe..13fc2c066327 100644
--- a/graphics/amide/Makefile
+++ b/graphics/amide/Makefile
@@ -17,7 +17,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_CSTD= gnu89
MAKE_JOBS_UNSAFE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk20 libgnomecanvas libgnomeui libxml2
INSTALLS_OMF= yes
diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile
index ff4975c7dc23..5fe8539e9bff 100644
--- a/graphics/chbg/Makefile
+++ b/graphics/chbg/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_GNOME= gdkpixbuf
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 8330fe280b90..e219c8cdc842 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -25,7 +25,7 @@ USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_PYTHON= yes
USE_GNOME= gtk12
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
USE_XORG= xpm xi xext xft xinerama
diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile
index b8ca60cfffd4..e79085a32e0e 100644
--- a/graphics/clutter-gtk/Makefile
+++ b/graphics/clutter-gtk/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack gtk20 ltverhack gnomeprefix
USE_XORG= xp x11
diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile
index 301a7864b35d..8390761b92ed 100644
--- a/graphics/comix/Makefile
+++ b/graphics/comix/Makefile
@@ -18,7 +18,7 @@ NO_BUILD= yes
USE_GNOME= desktopfileutils pygtk2
WANT_GNOME= yes
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
DOCS= COPYING ChangeLog README
diff --git a/graphics/danpei/Makefile b/graphics/danpei/Makefile
index 3703b42479ec..b3f3dae77365 100644
--- a/graphics/danpei/Makefile
+++ b/graphics/danpei/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
.endif
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk12 gdkpixbuf
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/digikam-kde4-l10n/Makefile b/graphics/digikam-kde4-l10n/Makefile
index 4d3d0a46f776..e4e164353aa7 100644
--- a/graphics/digikam-kde4-l10n/Makefile
+++ b/graphics/digikam-kde4-l10n/Makefile
@@ -10,7 +10,7 @@ COMMENT= l10n for digiKam, showFoto, and Kipi-plugins
LATEST_LINK= digikam-kde4-l10n
CONFLICTS_INSTALL= digikam-2.* kipi-plugins-2.* libkgeomap-2.*
-USE_GETTEXT= yes
+USES= gettext
WRKSRC= ${WRKDIR}/${DISTNAME}/po
.include "${.CURDIR}/../digikam-kde4/Makefile.common"
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index a4336fd8dc5d..665c6e66a116 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -30,7 +30,7 @@ USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_KDELIBS_VER=3
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
diff --git a/graphics/driconf/Makefile b/graphics/driconf/Makefile
index e8bb157adb97..f1929262ffd9 100644
--- a/graphics/driconf/Makefile
+++ b/graphics/driconf/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolki
USE_GL= glut
USE_PYTHON= yes
NO_BUILD= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_EGGINFO= yes
PYDISTUTILS_EGGINFODIR= lib/driconf
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index 08d9960eb095..1ba312934bfb 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -18,7 +18,7 @@ COMMENT= A graphic view base imlib & gtk
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index c01754353361..b7abc76e2e91 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gtk20
WANT_GNOME= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 739f7353f37c..a923a23afe16 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack librsvg2 desktopfileutils \
gconf2 gnomedesktop
WANT_GNOME= yes
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
GNOME_DESKTOP_VERSION=2
diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index 1b397d1c4af6..6f374f8501e0 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -17,7 +17,7 @@ COMMENT= Exif and Iptc metadata manipulation library and tools
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_LDCONFIG= yes
MAN1= exiv2.1
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 3e4992ce75f8..a48bb01617a3 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -29,7 +29,7 @@ USE_BZIP2= yes
USE_SQLITE= yes
USE_GNOME= gnomehack gnomeprefix intlhack gnomedesktopsharp20
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
diff --git a/graphics/frontline/Makefile b/graphics/frontline/Makefile
index 3ca2dc8b28b6..8dab39dc7443 100644
--- a/graphics/frontline/Makefile
+++ b/graphics/frontline/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= autotrace.3:${PORTSDIR}/graphics/autotrace \
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs imlib libartlgpl2
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 48569299da5f..41cc881bf764 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
LATEST_LINK= gdk-pixbuf2
USE_XZ= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_XORG= xt xi x11
USE_AUTOTOOLS= libtool
@@ -36,7 +36,7 @@ OPTIONS_DEFAULT=JASPER JPEG PNG TIFF 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/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 212cf753515b..ef313ee08445 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -26,7 +26,7 @@ MAKE_JOBS_SAFE= yes
PORTDOCS= *
MAN1= geeqie.1
-USE_GETTEXT= yes
+USES= gettext
OPTIONS_DEFINE= EXIV2 LCMS LIRC GPS DOCS
OPTIONS_DEFAULT=EXIV2 LCMS
diff --git a/graphics/geomorph/Makefile b/graphics/geomorph/Makefile
index 7f7935c725c1..48022cde2b95 100644
--- a/graphics/geomorph/Makefile
+++ b/graphics/geomorph/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS= --with-libintl-prefix="${LOCALBASE}"
PLIST_SUB= PORTVERSION=${PORTVERSION}
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/graphics/gimmage/Makefile b/graphics/gimmage/Makefile
index c5341864990e..69e5a798e7b0 100644
--- a/graphics/gimmage/Makefile
+++ b/graphics/gimmage/Makefile
@@ -17,7 +17,7 @@ COMMENT= Simple image viewer
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
curl.6:${PORTSDIR}/ftp/curl
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/graphics/gimp-focusblur-plugin/Makefile b/graphics/gimp-focusblur-plugin/Makefile
index 4fceee4a8406..f8453c6dfce5 100644
--- a/graphics/gimp-focusblur-plugin/Makefile
+++ b/graphics/gimp-focusblur-plugin/Makefile
@@ -35,7 +35,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/graphics/gimp-gap/Makefile b/graphics/gimp-gap/Makefile
index 23f1fa1fe26e..9534a4a88144 100644
--- a/graphics/gimp-gap/Makefile
+++ b/graphics/gimp-gap/Makefile
@@ -34,7 +34,7 @@ RUN_DEPENDS= wavplay:${PORTSDIR}/audio/wavplay \
IGNORE= does not work with Gimp 2.6, and no update available
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= intltool
diff --git a/graphics/gimp-lqr-plugin/Makefile b/graphics/gimp-lqr-plugin/Makefile
index d96cd6200738..089cfd2216d7 100644
--- a/graphics/gimp-lqr-plugin/Makefile
+++ b/graphics/gimp-lqr-plugin/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= gimp-2.0:${PORTSDIR}/graphics/gimp-app \
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk20
MAKE_JOBS_SAFE= yes
diff --git a/graphics/gimp-resynthesizer/Makefile b/graphics/gimp-resynthesizer/Makefile
index 7f081b604e3e..5d56b3103e5a 100644
--- a/graphics/gimp-resynthesizer/Makefile
+++ b/graphics/gimp-resynthesizer/Makefile
@@ -20,7 +20,7 @@ GH_COMMIT= 28cade5
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl"
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_SAFE= yes
USE_AUTOTOOLS= aclocal automake
USE_GMAKE= yes
diff --git a/graphics/gimp-save-for-web/Makefile b/graphics/gimp-save-for-web/Makefile
index 57f6432d8da6..342d851e2c0c 100644
--- a/graphics/gimp-save-for-web/Makefile
+++ b/graphics/gimp-save-for-web/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= gimp-2.0:${PORTSDIR}/graphics/gimp-app
BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 0cab7aecd45b..5a4b07d1e6be 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= 3ds-1.3:${PORTSDIR}/graphics/lib3ds
BUILD_DEPENDS= povray:${PORTSDIR}/graphics/povray-meta
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5_BUILD=yes
USE_GNOME= gtk20
USE_GMAKE= yes
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index 6ba46b9a711a..4f8ffd42ca5f 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -21,7 +21,7 @@ LICENSE= GPLv2
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix gtk20
USE_GL= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index f6cc0119e882..bdbe81a80b30 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+= --disable-cygnal
# NLS option processing (not sure if --disable-nls actually has any effect)
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/graphics/gpicview/Makefile b/graphics/gpicview/Makefile
index aed4ad80a553..1907c285906c 100644
--- a/graphics/gpicview/Makefile
+++ b/graphics/gpicview/Makefile
@@ -17,7 +17,7 @@ CONFIGURE_ARGS= 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/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 181328124dfd..6082c88e02de 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -34,7 +34,7 @@ PORTSCOUT= limitw:1,even
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile
index 1ee56db44c49..5f688ddfe691 100644
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -73,7 +73,7 @@ MAN1= ${PORTNAME}.1 scanadf-perl.1 scanimage-perl.1
PORT_VERBS= ${PORTNAME} Gscan2pdf
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
index 3254f198b5b5..49a3708ed418 100644
--- a/graphics/gtk-update-icon-cache/Makefile
+++ b/graphics/gtk-update-icon-cache/Makefile
@@ -27,7 +27,7 @@ MAKE_JOBS_UNSAFE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack
-USE_GETTEXT= yes
+USES= gettext
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
PATCHDIR= ${.CURDIR}/../../x11-toolkits/gtk20/files
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index 7e860946f3f1..e7c70b8e88f9 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -25,7 +25,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/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index 46836917baa6..6e2f73973e84 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= jedgar
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphing calculator using GTK+
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= imlib
USE_PERL5_BUILD=yes
diff --git a/graphics/gx/Makefile b/graphics/gx/Makefile
index c6c6430a9497..d0d63651ca96 100644
--- a/graphics/gx/Makefile
+++ b/graphics/gx/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
gnomevfsmm-2.6.1:${PORTSDIR}/devel/gnome-vfsmm \
gconfmm-2.6.1:${PORTSDIR}/devel/gconfmm26
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 0ec317b57693..be0baef76d1c 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -28,7 +28,7 @@ USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
USE_GNOME= gnomehack desktopfileutils intlhack libxslt
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_PERL5= yes
INSTALLS_ICONS= yes
diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index ece6e55f1ba4..b14857ffc499 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -20,7 +20,7 @@ DEPRECATED= Depends on QT3; unmaintained
EXPIRATION_DATE= 2013-07-01
USE_KDELIBS_VER= 3
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_AUTOTOOLS= automake:env autoconf:env libtool:env
GNU_CONFIGURE= yes
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index 8d2d4a66ad55..aa0e62dfc126 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -49,7 +49,7 @@ USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_KDELIBS_VER=3
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-ipodexport
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 14ad2b7544fd..edd2e89084c9 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack libglade2 libartlgpl2 ltverhack referencehack
diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index 785cb0fc9cfb..d4d6278ddd17 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
USE_ICONV= yes
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index c6a76464ceac..e084ffb95d2d 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -16,7 +16,7 @@ COMMENT= A C++ interface around the LibRaw library
LIB_DEPENDS= lcms.1:${PORTSDIR}/graphics/lcms
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_KDELIBS_VER=3
USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile
index bcfa93c71f21..a7c519060125 100644
--- a/graphics/libkexif/Makefile
+++ b/graphics/libkexif/Makefile
@@ -18,7 +18,7 @@ USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g;s|-fno-schedule-insns -fno-inline||g' \
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index a14ecd2def1a..a01999a79662 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -19,7 +19,7 @@ USE_GNOME= gnomehack pkgconfig
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g;s|-fno-schedule-insns -fno-inline||g' \
diff --git a/graphics/liblqr-1/Makefile b/graphics/liblqr-1/Makefile
index 58537d76bdb0..e5de5453c674 100644
--- a/graphics/liblqr-1/Makefile
+++ b/graphics/liblqr-1/Makefile
@@ -15,7 +15,7 @@ GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= _glib20 pkgconfig
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile
index 1f051a2160fb..9a69a70a116e 100644
--- a/graphics/libvisual04/Makefile
+++ b/graphics/libvisual04/Makefile
@@ -17,7 +17,7 @@ COMMENT= Abstraction library that sits between apps and visual plugin
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pkgconfig
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/graphics/mirage/Makefile b/graphics/mirage/Makefile
index 15f11bb96c47..ecf4cf08ff39 100644
--- a/graphics/mirage/Makefile
+++ b/graphics/mirage/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv3
USE_BZIP2= yes
USE_GNOME= gtk20 pygtk2
WANT_GNOME= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= Mirage
diff --git a/graphics/mtpaint/Makefile b/graphics/mtpaint/Makefile
index dd44eca98392..369122972345 100644
--- a/graphics/mtpaint/Makefile
+++ b/graphics/mtpaint/Makefile
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=jasper
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=intl
PLIST_SUB+= NLS=""
.else
diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index c70a2d1389d4..d4837b20d36f 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= glib20 pygtk2
USE_PYTHON= yes
USE_SCONS= yes
SCONS_ARGS= prefix="${PREFIX}"
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
SUB_FILES= pkg-install
diff --git a/graphics/ocre/Makefile b/graphics/ocre/Makefile
index fd1702a3f938..9483fbfc4061 100644
--- a/graphics/ocre/Makefile
+++ b/graphics/ocre/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= display:${PORTSDIR}/graphics/ImageMagick \
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
USE_GNOME= gtk20
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
MAKE_ENV= CFLAGS1="${CFLAGS}"
MAKE_JOBS_SAFE= yes
diff --git a/graphics/ocrfeeder/Makefile b/graphics/ocrfeeder/Makefile
index f7c708e95a6d..ee0faac9437e 100644
--- a/graphics/ocrfeeder/Makefile
+++ b/graphics/ocrfeeder/Makefile
@@ -32,14 +32,14 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PYTHON= yes
USE_GNOME= pygtk2 pygnomeextras
-USE_GETTEXT= yes
+USES= gettext
USE_GHOSTSCRIPT=yes
.if defined(WITHOUT_NLS)
PLIST_SUB+= NLS="@comment "
CONFIGURE_ARGS+= --disable-nls
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index e4f1fdaf0417..9031baba46b9 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS+= ming:${PORTSDIR}/graphics/ming \
drm:${PORTSDIR}/graphics/libdrm
USE_ZIP= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= glib20
USE_QT4= gui moc_build qmake_build rcc_build xml_build opengl_build
USE_XORG= xi xrender xrandr xfixes xcursor xinerama xext x11 xau xdmcp \
diff --git a/graphics/pinta/Makefile b/graphics/pinta/Makefile
index 1c13578df1af..9370499cdec4 100644
--- a/graphics/pinta/Makefile
+++ b/graphics/pinta/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gtksharp20 desktopfileutils
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
MAN1= pinta.1
MANCOMPRESSED= yes
diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile
index 5c78bdda1bda..5dcc5e68a0fe 100644
--- a/graphics/py-clutter/Makefile
+++ b/graphics/py-clutter/Makefile
@@ -25,7 +25,7 @@ BROKEN= bad plist
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack pygnome2 pygtk2
USE_PYTHON= 2.5+
diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile
index 6f297d69efab..e235f7c07b36 100644
--- a/graphics/rawstudio/Makefile
+++ b/graphics/rawstudio/Makefile
@@ -31,7 +31,7 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk20 libxml2 gconf2 desktopfileutils gnomehack
USE_SQLITE= 3
USE_LDCONFIG= yes
diff --git a/graphics/rgbpaint/Makefile b/graphics/rgbpaint/Makefile
index 0b5cdba439ec..e19f912737b7 100644
--- a/graphics/rgbpaint/Makefile
+++ b/graphics/rgbpaint/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/mtpaint/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Very basic painting program
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
USE_GNOME= gtk20
HAS_CONFIGURE= yes
diff --git a/graphics/ruby-tgif/Makefile b/graphics/ruby-tgif/Makefile
index b714ee1d93a2..7be4ce427871 100644
--- a/graphics/ruby-tgif/Makefile
+++ b/graphics/ruby-tgif/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${TGIF_PORT}:build \
# NB not USE_IMAKE; this is required for the tgif build but this
# port doesn't use it directly.
-USE_GETTEXT= yes
+USES= gettext
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index d4f1c5122dbf..6d9a4d4bc789 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 \
raw:${PORTSDIR}/graphics/libraw
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehier gconf2 gtk20 desktopfileutils librsvg2
USE_GMAKE= yes
HAS_CONFIGURE= yes
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index e43e1a89c1e1..ea95d6037845 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -26,7 +26,7 @@ USE_TCL_BUILD= yes
USE_TCL= yes
USE_TK_BUILD= yes
USE_TK= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index 9d6905bbe3be..b28e7290f365 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libglade2 libartlgpl2 desktopfileutils
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --without-gnome-print \
--with-popt
diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index 75e1b5f71b61..1fca413233d1 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= synfig.0:${PORTSDIR}/devel/synfig \
gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
USE_GNOME= gnomehack gtk20
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index c5964ed64e33..0b61351b6b08 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -30,7 +30,7 @@ MAN1= tgif.1
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
IMAKEDEFINES+= WITH_NLS
PLIST_SUB= NLS=""
.else
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index da4d34e95699..dc0a3f6ae2c0 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-silent-rules --enable-extras
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/graphics/viewnior/Makefile b/graphics/viewnior/Makefile
index 4ae8a7323147..e99fab4e0d2d 100644
--- a/graphics/viewnior/Makefile
+++ b/graphics/viewnior/Makefile
@@ -31,7 +31,7 @@ OPTIONS_DEFAULT= 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/graphics/vips/Makefile b/graphics/vips/Makefile
index f184c5b5e277..bbde8111f5d4 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \
PYPRESENT!= which python > /dev/null && echo on || echo off
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5_BUILD=yes
USE_GNOME= gnomehack glib20 pkgconfig pango libxml2
USE_AUTOTOOLS= libtool
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index cc3005f4533b..81f299c9fe09 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --with-gtk-driver=yes --with-x11-driver=no
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 159e0966a5ec..e16ac041ee09 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -32,7 +32,7 @@ GIMP_DESC= GIMP plugin support
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -lintl"
PLIST_SUB+= NLS=""
.else
diff --git a/graphics/zathura/Makefile b/graphics/zathura/Makefile
index 4156313fa374..5b13bcdd3fa5 100644
--- a/graphics/zathura/Makefile
+++ b/graphics/zathura/Makefile
@@ -35,7 +35,7 @@ MAKE_ENV+= RSTTOMAN=${LOCALBASE}/bin/rst2man
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/irc/dxirc/Makefile b/irc/dxirc/Makefile
index 90aee392ec14..09c7deac694f 100644
--- a/irc/dxirc/Makefile
+++ b/irc/dxirc/Makefile
@@ -35,7 +35,7 @@ PORTDOCS= README
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/irc/smuxi/Makefile b/irc/smuxi/Makefile
index faa4816428df..ec7524809f44 100644
--- a/irc/smuxi/Makefile
+++ b/irc/smuxi/Makefile
@@ -30,7 +30,7 @@ post-patch:
s|@libdir@/locale|@prefix@/share/locale|g'
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index e5925bfbc2ac..c58f4411b4e0 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= xchat-1* xchat-systray-plugin-[0-9]*
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack gtk20
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index bb0749c3cf5e..3f10d6526ae7 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -65,7 +65,7 @@ PORTDOCS= eb-01.html eb-02.html eb-03.html eb-04.html eb-05.html eb-06.html \
USE_AUTOTOOLS= libtool
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
@@ -78,7 +78,7 @@ APPENDIXDIR= ${DATADIR}/appendix
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls \
--with-gettext-includes=${LOCALBASE}/include \
--with-gettext-libraries=${LOCALBASE}/lib \
diff --git a/japanese/gjiten/Makefile b/japanese/gjiten/Makefile
index b8d215e45113..e18e4885896d 100644
--- a/japanese/gjiten/Makefile
+++ b/japanese/gjiten/Makefile
@@ -31,7 +31,7 @@ GCONF_SCHEMAS= gjiten-dicfiles.schemas gjiten.schemas
.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/japanese/ibus-anthy/Makefile b/japanese/ibus-anthy/Makefile
index 2305b14c57ea..36c671a4a304 100644
--- a/japanese/ibus-anthy/Makefile
+++ b/japanese/ibus-anthy/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:${PORTSDIR}/deve
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_GNOME= pygtk2
diff --git a/japanese/ibus-skk/Makefile b/japanese/ibus-skk/Makefile
index 604e3e61dc6c..5eadac96c026 100644
--- a/japanese/ibus-skk/Makefile
+++ b/japanese/ibus-skk/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= skk:${PORTSDIR}/japanese/libskk \
ibus-1.0:${PORTSDIR}/textproc/ibus
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= intltool
@@ -40,7 +40,7 @@ post-install:
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/japanese/kana-no-quiz/Makefile b/japanese/kana-no-quiz/Makefile
index 025b18febaf9..e5a26b8d1e55 100644
--- a/japanese/kana-no-quiz/Makefile
+++ b/japanese/kana-no-quiz/Makefile
@@ -24,7 +24,7 @@ NO_BUILD= yes
RM_FILES= CHANGES.txt FAL.txt GPL.txt
RM_OPTS= -f
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= 2.5+
USE_PYDISTUTILS=yes
diff --git a/japanese/kasumi/Makefile b/japanese/kasumi/Makefile
index 5a176ff888a7..f942f0550a88 100644
--- a/japanese/kasumi/Makefile
+++ b/japanese/kasumi/Makefile
@@ -30,7 +30,7 @@ MAN1= kasumi.1
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/japanese/mailman/Makefile b/japanese/mailman/Makefile
index db22eddb4970..f7abfa6ac669 100644
--- a/japanese/mailman/Makefile
+++ b/japanese/mailman/Makefile
@@ -27,7 +27,7 @@ CONFLICTS= mailman-2.1.*
PORTSCOUT= limit:.*\.j\d+$$
USE_AUTOTOOLS= autoconf
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_RC_SUBR= mailman
diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile
index 1986a936b56d..03c9d312ca0d 100644
--- a/japanese/scim-honoka-plugin-romkan/Makefile
+++ b/japanese/scim-honoka-plugin-romkan/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim \
${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= lthack gnomehack
USE_ICONV= yes
USE_GMAKE= yes
diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile
index 0701701e7064..fdb72658ea30 100644
--- a/japanese/scim-honoka-plugin-wnn/Makefile
+++ b/japanese/scim-honoka-plugin-wnn/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= scim:${PORTSDIR}/textproc/scim \
${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka \
${LOCALBASE}/lib/scim-1.0/1.4.0/honoka/plugin-romkan.so:${PORTSDIR}/japanese/scim-honoka-plugin-romkan
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= lthack gnomehack
USE_ICONV= yes
USE_GMAKE= yes
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index 8fcb827e4da6..04d077b502da 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= lthack gnomehack
USE_ICONV= yes
USE_GMAKE= yes
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index 0c980dc11812..10a7da436678 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= tomoe.1:${PORTSDIR}/japanese/tomoe \
tomoe-gtk.1:${PORTSDIR}/japanese/libtomoe-gtk
USE_GNOME= lthack intlhack
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile
index eee555f433fe..eed174a432b1 100644
--- a/japanese/tomoe/Makefile
+++ b/japanese/tomoe/Makefile
@@ -18,7 +18,7 @@ COMMENT= Tegaki Online MOji-ninshiki Engine
USE_GNOME= lthack gnomehack
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_RUBY= yes
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index 8eb4de0f6a38..5847e2cab3ef 100644
--- a/japanese/uim-tomoe-gtk/Makefile
+++ b/japanese/uim-tomoe-gtk/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= tomoe.1:${PORTSDIR}/japanese/tomoe \
USE_GNOME= lthack gtk20
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
PLIST_FILES= bin/uim-tomoe-gtk \
diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index de73a322df5c..4db98161901d 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -27,7 +27,7 @@ WANT_GNOME= yes
GNU_CONFIGURE= yes
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
diff --git a/korean/ibus-hangul/Makefile b/korean/ibus-hangul/Makefile
index ba3a4f0ee348..7f77d70d46bb 100644
--- a/korean/ibus-hangul/Makefile
+++ b/korean/ibus-hangul/Makefile
@@ -31,7 +31,7 @@ USE_PYTHON= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
diff --git a/korean/imhangul/Makefile b/korean/imhangul/Makefile
index a0f340a6817a..3696df45cdf3 100644
--- a/korean/imhangul/Makefile
+++ b/korean/imhangul/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= gtk20
GNU_CONFIGURE= yes
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
diff --git a/korean/libhangul/Makefile b/korean/libhangul/Makefile
index d81a88422486..0d31e85f7396 100644
--- a/korean/libhangul/Makefile
+++ b/korean/libhangul/Makefile
@@ -20,7 +20,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
diff --git a/korean/nabi/Makefile b/korean/nabi/Makefile
index 8dea3eae579c..32e47ee33b52 100644
--- a/korean/nabi/Makefile
+++ b/korean/nabi/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= gnomeprefix gnomehack gtk20
GNU_CONFIGURE= yes
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index f0b982267393..04335a00f327 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
USE_AUTOTOOLS= libltdl libtool
USE_KDELIBS_VER= 3
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --with-conv-includes=${LOCALBASE}/include \
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index d235f320d5c7..66ce97b1000d 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -27,7 +27,7 @@ PLIST_SUB= VERSION=${PORTVERSION}
.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/guile/Makefile b/lang/guile/Makefile
index 7f43b427415a..63ec4f1128df 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp
USE_AUTOTOOLS= autoconf libltdl
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_NCURSES= yes
diff --git a/lang/lush/Makefile b/lang/lush/Makefile
index 5e7aa2466d59..906d92f6a734 100644
--- a/lang/lush/Makefile
+++ b/lang/lush/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A high level object-oriented programming language
-USE_GETTEXT= yes
+USES= gettext
USE_XORG= xt xft
USE_GL= yes
USE_SDL= sdl image
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index 985c38aef8c0..2697ba1758b2 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFAULT=GLADE GUILE
USE_GNOME= glib20 intltool
USE_NCURSES= yes
USE_READLINE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile
index 04f18753b55f..eaa658de53be 100644
--- a/lang/open-cobol/Makefile
+++ b/lang/open-cobol/Makefile
@@ -30,7 +30,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index ecbfa93a667b..47fb54cc4725 100644
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@@ -35,7 +35,7 @@ ALL_TARGET= ${PYPY_NAMES}
BUILD_WRKSRC= ${WRKDIR}
USE_BZIP2= yes
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_SAFE= yes
MAKEFILE= ${FILESDIR}/Makefile
PKGINSTALL= ${WRKDIR}/pkg-install
diff --git a/mail/abook/Makefile b/mail/abook/Makefile
index e4ca050ac945..55ae421b6935 100644
--- a/mail/abook/Makefile
+++ b/mail/abook/Makefile
@@ -30,7 +30,7 @@ PORTDOCS= ANNOUNCE AUTHORS BUGS ChangeLog FAQ INSTALL 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/mail/althea/Makefile b/mail/althea/Makefile
index d87301a12071..660236b076c7 100644
--- a/mail/althea/Makefile
+++ b/mail/althea/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Yet another GTK-based mail reader for X. Supports IMAP
-USE_GETTEXT= yes
+USES= gettext
USE_OPENSSL= yes
MAKE_ENV= MKDIR="${MKDIR}"
MAKEFILE= ${FILESDIR}/Makefile.bsd
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index ebc5bfef3862..2baf505280b4 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -47,7 +47,7 @@ _REQUIRE= mail
.if ${PORT_OPTIONS:MNLS}
USE_ICONV= yes
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-address_keeper/Makefile b/mail/claws-mail-address_keeper/Makefile
index f160baa44909..1bbd5f07d60f 100644
--- a/mail/claws-mail-address_keeper/Makefile
+++ b/mail/claws-mail-address_keeper/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/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile
index 2a8836189bef..d6483148fc8c 100644
--- a/mail/claws-mail-attach_warner/Makefile
+++ b/mail/claws-mail-attach_warner/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-iconv-prefix=${LOCALBASE} \
.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/mail/claws-mail-bsfilter/Makefile b/mail/claws-mail-bsfilter/Makefile
index 0a5003b4223f..bff92553771f 100644
--- a/mail/claws-mail-bsfilter/Makefile
+++ b/mail/claws-mail-bsfilter/Makefile
@@ -27,7 +27,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/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile
index b1d850d79c93..48935b42f7f0 100644
--- a/mail/claws-mail-clamd/Makefile
+++ b/mail/claws-mail-clamd/Makefile
@@ -27,7 +27,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/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index 47d7f8bcc54d..2b5b10f85371 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
.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/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 1870335add62..6d38eeb1a767 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -25,7 +25,7 @@ MAKE_JOBS_SAFE= 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/mail/claws-mail-gdata/Makefile b/mail/claws-mail-gdata/Makefile
index ad20d277d2e8..1d5fa8d5f056 100644
--- a/mail/claws-mail-gdata/Makefile
+++ b/mail/claws-mail-gdata/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
.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/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile
index ad9ef0f34668..d8494ddec9f1 100644
--- a/mail/claws-mail-gtkhtml2_viewer/Makefile
+++ b/mail/claws-mail-gtkhtml2_viewer/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
.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/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 693bcfc375c7..da8ae686878f 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
.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/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 9b5da642cb4b..68e00d20cbbc 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/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/mail/claws-mail-python/Makefile b/mail/claws-mail-python/Makefile
index c818eeae0d21..6ea6375ecc67 100644
--- a/mail/claws-mail-python/Makefile
+++ b/mail/claws-mail-python/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/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 0d5f5cac34f8..b2684db16823 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
.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/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 7852d8807730..299f69069694 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
.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/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index 4eabe4bbb955..4910c535fc0e 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
.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/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 47fc7f27fba4..e482788bd2f0 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
.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/mail/clawsker/Makefile b/mail/clawsker/Makefile
index 7c63f82d0286..2a8fd35e6ed5 100644
--- a/mail/clawsker/Makefile
+++ b/mail/clawsker/Makefile
@@ -26,7 +26,7 @@ MAN1= clawsker.1
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
EXTRA_PATCHES= ${FILESDIR}/extra-Makefile-without_nls
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index e305633eb7dd..d07f5eb09ad8 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_FAM= yes
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_GNOME= libxml2
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index ebb727be0898..b4f12aa59f15 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -65,7 +65,7 @@ USE_AUTOTOOLS= libtool aclocal
USE_BZIP2= yes
USE_GCC= any
USE_FAM= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_OPENSSL= yes
USE_PERL5= yes
diff --git a/mail/crm114/Makefile b/mail/crm114/Makefile
index 5706f25d7b72..396a02925f8b 100644
--- a/mail/crm114/Makefile
+++ b/mail/crm114/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= tre.5:${PORTSDIR}/textproc/libtre
CRM114RELEASENAME=BlameMichelson
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
MAKE_ARGS= CC="${CC}" prefix="${PREFIX}" \
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 55a5c9914ca5..13b18bdc90c5 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -19,7 +19,7 @@ CFLAGS+= -D_SIZE_T
WRKSRC= ${WRKDIR}/elm${PORTVERSION}
NO_LATEST_LINK= yes
-USE_GETTEXT= yes
+USES= gettext
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure
CONFIGURE_ENV= PREFIX="${PREFIX}"
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index fb2b7b0ab6ad..a23a04271ec1 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.endif
.include <bsd.port.pre.mk>
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 94623b648b5c..7fc2d880bade 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -32,7 +32,7 @@ PLIST_SUB+= NLS="@comment "
.else
CONFIGURE_ARGS+=--with-libintl-prefix="${LOCALBASE}"
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.endif
.include <bsd.port.pre.mk>
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index c801dcf2fea0..c778fae3a80c 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${EVO_PC_FILE}:${PORTSDIR}/mail/evolution
CONFLICTS= evolution-exchange-3.[0-9]*
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_BDB= 41
diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
index 298b0d209d4f..81bec32d829e 100644
--- a/mail/evolution-mapi/Makefile
+++ b/mail/evolution-mapi/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${PKGFILES}:${PORTSDIR}/mail/evolution
PKGFILES= ${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= evolutiondataserver
USE_LDCONFIG= yes
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 99966aff06b2..c9a6feaf0dcb 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -69,7 +69,7 @@ PLIST_SUB+= X11="@comment " NOX11=""
.if ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.else
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
diff --git a/mail/gnome-gmail-notifier/Makefile b/mail/gnome-gmail-notifier/Makefile
index ea8b0a29763f..465ca83aaac2 100644
--- a/mail/gnome-gmail-notifier/Makefile
+++ b/mail/gnome-gmail-notifier/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= glib20 gtk20 gconf2 libxml2 librsvg2
USE_GSTREAMER= good
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index 0181e3682524..83b6bd7cebcb 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+= --with-password
.ifndef(WITHOUT_NLS)
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.else
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
diff --git a/mail/horde3-dimp/Makefile b/mail/horde3-dimp/Makefile
index 8d6c7dea559a..f5febe97adc5 100644
--- a/mail/horde3-dimp/Makefile
+++ b/mail/horde3-dimp/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
.endif
USE_HORDE= base
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL RELEASE_NOTES
pre-configure:
diff --git a/mail/horde3-forwards/Makefile b/mail/horde3-forwards/Makefile
index f1cf7f6d6671..addb15a00811 100644
--- a/mail/horde3-forwards/Makefile
+++ b/mail/horde3-forwards/Makefile
@@ -33,7 +33,7 @@ USE_PHP+= ftp
.endif
USE_HORDE= base pkg-message
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL RELEASE_NOTES TODO
.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/mail/horde3-imp/Makefile b/mail/horde3-imp/Makefile
index d12510e988e5..bfbcee00cb0b 100644
--- a/mail/horde3-imp/Makefile
+++ b/mail/horde3-imp/Makefile
@@ -67,7 +67,7 @@ RUN_DEPENDS+= ${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
CONFLICTS= imp-3.*
USE_HORDE= base
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL \
RELEASE_NOTES TODO UPGRADING
diff --git a/mail/horde3-ingo/Makefile b/mail/horde3-ingo/Makefile
index 8f1f644ba42f..e7c76177e985 100644
--- a/mail/horde3-ingo/Makefile
+++ b/mail/horde3-ingo/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS+= ${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve
USE_PHP= imap
USE_HORDE= base pkg-message
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL RELEASE_NOTES TODO
.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/mail/horde3-mimp/Makefile b/mail/horde3-mimp/Makefile
index 2321e5c7102c..b2eaa27cf2ad 100644
--- a/mail/horde3-mimp/Makefile
+++ b/mail/horde3-mimp/Makefile
@@ -43,7 +43,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
.endif
USE_HORDE= base
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL RELEASE_NOTES
pre-configure:
diff --git a/mail/horde3-turba/Makefile b/mail/horde3-turba/Makefile
index f276824d402b..dab65b8bdc39 100644
--- a/mail/horde3-turba/Makefile
+++ b/mail/horde3-turba/Makefile
@@ -16,7 +16,7 @@ COMMENT= Contact management application
USE_HORDE= base
USE_PHP= ldap
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL LDAP RELEASE_NOTES TODO UPGRADING
diff --git a/mail/horde3-vacation/Makefile b/mail/horde3-vacation/Makefile
index 4def9de9b5e0..817211788fa0 100644
--- a/mail/horde3-vacation/Makefile
+++ b/mail/horde3-vacation/Makefile
@@ -33,7 +33,7 @@ USE_PHP+= ftp
.endif
USE_HORDE= base pkg-message
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= CHANGES CREDITS INSTALL RELEASE_NOTES TODO
.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/mail/kcheckgmail/Makefile b/mail/kcheckgmail/Makefile
index dba404e519a7..ab424c9bdb89 100644
--- a/mail/kcheckgmail/Makefile
+++ b/mail/kcheckgmail/Makefile
@@ -22,7 +22,7 @@ USE_AUTOTOOLS= libtool
USE_KDELIBS_VER=3
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 4c621502a1f0..c280d820adad 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
notify:${PORTSDIR}/devel/libnotify
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
USE_GNOME= gconf2 gnomeprefix gnomevfs2 libglade2 libgnomeui libxml2
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 484fe64ee860..f16ea574b57d 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -78,7 +78,7 @@ MTA_DESC= integrate with a MTA
.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/mail/mailutils/Makefile b/mail/mailutils/Makefile
index 94f13760ca49..3f94d899dcd2 100644
--- a/mail/mailutils/Makefile
+++ b/mail/mailutils/Makefile
@@ -95,7 +95,7 @@ PLIST_SUB+= PYTHON="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index 6a39bf491a86..85873f0df354 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --without-libgsasl-prefix
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB= NLS=""
.else
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 358838f23c77..4e09e34969ae 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+= --without-gnome-keyring
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index c65e406a6f9a..7c35b15608f2 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -177,7 +177,7 @@ XML_USED= no
.endif
.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
+USES+= gettext
SCRIPTS_ENV+= NLS="yes"
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index d77275c85f4f..16c73adc444e 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -25,7 +25,7 @@ MLINKS= perdition.8 perdition.imap4.8 \
MANCOMPRESSED= no
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/mail/squirrelmail-change_ldappass-plugin/Makefile b/mail/squirrelmail-change_ldappass-plugin/Makefile
index 22c750a6ca54..9b5d7c14ceed 100644
--- a/mail/squirrelmail-change_ldappass-plugin/Makefile
+++ b/mail/squirrelmail-change_ldappass-plugin/Makefile
@@ -16,7 +16,7 @@ COMMENT= Allows users to change their passwords stored in LDAP Tree
LICENSE= GPLv2
USE_PHP+= ldap
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 082292da575b..807a75ebc406 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -27,7 +27,7 @@ IGNORE_WITH_PHP=5 # known incompatibilities with php-5.4, use 5.3 for now
DEFAULT_PHP_VER=53
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
OPTIONS_DEFINE= DATABASE LDAP
DATABASE_DESC= PEAR database support (must also intall a driver)
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index c0d75a652634..9d581508d284 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -59,7 +59,7 @@ CACHEOWNER?= bin
USE_PERL5= YES
USE_BZIP2= YES
-USE_GETTEXT= YES
+USES= gettext
USE_GMAKE= YES
USE_RC_SUBR= sqwebmail-sqwebmaild
GNU_CONFIGURE= yes
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 57e868f111cc..37e4bd8ee390 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -66,7 +66,7 @@ SUB_FILES= pkg-install
USE_RC_SUBR= sympa
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/vexim/Makefile b/mail/vexim/Makefile
index 5571c53273b3..c287f3a75d72 100644
--- a/mail/vexim/Makefile
+++ b/mail/vexim/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/vexim-release
SUB_FILES= pkg-message
NO_BUILD= yes
USE_PHP= gettext session posix
-USE_GETTEXT= yes
+USES= gettext
OPTIONS_MULTI= DB
OPTIONS_MULTI_DB= MYSQL PGSQL
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index 12b3fe5a0acc..76b8b44c1371 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls \
USE_BZIP2= yes
USE_GMAKE= yes
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_GNOME= gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libgui libutil panel
diff --git a/math/R/Makefile b/math/R/Makefile
index 95722c298aab..0ee0b6c88a7b 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -146,7 +146,7 @@ CONFIGURE_ARGS+= --without-ICU
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile
index 7d777559e877..3578b12f8d02 100644
--- a/math/drgeo/Makefile
+++ b/math/drgeo/Makefile
@@ -16,7 +16,7 @@ COMMENT= GTK interactive geometry software
LIB_DEPENDS= guile.21:${PORTSDIR}/lang/guile
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack gnomeprefix intlhack libglade2
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/math/fricas/Makefile b/math/fricas/Makefile
index 43e28e8cac08..da2bc50edb0f 100644
--- a/math/fricas/Makefile
+++ b/math/fricas/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
USE_XORG= x11 ice sm xpm
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-lisp=sbcl
diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
index f717545d9601..4326b9e8da8f 100644
--- a/math/giacxcas/Makefile
+++ b/math/giacxcas/Makefile
@@ -31,7 +31,7 @@ USE_GMAKE= yes
USE_GL= gl
USE_XORG= xcursor xft xi
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_SAFE= yes
DOCSDIR= ${PREFIX}/share/doc/giac
diff --git a/math/open-axiom/Makefile b/math/open-axiom/Makefile
index f1f2172d2d2b..ff0638ed3528 100644
--- a/math/open-axiom/Makefile
+++ b/math/open-axiom/Makefile
@@ -18,7 +18,7 @@ CONFIGURE_ARGS= --with-lisp=sbcl
USE_GMAKE= yes
USE_XORG= x11 ice sm xpm
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_UNSAFE=yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 39e64483ada8..60b2b41dd5f7 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -30,7 +30,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/math/qalculate/Makefile b/math/qalculate/Makefile
index 3443a4e466c2..a224deb94e70 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \
wget:${PORTSDIR}/ftp/wget
USE_GNOME= gnomehack gnomeprefix intlhack libglade2 libgnome
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
diff --git a/math/rkward/Makefile b/math/rkward/Makefile
index 015e162e9f58..15a97e0a52f9 100644
--- a/math/rkward/Makefile
+++ b/math/rkward/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= rkward-kde4-0.5.*
USE_KDELIBS_VER=3
USE_PHP= yes
WANT_PHP_CLI= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index a9bc92d820b8..b748e03e4d7b 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
MAKE_JOBS_SAFE= yes
USE_FORTRAN= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
diff --git a/math/tablix/Makefile b/math/tablix/Makefile
index 869a3a9995b3..29d9af49a66e 100644
--- a/math/tablix/Makefile
+++ b/math/tablix/Makefile
@@ -23,7 +23,7 @@ PVM_ROOT= ${PREFIX}/lib/pvm
USE_GMAKE= yes
USE_GNOME= libxml2
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
CONFIGURE_ENV= LIBS=-L${PREFIX}/lib \
PVM_ROOT=${PVM_ROOT} PVM_LIB=${PREFIX}/lib
diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index 3cd5d241954c..98eda8a21351 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv2
RUN_DEPENDS= maxima:${PORTSDIR}/math/maxima
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= desktopfileutils libxml2
USE_WX= 2.8
WX_COMPS= wx
diff --git a/misc/diary-hercules/Makefile b/misc/diary-hercules/Makefile
index c3ed78c4283f..d5480ef1757d 100644
--- a/misc/diary-hercules/Makefile
+++ b/misc/diary-hercules/Makefile
@@ -17,7 +17,7 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlobject>=0.7:${PORTSDIR}/databases/py-sqlobject \
${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= 2.5+
USE_PYDISTUTILS= yes
USE_WX= 2.6+
diff --git a/misc/findutils/Makefile b/misc/findutils/Makefile
index 630e213efdde..36dbf163ebdb 100644
--- a/misc/findutils/Makefile
+++ b/misc/findutils/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= 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/misc/gman/Makefile b/misc/gman/Makefile
index 1dd674f8e778..88eb3f98c8ee 100644
--- a/misc/gman/Makefile
+++ b/misc/gman/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS= ghostview:${PORTSDIR}/print/ghostview \
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk12
USE_GMAKE= yes
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index f6a0cb3a1401..6a06bcb486df 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A MIME and Application database for GNOME
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack
GNU_CONFIGURE= yes
diff --git a/misc/gonvert/Makefile b/misc/gonvert/Makefile
index cd201a74ec73..c09e4c4c8cd3 100644
--- a/misc/gonvert/Makefile
+++ b/misc/gonvert/Makefile
@@ -20,7 +20,7 @@ PORTDOCS= CHANGELOG FAQ README THANKS TODO
.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/misc/hello/Makefile b/misc/hello/Makefile
index 5082279d0e92..ee1edfbed4fb 100644
--- a/misc/hello/Makefile
+++ b/misc/hello/Makefile
@@ -21,7 +21,7 @@ MAN1= hello.1
INFO= hello
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/misc/help2man/Makefile b/misc/help2man/Makefile
index f3b3547bb36c..751f7401ecf3 100644
--- a/misc/help2man/Makefile
+++ b/misc/help2man/Makefile
@@ -30,7 +30,7 @@ RUN_DEPENDS+= p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
CFLAGS+= -lintl
MANLANG= "" ${LANGS} ${LANGS_MTREE}
-USE_GETTEXT= yes
+USES+= gettext
LANGS= de el eo fi fr hr it pl pt_BR ru sr sv uk vi
LANGS_MTREE= ja # languages that already exist in BSD.local.dist
diff --git a/misc/kcd/Makefile b/misc/kcd/Makefile
index 236abb4c3a80..b39146924c6c 100644
--- a/misc/kcd/Makefile
+++ b/misc/kcd/Makefile
@@ -12,7 +12,7 @@ COMMENT= Change directory in full-screen visual mode
LICENSE= GPLv2
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index 8cef3dc73b63..bae44a9cfa3f 100644
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@@ -20,7 +20,7 @@ EXPIRATION_DATE= 2013-07-01
USE_KDELIBS_VER=3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
DOCSDIR= ${PREFIX}/share/doc/HTML
diff --git a/misc/metromap/Makefile b/misc/metromap/Makefile
index 035e568c8362..6a772db7e2fd 100644
--- a/misc/metromap/Makefile
+++ b/misc/metromap/Makefile
@@ -22,7 +22,7 @@ USE_PYTHON= yes
USE_GNOME= pygtk2
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= AUTHORS NEWS README README.data TODO
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index b284ac2ddf39..f326c179f6e6 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= SLANG_H_LOC="${LOCALBASE}/include/slang.h" \
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index da5f15c61767..9c4f00dc3706 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -17,7 +17,7 @@ READLINE_DESC= Enable readline support
USE_BZIP2= yes
USE_NCURSES= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtoolize aclocal autoheader automake autoconf
LIBTOOLIZE_ARGS=--force
ACLOCAL_ARGS= -I macros
@@ -35,7 +35,7 @@ INFO= pinfo
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/misc/rabbit/Makefile b/misc/rabbit/Makefile
index a36c5eb31aae..34fc34e14a6e 100644
--- a/misc/rabbit/Makefile
+++ b/misc/rabbit/Makefile
@@ -35,7 +35,7 @@ USE_RUBY_SETUP= yes
.if defined(WITHOUT_NLS)
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES= gettext
RUN_DEPENDS+= rubygem-gettext>0:${PORTSDIR}/devel/rubygem-gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile
index a0995b293647..f9dbb719fa41 100644
--- a/misc/upclient/Makefile
+++ b/misc/upclient/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
COMMENT= Uptimes project client
-USE_GETTEXT= yes
+USES= gettext
USE_RC_SUBR= upclient
ALL_TARGET= bsd
BUILD_WRKSRC= ${WRKSRC}/src
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index 5ea5a89972b9..4e7c945ec2ae 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20 glib20 intltool intlhack pkgconfig desktopfileutils
USE_XFCE= configenv garcon libmenu libutil xfconf
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index a6cd2d35464c..d5890fb269cd 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS:= ${RUN_DEPENDS} \
nspr>=4.8:${PORTSDIR}/devel/nspr
USE_PYTHON_BUILD= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_GNOME= gnomehack gnomeprefix gtkhtml3 intlhack libgsf
diff --git a/multimedia/arista/Makefile b/multimedia/arista/Makefile
index f74eeea1175b..65ab065022ce 100644
--- a/multimedia/arista/Makefile
+++ b/multimedia/arista/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://programmer-art.org/media/releases/arista-transcoder/ \
MAINTAINER= swills@FreeBSD.org
COMMENT= An easy to use multimedia transcoder for the GNOME Desktop
-USE_GETTEXT= yes
+USES= gettext
USE_GSTREAMER= faac x264 lame mpeg2enc
USE_GNOME= pygnomedesktop
USE_PYTHON= yes
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 5d401ebdf8c7..1621a3ae71bd 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -324,7 +324,7 @@ PLIST_SUB+= GIOPLUGIN="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 0cbd93f562c1..d3ebe94d93e8 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -57,7 +57,7 @@ USE_ICONV= yes
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/multimedia/banshee/Makefile b/multimedia/banshee/Makefile
index 991699aee1a5..48300951105f 100644
--- a/multimedia/banshee/Makefile
+++ b/multimedia/banshee/Makefile
@@ -53,7 +53,7 @@ CONFIGURE_ARGS= --with-vendor-build-id=FreeBSD\ BSD\#\ Project --disable-gio-har
.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/multimedia/bmp-extra-plugins/Makefile b/multimedia/bmp-extra-plugins/Makefile
index aa9d6704bbbb..1bf745650734 100644
--- a/multimedia/bmp-extra-plugins/Makefile
+++ b/multimedia/bmp-extra-plugins/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player \
artsc.0:${PORTSDIR}/audio/arts
USE_GNOME= libglade2 esound
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index 42a98f3e04a1..ac0fb81a40a2 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack evolutiondataserver librsvg2 \
gnomedocutils gnomedesktop
-USE_GETTEXT= yes
+USES= gettext
USE_GSTREAMER= gconf good ogg theora v4l2 vorbis
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 15e3006008a4..abf8d26e5e91 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -35,7 +35,7 @@ SUBTITLE_DESC= Enable support for getting subtitles
PERL_CONFIGURE= yes
CONFIGURE_ENV= SKIP_UNPACK_REQUIRED_MODULES=1
USE_CDRTOOLS= yes
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_UNSAFE= yes
MAN1= dvdrip.1 dvdrip-progress.1 dvdrip-splitpipe.1
diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile
index 3833fd0a79c1..8892a14c1816 100644
--- a/multimedia/freevo/Makefile
+++ b/multimedia/freevo/Makefile
@@ -57,7 +57,7 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
.if defined(WITHOUT_NLS)
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/multimedia/gaupol/Makefile b/multimedia/gaupol/Makefile
index c186c5d58331..986ecb69aea3 100644
--- a/multimedia/gaupol/Makefile
+++ b/multimedia/gaupol/Makefile
@@ -29,7 +29,7 @@ INSTALLS_ICONS= yes
MAN1= ${PORTNAME}.1
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile
index c8a7e2cb4679..1046bf5be8d9 100644
--- a/multimedia/gnome-mplayer/Makefile
+++ b/multimedia/gnome-mplayer/Makefile
@@ -83,7 +83,7 @@ CONFIGURE_ARGS+= --enable-nautilus=no
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/multimedia/gnome-subtitles/Makefile b/multimedia/gnome-subtitles/Makefile
index 6c238be7b327..8c34efcf9521 100644
--- a/multimedia/gnome-subtitles/Makefile
+++ b/multimedia/gnome-subtitles/Makefile
@@ -36,7 +36,7 @@ USE_LDCONFIG= ${PREFIX}/lib/gnome-subtitles
MAN1= gnome-subtitles.1
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index 2077253b37f8..ac9c24391ad5 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -32,7 +32,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
index ae4f7488aee8..d7991949e408 100644
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -28,7 +28,7 @@ OPTIONS_EXCLUDE=NLS
ALL_TARGET= messages
MAKE_ENV= GPODDER_MANPATH_NO_SHARE="yes"
MAKEFILE= makefile
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_PYTHON= -2.7
WANT_GNOME= yes
diff --git a/multimedia/gtk-recordmydesktop/Makefile b/multimedia/gtk-recordmydesktop/Makefile
index 277190760fad..d6713b7edb25 100644
--- a/multimedia/gtk-recordmydesktop/Makefile
+++ b/multimedia/gtk-recordmydesktop/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/recordmydesktop:${PORTSDIR}/multimedia/recordmydes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_PYTHON= -2.7
diff --git a/multimedia/gxmms/Makefile b/multimedia/gxmms/Makefile
index 22b5aff170f2..96f0ba97fdb2 100644
--- a/multimedia/gxmms/Makefile
+++ b/multimedia/gxmms/Makefile
@@ -12,7 +12,7 @@ COMMENT= Simple GNOME panel applet for controlling XMMS
USE_GMAKE= yes
USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack libgnomeui
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`"
CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile
index 2410eb97042a..5e09f0e2db4b 100644
--- a/multimedia/k9copy/Makefile
+++ b/multimedia/k9copy/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
USE_KDELIBS_VER=3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
diff --git a/multimedia/kplayer/Makefile b/multimedia/kplayer/Makefile
index ed4803525626..627153133880 100644
--- a/multimedia/kplayer/Makefile
+++ b/multimedia/kplayer/Makefile
@@ -24,7 +24,7 @@ EXPIRATION_DATE= 2013-07-01
USE_BZIP2= yes
USE_GMAKE= yes
USE_KDELIBS_VER=3
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5_BUILD=yes
USE_AUTOTOOLS= automake:env autoconf:env libtool
diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile
index 696155ecfa07..458ecd8d77bd 100644
--- a/multimedia/miro/Makefile
+++ b/multimedia/miro/Makefile
@@ -35,7 +35,7 @@ INSTALL_WRKSRC= ${WRKSRC}/linux
USE_GMAKE= yes
USE_GNOME= gconf2 gtk20
USE_GSTREAMER= python gconf
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= 2.5+
USE_PYDISTUTILS= yes
USE_LDCONFIG= yes
diff --git a/multimedia/openshot/Makefile b/multimedia/openshot/Makefile
index 48633747d767..92adec7e65e4 100644
--- a/multimedia/openshot/Makefile
+++ b/multimedia/openshot/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
USE_GNOME= pygtk2 desktopfileutils
USE_PYTHON= -2.7
USE_PYDISTUTILS=yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
MAN1= ${PORTNAME}.1 \
diff --git a/multimedia/photofilmstrip/Makefile b/multimedia/photofilmstrip/Makefile
index b6f2ef4f189e..bf82a50858a1 100644
--- a/multimedia/photofilmstrip/Makefile
+++ b/multimedia/photofilmstrip/Makefile
@@ -24,7 +24,7 @@ USE_PYTHON= yes
USE_WX= 2.8+
WX_COMPS= python:lib
WX_UNICODE= yes
-USE_GETTEXT= yes
+USES= gettext
ALL_TARGET= compile
PFSDIR= ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
diff --git a/multimedia/pyjama/Makefile b/multimedia/pyjama/Makefile
index 19ce86f6abb0..2cf378c9dacb 100644
--- a/multimedia/pyjama/Makefile
+++ b/multimedia/pyjama/Makefile
@@ -21,7 +21,7 @@ NO_BUILD= yes
USE_PYTHON= 2.5+
USE_GSTREAMER= core good bad gnomevfs
USE_GNOME= pygtk2
-USE_GETTEXT= yes
+USES= gettext
LOCALES= bg ca da de en_GB es fr it pl
INSTDIR= ${PYTHON_SITELIBDIR}/${PORTNAME}
diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile
index 5afac7be4c23..7cb87affd4f4 100644
--- a/multimedia/quodlibet/Makefile
+++ b/multimedia/quodlibet/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutag
USE_PYTHON= 2.5+
USE_GNOME= pygtk2
-USE_GETTEXT= yes
+USES= gettext
USE_PYDISTUTILS= yes
USE_DISPLAY= yes
USE_GSTREAMER= gconf good python
diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile
index bdca88a95368..c27ad3ce4eb4 100644
--- a/multimedia/swfdec-gnome/Makefile
+++ b/multimedia/swfdec-gnome/Makefile
@@ -22,7 +22,7 @@ USE_GNOME= gnomehack gnomeprefix gtk20 intlhack gconf2
USE_BZIP2= yes
INSTALLS_ICONS= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/multimedia/transkode/Makefile b/multimedia/transkode/Makefile
index 526258a7d5f2..f48fb7aa33d7 100644
--- a/multimedia/transkode/Makefile
+++ b/multimedia/transkode/Makefile
@@ -26,7 +26,7 @@ USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PERL5= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/multimedia/w_scan/Makefile b/multimedia/w_scan/Makefile
index ceaad1aa13b2..08596bd246d8 100644
--- a/multimedia/w_scan/Makefile
+++ b/multimedia/w_scan/Makefile
@@ -23,7 +23,7 @@ LINUX_DESC= Install Linux binary too (linux-w_scan)
USE_BZIP2= yes
GNU_CONFIGURE= yes
PATCH_STRIP= -lp1
-USE_GETTEXT= yes
+USES+= gettext
CPPFLAGS+= -I"${LOCALBASE}/include"
LDFLAGS+= -L"${LOCALBASE}/lib\ -liconv"
PORTDOCS= COPYING ChangeLog README
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index 4896624fcbbe..ac67b5b6eb95 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -14,7 +14,7 @@ COMMENT= Xfce4 XMMS control plugin for xfce4-panel
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20 intltool intlhack pango pkgconfig
USE_XFCE= configenv libgui libutil panel
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 3806dd523563..73640aea6953 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -34,7 +34,7 @@ WIN32_CODECS_DESC= Enable win32 codecs
USE_XZ= yes
USE_XORG= x11 xext xinerama xscrnsaver xt xtst xv xxf86vm
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-vdr-keys \
@@ -66,7 +66,7 @@ CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index e712e7300f04..05864728f556 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -17,7 +17,7 @@ USE_BZIP2= yes
USE_GL= gl
USE_GNOME= desktopfileutils gtk12 gnomehack
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= automake autoconf libtool
diff --git a/net-im/emesene/Makefile b/net-im/emesene/Makefile
index 6f977368ddfd..505b3af1b774 100644
--- a/net-im/emesene/Makefile
+++ b/net-im/emesene/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
PROJECTHOST= bsdistfiles
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= pygtk2 desktopfileutils
USE_GSTREAMER= python
INSTALLS_ICONS= yes
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index f8c3d7dca79a..20ecef6acb60 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -32,7 +32,7 @@ CONFLICTS= empathy-3.[0-9]*
USE_GMAKE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
USE_GNOME= evolutiondataserver gnomehack gnomeprefix pygtk2 ltverhack
USE_GSTREAMER= yes
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index 4f71c46b2961..175f60b63c86 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -23,7 +23,7 @@ USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GMAKE= yes
USE_GNOME= gnomehier gnomehack intlhack ltverhack evolutiondataserver3
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/net-im/freetalk/Makefile b/net-im/freetalk/Makefile
index 45599565cd6a..740c537a9410 100644
--- a/net-im/freetalk/Makefile
+++ b/net-im/freetalk/Makefile
@@ -34,7 +34,7 @@ OPTIONS= BEEP "Use beep program" off
.if !defined(WITHOUT_NLS)
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE}
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index f11f4b101c43..6964eb693fe6 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -40,7 +40,7 @@ SPELL_DESC= Spell checking support
.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/net-im/jabber/Makefile b/net-im/jabber/Makefile
index decbb19839ee..84dc48bc4a91 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -33,7 +33,7 @@ OPTIONS_DEFINE= IPV6 MYSQL PGSQL
USE_RC_SUBR= jabber
USE_ICONV= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
USE_LDCONFIG= ${PREFIX}/lib/jabber
MAKE_JOBS_UNSAFE= yes
diff --git a/net-im/jggtrans/Makefile b/net-im/jggtrans/Makefile
index b4911c2ca8df..345b1c19d8d0 100644
--- a/net-im/jggtrans/Makefile
+++ b/net-im/jggtrans/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= idn.17:${PORTSDIR}/dns/libidn \
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= glib20 pkgconfig
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 22dce5cd5577..e2e59d4e69ca 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -33,7 +33,7 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
.if !defined(PIDGIN_SLAVE)
# Pidgin slave ports that require the following functionality, must explicitly
# set these macros themselves.
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_LDCONFIG= yes
WANT_GNOME= yes
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index ffc876b020ab..341639d8cd63 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
USE_GNOME= gnomehack glib20 ltverhack
diff --git a/net-im/pidgin-birthday-reminder/Makefile b/net-im/pidgin-birthday-reminder/Makefile
index 8fada4ad9445..426bc455e465 100644
--- a/net-im/pidgin-birthday-reminder/Makefile
+++ b/net-im/pidgin-birthday-reminder/Makefile
@@ -22,7 +22,7 @@ MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= pkgconfig intltool
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/net-im/pidgin-libnotify/Makefile b/net-im/pidgin-libnotify/Makefile
index 1602608edef7..bb72fc2497a5 100644
--- a/net-im/pidgin-libnotify/Makefile
+++ b/net-im/pidgin-libnotify/Makefile
@@ -30,7 +30,7 @@ USE_GNOME= pkgconfig gtk20
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/net-im/pidgin-msn-pecan/Makefile b/net-im/pidgin-msn-pecan/Makefile
index ce9f00ac2e62..6d394f9b649d 100644
--- a/net-im/pidgin-msn-pecan/Makefile
+++ b/net-im/pidgin-msn-pecan/Makefile
@@ -22,7 +22,7 @@ PROJECTHOST= msn-pecan
USE_BZIP2= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
post-install:
${GMAKE} -C ${WRKSRC} install_locales
diff --git a/net-im/pidgin-sipe/Makefile b/net-im/pidgin-sipe/Makefile
index bb0b633301fe..e34533dfd7f1 100644
--- a/net-im/pidgin-sipe/Makefile
+++ b/net-im/pidgin-sipe/Makefile
@@ -54,7 +54,7 @@ post-install:
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/net-im/pwytter/Makefile b/net-im/pwytter/Makefile
index f8fdf819098c..d0e5d6703942 100644
--- a/net-im/pwytter/Makefile
+++ b/net-im/pwytter/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkin
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_ZIP= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= -2.7
USE_PYDISTUTILS= easy_install
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/net-im/sim-im-devel/Makefile b/net-im/sim-im-devel/Makefile
index aea2c15c28f0..785c1fe9f034 100644
--- a/net-im/sim-im-devel/Makefile
+++ b/net-im/sim-im-devel/Makefile
@@ -26,7 +26,7 @@ USE_QT_VER= 3
USE_XORG= x11 xext xscrnsaver
USE_OPENSSL= yes
USE_PERL5_BUILD= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
diff --git a/net-im/sim-im/Makefile b/net-im/sim-im/Makefile
index 65bdfe35fb9b..897275d0e537 100644
--- a/net-im/sim-im/Makefile
+++ b/net-im/sim-im/Makefile
@@ -31,7 +31,7 @@ USE_PERL5_BUILD=yes
USE_AUTOTOOLS= libtool
USE_OPENSSL= yes
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
USE_XORG= x11 xext ice xscrnsaver
diff --git a/net-im/xfce4-messenger-plugin/Makefile b/net-im/xfce4-messenger-plugin/Makefile
index f013bc3050a9..87a25165713e 100644
--- a/net-im/xfce4-messenger-plugin/Makefile
+++ b/net-im/xfce4-messenger-plugin/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libgui libutil panel
diff --git a/net-mgmt/ap-utils/Makefile b/net-mgmt/ap-utils/Makefile
index d3678f897e6d..441286292c52 100644
--- a/net-mgmt/ap-utils/Makefile
+++ b/net-mgmt/ap-utils/Makefile
@@ -23,7 +23,7 @@ LDFLAGS+= -lintl -L${LOCALBASE}/lib
MAN8= ap-trapd.8 ap-mrtg.8 ap-config.8
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
BROKEN= Does not build without gettext
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index bc76928950da..bf7fbb90aa69 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -24,7 +24,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
MAN1= etherape.1
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/net-mgmt/horde3-nic/Makefile b/net-mgmt/horde3-nic/Makefile
index f9c4dbd40d53..5837a9008e9d 100644
--- a/net-mgmt/horde3-nic/Makefile
+++ b/net-mgmt/horde3-nic/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Network service monitor
USE_HORDE= base pkg-message
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= CHANGES CREDITS INSTALL TODO README
.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/net-mgmt/ipv6calc/Makefile b/net-mgmt/ipv6calc/Makefile
index b945adc8ef22..f61f51b710d0 100644
--- a/net-mgmt/ipv6calc/Makefile
+++ b/net-mgmt/ipv6calc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
MAINTAINER= edwin@mavetju.org
COMMENT= Convert, change, and calculate with IPv6 addresses
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net-mgmt/nagiosql/Makefile b/net-mgmt/nagiosql/Makefile
index 19220da9f4d1..345cd1a9e5dd 100644
--- a/net-mgmt/nagiosql/Makefile
+++ b/net-mgmt/nagiosql/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= nagios:${PORTSDIR}/net-mgmt/nagios \
USE_BZIP2= yes
USE_MYSQL= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PHP= mysql filter gettext session simplexml
WANT_PHP_WEB= yes
diff --git a/net-mgmt/netustad/Makefile b/net-mgmt/netustad/Makefile
index f2a5719a0658..c165ad055572 100644
--- a/net-mgmt/netustad/Makefile
+++ b/net-mgmt/netustad/Makefile
@@ -18,7 +18,7 @@ COMMENT= A Web based admin tool that manages network services
#MAN5= netustad.conf.5
USE_RC_SUBR= ${PORTNAME}
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
OPTIONS_DEFINE= SSL NLS
diff --git a/net-mgmt/tork/Makefile b/net-mgmt/tork/Makefile
index decceb9585d4..8d70a885b222 100644
--- a/net-mgmt/tork/Makefile
+++ b/net-mgmt/tork/Makefile
@@ -13,7 +13,7 @@ COMMENT= TorK is an Anonymity Manager for the KDE Desktop
USE_GMAKE= yes
USE_GNOME= pkgconfig
USE_AUTOTOOLS= libtool aclocal:env
-USE_GETTEXT= yes
+USES= gettext
USE_XORG= xext
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
diff --git a/net-mgmt/virtinst/Makefile b/net-mgmt/virtinst/Makefile
index 3448946a0e6e..b3d76482605a 100644
--- a/net-mgmt/virtinst/Makefile
+++ b/net-mgmt/virtinst/Makefile
@@ -13,7 +13,7 @@ COMMENT= Module to help in starting installations inside of virtual machines
LIB_DEPENDS= virt.1000:${PORTSDIR}/devel/libvirt
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.9.1:${PORTSDIR}/www/py-urlgrabber
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON_RUN= yes
USE_PYTHON_BUILD= yes
USE_PYDISTUTILS= yes
diff --git a/net-mgmt/wifimgr/Makefile b/net-mgmt/wifimgr/Makefile
index a172d7ec3c0c..e23c4e95b220 100644
--- a/net-mgmt/wifimgr/Makefile
+++ b/net-mgmt/wifimgr/Makefile
@@ -21,7 +21,7 @@ USE_GNOME= gtk20 pkgconfig
INSTALLS_ICONS= yes
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CFLAGS+= -DWITHOUT_NLS
diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile
index 174eda7a70d8..71ccf53f8cf5 100644
--- a/net-p2p/deluge/Makefile
+++ b/net-p2p/deluge/Makefile
@@ -24,7 +24,7 @@ PLIST_SUB+= PYTHON_VER=${PYTHON_VER}
USE_XZ= yes
WANT_GNOME= yes
-USE_GETTEXT= yes
+USES= gettext
USE_OPENSSL= yes
USE_PYTHON= -2.7
USE_TWISTED_RUN= web
diff --git a/net-p2p/gnunet-gtk/Makefile b/net-p2p/gnunet-gtk/Makefile
index 6cee5980a8d8..25268ecf7022 100644
--- a/net-p2p/gnunet-gtk/Makefile
+++ b/net-p2p/gnunet-gtk/Makefile
@@ -36,7 +36,7 @@ MAN1= gnunet-fs-gtk.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/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 53602c8514e6..f7ecebe16f53 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -92,7 +92,7 @@ PLIST_SUB+= MYSQL="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --with-libintl-prefix=${LOCALBASE}
PLIST_SUB+= NLS=""
.else
diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile
index 23aadf4e31ee..53dc6e959dc6 100644
--- a/net-p2p/jigdo/Makefile
+++ b/net-p2p/jigdo/Makefile
@@ -51,7 +51,7 @@ CONFIGURE_ARGS+=--without-libdb
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/net-p2p/microdc2/Makefile b/net-p2p/microdc2/Makefile
index 869f86576222..21c6b6155fff 100644
--- a/net-p2p/microdc2/Makefile
+++ b/net-p2p/microdc2/Makefile
@@ -22,7 +22,7 @@ USE_ICONV= yes
USE_GNOME= libxml2
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/net-p2p/moodriver/Makefile b/net-p2p/moodriver/Makefile
index 0f94496e628b..a7b5485c03af 100644
--- a/net-p2p/moodriver/Makefile
+++ b/net-p2p/moodriver/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
CXXFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= glib20 pkgconfig
USE_LDCONFIG= yes
diff --git a/net-p2p/nicotine-plus/Makefile b/net-p2p/nicotine-plus/Makefile
index ba78315fe919..e3687d979717 100644
--- a/net-p2p/nicotine-plus/Makefile
+++ b/net-p2p/nicotine-plus/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GNOME= pygtk2
USE_PYTHON= yes
USE_PYDISTUTILS= yes
-USE_GETTEXT= yes
+USES= gettext
PYDISTUTILS_PKGNAME= nicotine
DOCSDIR= share/doc/${PKGNAMEPREFIX:S/-//}
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index c5f5f337d0db..e544af316e19 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS+= pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
WRKSRC= ${WRKDIR}/trunk
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= glib20
USE_XORG= ice sm x11 xau xdmcp xext xrender
USE_QT4= corelib gui network xml script designer_build uic_build \
diff --git a/net-p2p/transmission-gtk/Makefile b/net-p2p/transmission-gtk/Makefile
index 58c30c6ea673..59e2329ae324 100644
--- a/net-p2p/transmission-gtk/Makefile
+++ b/net-p2p/transmission-gtk/Makefile
@@ -17,7 +17,7 @@ PLIST= ${.CURDIR}/pkg-plist
SLAVEPORT= gtk2
USE_GNOME= gnomehack gtk30 desktopfileutils intlhack
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
EXTRA_CONF_ARGS=--disable-cli \
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 311a9a70cc8d..6388ea8012f6 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -27,7 +27,7 @@ USERS?= ${PORTNAME}
GROUPS?= ${USERS}
USE_GNOME?= gnomehack ltverhack glib20 intltool
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME_SUBR= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
diff --git a/net/blam/Makefile b/net/blam/Makefile
index 08f6bd605bbc..ec31f55b064c 100644
--- a/net/blam/Makefile
+++ b/net/blam/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV= GMSGFMT="${LOCALBASE}/bin/msgfmt" DATADIRNAME="share"
USE_GNOME= gnomesharp20
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
GCONF_SCHEMAS= blam.schemas
diff --git a/net/desktop-data-model/Makefile b/net/desktop-data-model/Makefile
index a927c3d21134..b129405f8da9 100644
--- a/net/desktop-data-model/Makefile
+++ b/net/desktop-data-model/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS= pcre.3:${PORTSDIR}/devel/pcre \
USE_GMAKE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack gtk20 glib20 gnomedesktop gnomevfs2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-maemo=no
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index a386a1a4a112..84ba453deff8 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= ekiga-3.*
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_SDL= sdl
INSTALLS_OMF= yes
USE_GNOME= libgnomeui gnomeprefix gnomehack gnomedocutils \
diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile
index b9eb55c4e492..53f17d64a012 100644
--- a/net/ekiga3/Makefile
+++ b/net/ekiga3/Makefile
@@ -23,7 +23,7 @@ USE_GCC= any
USE_PERL5= yes
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_XORG= xv
USE_GNOME= gtk20 gnomehack
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index 9b14850a958a..efdaed5f42bc 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
USE_XZ= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack glib20 intltool
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
diff --git a/net/gnetcat/Makefile b/net/gnetcat/Makefile
index 77d88874fae5..9b690d281c1a 100644
--- a/net/gnetcat/Makefile
+++ b/net/gnetcat/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= GPL'ed re-write of the well known networking tool netcat
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index eb9a796c9f5d..229730211fa8 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel \
gnomedocutils
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index bb5b8ca86ed1..b68fafd716a5 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index 9c64dc9a7131..04c193f84a40 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -83,7 +83,7 @@ PLIST_SUB+= LDAP="@comment "
.endif
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 5de1a76d96f8..b43eb81f7266 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -101,7 +101,7 @@ PLIST_SUB+= EMACS="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/net/gq/Makefile b/net/gq/Makefile
index 360f575d88b2..78560ab8c927 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -21,7 +21,7 @@ CACHE_DESC= Support the OpenLDAP experimental client cache
USE_GNOME= libglade2 gnomedocutils
USE_OPENSSL= yes
USE_OPENLDAP= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE}
diff --git a/net/grsync/Makefile b/net/grsync/Makefile
index 7e37a371e8eb..85eb5169527f 100644
--- a/net/grsync/Makefile
+++ b/net/grsync/Makefile
@@ -30,7 +30,7 @@ MAN1= grsync.1 grsync-batch.1
.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/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 9a957d4952b0..2c1da2993ddc 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= gtk-vnc-0.4.[0-9]*
USE_GNOME= pygtk2 gnomehack
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
diff --git a/net/heybuddy/Makefile b/net/heybuddy/Makefile
index 467e7fd4a732..d5f7557315c1 100644
--- a/net/heybuddy/Makefile
+++ b/net/heybuddy/Makefile
@@ -28,7 +28,7 @@ DESKTOP_ENTRIES= "Heybuddy" \
.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/net/jwhois/Makefile b/net/jwhois/Makefile
index f9f6512ea6d2..c356e53a849e 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT=An improved WHOIS client capable of selecting server to query
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
CPPFLAGS+= -I${PREFIX}/include
LDFLAGS+= -L${PREFIX}/lib
diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile
index e4199d19ae05..7865ac3946cf 100644
--- a/net/libgnetwork/Makefile
+++ b/net/libgnetwork/Makefile
@@ -17,7 +17,7 @@ COMMENT= A GLib-based networking wrapper
USE_AUTOTOOLS= libtool
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomeprefix gnomehack intlhack gconf2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index 867bc56c9f8b..f2cb88204d2a 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/mi
LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 ltverhack
diff --git a/net/libmms/Makefile b/net/libmms/Makefile
index df92c4abc182..b7781e916cc6 100644
--- a/net/libmms/Makefile
+++ b/net/libmms/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= kwm@FreeBSD.org
COMMENT= Library for parsing mms:// and mmsh:// type network streams
USE_GNOME= gnomehack pkgconfig glib20
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net/link-monitor-applet/Makefile b/net/link-monitor-applet/Makefile
index 997afbe8ca08..dd346cc49d51 100644
--- a/net/link-monitor-applet/Makefile
+++ b/net/link-monitor-applet/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= GeoIP:${PORTSDIR}/net/GeoIP
USE_BZIP2= yes
USE_GNOME= gnomepanel gnomeprefix libgnomeui librsvg2
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 7accf4eb8938..7c0868a973e8 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -31,7 +31,7 @@ USE_RC_SUBR= miredo_server miredo
LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
USE_ICONV= yes
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB= NLS=""
diff --git a/net/morebalance/Makefile b/net/morebalance/Makefile
index 4f74b9073972..07c99be7aa62 100644
--- a/net/morebalance/Makefile
+++ b/net/morebalance/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS+= pcre.3:${PORTSDIR}/devel/pcre \
CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
MAKE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-USE_GETTEXT= YES
+USES= gettext
LDFLAGS+= -L${LOCALBASE}/lib -lpcre -lggz -lgnutls \
-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/net/nc6/Makefile b/net/nc6/Makefile
index 12a079a118c5..50ac0a063c46 100644
--- a/net/nc6/Makefile
+++ b/net/nc6/Makefile
@@ -22,7 +22,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/net/netdude/Makefile b/net/netdude/Makefile
index 5aae269e9b67..c3d11136ac67 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= netdude.0:${PORTSDIR}/net/libnetdude
USE_AUTOTOOLS= libltdl libtool
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR}
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lltdl"
diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile
index 73a0ae39a57b..d9a38db61410 100644
--- a/net/netspeed_applet/Makefile
+++ b/net/netspeed_applet/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop
INSTALLS_OMF= yes
USE_GMAKE= yes
USE_GNOME= gnomehier intlhack gnomeprefix gnomehack gnomepanel
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net/nxserver/Makefile b/net/nxserver/Makefile
index a62883dd23e4..1f50df2ca5a9 100644
--- a/net/nxserver/Makefile
+++ b/net/nxserver/Makefile
@@ -33,7 +33,7 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
ONLY_FOR_ARCHS= i386
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
WRKSRC= ${WRKDIR}
GNU_CONFIGURE= yes
ALL_TARGET= World
diff --git a/net/online-desktop/Makefile b/net/online-desktop/Makefile
index 790effefc838..10332fff1bdc 100644
--- a/net/online-desktop/Makefile
+++ b/net/online-desktop/Makefile
@@ -33,7 +33,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/desktop-data-engine:${PORTSDIR}/net/desktop-da
USE_BZIP2= yes
USE_GNOME= glib20 gconf2 pygnomedesktop
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_PYTHON= 2.5+
GCONF_SCHEMAS= online-desktop.schemas
diff --git a/net/opennx/Makefile b/net/opennx/Makefile
index 35cd74649d11..1f4ff3e4d112 100644
--- a/net/opennx/Makefile
+++ b/net/opennx/Makefile
@@ -42,7 +42,7 @@ SSH_KEYGEN?= ssh-keygen
CONFIGURE_ARGS+=--disable-nls --localedir=/dev/null
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/net/phamm/Makefile b/net/phamm/Makefile
index 2fa3cb990feb..39e544162914 100644
--- a/net/phamm/Makefile
+++ b/net/phamm/Makefile
@@ -16,7 +16,7 @@ COMMENT= Front-end written in PHP to manage virtual service
NO_BUILD= yes
USE_PHP= gettext ldap openssl pcre session
-USE_GETTEXT= yes
+USES= gettext
PHAMMDIR?= www/${PORTNAME}
SCHEMADIR= ${WRKSRC}/schema
diff --git a/net/py-ldaptor/Makefile b/net/py-ldaptor/Makefile
index 549a4a4db693..2a07b89798bf 100644
--- a/net/py-ldaptor/Makefile
+++ b/net/py-ldaptor/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyparsing.py:${PORTSDIR}/devel/py-parsing \
GITVERSION= aad8ded658b36337a08aeb7402b6b67eb8771bea
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_TWISTED= yes
USE_PYDISTUTILS= yes
diff --git a/net/remmina-applet/Makefile b/net/remmina-applet/Makefile
index 443f46dadf57..14c665b0c43c 100644
--- a/net/remmina-applet/Makefile
+++ b/net/remmina-applet/Makefile
@@ -29,7 +29,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
.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/net/remmina-plugin-i18n/Makefile b/net/remmina-plugin-i18n/Makefile
index d638ef31e1ff..868be5c15bcd 100644
--- a/net/remmina-plugin-i18n/Makefile
+++ b/net/remmina-plugin-i18n/Makefile
@@ -11,6 +11,6 @@ COMMENT= Localized messages for Remmina plugins
MASTERDIR= ${.CURDIR}/../remmina-plugins
-USE_GETTEXT= yes
+USES= gettext
.include "${MASTERDIR}/Makefile"
diff --git a/net/remmina/Makefile b/net/remmina/Makefile
index 161531f7ece6..b7f3e44d5c7e 100644
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@@ -37,7 +37,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/net/service-discovery-applet/Makefile b/net/service-discovery-applet/Makefile
index 399246a5d4de..6e800c31703a 100644
--- a/net/service-discovery-applet/Makefile
+++ b/net/service-discovery-applet/Makefile
@@ -18,7 +18,7 @@ COMMENT= A GNOME applet that shows available network services using mDNS
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_GNOME= gnomehack gnomeprefix intlhack pygnomedesktop
USE_GMAKE= yes
diff --git a/net/smb4k/Makefile b/net/smb4k/Makefile
index 5ca48c81e4d3..bc430dfaf3cd 100644
--- a/net/smb4k/Makefile
+++ b/net/smb4k/Makefile
@@ -23,7 +23,7 @@ SAMBA_PORT?= net/samba36
USE_KDEBASE_VER= 3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS += --with-qt-dir=${QT_PREFIX} \
diff --git a/net/tcpreen/Makefile b/net/tcpreen/Makefile
index 41f44283fe31..605be9513d8d 100644
--- a/net/tcpreen/Makefile
+++ b/net/tcpreen/Makefile
@@ -17,7 +17,7 @@ MAN1= tcpreen.1
DOC_FILES= AUTHORS NEWS README THANKS TODO
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/net/tucan/Makefile b/net/tucan/Makefile
index 4cb62e9bb360..e6e9da4e706d 100644
--- a/net/tucan/Makefile
+++ b/net/tucan/Makefile
@@ -24,7 +24,7 @@ USE_PYTHON= 2.5+
MANCOMPRESSED= yes
MAN1= tucan.1
-USE_GETTEXT= yes
+USES= gettext
post-patch:
${REINPLACE_CMD} -Ee 's|#! /usr/bin/env python|#! ${PYTHON_CMD}|' ${WRKSRC}/tucan.py
diff --git a/net/twitux/Makefile b/net/twitux/Makefile
index 2648e2a7c287..c161a783d37d 100644
--- a/net/twitux/Makefile
+++ b/net/twitux/Makefile
@@ -25,7 +25,7 @@ INSTALLS_OMF= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
CONFIGURE_ENV+= GMSGFMT="${LOCALBASE}/bin/msgfmt"
GCONF_SCHEMAS= twitux.schemas
INSTALLS_ICONS= yes
diff --git a/net/ushare/Makefile b/net/ushare/Makefile
index 455d9ce16eb9..2145fbefa78c 100644
--- a/net/ushare/Makefile
+++ b/net/ushare/Makefile
@@ -16,7 +16,7 @@ HAS_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig
-USE_GETTEXT= yes
+USES= gettext
LDFLAGS+= -L${LOCALBASE}/lib -lintl
CFLAGS+= -I${LOCALBASE}/include -I${WRKSRC}
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 9de0c891209e..17392f001946 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomeprefix intlhack gnomehack gnomepanel
USE_XORG= xtst
USE_GMAKE= yes
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 0607fb96a635..318d281c1c43 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -21,7 +21,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-nls
PLIST_SUB= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
USE_ICONV= yes
PLIST_SUB= NLS=""
.endif
diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile
index 72ca1b822d88..caddb89316f2 100644
--- a/net/x11vnc/Makefile
+++ b/net/x11vnc/Makefile
@@ -36,7 +36,7 @@ NO_OPTIONS_SORT=yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
.endif
.if ${PORT_OPTIONS:MAVAHI}
diff --git a/news/klibido/Makefile b/news/klibido/Makefile
index 575b67d63304..d851c0afc9ff 100644
--- a/news/klibido/Makefile
+++ b/news/klibido/Makefile
@@ -21,7 +21,7 @@ USE_KDELIBS_VER=3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
LDFLAGS+= -L${LOCALBASE}/lib/db44 ${PTHREAD_LIBS}
CFLAGS+= -I${LOCALBASE}/include/db44 ${PTHREAD_CFLAGS}
diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile
index 7d901e8950d6..c8f77a392580 100644
--- a/news/sabnzbdplus/Makefile
+++ b/news/sabnzbdplus/Makefile
@@ -65,7 +65,7 @@ LICENSE_FILE_SSMTPLIB= ${WRKSRC}/licenses/License-ssmtplib.txt
LICENSE_PERMS_SSMTPLIB= auto-accept
USE_PYTHON= 2.5+
-USE_GETTEXT= yes
+USES= gettext
NO_BUILD= yes
WRKSRC= ${WRKDIR}/SABnzbd-${PORTVERSION}
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 3c910c189ed4..283fead6a365 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -31,7 +31,7 @@ OPTIONS_DEFAULT=SSL
.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/news/tin/Makefile b/news/tin/Makefile
index 2625a3d2e9f7..ec65d8c86faf 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -93,7 +93,7 @@ CONFIGURE_ARGS+= --enable-cancel-locks
.if ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+= --enable-nls
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/news/xpn/Makefile b/news/xpn/Makefile
index 85f7c922eb03..c71710a872de 100644
--- a/news/xpn/Makefile
+++ b/news/xpn/Makefile
@@ -27,7 +27,7 @@ FIND_DATA= -type f -mindepth 2 -not -name "*~"
SUB_FILES= ${PORTNAME}
SUB_LIST= PYTHON_CMD=${PYTHON_CMD} XPN=${XPN}
-USE_GETTEXT= yes
+USES= gettext
XPN= ${PORTNAME}.py
diff --git a/news/yencode/Makefile b/news/yencode/Makefile
index 7e5d2a8b3204..14de2abf3ce9 100644
--- a/news/yencode/Makefile
+++ b/news/yencode/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A free (GPL) encoder and decoder for the yEnc Usenet file format
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
MAN1= ydecode.1 yencode.1 ypost.1
diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile
index 75c6181fabf6..13b51b0b84d2 100644
--- a/polish/ekg2/Makefile
+++ b/polish/ekg2/Makefile
@@ -94,7 +94,7 @@ PLIST_SUB+= GTK2_PLUGIN="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index 5a31900d5f21..f4850c741662 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/libgadu \
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20
USE_LDCONFIG= yes
diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index 47cdca4c3b5a..69a381fc4e93 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
RUN_DEPENDS= 7z:${PORTSDIR}/archivers/p7zip
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
USE_XORG= ice sm x11 xau xdmcp xext xrender
USE_QT4= corelib gui network xml qmake_build moc_build uic_build rcc_build
USE_KDE4= kdehier
diff --git a/ports-mgmt/gnome-packagekit/Makefile b/ports-mgmt/gnome-packagekit/Makefile
index 691b5c253c79..7c2ac9b4ad7a 100644
--- a/ports-mgmt/gnome-packagekit/Makefile
+++ b/ports-mgmt/gnome-packagekit/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_BZIP2= yes
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomemenus gnomedocutils \
desktopfileutils
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_PYTHON_BUILD=2.5+
GCONF_SCHEMAS= gnome-packagekit.schemas
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index cfe0d7c01f70..a273fb72e0e1 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof \
${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= glib20 intltool gnomehier
USE_SQLITE= 3
USE_ICONV= yes
diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index 8b3f39cbc794..64c1d0ff0d68 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -59,7 +59,7 @@ I18N_DESC=Enable I18N support
.include <bsd.port.options.mk>
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 653e6eff6da0..2e39d7134f3c 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -35,7 +35,7 @@ ALL_TARGET= all check
USE_GNOME= lthack
USE_PERL5= yes
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
diff --git a/print/cups-pk-helper/Makefile b/print/cups-pk-helper/Makefile
index f4b116982426..4b7f4848d47b 100644
--- a/print/cups-pk-helper/Makefile
+++ b/print/cups-pk-helper/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= intlhack gtk20
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/libs
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index ed6236e2b63e..eb7588c5bf4b 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -34,7 +34,7 @@ DISTFILES+= ${DOCFILES:C/$/:docs/}
.endif
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_XORG= x11 xi ice xkbui
USE_GMAKE= yes
USE_ICONV= yes
diff --git a/print/frescobaldi/Makefile b/print/frescobaldi/Makefile
index 47993c296e46..e48cb9d5b7fc 100644
--- a/print/frescobaldi/Makefile
+++ b/print/frescobaldi/Makefile
@@ -16,7 +16,7 @@ LICENSE_COMB= dual
RUN_DEPENDS= lilypond:${PORTSDIR}/print/lilypond \
${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:${PORTSDIR}/graphics/py-poppler-qt4
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
USE_KDE4= kdeprefix kdelibs pykde4_build pykde4_run
USE_PYTHON= 2.6+
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 265c81b350bf..4d0f69bec593 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui desktopfileutils
-USE_GETTEXT= yes
+USES= gettext
USE_GHOSTSCRIPT=yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index 3b40b565f9ab..18b11274fe5c 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \
desktopfileutils
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 9a094b28b1c2..fd190f326cd1 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -29,7 +29,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_GNOME= gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/print/gnome-specimen/Makefile b/print/gnome-specimen/Makefile
index 05d5064bdfb2..4b9cadeb760f 100644
--- a/print/gnome-specimen/Makefile
+++ b/print/gnome-specimen/Makefile
@@ -19,7 +19,7 @@ USE_GNOME= pygnomedesktop
GCONF_SCHEMAS= gnome-specimen.schemas
USE_GMAKE= yes
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= automake:env autoconf:env
INSTALLS_ICONS= yes
diff --git a/print/gnomephotoprinter/Makefile b/print/gnomephotoprinter/Makefile
index 52f28ec5b038..af2648175d45 100644
--- a/print/gnomephotoprinter/Makefile
+++ b/print/gnomephotoprinter/Makefile
@@ -19,7 +19,7 @@ COMMENT= Gnome Photo Printer is intended for printing photos in an easy way
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui libglade2 libgnomeprintui \
gnomevfs2
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index eac50768eee0..51962010d463 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -29,7 +29,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
MAN1= gtklp.1 gtklpq.1
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index 9d6b1a839075..5121563bdcfb 100644
--- a/print/gutenprint-base/Makefile
+++ b/print/gutenprint-base/Makefile
@@ -20,7 +20,7 @@ LICENSE= GPLv2
CONFLICTS= gimp-print-[0-9]*
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20
GNU_CONFIGURE= yes
diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
index 7fce91c7d152..7a2b8480f02a 100644
--- a/print/lilypond-devel/Makefile
+++ b/print/lilypond-devel/Makefile
@@ -46,7 +46,7 @@ INFO= lilypond-notation \
internals
USE_BISON= build
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GHOSTSCRIPT=9
USE_PYTHON= yes
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index b1982982a091..209060518dc2 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+= --without-hunspell
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 9ae9edcf73cb..ea2b984925f9 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -66,7 +66,7 @@ CONFIGURE_ARGS+= --without-aspell --without-pspell
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/print/openprinting/Makefile b/print/openprinting/Makefile
index 4add87bd9681..d12b6a55d764 100644
--- a/print/openprinting/Makefile
+++ b/print/openprinting/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/papi-${PORTVERSION}_beta
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/libexec
diff --git a/print/pdfmod/Makefile b/print/pdfmod/Makefile
index 378d3440d04f..db0ce217cb2c 100644
--- a/print/pdfmod/Makefile
+++ b/print/pdfmod/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomesharp20
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
.include <bsd.port.mk>
diff --git a/print/photoprint/Makefile b/print/photoprint/Makefile
index 7309c6fb2883..766adff4af6d 100644
--- a/print/photoprint/Makefile
+++ b/print/photoprint/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= cups:${PORTSDIR}/print/cups-client \
xcb:${PORTSDIR}/x11/libxcb
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= desktopfileutils pango
USE_XORG= x11 xau xcomposite xcursor xdamage xdmcp xext \
xfixes xi xinerama xrandr xrender
diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index 382d12dd6b82..88f51024b0f2 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -32,7 +32,7 @@ USE_BZIP2= yes
USE_PYTHON= 2.6+
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_GNOME= pygtk2
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index 300455cfed69..5b892486ad8b 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -40,7 +40,7 @@ PLIST_SUB= TEXMF=${TEXMF}
.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/print/trueprint/Makefile b/print/trueprint/Makefile
index 913d2eadf1b4..452b3e674a65 100644
--- a/print/trueprint/Makefile
+++ b/print/trueprint/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= danilogondolfo@gmail.com
COMMENT= Print program listings on postscript printer
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib -lintl
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 03b0dee5b3fe..8998c1befe5d 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -16,7 +16,7 @@ COMMENT= Xfce 4 graphical frontend for printing
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
diff --git a/science/chemtool-devel/Makefile b/science/chemtool-devel/Makefile
index 9c035fc7ab42..9a2d0b116a06 100644
--- a/science/chemtool-devel/Makefile
+++ b/science/chemtool-devel/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= gtk20
#USE_AUTOTOOLS= autoconf213
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
CONFIGURE_ARGS= --enable-emf=yes
PKGNAMESUFFIX= -devel
MAN1= chemtool.1 cht.1
diff --git a/science/ecs/Makefile b/science/ecs/Makefile
index 2e2a1f0fbcbe..a877a207f211 100644
--- a/science/ecs/Makefile
+++ b/science/ecs/Makefile
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--without-adf --without-ccm
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
USE_ICONV= yes
PLIST_SUB+= NLS=""
.endif
diff --git a/science/kst/Makefile b/science/kst/Makefile
index abe800fb097b..59f86c808269 100644
--- a/science/kst/Makefile
+++ b/science/kst/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
USE_GMAKE= yes
USE_AUTOTOOLS= automake:env autoconf:env libtool
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_SAFE= yes
AUTOTOOLSFILES= admin/cvs.sh
diff --git a/science/linsmith/Makefile b/science/linsmith/Makefile
index fc09e26a4604..9a73e496bfae 100644
--- a/science/linsmith/Makefile
+++ b/science/linsmith/Makefile
@@ -14,7 +14,7 @@ LICENSE= GPLv2 # (or later)
USE_GNOME= libgnomeui libxml2
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/science/meep/Makefile b/science/meep/Makefile
index 1c3d7ca9d3be..330e30e63aa5 100644
--- a/science/meep/Makefile
+++ b/science/meep/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
USE_FORTRAN= yes
USE_GCC= 4.6+
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS+= libltdl
CPPFLAGS+= -I${LOCALBASE}/include
LD_LIBRARY_PATH= -L${LOCALBASE}/lib -L/usr/lib
diff --git a/science/ncs/Makefile b/science/ncs/Makefile
index 2ed4eb69c509..0dba40fe710b 100644
--- a/science/ncs/Makefile
+++ b/science/ncs/Makefile
@@ -30,7 +30,7 @@ RUN_DEPENDS= xmgrace:${PORTSDIR}/math/grace \
USE_ZIP= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= libxml2
USE_PYTHON= yes
USE_QT_VER= 4
diff --git a/science/v_sim/Makefile b/science/v_sim/Makefile
index d62dbc4253f6..680d095e3127 100644
--- a/science/v_sim/Makefile
+++ b/science/v_sim/Makefile
@@ -36,7 +36,7 @@ MAN1= v_sim.1
.if defined(WITHOUT_NLS)
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/security/authforce/Makefile b/security/authforce/Makefile
index f3b80eb62495..dfa0bb6d8858 100644
--- a/security/authforce/Makefile
+++ b/security/authforce/Makefile
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --without-curl
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_FILES+= share/locale/nl/LC_MESSAGES/authforce.mo
CONFIGURE_ENV+= CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib
.else
diff --git a/security/bsp_upektfmess/Makefile b/security/bsp_upektfmess/Makefile
index 4ee05da0a624..1e6b7add75b5 100644
--- a/security/bsp_upektfmess/Makefile
+++ b/security/bsp_upektfmess/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES= lib/libtfmessbsp.so
USE_ZIP= yes
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
# Maintainer note
# Both the gui and the non-gui object are linked to libX11
diff --git a/security/ccrypt/Makefile b/security/ccrypt/Makefile
index 200d29575b0a..cd5e04921ffc 100644
--- a/security/ccrypt/Makefile
+++ b/security/ccrypt/Makefile
@@ -14,7 +14,7 @@ COMMENT= Command-line utility for encrypting and decrypting files and streams
.if ${PORT_OPTIONS:MNLS}
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.else
PLIST_SUB+= NLS="@comment "
USE_PERL5_BUILD= yes
diff --git a/security/fwlogwatch/Makefile b/security/fwlogwatch/Makefile
index 300b9910cc1e..7eec0a5f64cc 100644
--- a/security/fwlogwatch/Makefile
+++ b/security/fwlogwatch/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.kybs.de/boris/sw/
MAINTAINER= michael@ranner.eu
COMMENT= Packet filter and firewall log analyzer
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
MAKE_ENV= MKDIR="${MKDIR}"
INSTALL_TARGET= install install-config install-i18n
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index f8e368c45d6e..13c251cbbaec 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack intlhack
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib" \
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 582a8d71a57b..e8e746a3153c 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -87,7 +87,7 @@ CONFIGURE_ARGS+=--enable-standard-socket
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= YES
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/security/gss/Makefile b/security/gss/Makefile
index 59b32ee0c3be..da1ad8e33706 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -34,7 +34,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/security/heimdal/Makefile b/security/heimdal/Makefile
index c38e52441412..a3624351fd34 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -30,7 +30,7 @@ OPTIONS= IPV6 "Enable IPV6 support" on \
USE_AUTOTOOLS= autoconf autoheader libtool
USE_GNOME= gnomehack pkgconfig
USE_OPENSSL= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS+= --with-libintl=${LOCALBASE} \
diff --git a/security/horde3-jeta/Makefile b/security/horde3-jeta/Makefile
index 6dabe1d6c9ac..014915ce2422 100644
--- a/security/horde3-jeta/Makefile
+++ b/security/horde3-jeta/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Horde wrapper around various Java SSH applets
USE_HORDE= base pkg-message
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL RELEASE_NOTES
.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/security/hotssh/Makefile b/security/hotssh/Makefile
index 0a4804671b01..47419ac22afa 100644
--- a/security/hotssh/Makefile
+++ b/security/hotssh/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-
${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
USE_GNOME= pygtk2 gnomedocutils libxslt glib20
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= 2.5+
INSTALLS_ICONS= yes
USE_BZIP2= yes
diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index efb7b0154092..0587b38ed69f 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -21,7 +21,7 @@ PREFIX= ${KDE_PREFIX}
USE_GMAKE= yes
USE_SQLITE= 3
USE_GNOME= pkgconfig
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool aclocal
diff --git a/security/kovpn/Makefile b/security/kovpn/Makefile
index 211eb1cab0f5..21d19c5246bc 100644
--- a/security/kovpn/Makefile
+++ b/security/kovpn/Makefile
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
USE_BZIP2= yes
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
USE_GMAKE= yes
USE_XORG= xpm
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 473468d3a310..84e994ca5d39 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -27,7 +27,7 @@ USE_PERL5_BUILD= yes
USE_LDCONFIG= yes
USE_CSTD= gnu99
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
+USES= gettext
CONFIGURE_ARGS?= --enable-shared --without-system-verto
CONFIGURE_ENV= INSTALL="${INSTALL}" YACC="${YACC}"
MAKE_ARGS= INSTALL="${INSTALL}"
diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile
index 80eecb04ee89..b591f55ffc59 100644
--- a/security/libgnome-keyring/Makefile
+++ b/security/libgnome-keyring/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= tasn1.5:${PORTSDIR}/security/libtasn1 \
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix ltverhack intlhack gconf2
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 884d1b6154c8..7f9f9f75335e 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -21,7 +21,7 @@ MAKE_JOBS_UNSAFE= yes
.if ${PORT_OPTIONS:MNLS}
USE_ICONV= yes
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
PLIST_SUB= NLS=""
diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index a6f0aac13c71..4d51458cf060 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp \
USE_GMAKE= yes
USE_AUTOTOOLS= libltdl
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
CONFIGURE_ARGS= --enable-gtk-doc=no
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 90b19ea316d1..a56240c21fa3 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -16,7 +16,7 @@ COMMENT= Replacement for crypt(1)
LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \
mhash.2:${PORTSDIR}/security/mhash
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lintl
diff --git a/security/openvas-server/Makefile b/security/openvas-server/Makefile
index d377b68f93cd..a3d7e8af0711 100644
--- a/security/openvas-server/Makefile
+++ b/security/openvas-server/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= openvas.2:${PORTSDIR}/security/openvas-libraries \
openvasnasl.2:${PORTSDIR}/security/openvas-libnasl
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_RC_SUBR= openvasd
MAN1= openvas-mkrand.1 openvas-mkcert-client.1 openvasd-config.1
diff --git a/security/p5-openxpki-i18n/Makefile b/security/p5-openxpki-i18n/Makefile
index 8cd89c4e3a2d..0ba456f1badf 100644
--- a/security/p5-openxpki-i18n/Makefile
+++ b/security/p5-openxpki-i18n/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= \
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= yes
-USE_GETTEXT= yes
+USES= gettext
### We can not go WITHOUT_NLS. Internationalization is needed
### even to use English language.
USE_GMAKE= yes
diff --git a/security/pam_krb5-rh/Makefile b/security/pam_krb5-rh/Makefile
index 64c447548a15..17415f7d7075 100644
--- a/security/pam_krb5-rh/Makefile
+++ b/security/pam_krb5-rh/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=--disable-nls
.else
PLIST_SUB+= NLS=""
LDFLAGS+= -lintl
-USE_GETTEXT= yes
+USES+= gettext
.endif
.include <bsd.port.pre.mk>
diff --git a/security/parano/Makefile b/security/parano/Makefile
index 42997ce7aa49..0c8d70009b19 100644
--- a/security/parano/Makefile
+++ b/security/parano/Makefile
@@ -16,7 +16,7 @@ COMMENT= A Gnome program to deal with hashfiles
USE_GNOME= pygnome2
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 22c5a05d393c..543077c62687 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= purple.10:${PORTSDIR}/net-im/libpurple \
USE_GMAKE= yes
USE_GNOME= gtk20
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
@@ -33,7 +33,7 @@ CONFIGURE_ARGS= --with-nspr-includes=${LOCALBASE}/include/nspr \
--with-nss-libs=${LOCALBASE}/lib/nss
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --with-libintl-prefix=${LOCALBASE}
PLIST_SUB+= NLS=""
.else
diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile
index 6fbf4b64c582..85197850f510 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -22,7 +22,7 @@ MAKE_JOBS_SAFE= yes
USE_GMAKE= yes
USE_GNOME= intltool
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index 83c0c7f8dfd9..86e59cde951c 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -34,7 +34,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/security/sssd/Makefile b/security/sssd/Makefile
index 78b4d061966a..2714f88ed35a 100644
--- a/security/sssd/Makefile
+++ b/security/sssd/Makefile
@@ -53,7 +53,7 @@ USE_PYTHON= yes
USE_OPENLDAP= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_PYTHON= yes
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index 14079b524b08..9692b3a66cc7 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5= yes
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 7333854e0e5b..a4aee72c1d6c 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --with-secure-path="${SUDO_SECURE_PATH}"
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
LDFLAGS+= -L${LOCALBASE}/lib -lintl
CFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
diff --git a/security/tpm-tools/Makefile b/security/tpm-tools/Makefile
index fd3aee652fb8..fee37ba49af6 100644
--- a/security/tpm-tools/Makefile
+++ b/security/tpm-tools/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/pkcs11/libopencryptoki.so:${PORTSDIR}/security/op
USE_GMAKE= YES
USE_ICONV= YES
-USE_GETTEXT= YES
+USES= gettext
USE_LDCONFIG= YES
USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= YES
diff --git a/security/w3af/Makefile b/security/w3af/Makefile
index be3797fc9915..7224a6943582 100644
--- a/security/w3af/Makefile
+++ b/security/w3af/Makefile
@@ -33,7 +33,7 @@ MAN1= halberd.1
MANCOMPRESSED= no
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
USE_PYTHON= yes
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index 29237183e057..8770f347af8e 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/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
PLIST_SUB+= NLS="@comment "
diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index 3842e510496d..12f175517261 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -15,7 +15,7 @@ USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= LIBS="${LDFLAGS}"
diff --git a/sysutils/apt/Makefile b/sysutils/apt/Makefile
index e2ae8d6c21fb..747d28718973 100644
--- a/sysutils/apt/Makefile
+++ b/sysutils/apt/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
USE_BDB= 44+
USE_LDCONFIG= yes
NO_FILTER_SHLIBS= yes
diff --git a/sysutils/battfink/Makefile b/sysutils/battfink/Makefile
index b5cf5f8eaa7b..d40070a66f50 100644
--- a/sysutils/battfink/Makefile
+++ b/sysutils/battfink/Makefile
@@ -20,7 +20,7 @@ USE_XORG= x11
INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/cog/Makefile b/sysutils/cog/Makefile
index 4e77fc04a165..5d8849e4b1b4 100644
--- a/sysutils/cog/Makefile
+++ b/sysutils/cog/Makefile
@@ -17,7 +17,7 @@ COMMENT= A program for editing advanced GNOME settings in an easy way
USE_XORG= x11
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 825d95d25643..55096b4a44d8 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -55,7 +55,7 @@ OPTIONS_DEFAULT=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/sysutils/dar/Makefile b/sysutils/dar/Makefile
index 2f072152167f..af73df2c2b9c 100644
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@@ -24,7 +24,7 @@ CPPFLAGS+= -DHAVE_DECL_GETOPT=0
MAN1= dar.1 dar_cp.1 dar_manager.1 dar_slave.1 dar_xform.1
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/dc3dd/Makefile b/sysutils/dc3dd/Makefile
index 891480060ff3..ce09ddded6d6 100644
--- a/sysutils/dc3dd/Makefile
+++ b/sysutils/dc3dd/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= nobutaka@FreeBSD.org
COMMENT= A dd program useful for computer forensics
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/di/Makefile b/sysutils/di/Makefile
index d5c2e403ed7f..238d80fab403 100644
--- a/sysutils/di/Makefile
+++ b/sysutils/di/Makefile
@@ -19,7 +19,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/sysutils/dircomp/Makefile b/sysutils/dircomp/Makefile
index 66b1e749bf68..1d61e9866ec8 100644
--- a/sysutils/dircomp/Makefile
+++ b/sysutils/dircomp/Makefile
@@ -23,7 +23,7 @@ MK_PATCH+= s/@MYSUBDIRS@/Common/g;
LIB_DEPENDS+= YGP.0:${PORTSDIR}/devel/libYGP
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --disable-rpath
PLIST_FILES+= bin/DirComp \
share/locale/de/LC_MESSAGES/DirComp.mo \
diff --git a/sysutils/dtc/Makefile b/sysutils/dtc/Makefile
index 41c55167e046..a70ad10e1d52 100644
--- a/sysutils/dtc/Makefile
+++ b/sysutils/dtc/Makefile
@@ -43,7 +43,7 @@ RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_log_sql.so:${PORTSDIR}/www/mod_log
CONFLICTS= dtc-toaster-[0-9]* dtc-postfix-courier-[0-9]*
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
diff --git a/sysutils/duff/Makefile b/sysutils/duff/Makefile
index e42c11500a71..0a39bfbe1915 100644
--- a/sysutils/duff/Makefile
+++ b/sysutils/duff/Makefile
@@ -25,7 +25,7 @@ PORTDOCS= README.SHA
.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/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 867badb2bdc7..3d70f2b262ea 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -32,7 +32,7 @@ SSH_DESC= Install SSH/SCP/SFTP backend
.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/sysutils/dvdisaster/Makefile b/sysutils/dvdisaster/Makefile
index 446a40d9fc4d..092ab103ae84 100644
--- a/sysutils/dvdisaster/Makefile
+++ b/sysutils/dvdisaster/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
MAKEFILE= GNUmakefile
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk20
CONFIGURE_ARGS= --prefix=${PREFIX} \
--docsubdir="/" \
diff --git a/sysutils/empower/Makefile b/sysutils/empower/Makefile
index fa8c7207bd77..5d427dedd2d0 100644
--- a/sysutils/empower/Makefile
+++ b/sysutils/empower/Makefile
@@ -25,7 +25,7 @@ USE_LDCONFIG= yes
.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/filelight/Makefile b/sysutils/filelight/Makefile
index 12c25b18fe44..74df9c153c94 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -14,7 +14,7 @@ USE_KDELIBS_VER=3
USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
post-patch:
@${REINPLACE_CMD} -e 's/-O2//g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index d1731b7570f0..ed07b8de2ffa 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -19,7 +19,7 @@ LICENSE= GPLv2
RUN_DEPENDS= cdlabelgen:${PORTSDIR}/print/cdlabelgen
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5_BUILD=yes
USE_GNOME= gtk12 gnomehier
USE_CDRTOOLS= yes
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 87db72c8aaea..2e02cc7ef560 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A gconf database editor for the GNOME 2 environment
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_GMAKE= yes
diff --git a/sysutils/gigolo/Makefile b/sysutils/gigolo/Makefile
index 07ab2215cdac..93f4e415b7f5 100644
--- a/sysutils/gigolo/Makefile
+++ b/sysutils/gigolo/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2= yes
USE_GNOME= gtk20 gvfs
USE_XORG= x11
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
MAN1= gigolo.1
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index da2f1a7fa862..fe49aad5dd3d 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -22,7 +22,7 @@ NO_LATEST_LINK= yes
USE_BZIP2= yes
USE_GNOME= imlib
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
INCLUDES= gkrellm.h gkrellm_public_proto.h
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 8d8628eeb3ac..bf0f473fef4e 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -31,7 +31,7 @@ GKRELLM_CLIENT_DESC= GKrellM Client
CONFLICTS= gkrellm-1.*
USE_GNOME= gtk20
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
.else
MAKE_ENV+= enable_nls=0
.endif
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 96cc3e7f63ec..9cb9359909a7 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GSTREAMER= good
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index 268fc0cf151f..80326da75a82 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/polkit-gnome.pc:${PORTSDIR}/sysutils
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gtk20
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-nautilus-extension
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index 2426f1e16bb3..a09877361e73 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -18,7 +18,7 @@ COMMENT= Displays the version of GNOME components installed
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui intlhack
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 7b720f31d12b..22e0c8219507 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= pkexec:${PORTSDIR}/sysutils/polkit
CONFLICTS= gnome-power-manager-3.[0-9]*
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
diff --git a/sysutils/gnome-schedule/Makefile b/sysutils/gnome-schedule/Makefile
index fe1b6d9915e7..a23e2f901f94 100644
--- a/sysutils/gnome-schedule/Makefile
+++ b/sysutils/gnome-schedule/Makefile
@@ -35,7 +35,7 @@ PLIST_SUB+= APPLET="@comment "
.endif
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 28d090a7f0c9..51737bee7a67 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc
CONFLICTS= gnome-system-monitor-3.[0-9]*
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_OMF= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index dd2d4f4cd1d7..3545f69828dc 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= oobs-1.5:${PORTSDIR}/devel/liboobs \
USE_BZIP2= yes
USE_GMAKE= yes
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomehack gnomeprefix intlhack nautilus2
diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index 6860caa93d2d..57e218c84cc3 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -22,7 +22,7 @@ USE_CDRTOOLS= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GSTREAMER= vorbis mp3 flac
INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 298b35d33981..16c0c58174f7 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -29,7 +29,7 @@ AUTOMAKE_ARGS+= --add-missing --include-deps --copy
ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= glib20
USE_LDCONFIG= yes
diff --git a/sysutils/isomaster/Makefile b/sysutils/isomaster/Makefile
index 9ec5eab139ff..2b7ef6758556 100644
--- a/sysutils/isomaster/Makefile
+++ b/sysutils/isomaster/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
USE_BZIP2= yes
USE_GNOME= desktopfileutils intlhack gnomehier gtk20
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
MAKE_ENV= DEFAULT_VIEWER="xdg-open" USE_SYSTEM_INIPARSER=1
MAKE_JOBS_SAFE= yes
diff --git a/sysutils/keep/Makefile b/sysutils/keep/Makefile
index 1fa6d823fce2..2d3cd766422b 100644
--- a/sysutils/keep/Makefile
+++ b/sysutils/keep/Makefile
@@ -21,6 +21,6 @@ USE_GMAKE= yes
USE_KDELIBS_VER=3
USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.mk>
diff --git a/sysutils/kleansweep/Makefile b/sysutils/kleansweep/Makefile
index 502c8496be5e..5a03f7e474b0 100644
--- a/sysutils/kleansweep/Makefile
+++ b/sysutils/kleansweep/Makefile
@@ -17,7 +17,7 @@ COMMENT= KleanSweep allows you to reclaim disk space by finding unneeded files
USE_BZIP2= yes
USE_GMAKE= yes
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
USE_KDELIBS_VER=3
post-extract:
diff --git a/sysutils/knutclient/Makefile b/sysutils/knutclient/Makefile
index e74913462e84..e533688d3403 100644
--- a/sysutils/knutclient/Makefile
+++ b/sysutils/knutclient/Makefile
@@ -19,7 +19,7 @@ MAKE_JOBS_UNSAFE= yes
CONFLICTS= knutclient-1.*
USE_KDELIBS_VER= 3
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_AUTOTOOLS= libtool automake:env aclocal:env
CONFIGURE_ARGS= --disable-fast-perl --enable-mt --program-transform-name=''
diff --git a/sysutils/komparator/Makefile b/sysutils/komparator/Makefile
index 2293cac749db..6de46f3a90b8 100644
--- a/sysutils/komparator/Makefile
+++ b/sysutils/komparator/Makefile
@@ -17,7 +17,7 @@ USE_KDELIBS_VER=3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
DOCSDIR= ${PREFIX}/share/doc/HTML/en/komparator
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index f3754ff2d0b2..1d3c81031c29 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -33,7 +33,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
.if ${PORT_OPTIONS:MGTK}
PKGNAMESUFFIX= -gtk2
USE_GNOME+= gtk20 libgnomeui
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --with-gtk
PLIST_SUB+= NLS=""
.else
diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile
index 60c77818743f..9afa427a6d93 100644
--- a/sysutils/ldap-account-manager/Makefile
+++ b/sysutils/ldap-account-manager/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS= p5-Quota>=0:${PORTSDIR}/sysutils/p5-Quota \
p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
NO_BUILD= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5= yes
USE_PHP= gettext hash iconv ldap mcrypt pcre session simplexml spl xml json zip
WANT_PHP_WEB= yes
diff --git a/sysutils/lxinput/Makefile b/sysutils/lxinput/Makefile
index 552c7d5a48c6..81c9aa15f309 100644
--- a/sysutils/lxinput/Makefile
+++ b/sysutils/lxinput/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX}
MAN1= lxinput.1
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/lxtask/Makefile b/sysutils/lxtask/Makefile
index 74d82fbd341d..f8c7a939ff67 100644
--- a/sysutils/lxtask/Makefile
+++ b/sysutils/lxtask/Makefile
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/lxterminal/Makefile b/sysutils/lxterminal/Makefile
index f50cc77fcecb..4494a41b40eb 100644
--- a/sysutils/lxterminal/Makefile
+++ b/sysutils/lxterminal/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX}
MAN1= lxterminal.1
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/mount.app/Makefile b/sysutils/mount.app/Makefile
index e14a2b1d6c35..56f3305834ba 100644
--- a/sysutils/mount.app/Makefile
+++ b/sysutils/mount.app/Makefile
@@ -16,7 +16,7 @@ COMMENT= Windowmaker application, Resembles wmmount with extra functionality
BUILD_DEPENDS= ${LOCALBASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk12 glib12
GNU_CONFIGURE= yes
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 04eff4638924..7b47b256de12 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
CONFIGURE_ARGS= --enable-gnome-mount
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack \
diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile
index 60bc5a9550b5..84f4117d2f42 100644
--- a/sysutils/nitrogen/Makefile
+++ b/sysutils/nitrogen/Makefile
@@ -33,7 +33,7 @@ RUN_DEPENDS= gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
OPTIONS_DEFINE= XINERAMA
OPTIONS_DEFAULT=XINERAMA
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_GNOME= gtk20
USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile
index a0ef72269ade..3a630f3011fb 100644
--- a/sysutils/pacman/Makefile
+++ b/sysutils/pacman/Makefile
@@ -64,7 +64,7 @@ CFLAGS+= -I${LOCALBASE}/include/gpgme
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index d9deab8a4a57..fd8fef34f402 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix intlhack pygnome2 pygnomedesktop
WANT_GNOME= yes
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/policykit-gnome/Makefile b/sysutils/policykit-gnome/Makefile
index e639eda30288..debea2217a68 100644
--- a/sysutils/policykit-gnome/Makefile
+++ b/sysutils/policykit-gnome/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack intlhack gnomedocutils gconf2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index 7e2c2385f6b3..7f17caafbc74 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= polkit-gobject-1:${PORTSDIR}/sysutils/polkit
USE_XZ= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack gnomeprefix gtk20 intlhack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile
index 6d439ec4ef2e..ee7b793925c3 100644
--- a/sysutils/progsreiserfs/Makefile
+++ b/sysutils/progsreiserfs/Makefile
@@ -25,7 +25,7 @@ EXTRA_PATCHES= ${FILESDIR}/extrapatch-progsreiserfs::libmisc::Makefile.in
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=--disable-nls
.else
-USE_GETTEXT= yes
+USES+= gettext
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
.endif
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index 682f5a69f93a..6758db8b533a 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -32,7 +32,7 @@ MAN1= killall.1 pstree.1
CONFIGURE_ARGS= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS= --enable-nls
PLIST_SUB+= NLS=""
.endif
diff --git a/sysutils/relaxconf/Makefile b/sysutils/relaxconf/Makefile
index d9f9988e0234..a5856776f741 100644
--- a/sysutils/relaxconf/Makefile
+++ b/sysutils/relaxconf/Makefile
@@ -25,7 +25,7 @@ PLIST_SUB+= NLS="@comment "
CONFIGURE_ARGS+=--disable-nls
.else
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.endif
.include <bsd.port.mk>
diff --git a/sysutils/sge62/Makefile b/sysutils/sge62/Makefile
index 7d62035b0c1b..4ffa4d4a45bd 100644
--- a/sysutils/sge62/Makefile
+++ b/sysutils/sge62/Makefile
@@ -30,7 +30,7 @@ CONFLICTS= sge-6.[013-9]* sge-5* sgeee-[0-9]* sge-0.*
NOT_FOR_ARCHS= powerpc
-USE_GETTEXT= yes
+USES+= gettext
USE_GMAKE= yes
USE_OPENSSL= yes
USE_LDCONFIG= ${SGE_ROOT}/lib/${SGE_ARCH}
diff --git a/sysutils/shmcat/Makefile b/sysutils/shmcat/Makefile
index 2c52b2c2353a..36b331732295 100644
--- a/sysutils/shmcat/Makefile
+++ b/sysutils/shmcat/Makefile
@@ -23,7 +23,7 @@ MAN1= shmcat.1 \
.if ${PORT_OPTIONS:MNLS}
MANLANG= "" de
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index 42546f31ba16..72e7f5e9cdc8 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -36,7 +36,7 @@ WANT_FAM_SYSTEM=gamin
INSTALLS_ICONS= yes
USE_GNOME= gnomehack gnomeprefix ltasneededhack intltool ltverhack
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
USE_GSTREAMER= core
INSTALLS_ICONS= yes
diff --git a/sysutils/uniutils/Makefile b/sysutils/uniutils/Makefile
index 76ae94f82d0f..faf13831d054 100644
--- a/sysutils/uniutils/Makefile
+++ b/sysutils/uniutils/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-lintl"
CPPFLAGS+= ${CFLAGS} -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-USE_GETTEXT= yes
+USES= gettext
TESTFILES= Test1.ann Test1.u Test2.ann Test2.u Test3.ann Test3.u \
Test4.ann Test4.u Test5.ann Test5.u
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index b3a023b006f6..4a916b6ee00b 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/d
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack ltverhack glib20
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 47a763b5693b..d95c29ab31c9 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -21,7 +21,7 @@ OPTIONS= GTK2 "Enable GTK2 support" on \
NONROOT "Use xcdroast w/o being root" off \
NLS "Native language support" on
-USE_GETTEXT= yes
+USES= gettext
USE_CDRTOOLS= yes
GNU_CONFIGURE= yes
WANT_GNOME= yes
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index c3cad50f63a4..7edf71243267 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -30,7 +30,7 @@ OPTIONS_DEFAULT= 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-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index fa2da92245fd..7bb681298b46 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -28,7 +28,7 @@ OPTIONS_DEFAULT= 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-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
index cc81cde43fe5..bf7116051064 100644
--- a/sysutils/xfce4-minicmd-plugin/Makefile
+++ b/sysutils/xfce4-minicmd-plugin/Makefile
@@ -17,7 +17,7 @@ COMMENT= Displays a mini-command line on the xfce4-panel
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20 intltool intlhack pkgconfig
USE_XFCE= libgui configenv panel
diff --git a/sysutils/xfce4-mount-plugin/Makefile b/sysutils/xfce4-mount-plugin/Makefile
index 1294769fa492..c2b2489fa405 100644
--- a/sysutils/xfce4-mount-plugin/Makefile
+++ b/sysutils/xfce4-mount-plugin/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intltool intlhack pkgconfig
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
USE_XFCE= configenv libmenu panel
diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index b03fd7683e77..a0c4578e19a7 100644
--- a/sysutils/xfce4-power-manager/Makefile
+++ b/sysutils/xfce4-power-manager/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libutil libgui panel
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index 8e2382ea176e..e926a84e5b2d 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+=--disable-libnotify
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index e3295b904046..09c367cc6e64 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -29,7 +29,7 @@ OPTIONS_DEFAULT= 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-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index 0af11a2ad2b0..5923ade74427 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -19,7 +19,7 @@ COMMENT= Displays various information about a WaveLAN device
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libutil libgui panel
diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 54d8619a2513..08dd64306ea7 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= rodrigc@FreeBSD.org
COMMENT= A set of utilities and library to manipulate an xfs filesystem
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= autoconf libtool:env
GNU_CONFIGURE= yes
CONFIGURE_ENV+= INSTALL="${INSTALL} ${_BINOWNGRP}" \
diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index 8e7568a79a78..cb1c410fe347 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS= --with-forced-embedded-ffmpeg # To be removed after ffmpeg-deve
USE_GMAKE= yes # To be removed after ffmpeg-devel's upgrade
USE_GNOME= glib20 libglade2
-USE_GETTEXT= yes
+USES= gettext
USE_XORG= x11 xmu
INSTALLS_OMF= yes
diff --git a/sysutils/yum/Makefile b/sysutils/yum/Makefile
index 6b2aab19343b..a8b6bc957217 100644
--- a/sysutils/yum/Makefile
+++ b/sysutils/yum/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/rpm:${PORTSDIR}/archivers/rpm4 \
USE_PYTHON= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
MAKE_ARGS= MAKE=${GMAKE} PYTHON=${PYTHON_CMD} \
prefix=${PREFIX} mandir=${MANPREFIX}/man sysconfdir=${PREFIX}/etc
diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile
index 23ae456887d8..28e43ab1aab9 100644
--- a/sysutils/zeitgeist/Makefile
+++ b/sysutils/zeitgeist/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_PYTHON= yes
FETCH_ARGS= -Fpr
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 50aeb4137667..275fc0fae7ec 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -36,7 +36,7 @@ SUB_LIST= VERINST=${VERINST}
.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/dwdiff/Makefile b/textproc/dwdiff/Makefile
index edff2c9be243..072df1fd35c6 100644
--- a/textproc/dwdiff/Makefile
+++ b/textproc/dwdiff/Makefile
@@ -30,7 +30,7 @@ PORTDOCS= COPYING Changelog README
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
MANLANG= "" nl nl.UTF-8
.else
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 6c5a9fcd9505..52d006bff392 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \
USE_BZIP2= yes
USE_GMAKE= yes
MAKE_JOBS_UNSAFE=yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehier gnomehack libxslt intlhack
USE_PYTHON= yes
INSTALLS_OMF= yes
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index dd1f90c97b4e..f9d9fe91c431 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/textproc/gnugrep/Makefile b/textproc/gnugrep/Makefile
index 17c4cb059bcc..f2ebbe7e9f27 100644
--- a/textproc/gnugrep/Makefile
+++ b/textproc/gnugrep/Makefile
@@ -32,7 +32,7 @@ OPTIONS_DEFINE= PCRE
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
LDFLAGS+= -lintl -L${LOCALBASE}/lib
PLIST_SUB+= NLS=
.else
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index a1d8f3bfabae..533d4bf36062 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20 intlhack
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/textproc/ibus-kmfl/Makefile b/textproc/ibus-kmfl/Makefile
index d6191bb663a0..4166cbbeecbd 100644
--- a/textproc/ibus-kmfl/Makefile
+++ b/textproc/ibus-kmfl/Makefile
@@ -29,7 +29,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/textproc/ibus-m17n/Makefile b/textproc/ibus-m17n/Makefile
index 47e4c003d737..e381a9b57642 100644
--- a/textproc/ibus-m17n/Makefile
+++ b/textproc/ibus-m17n/Makefile
@@ -25,7 +25,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/textproc/ibus-table/Makefile b/textproc/ibus-table/Makefile
index 2aceae2d5ab0..5929c741e68c 100644
--- a/textproc/ibus-table/Makefile
+++ b/textproc/ibus-table/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
PROJECTHOST= ibus
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 973476c62b98..fa261cfdaf60 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -51,7 +51,7 @@ CONFIGURE_ARGS+= --disable-iso-codes-check
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/textproc/libcue/Makefile b/textproc/libcue/Makefile
index aef4e805faa6..4d8bf71e6b77 100644
--- a/textproc/libcue/Makefile
+++ b/textproc/libcue/Makefile
@@ -17,7 +17,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
USE_BZIP2= yes
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
post-extract:
${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
diff --git a/textproc/m17n-contrib/Makefile b/textproc/m17n-contrib/Makefile
index 96d43235dd6a..a28981bbade4 100644
--- a/textproc/m17n-contrib/Makefile
+++ b/textproc/m17n-contrib/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/textproc/m17n-im-config/Makefile b/textproc/m17n-im-config/Makefile
index efe89390c17d..667665236a34 100644
--- a/textproc/m17n-im-config/Makefile
+++ b/textproc/m17n-im-config/Makefile
@@ -21,7 +21,7 @@ MAKE_JOBS_UNSAFE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gtk20 intltool intlhack pkgconfig glib20
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -33,7 +33,7 @@ DESKTOP_ENTRIES="M17N-IM Configuration" \
true
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 750685f292b3..80e2ac2d1f96 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -25,7 +25,7 @@ PYGNOMEDESKTOP_DESC= Code syntax highlighting (many dependencies)
.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/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index e8822f2334e0..9468f7edc20b 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= adns.1:${PORTSDIR}/dns/adns \
expat.6:${PORTSDIR}/textproc/expat2
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
+USES= gettext
# Please don't remove the comments, as soon as autoconf/libtool get's
# updated in the ports collection the comments may be removed.
diff --git a/textproc/msort/Makefile b/textproc/msort/Makefile
index 4139af8aec4c..892730d58539 100644
--- a/textproc/msort/Makefile
+++ b/textproc/msort/Makefile
@@ -26,7 +26,7 @@ MAKE_ENV+= INCLUDES="-I${LOCALBASE}/include"
GNU_CONFIGURE= yes
USE_TK_RUN= yes
USE_TCL_WRAPPER= yes
-USE_GETTEXT= yes
+USES= gettext
PLIST_FILES= bin/msg bin/msort
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 891b8058b435..f9ddf0aec66b 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -22,7 +22,7 @@ USE_GCC= any
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_PERL5= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog \
--datadir=${DATADIR}
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 118e9064595f..76dacdeb8105 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -29,7 +29,7 @@ CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile
index 90d979570b89..d704753cce33 100644
--- a/textproc/ots/Makefile
+++ b/textproc/ots/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_GNOME= glib20 libxml2
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/textproc/po4a/Makefile b/textproc/po4a/Makefile
index 37b10c84b8e2..2ecc7895c140 100644
--- a/textproc/po4a/Makefile
+++ b/textproc/po4a/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS= p5-Term-ReadKey>=2.30:${PORTSDIR}/devel/p5-Term-ReadKey \
jade>=0:${PORTSDIR}/textproc/jade
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5= yes
PERL_MODBUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-v0.40.1
diff --git a/textproc/pootle/Makefile b/textproc/pootle/Makefile
index 4c943b1da33e..2e313f741f96 100644
--- a/textproc/pootle/Makefile
+++ b/textproc/pootle/Makefile
@@ -25,7 +25,7 @@ CONFLICTS= ${PYTHON_PKGNAMEPREFIX}django-profiles-[0-9]* \
${PYTHON_PKGNAMEPREFIX}django-registration-[0-9]*
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS=yes
PYDISTUTILS_PKGNAME= Pootle
diff --git a/textproc/rotix/Makefile b/textproc/rotix/Makefile
index f11fcedb71b6..253d45344bf2 100644
--- a/textproc/rotix/Makefile
+++ b/textproc/rotix/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/${DISTNAME
MAINTAINER= lintux@debian.org
COMMENT= A program to generate rotational obfuscations
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --i18n=1
diff --git a/textproc/scim-bridge-qt4/Makefile b/textproc/scim-bridge-qt4/Makefile
index 1c5c697e1b06..9adafadf7719 100644
--- a/textproc/scim-bridge-qt4/Makefile
+++ b/textproc/scim-bridge-qt4/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= scim-bridge:${PORTSDIR}/textproc/scim-bridge
USE_QT4= corelib gui moc_build
QT_NONSTANDARD= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
LICENSE= GPLv2 LGPL21
diff --git a/textproc/scim-bridge/Makefile b/textproc/scim-bridge/Makefile
index dcbb28812bc6..edb44132515a 100644
--- a/textproc/scim-bridge/Makefile
+++ b/textproc/scim-bridge/Makefile
@@ -17,7 +17,7 @@ COMMENT= Scim-bridge agent (server)
LIB_DEPENDS= scim-1.0.10:${PORTSDIR}/textproc/scim
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
LICENSE= GPLv2 LGPL21
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index 0ba474a6c5f8..809021f21b6f 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -33,7 +33,7 @@ DESKTOP_ENTRIES="SCIM Input Pad" \
DOCS= ChangeLog README
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
USE_GNOME= intlhack
PLIST_SUB+= NLS=""
.else
diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile
index a70581d369e0..408253bb491e 100644
--- a/textproc/scim-kmfl-imengine/Makefile
+++ b/textproc/scim-kmfl-imengine/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS= kmflcomp:${PORTSDIR}/textproc/kmflcomp \
USE_XORG= x11 xkbfile xproto
USE_AUTOTOOLS= libtool
USE_GNOME= glib20 gtk20 intlhack
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 30c4a1ae7c64..b322f2fc756c 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -22,7 +22,7 @@ USE_AUTOTOOLS= libtool
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= intlhack
-USE_GETTEXT= yes
+USES= gettext
MAN1= scim-make-table.1
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index a21d1b773d14..09e954561c81 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -22,7 +22,7 @@ USE_ICONV= yes
USE_GMAKE= yes
USE_XORG= x11 xpm
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/textproc/spellutils/Makefile b/textproc/spellutils/Makefile
index 36440b87c5a8..0b946580643d 100644
--- a/textproc/spellutils/Makefile
+++ b/textproc/spellutils/Makefile
@@ -17,7 +17,7 @@ COMMENT= Programs used to isolate some parts or texts before spell-checking
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
CONFIGURE_ENV= LIBS='-L${LOCALBASE}/lib'
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -lintl
diff --git a/textproc/stardict2/Makefile b/textproc/stardict2/Makefile
index ec6f62818bc5..94066e8429ed 100644
--- a/textproc/stardict2/Makefile
+++ b/textproc/stardict2/Makefile
@@ -17,7 +17,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
USE_GMAKE= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_SAFE= yes
LATEST_LINK= stardict2
diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile
index c952f745ff5b..80e288409fb3 100644
--- a/textproc/stardict3/Makefile
+++ b/textproc/stardict3/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS= --disable-festival \
USE_GMAKE= yes
USE_BZIP2= yes
USE_GNOME= gnomehack
-USE_GETTEXT= yes
+USES= gettext
MAKE_JOBS_SAFE= yes
CONFIGURE_WRKSRC= ${WRKSRC}/dict
BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile
index b5e46d13706a..111325b42298 100644
--- a/textproc/texi2html/Makefile
+++ b/textproc/texi2html/Makefile
@@ -38,7 +38,7 @@ INFO= texi2html
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls --enable-translations
PLIST_SUB+= NLS=""
.else
diff --git a/textproc/translate-toolkit/Makefile b/textproc/translate-toolkit/Makefile
index d42314798ab6..9db7d1202967 100644
--- a/textproc/translate-toolkit/Makefile
+++ b/textproc/translate-toolkit/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
# Can use psyco (on i386)
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= 2.5+
USE_PYDISTUTILS= yes
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 1c1c046ebbee..d6869fc5e85b 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -22,7 +22,7 @@ WANT_GNOME= yes
USE_GNOME+= glib20 intltool
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
+USES= gettext
USE_ICONV= yes
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile
index 42d171acbaab..44fd891955c7 100644
--- a/textproc/wdiff/Makefile
+++ b/textproc/wdiff/Makefile
@@ -22,7 +22,7 @@ MAN1= wdiff.1
INFO= wdiff
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
CFLAGS+= -I${LOCALBASE}/include
PLIST_SUB+= NLS=""
.else
diff --git a/textproc/xfce4-dict-plugin/Makefile b/textproc/xfce4-dict-plugin/Makefile
index 69e956a7ca78..81771e1161e1 100644
--- a/textproc/xfce4-dict-plugin/Makefile
+++ b/textproc/xfce4-dict-plugin/Makefile
@@ -20,7 +20,7 @@ COMMENT= Xfce Plugin for searching for the translation or explanation of a word
USE_BZIP2= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20 intltool intlhack pkgconfig desktopfileutils
USE_XFCE= configenv libgui libutil panel
diff --git a/www/aria/Makefile b/www/aria/Makefile
index e97325e9e468..70dfd06eb881 100644
--- a/www/aria/Makefile
+++ b/www/aria/Makefile
@@ -19,7 +19,7 @@ BROKEN= fails to build
USE_BZIP2= yes
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/www/awffull/Makefile b/www/awffull/Makefile
index 6611446c41f0..f779590d3c91 100644
--- a/www/awffull/Makefile
+++ b/www/awffull/Makefile
@@ -24,7 +24,7 @@ FONTLABEL?= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
OPTIONS_DEFINE= GEOIP
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-font-default=${FONTDEFAULT} \
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 8ab983662bb5..2060fd6c038a 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -52,7 +52,7 @@ post-install:
.if !defined(WITHOUT_NLS)
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
--with-libintl-prefix=${LOCALBASE}
LANGS=en@quot es it
diff --git a/www/cakephp12/Makefile b/www/cakephp12/Makefile
index fb2de643f780..dd35ccb63986 100644
--- a/www/cakephp12/Makefile
+++ b/www/cakephp12/Makefile
@@ -24,7 +24,7 @@ SLAVE_PORT_MODULES= REWRITE
CONFLICTS= cakephp-1.[13].*
NO_BUILD= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PHP= session
WANT_PHP_WEB= yes
DEFAULT_PHP_VER=5
diff --git a/www/cakephp13/Makefile b/www/cakephp13/Makefile
index 57e90a182d6b..faf7da4ed124 100644
--- a/www/cakephp13/Makefile
+++ b/www/cakephp13/Makefile
@@ -26,7 +26,7 @@ SLAVE_PORT_MODULES= REWRITE
CONFLICTS= cakephp-1.[12].* cakephp-2.*
NO_BUILD= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PHP= session
WANT_PHP_WEB= yes
DEFAULT_PHP_VER=5
diff --git a/www/cakephp21/Makefile b/www/cakephp21/Makefile
index 7d5337b41c62..72209a3645c7 100644
--- a/www/cakephp21/Makefile
+++ b/www/cakephp21/Makefile
@@ -25,7 +25,7 @@ SLAVE_PORT_MODULES= REWRITE
CONFLICTS= cakephp-1.* cakephp-2.2.*
NO_BUILD= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PHP= ctype session
WANT_PHP_WEB= yes
DEFAULT_PHP_VER=5
diff --git a/www/cakephp22/Makefile b/www/cakephp22/Makefile
index e7c0f986512d..1a26a5a80cfa 100644
--- a/www/cakephp22/Makefile
+++ b/www/cakephp22/Makefile
@@ -21,7 +21,7 @@ SLAVE_PORT_MODULES= REWRITE
CONFLICTS= cakephp-1.* cakephp-2.1.*
NO_BUILD= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PHP= ctype session
WANT_PHP_WEB= yes
DEFAULT_PHP_VER=5
diff --git a/www/diamanda/Makefile b/www/diamanda/Makefile
index 7a348b971cc5..af1bdd957429 100644
--- a/www/diamanda/Makefile
+++ b/www/diamanda/Makefile
@@ -27,7 +27,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BZIP2= yes
NO_BUILD= yes
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
SUB_FILES= pkg-message
.include <bsd.port.pre.mk>
diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile
index 86a3f4a99343..317f7e3560bd 100644
--- a/www/dillo-i18n/Makefile
+++ b/www/dillo-i18n/Makefile
@@ -43,7 +43,7 @@ CONFIGURE_ARGS= --enable-cookies --enable-threaded-dns \
CONFLICTS= dillo-[0-9].[0-9].[0-9]*
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB= NLS=""
CONFIGURE_ARGS+= --enable-nls
.else
diff --git a/www/elgg/Makefile b/www/elgg/Makefile
index 27e634acabba..0e20ad784766 100644
--- a/www/elgg/Makefile
+++ b/www/elgg/Makefile
@@ -16,7 +16,7 @@ COMMENT= Blogging and social networking platform
LICENSE= GPLv2
USE_PHP= mysql gd json soap dom xml
-USE_GETTEXT= yes
+USES= gettext
USE_ZIP= yes
NO_BUILD= yes
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index ad797c34aaf6..15981a7e8286 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany
CONFLICTS= epiphany-extensions-3.[0-9]*
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
USE_GNOME= gnomeprefix gnomehack intlhack
INSTALLS_OMF= yes
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 1d3dcdffad32..d869476eef83 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -18,7 +18,7 @@ COMMENT= Webcal(endar) handler for gnome
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5= yes
USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver libgnomeui
GNU_CONFIGURE= yes
diff --git a/www/gallery/Makefile b/www/gallery/Makefile
index ce7e07f830df..45d158821e37 100644
--- a/www/gallery/Makefile
+++ b/www/gallery/Makefile
@@ -21,7 +21,7 @@ WANT_PHP_WEB= yes
.if !defined(WITHOUT_NLS)
USE_PHP+= gettext
-USE_GETTEXT= yes # Pet portlint
+USES+= gettext
LANGPACKS= af_ZA-1.5.2${EXTRACT_SUFX} \
ar_EG-1.5.1-cvs${EXTRACT_SUFX} \
diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index f1fefe652c04..8fcd4fe4c7fa 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -43,7 +43,7 @@ RUN_DEPENDS+= pngtogd:${PORTSDIR}/graphics/gd
.if ${PORT_OPTIONS:MNLS}
USE_PHP+= gettext
-USE_GETTEXT= yes # Pet portlint
+USES+= gettext
.endif
.if ${PORT_OPTIONS:MNETPBM}
diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index e78201608827..618ba76d0368 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -67,7 +67,7 @@ RUN_DEPENDS+= giftopnm:${PORTSDIR}/graphics/netpbm
.if ${PORT_OPTIONS:MNLS}
USE_PHP+= gettext
-USE_GETTEXT= yes # Pet portlint
+USES+= gettext
.endif
.if ${PORT_OPTIONS:MUNZIP}
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 034e1b88a1ff..3cf2cc7bbf25 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_dnssd.so:${PORTSDIR}/www/mod_dnssd
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_APACHE= 22
USE_XORG= sm
USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils nautilus2
diff --git a/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile
index bc2a64f262d0..fe2c815728ea 100644
--- a/www/gnome-web-photo/Makefile
+++ b/www/gnome-web-photo/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
USE_XZ= yes
USE_GNOME= gconf2 gnomehack gnomeprefix
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-silent-rules \
diff --git a/www/google-appengine/Makefile b/www/google-appengine/Makefile
index f875f98c4ad5..358823780930 100644
--- a/www/google-appengine/Makefile
+++ b/www/google-appengine/Makefile
@@ -22,7 +22,7 @@ PROJECTHOST= googleappengine
USE_PYTHON= 2.7
USE_ZIP= yes
-USE_GETTEXT= yes
+USES= gettext
OPTIONS_DEFINE= EXAMPLES MYSQL
OPTIONS_DEFAULT= MYSQL
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 3ac74e2fb805..b565f1505f5f 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup \
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
USE_XORG= xinerama xi xrandr xcursor xcomposite xdamage
USE_GMAKE= yes
diff --git a/www/horde3-ansel/Makefile b/www/horde3-ansel/Makefile
index bfe73227d9ae..f9209923da05 100644
--- a/www/horde3-ansel/Makefile
+++ b/www/horde3-ansel/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Image gallery
USE_HORDE= base pkg-message
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= CHANGES CREDITS TODO README
.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/www/horde3-base/Makefile b/www/horde3-base/Makefile
index 183fd064696e..fd0166d92401 100644
--- a/www/horde3-base/Makefile
+++ b/www/horde3-base/Makefile
@@ -79,7 +79,7 @@ RUN_DEPENDS+= ${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \
${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP \
${PEARDIR}/MDB2/Schema/Validate.php:${PORTSDIR}/databases/pear-MDB2_Schema
-USE_GETTEXT= yes
+USES= gettext
USE_PHP= ctype gettext session
.if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
diff --git a/www/horde3-passwd/Makefile b/www/horde3-passwd/Makefile
index afd85398253a..7a09f01bf72e 100644
--- a/www/horde3-passwd/Makefile
+++ b/www/horde3-passwd/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Password changing module
USE_HORDE= base
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL RELEASE_NOTES TODO
.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/www/horde3-trean/Makefile b/www/horde3-trean/Makefile
index 233902a52cf0..41164173546f 100644
--- a/www/horde3-trean/Makefile
+++ b/www/horde3-trean/Makefile
@@ -17,7 +17,7 @@ COMMENT= Bookmark manager
USE_HORDE= base pkg-message
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= CHANGES CREDITS INSTALL TODO README
.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
diff --git a/www/horde3-wicked/Makefile b/www/horde3-wicked/Makefile
index a393679a194f..e1f1954c4bcc 100644
--- a/www/horde3-wicked/Makefile
+++ b/www/horde3-wicked/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Wiki module for Horde
USE_HORDE= base pkg-message
-USE_GETTEXT= yes
+USES= gettext
PORTDOCS= README CHANGES CREDITS INSTALL TODO
BUILD_DEPENDS+= ${PEARDIR}/Text/Wiki.php:${PORTSDIR}/www/pear-Text_Wiki
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 40b6abd26902..598532415035 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -38,7 +38,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
LICENSE= GPLv2
PERL_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
OPTIONS= PO4A "Install translated underlays" On \
SEARCH "Install search backend" On \
diff --git a/www/libepc/Makefile b/www/libepc/Makefile
index b1648f6590b9..8977fcb8985c 100644
--- a/www/libepc/Makefile
+++ b/www/libepc/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomeprefix gnomehack gtk20
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index f41d078779ea..817cbd86e3a9 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -90,7 +90,7 @@ USE_APACHE_RUN= 22
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/www/llgal/Makefile b/www/llgal/Makefile
index 924ac08cb46e..2491281dfc76 100644
--- a/www/llgal/Makefile
+++ b/www/llgal/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS= p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
USE_BZIP2= yes
USE_PERL5= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
MAN1= llgal.1
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 7eb3c10c3ffa..399d21573c46 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -52,7 +52,7 @@ L_DOC= ${PREFIX}/share/doc/lynx
L_HELP= ${PREFIX}/share/lynx_help
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CONFIGURE_ARGS+= --enable-nls
.else
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index d9720e8d2382..675fe98ce257 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -34,7 +34,7 @@ DEFAULT_COLORS_DESC= Colors support
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS='@comment '
.else
-USE_GETTEXT= yes
+USES+= gettext
USE_ICONV= yes
CONFIGURE_ARGS+=--enable-nls --with-libiconv-prefix="${LOCALBASE}"
PLIST_SUB+= NLS=''
diff --git a/www/neon29/Makefile b/www/neon29/Makefile
index 4a577fa7754b..a6e153e55b1f 100644
--- a/www/neon29/Makefile
+++ b/www/neon29/Makefile
@@ -58,7 +58,7 @@ USE_OPENSSL= yes
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/www/newsbeuter/Makefile b/www/newsbeuter/Makefile
index 269398c2ec91..e090c461435c 100644
--- a/www/newsbeuter/Makefile
+++ b/www/newsbeuter/Makefile
@@ -18,7 +18,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PERL5_BUILD=yes
USE_SQLITE= yes
USE_GNOME= libxml2
diff --git a/www/nscache/Makefile b/www/nscache/Makefile
index d36db55014c2..39b7a20ae010 100644
--- a/www/nscache/Makefile
+++ b/www/nscache/Makefile
@@ -20,7 +20,7 @@ COMMENT= Netscape cache browser
USE_GNOME= gnomehier gtk12
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gtk-config=${GTK_CONFIG} --disable-gnome
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/www/pivotx/Makefile b/www/pivotx/Makefile
index b8d5df28e327..4fc7c084bbe2 100644
--- a/www/pivotx/Makefile
+++ b/www/pivotx/Makefile
@@ -30,7 +30,7 @@ PHPDOM_DESC= Use PHP:DOM instead of SimpleXML
WANT_PHP_WEB= yes
USE_PHP= session gettext xml tokenizer gd pcre
-USE_GETTEXT= yes
+USES+= gettext
.if ${PORT_OPTIONS:MPHPDOM}
USE_PHP+= dom
diff --git a/www/py-django-devel/Makefile b/www/py-django-devel/Makefile
index a17eee487a42..e74533a16556 100644
--- a/www/py-django-devel/Makefile
+++ b/www/py-django-devel/Makefile
@@ -20,7 +20,7 @@ LICENSE= BSD
SNAPSHOTDATE= 20130106
USE_XZ= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/www/py-django-mezzanine-filebrowser/Makefile b/www/py-django-mezzanine-filebrowser/Makefile
index 7e039c5f76d7..0c4f0efced22 100644
--- a/www/py-django-mezzanine-filebrowser/Makefile
+++ b/www/py-django-mezzanine-filebrowser/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= koobs@FreeBSD.org
COMMENT= Fork of django-filebrowser for Mezzanine CMS
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYDISTUTILS= easy_install
PYDISTUTILS_PKGNAME= filebrowser_safe
diff --git a/www/py-django-mezzanine-grappelli/Makefile b/www/py-django-mezzanine-grappelli/Makefile
index 5393f2879d9a..0f302264ef1b 100644
--- a/www/py-django-mezzanine-grappelli/Makefile
+++ b/www/py-django-mezzanine-grappelli/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= koobs@FreeBSD.org
COMMENT= Fork of django-grappelli for Mezzanine CMS
USE_PYTHON= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYDISTUTILS= easy_install
PYDISTUTILS_PKGNAME= grappelli_safe
diff --git a/www/py-django-mptt/Makefile b/www/py-django-mptt/Makefile
index 10eb560e9e0b..f7818b502eec 100644
--- a/www/py-django-mptt/Makefile
+++ b/www/py-django-mptt/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-
GITVERSION= 4310e7e
FETCH_ARGS= -Fpr
-USE_GETTEXT= yes
+USES= gettext
USE_PYDISTUTILS= yes
USE_PYTHON= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-${GITVERSION}
diff --git a/www/py-django-registration/Makefile b/www/py-django-registration/Makefile
index 13c2256753c5..0431e52e68fa 100644
--- a/www/py-django-registration/Makefile
+++ b/www/py-django-registration/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.3:${PORTSDIR}/www/py-django
USE_PYTHON= yes
USE_PYDISTUTILS= yes
-USE_GETTEXT= yes
+USES= gettext
CONFLICTS_INSTALL= pootle-*
diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index b66e120329b1..0e158e6da770 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -15,7 +15,7 @@ COMMENT= High-level Python Web framework
LICENSE= BSD
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= Django
diff --git a/www/py-django13/Makefile b/www/py-django13/Makefile
index 3570a49c4601..545526eb02e4 100644
--- a/www/py-django13/Makefile
+++ b/www/py-django13/Makefile
@@ -20,7 +20,7 @@ LICENSE= BSD
LATEST_LINK= ${PYTHON_PKGNAMEPREFIX}django13
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= -2.7
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= Django
diff --git a/www/py-django14/Makefile b/www/py-django14/Makefile
index 8f6302f3536d..f0a703becb9b 100644
--- a/www/py-django14/Makefile
+++ b/www/py-django14/Makefile
@@ -17,7 +17,7 @@ LICENSE= BSD
LATEST_LINK= ${PYTHON_PKGNAMEPREFIX}django14
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= -2.7
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= Django
diff --git a/www/py-formencode/Makefile b/www/py-formencode/Makefile
index 7d6052002633..22863631ebd3 100644
--- a/www/py-formencode/Makefile
+++ b/www/py-formencode/Makefile
@@ -17,7 +17,7 @@ COMMENT= HTML form validation, generation, and conversion package
USE_PYTHON= -2.7
USE_PYDISTUTILS= easy_install
-USE_GETTEXT= yes
+USES= gettext
PYDISTUTILS_PKGNAME= FormEncode
diff --git a/www/py-nevow/Makefile b/www/py-nevow/Makefile
index f80ef88962b0..1dac25a7b7bd 100644
--- a/www/py-nevow/Makefile
+++ b/www/py-nevow/Makefile
@@ -20,7 +20,7 @@ COMMENT= A web application templating system, based on the Twisted Woven
USE_PYTHON= yes
USE_PYDISTUTILS= easy_install
USE_TWISTED= web
-USE_GETTEXT= yes
+USES= gettext
PYDISTUTILS_PKGNAME= Nevow
SUB_FILES= pkg-message
diff --git a/www/py-prewikka/Makefile b/www/py-prewikka/Makefile
index 9cd87dc6e137..dd5951fae96d 100644
--- a/www/py-prewikka/Makefile
+++ b/www/py-prewikka/Makefile
@@ -20,7 +20,7 @@ USE_PYDISTUTILS= yes
.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/www/py-satchmo/Makefile b/www/py-satchmo/Makefile
index 16daf5725a59..9c5ed34ff584 100644
--- a/www/py-satchmo/Makefile
+++ b/www/py-satchmo/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.2.3:${PORTSDIR}/www/py-django \
${PYTHON_PKGNAMEPREFIX}django-signals-ahoy>=0:${PORTSDIR}/www/py-django-signals-ahoy \
${PYTHON_PKGNAMEPREFIX}django-threaded-multihost>=0:${PORTSDIR}/www/py-django-threaded-multihost
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS= easy_install
PYEASYINSTALL_EGG= Satchmo-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg
diff --git a/www/py-turbogears/Makefile b/www/py-turbogears/Makefile
index 47a122755597..a0131d2bc4a4 100644
--- a/www/py-turbogears/Makefile
+++ b/www/py-turbogears/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.1.2:${PORTSDIR}/www/py-cherrypy
${PYTHON_PKGNAMEPREFIX}Genshi>=0.4.4:${PORTSDIR}/textproc/py-genshi \
${PYTHON_PKGNAMEPREFIX}TGScheduler>0:${PORTSDIR}/devel/py-TGScheduler
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= -2.7
USE_PYDISTUTILS= easy_install
diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index 7a8c2545f814..bb169fd0956f 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.2.6c
MAINTAINER= ports@FreeBSD.org
COMMENT= An interactive, multi-threaded web browser for text terminals
-USE_GETTEXT= yes
+USES= gettext
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --path-archprefix=${PREFIX} --path-prefix=${PREFIX} \
--enable-i18n --enable-local-cgi --enable-ipv6
diff --git a/www/roundup/Makefile b/www/roundup/Makefile
index 72ab483f3b06..f2305b1eb81c 100644
--- a/www/roundup/Makefile
+++ b/www/roundup/Makefile
@@ -11,7 +11,7 @@ COMMENT= Issue-Tracking System for Knowledge Workers
LICENSE= PSFL
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS=yes
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index fd3bdea02029..1cdc2d6578c9 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
LIBS+= -lintl
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index 06919ac70024..4781ecd632fd 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -22,7 +22,7 @@ OPML_DESC= Outline Processor Markup Support
.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/www/w3m/Makefile b/www/w3m/Makefile
index f453164c10c3..fd84afa9c97f 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -47,7 +47,7 @@ PLIST_SUB+= M17N="@comment "
.endif
.if ${PORT_OPTIONS:MJAPANESE}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-m17n --enable-japanese=E --with-migemo=yes gt_cv_func_gnugettext1_libintl=yes
DOCS_JP= ${DOCS} README.SSL README.cookie README.keymap README.mailcap \
README.menu README.migemo
diff --git a/www/wml/Makefile b/www/wml/Makefile
index b5fb829338a7..52b6190c6a45 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -31,7 +31,7 @@ BUILD_DEPENDS= lynx:${PORTSDIR}/www/lynx \
USE_PERL5= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
CONFIGURE_ARGS= --with-perl=${PERL5} --with-catdir=man \
--prefix=${PREFIX}
diff --git a/www/zend-framework/Makefile b/www/zend-framework/Makefile
index c67cd1edadd7..8696bc6ff2e2 100644
--- a/www/zend-framework/Makefile
+++ b/www/zend-framework/Makefile
@@ -17,7 +17,7 @@ COMMENT= A framework for developing PHP web applications
NO_BUILD= yes
USE_PHP= spl
WANT_PHP_WEB= yes
-USE_GETTEXT= yes
+USES= gettext
LICENSE= BSD
diff --git a/x11-clocks/alarm-clock/Makefile b/x11-clocks/alarm-clock/Makefile
index f98245515900..bc71deb0614f 100644
--- a/x11-clocks/alarm-clock/Makefile
+++ b/x11-clocks/alarm-clock/Makefile
@@ -19,13 +19,13 @@ LIB_DEPENDS= unique-1:${PORTSDIR}/x11-toolkits/unique \
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GSTREAMER= yes
USE_GNOME= gnomehack gtk20
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/x11-clocks/cairo-clock/Makefile b/x11-clocks/cairo-clock/Makefile
index 6bf52f990faa..4bb58c8af099 100644
--- a/x11-clocks/cairo-clock/Makefile
+++ b/x11-clocks/cairo-clock/Makefile
@@ -22,7 +22,7 @@ USE_LDCONFIG= yes
MAN1= cairo-clock.1
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11-clocks/xfce4-timer-out-plugin/Makefile b/x11-clocks/xfce4-timer-out-plugin/Makefile
index 54107c54b813..1c6a3ab6b26c 100644
--- a/x11-clocks/xfce4-timer-out-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-out-plugin/Makefile
@@ -19,7 +19,7 @@ COMMENT= A timer out plugin for Xfce
USE_BZIP2= yes
USE_GMAKE= yes
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libmenu libutil panel
diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index b9aed29eda35..b26078b3a573 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -58,7 +58,7 @@ PLIST_SUB+= TRACKER="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
INSTALL_TARGET+=install_i18n
PLIST_SUB+= NLS=""
.else
diff --git a/x11-fm/gentoo/Makefile b/x11-fm/gentoo/Makefile
index 76a7c90075e3..91a9cba08aea 100644
--- a/x11-fm/gentoo/Makefile
+++ b/x11-fm/gentoo/Makefile
@@ -14,7 +14,7 @@ COMMENT= Gtk+ based, file manager inspired by DirectoryOpus
OPTIONS_DEFINE= FAM DOCS
USE_GNOME= gnomehack gtk20
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= MKDIR_P="${MKDIR}"
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index a36e115149fc..2556775cc420 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -41,7 +41,7 @@ pre-configure:
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/x11-fm/gprename/Makefile b/x11-fm/gprename/Makefile
index 7e488b53d8d1..ea08d519d44d 100644
--- a/x11-fm/gprename/Makefile
+++ b/x11-fm/gprename/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}/trunk
USE_BZIP2= yes
USE_PERL5_RUN= yes
-USE_GETTEXT= yes
+USES= gettext
NO_BUILD= yes
MAN1= gprename.1
diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile
index 8802b304c550..da448f9b3b31 100644
--- a/x11-fm/krusader/Makefile
+++ b/x11-fm/krusader/Makefile
@@ -17,7 +17,7 @@ COMMENT= A two window file-manager for KDE, like midnight or norton commander
USE_KDELIBS_VER=3
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
PORTSCOUT= ignore:1
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index d081c4407af9..ca148e9c3b9e 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= nautilus-3.[0-9]*
INSTALLS_ICONS= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \
librsvg2 desktopfileutils ltverhack gvfs ltasneededhack
USE_LDCONFIG= yes
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 0f449f5c9592..4a291289a93b 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -28,7 +28,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-fm/rodent/Makefile b/x11-fm/rodent/Makefile
index 58c1ce304a4e..8b27a81ad371 100644
--- a/x11-fm/rodent/Makefile
+++ b/x11-fm/rodent/Makefile
@@ -36,7 +36,7 @@ PORTDOCS= *
MAN1= fgr.1
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile
index b0877cbe4652..5b82331585dd 100644
--- a/x11-fm/xfe/Makefile
+++ b/x11-fm/xfe/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
USE_XORG= xft
USE_GNOME= gnomehack intltool
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index a1a44a62eaa2..cc40b0328fd2 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_XORG= x11 xext xt
CONFIGURE_ARGS+=--with-pty=BSD --with-libintl-prefix=${LOCALBASE}
diff --git a/x11-fonts/fntsample/Makefile b/x11-fonts/fntsample/Makefile
index 675802317e6c..68b987924db0 100644
--- a/x11-fonts/fntsample/Makefile
+++ b/x11-fonts/fntsample/Makefile
@@ -34,7 +34,7 @@ BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk
RUN_DEPENDS= pdfoutline:${PORTSDIR}/textproc/pdfoutline
USE_GNOME= pango
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-silent-rules \
--with-unicode-blocks=${WRKSRC}/Blocks.txt
diff --git a/x11-fonts/font-manager/Makefile b/x11-fonts/font-manager/Makefile
index 0f604bcbb32a..bc9b3024065e 100644
--- a/x11-fonts/font-manager/Makefile
+++ b/x11-fonts/font-manager/Makefile
@@ -34,7 +34,7 @@ IGNORE= port data is source code, undefine NOPORTDATA
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-fonts/gbdfed/Makefile b/x11-fonts/gbdfed/Makefile
index b0999d219c18..81d9cb24f64a 100644
--- a/x11-fonts/gbdfed/Makefile
+++ b/x11-fonts/gbdfed/Makefile
@@ -16,7 +16,7 @@ COMMENT= A GTK2 bitmap font editor
LICENSE= MIT
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gtk20 pkgconfig
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile
index 1a23d014e77b..44ddf56024dc 100644
--- a/x11-themes/gnome-backgrounds/Makefile
+++ b/x11-themes/gnome-backgrounds/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A collection of backgrounds for GNOME 2
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack
diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index 151572aa9f35..6579a36589fc 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= gtk-engines2>=2.11.0:${PORTSDIR}/x11-themes/gtk-engines2 \
RUN_DEPENDS= gtk-engines2>=2.11.0:${PORTSDIR}/x11-themes/gtk-engines2
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui intlhack
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 2e551f1b4089..b8f9d70f8d7e 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= gtk-engines2>=2.15.0:${PORTSDIR}/x11-themes/gtk-engines2
CONFLICTS= clearlooks-metacity-0.*
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
USE_GMAKE= yes
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 56a476bc1f93..53855b25d708 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= gtk-smooth-engine-[0-9]* clearlooks-[0-9]*
USE_GMAKE= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gtk20 intlhack ltasneededhack
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-themes/kde-style-polyester/Makefile b/x11-themes/kde-style-polyester/Makefile
index 5038c4e71127..2eee546a72bf 100644
--- a/x11-themes/kde-style-polyester/Makefile
+++ b/x11-themes/kde-style-polyester/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_KDEBASE_VER=3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
+USES= gettext
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/x11-themes/lxappearance/Makefile b/x11-themes/lxappearance/Makefile
index 6744c8339156..784a99e4ee1b 100644
--- a/x11-themes/lxappearance/Makefile
+++ b/x11-themes/lxappearance/Makefile
@@ -17,7 +17,7 @@ COMMENT= A desktop-independent theme switcher for GTK+
LICENSE= GPLv2
USE_GNOME= gnomehack gtk20 intlhack
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index 5fa4ae71cd6e..6d79e136637f 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
USE_GNOME= gnomehack gnomeprefix intlhack ltverhack
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index e1e135dea13b..5b09c7345f84 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Generally useful classes and extensions to GNOME
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
USE_GMAKE= yes
USE_XORG= xrender
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index da6093fbbb13..cc6255a0e654 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -18,7 +18,7 @@ COMMENT= Components intended to be shared between GNOME development tools
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-toolkits/girara/Makefile b/x11-toolkits/girara/Makefile
index d1f16e3afa7e..c3e21ff5edcc 100644
--- a/x11-toolkits/girara/Makefile
+++ b/x11-toolkits/girara/Makefile
@@ -16,7 +16,7 @@ USE_LDCONFIG= yes
.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/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index ed58034df416..30889880cffb 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ENV= X_CFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index f5be83f1c297..bae3c69a4ab4 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -34,7 +34,7 @@ MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
-USE_GETTEXT= yes
+USES= gettext
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
CONFIGURE_ARGS= --enable-static --with-xinput=yes
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 158df3b0e5ca..f635ae02b4df 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -33,7 +33,7 @@ MAKE_JOBS_UNSAFE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
-USE_GETTEXT= yes
+USES= gettext
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index a84386a8824d..9b74d6f63d45 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index 83b33cb14970..d252562d86ec 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index 55e6b4320819..b48b9204293b 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 1407c60e85d0..d5ebf2da75ba 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier intlhack \
diff --git a/x11-toolkits/libunique3/Makefile b/x11-toolkits/libunique3/Makefile
index e5c29675641a..42057a8a4bc6 100644
--- a/x11-toolkits/libunique3/Makefile
+++ b/x11-toolkits/libunique3/Makefile
@@ -16,7 +16,7 @@ LATEST_LINK= libunique3
USE_XORG= ice x11
USE_XZ= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gtk30 gnomeprefix ltverhack:0
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 4872b44c2b71..f18850da5e18 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -36,7 +36,7 @@ STARTUP_DESC= Use libstartup-notification
.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/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index a970ec8855fa..00c6e771c87d 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -27,7 +27,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_PYTHON= yes
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= gnomehack libgnomeui pygtk2
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
diff --git a/x11-toolkits/py-kiwi/Makefile b/x11-toolkits/py-kiwi/Makefile
index ff7b6ad64db1..ce694e640620 100644
--- a/x11-toolkits/py-kiwi/Makefile
+++ b/x11-toolkits/py-kiwi/Makefile
@@ -19,7 +19,7 @@ COMMENT= A framework and a set of enhanced widgets based on PyGTK
BUILD_DEPENDS= pygtk-codegen-2.0:${PORTSDIR}/x11-toolkits/py-gtk2
RUN_DEPENDS= pygtk-codegen-2.0:${PORTSDIR}/x11-toolkits/py-gtk2
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= libglade2
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 4c0fd5de7fe2..771f19352f91 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -26,7 +26,7 @@ USE_GMAKE= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
PLIST_SUB= PYTHON_VER=${PYTHON_VER}
-USE_GETTEXT= yes
+USES= gettext
PYDISTUTILS_BUILDARGS= \
WX_CONFIG="${WX_CONFIG}" \
diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile
index 88b63bf87ee0..87e7da003e15 100644
--- a/x11-toolkits/unique/Makefile
+++ b/x11-toolkits/unique/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus
USE_XORG= ice
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gtk20 gnomeprefix ltverhack:2
diff --git a/x11-wm/ccsm/Makefile b/x11-wm/ccsm/Makefile
index 86d039b30b63..2d9d54f1dcd0 100644
--- a/x11-wm/ccsm/Makefile
+++ b/x11-wm/ccsm/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compizconfig-python.pc:${PORTSDIR}/x
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= pygtk2
USE_PYTHON= -2.7
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 27ce679eac10..3b33682e1041 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -15,7 +15,7 @@ SOUND_DESC= Sound support via pulseaudio/libsndfile
USE_XORG= compositeproto damageproto xextproto x11 xbitmaps xcomposite xdamage \
xext xfixes xft xinerama xrandr xrender xxf86vm
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_EFL= imlib2
USE_AUTOTOOLS= libtool
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--disable-sound \
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/x11-wm/e17-module-alarm/Makefile b/x11-wm/e17-module-alarm/Makefile
index 2837857cd5ce..fefc428ab142 100644
--- a/x11-wm/e17-module-alarm/Makefile
+++ b/x11-wm/e17-module-alarm/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-comp-scale/Makefile b/x11-wm/e17-module-comp-scale/Makefile
index 9fe8d1bdb13b..4f4f7c5c5956 100644
--- a/x11-wm/e17-module-comp-scale/Makefile
+++ b/x11-wm/e17-module-comp-scale/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index e56a4ea56c8b..f423641ab1be 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-diskio/Makefile b/x11-wm/e17-module-diskio/Makefile
index 48f43932fa87..1add01719036 100644
--- a/x11-wm/e17-module-diskio/Makefile
+++ b/x11-wm/e17-module-diskio/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-eektool/Makefile b/x11-wm/e17-module-eektool/Makefile
index 69b358512009..332e075c947d 100644
--- a/x11-wm/e17-module-eektool/Makefile
+++ b/x11-wm/e17-module-eektool/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-engage/Makefile b/x11-wm/e17-module-engage/Makefile
index 3b5f9f741b75..c97429d9bf3d 100644
--- a/x11-wm/e17-module-engage/Makefile
+++ b/x11-wm/e17-module-engage/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-eooorg/Makefile b/x11-wm/e17-module-eooorg/Makefile
index 29aa91c23a20..6da9fbcc59fe 100644
--- a/x11-wm/e17-module-eooorg/Makefile
+++ b/x11-wm/e17-module-eooorg/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-everything-aspell/Makefile b/x11-wm/e17-module-everything-aspell/Makefile
index 5c3a698be0f4..e0de08b90f2f 100644
--- a/x11-wm/e17-module-everything-aspell/Makefile
+++ b/x11-wm/e17-module-everything-aspell/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-everything-mpris/Makefile b/x11-wm/e17-module-everything-mpris/Makefile
index f094b3b23c9c..1416603f3afe 100644
--- a/x11-wm/e17-module-everything-mpris/Makefile
+++ b/x11-wm/e17-module-everything-mpris/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-everything-pidgin/Makefile b/x11-wm/e17-module-everything-pidgin/Makefile
index 1e0eab4fb63b..1875bd7f358b 100644
--- a/x11-wm/e17-module-everything-pidgin/Makefile
+++ b/x11-wm/e17-module-everything-pidgin/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-everything-places/Makefile b/x11-wm/e17-module-everything-places/Makefile
index fb0488f39c7c..1f26cb260a3d 100644
--- a/x11-wm/e17-module-everything-places/Makefile
+++ b/x11-wm/e17-module-everything-places/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-everything-wallpaper/Makefile b/x11-wm/e17-module-everything-wallpaper/Makefile
index 70ade78e901b..c4a2553a81d8 100644
--- a/x11-wm/e17-module-everything-wallpaper/Makefile
+++ b/x11-wm/e17-module-everything-wallpaper/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-everything-websearch/Makefile b/x11-wm/e17-module-everything-websearch/Makefile
index fa45bd2edfdd..ad98d9509812 100644
--- a/x11-wm/e17-module-everything-websearch/Makefile
+++ b/x11-wm/e17-module-everything-websearch/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile
index 5114ab8f25bc..b1efee62b872 100644
--- a/x11-wm/e17-module-flame/Makefile
+++ b/x11-wm/e17-module-flame/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-forecasts/Makefile b/x11-wm/e17-module-forecasts/Makefile
index 5f87f2fa5503..f818b7803906 100644
--- a/x11-wm/e17-module-forecasts/Makefile
+++ b/x11-wm/e17-module-forecasts/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-iiirk/Makefile b/x11-wm/e17-module-iiirk/Makefile
index 1b5fc9ba9bff..9186e7f0d63b 100644
--- a/x11-wm/e17-module-iiirk/Makefile
+++ b/x11-wm/e17-module-iiirk/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index b66919af3d8c..d73104c631d7 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index e4b0ba78b2dd..a5b59a1f15ab 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index e519c5b8b09a..456549b74b7d 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-mpdule/Makefile b/x11-wm/e17-module-mpdule/Makefile
index ec51c6c00a78..6f036299afff 100644
--- a/x11-wm/e17-module-mpdule/Makefile
+++ b/x11-wm/e17-module-mpdule/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-net/Makefile b/x11-wm/e17-module-net/Makefile
index 9b51395191d5..f48213e63a0c 100644
--- a/x11-wm/e17-module-net/Makefile
+++ b/x11-wm/e17-module-net/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-news/Makefile b/x11-wm/e17-module-news/Makefile
index a2f7f09f7985..74a6eaffe4fb 100644
--- a/x11-wm/e17-module-news/Makefile
+++ b/x11-wm/e17-module-news/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-penguins/Makefile b/x11-wm/e17-module-penguins/Makefile
index 2caa3ad16bf0..2178160844c7 100644
--- a/x11-wm/e17-module-penguins/Makefile
+++ b/x11-wm/e17-module-penguins/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-photo/Makefile b/x11-wm/e17-module-photo/Makefile
index dc74b25f02e5..f4a84a17de3c 100644
--- a/x11-wm/e17-module-photo/Makefile
+++ b/x11-wm/e17-module-photo/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-places/Makefile b/x11-wm/e17-module-places/Makefile
index c85a80fa6dd2..f1a91a25b457 100644
--- a/x11-wm/e17-module-places/Makefile
+++ b/x11-wm/e17-module-places/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile
index 849c28b01ba4..18dc9a56756e 100644
--- a/x11-wm/e17-module-rain/Makefile
+++ b/x11-wm/e17-module-rain/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index b19a0e8c656e..5c62f1219754 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile
index 24c54cfaed6b..c1afcb018de9 100644
--- a/x11-wm/e17-module-slideshow/Makefile
+++ b/x11-wm/e17-module-slideshow/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile
index 00186c001dd8..b9a1c196fe97 100644
--- a/x11-wm/e17-module-snow/Makefile
+++ b/x11-wm/e17-module-snow/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-taskbar/Makefile b/x11-wm/e17-module-taskbar/Makefile
index 56ebedb43b1c..b8af47a9b347 100644
--- a/x11-wm/e17-module-taskbar/Makefile
+++ b/x11-wm/e17-module-taskbar/Makefile
@@ -25,7 +25,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-tclock/Makefile b/x11-wm/e17-module-tclock/Makefile
index de8d6d4c4e07..683bd4a890dc 100644
--- a/x11-wm/e17-module-tclock/Makefile
+++ b/x11-wm/e17-module-tclock/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile
index d9f6e7a365fe..549f50c1c9ae 100644
--- a/x11-wm/e17-module-uptime/Makefile
+++ b/x11-wm/e17-module-uptime/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-weather/Makefile b/x11-wm/e17-module-weather/Makefile
index f46708cd5d33..875355d201ef 100644
--- a/x11-wm/e17-module-weather/Makefile
+++ b/x11-wm/e17-module-weather/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-winlist-ng/Makefile b/x11-wm/e17-module-winlist-ng/Makefile
index 84e9ad827da5..1ea26c1fdb66 100644
--- a/x11-wm/e17-module-winlist-ng/Makefile
+++ b/x11-wm/e17-module-winlist-ng/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/e17-module-wlan/Makefile b/x11-wm/e17-module-wlan/Makefile
index e42bf9657d9c..b4103f6d05b1 100644
--- a/x11-wm/e17-module-wlan/Makefile
+++ b/x11-wm/e17-module-wlan/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= pkgconfig
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
diff --git a/x11-wm/fvwm-crystal/Makefile b/x11-wm/fvwm-crystal/Makefile
index 5c50ab274f47..e1d94cbe7910 100644
--- a/x11-wm/fvwm-crystal/Makefile
+++ b/x11-wm/fvwm-crystal/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS= fvwm>=2.5:${PORTSDIR}/x11-wm/fvwm2 \
bash:${PORTSDIR}/shells/bash
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
MAKE_ENV= prefix="${PREFIX}" addondir="${DOCSDIR}/addons"
PORTDOCS= *
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 5b0250c6eb3e..c4d4147629a1 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -109,7 +109,7 @@ WITHOUT_GNOME= true
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --with-intl-library=${LOCALBASE}/lib \
--with-intl-includes=${LOCALBASE}/include
PLIST_SUB+= NLS=""
diff --git a/x11-wm/lxsession/Makefile b/x11-wm/lxsession/Makefile
index c12760898a9c..f3db0dc54ca3 100644
--- a/x11-wm/lxsession/Makefile
+++ b/x11-wm/lxsession/Makefile
@@ -32,7 +32,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 55fa76d2cbc4..f1d9a3d37010 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity
USE_BZIP2= yes
USE_XORG= x11 xcomposite xdamage
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index 884f5dcdda06..8a26f620844d 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity
USE_BZIP2= yes
USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 ltverhack
diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index 191517dffc4d..83a13355ebeb 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -29,7 +29,7 @@ PORTDOCS= ABOUT-NLS AUTHORS README TODO
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/x11-wm/obkey/Makefile b/x11-wm/obkey/Makefile
index fab95e76634c..b0644deb52f7 100644
--- a/x11-wm/obkey/Makefile
+++ b/x11-wm/obkey/Makefile
@@ -13,7 +13,7 @@ LICENSE= MIT
RUN_DEPENDS= py2[67]-gtk>=2.14:${PORTSDIR}/x11-toolkits/py-gtk2
-USE_GETTEXT= yes
+USES= gettext
USE_PYTHON= yes
USE_PYDISTUTILS= yes
PORTDOCS= NEWS
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index 2404971b2b0c..1a489322e4bd 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -26,7 +26,7 @@ MAN1= openbox.1 openbox-session.1 obxprop.1 \
PLIST_SUB= VERSION=${PORTVERSION:C/.[0-9]+\$//}
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
diff --git a/x11-wm/simple-ccsm/Makefile b/x11-wm/simple-ccsm/Makefile
index 780ed2228438..66abe830d406 100644
--- a/x11-wm/simple-ccsm/Makefile
+++ b/x11-wm/simple-ccsm/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compizconfig-python.pc:${PORTSDIR}/x
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GNOME= pygtk2
USE_PYTHON= -2.7
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 23166ea719ce..819bae359c9d 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GNOME= gtk20
USE_PERL5= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 75d9ce8acc10..e53c30ade3e7 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS= --enable-xsync \
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20 intltool intlhack pkgconfig desktopfileutils
USE_LDCONFIG= yes
diff --git a/x11/florence/Makefile b/x11/florence/Makefile
index 440c994084b1..08762e3b7ba9 100644
--- a/x11/florence/Makefile
+++ b/x11/florence/Makefile
@@ -21,7 +21,7 @@ USE_XORG= xtst
USE_GNOME= gtk20 intlhack gnomedocutils gconf2 librsvg2 gnomepanel
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index fe3650ca17ad..e2c88c82e725 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gno
${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
USE_XORG= ice sm xau xrandr
USE_GNOME= gnomeprefix gnomehack intlhack gconf2
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 6387ac9ec82b..ff1e97970d02 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -27,7 +27,7 @@ BROKEN= Doesn't build
USE_BZIP2= yes
USE_XORG= x11 xfixes sm
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomemenus \
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 64a9b5285f3c..ebf3b7c82938 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -18,7 +18,7 @@ COMMENT= Terminal component for the GNOME 2 Desktop
LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
diff --git a/x11/guake/Makefile b/x11/guake/Makefile
index cbdb82283828..01abebb43a3b 100644
--- a/x11/guake/Makefile
+++ b/x11/guake/Makefile
@@ -38,7 +38,7 @@ MAKE_ENV= man_MANS=""
.if ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS= --localedir=${PREFIX}/share/locale
PLIST_SUB= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.else
CONFIGURE_ARGS= --disable-nls
PLIST_SUB= NLS="@comment "
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index aff14da9f33e..72e89ec1ead4 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -53,7 +53,7 @@ EXPIRATION_DATE= 2013-07-01
USE_BZIP2= yes
USE_FAM= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_OPENSSL= yes
USE_QT_VER= 3
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 5e79cd673c30..b7a363b374e4 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GNOME= gnomeprefix gnomehack ltverhack gconf2
USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
-USE_GETTEXT= yes
+USES= gettext
USE_LDCONFIG= yes
USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/lxmenu-data/Makefile b/x11/lxmenu-data/Makefile
index f9e28f60cd4e..e75fef058a5b 100644
--- a/x11/lxmenu-data/Makefile
+++ b/x11/lxmenu-data/Makefile
@@ -15,7 +15,7 @@ COMMENT= Menu data used by lxpanel
USE_XORG= x11 xmu
USE_GNOME= intltool
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
USE_AUTOTOOLS= automake:env
CONFIGURE_ARGS+=--prefix=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc
diff --git a/x11/lxrandr/Makefile b/x11/lxrandr/Makefile
index 39c8cab42c26..42785b368392 100644
--- a/x11/lxrandr/Makefile
+++ b/x11/lxrandr/Makefile
@@ -11,7 +11,7 @@ COMMENT= LXDE screen manager
USE_GNOME= gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
USE_XORG= xrandr
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index ead0bb7912a0..53670d0a4a50 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -16,7 +16,7 @@ USE_GNOME= gtk20 lthack vte
USE_AUTOTOOLS= libtool
LIBTOOLFILES= configure kiklib/configure mkf/configure
USE_PERL5_BUILD=yes
-USE_GETTEXT= yes
+USES= gettext
CONFIGURE_ARGS= --with-imagelib=gdk-pixbuf2 --enable-utmp \
--enable-optimize-redrawing \
--with-tools="mlclient,mlconfig,mlterm-menu,mlcc,w3mmlconfig,mlimgloader" \
@@ -111,7 +111,7 @@ LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter
.endif
USE_LDCONFIG= yes
-USE_GETTEXT= yes
+USES= gettext
MAN1= mlterm.1 mlclient.1
diff --git a/x11/rsibreak/Makefile b/x11/rsibreak/Makefile
index 706f415c24a1..5bd15baef47c 100644
--- a/x11/rsibreak/Makefile
+++ b/x11/rsibreak/Makefile
@@ -16,7 +16,7 @@ PORTSCOUT= limit:^0\.8\.
USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_AUTOTOOLS= libtool
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
USE_XORG= xscrnsaver
diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index 6c9fb2aef0ad..a4b6a5e56ebc 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -50,7 +50,7 @@ PLIST_SUB+= WBARCONFIG="@comment "
.endif
USE_EFL= imlib2
-USE_GETTEXT= yes
+USES+= gettext
USE_GMAKE= yes
USE_GNOME+= desktopfileutils intltool
diff --git a/x11/wbarconf/Makefile b/x11/wbarconf/Makefile
index 516639ff6955..bfeaa0237238 100644
--- a/x11/wbarconf/Makefile
+++ b/x11/wbarconf/Makefile
@@ -18,11 +18,11 @@ RUN_DEPENDS= wbar:${PORTSDIR}/x11/wbar
USE_GNOME= pygobject pygtk2 gtk20
USE_PYTHON= 2.5+
-USE_GETTEXT= yes
+USES= gettext
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
PORTDOCS= README COPYING
-USE_GETTEXT= yes
+USES= gettext
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 666bbf3a94eb..b1cb91e92a94 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -31,7 +31,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index 88f55663306b..216f3f91033f 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -18,7 +18,7 @@ COMMENT= Quicklauncher plugin for Xfce
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libgui panel
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 6dae3857a993..a2e4c4ebed98 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20 desktopfileutils intltool intlhack pkgconfig
diff --git a/x11/xfce4-wmdock-plugin/Makefile b/x11/xfce4-wmdock-plugin/Makefile
index 60d740e95846..a57a0d595553 100644
--- a/x11/xfce4-wmdock-plugin/Makefile
+++ b/x11/xfce4-wmdock-plugin/Makefile
@@ -16,7 +16,7 @@ COMMENT= WMdock plugin for Xfce
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_GETTEXT= yes
+USES= gettext
INSTALLS_ICONS= yes
USE_GMAKE= yes
USE_GNOME= gtk20 intltool intlhack pkgconfig libwnck
diff --git a/x11/xfce4-xfapplet-plugin/Makefile b/x11/xfce4-xfapplet-plugin/Makefile
index 5af1162b2b0e..4eb89999b96c 100644
--- a/x11/xfce4-xfapplet-plugin/Makefile
+++ b/x11/xfce4-xfapplet-plugin/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= panelappletmm-2.6:${PORTSDIR}/x11-toolkits/libpanelappletmm
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USES= gettext
USE_GMAKE= yes
USE_GNOME= gtk20 intltool intlhack orbit2 pkgconfig
USE_XFCE= configenv libgui libutil panel
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index f352fd6d2f94..af92391cab41 100644
--- a/x11/xfree86_xkb_xml/Makefile
+++ b/x11/xfree86_xkb_xml/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A little set of XML files useful for dealing with XKB rules
USE_ICONV= yes
-USE_GETTEXT= yes
+USES= gettext
USE_XORG= x11
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile
index 79705cd4410f..63c3c6ba1d13 100644
--- a/x11/xnee/Makefile
+++ b/x11/xnee/Makefile
@@ -41,7 +41,7 @@ LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre \
fontconfig:${PORTSDIR}/x11-fonts/fontconfig
CONFIGURE_ARGS+=--enable-gui
-USE_GETTEXT= yes
+USES+= gettext
USE_ICONV= yes
USE_XORG+= pixman xcomposite xcursor xdamage xfixes xinerama xrandr xrender
USE_GNOME+= gdkpixbuf2 gtk20 libgnomeui
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index a6f6e12623f6..c603de9395b0 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -26,7 +26,7 @@ USE_GL= gl
USE_GMAKE= yes
USE_PERL5_RUN= yes
USE_GNOME= gnomehier libglade2 gnomehack
-USE_GETTEXT= yes
+USES= gettext
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/xtermcontrol/Makefile b/x11/xtermcontrol/Makefile
index 6155fa1736a2..e11f8538f7fe 100644
--- a/x11/xtermcontrol/Makefile
+++ b/x11/xtermcontrol/Makefile
@@ -16,7 +16,7 @@ COMMENT= Tool for dynamic control of xterm properties
RUN_DEPENDS= xterm:${PORTSDIR}/x11/xterm
-USE_GETTEXT= yes
+USES= gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/yad/Makefile b/x11/yad/Makefile
index 9ab67b77fdae..66c6f3839354 100644
--- a/x11/yad/Makefile
+++ b/x11/yad/Makefile
@@ -30,7 +30,7 @@ OPTIONS_DEFAULT= GTK2
.if ${PORT_OPTIONS:MNLS}
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+USES+= gettext
.else
PLIST_SUB+= NLS="@comment "
CONFIGURE_ARGS+= --disable-nls
diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile
index 93a6569f0dc3..13d7c038a4e5 100644
--- a/x11/yakuake/Makefile
+++ b/x11/yakuake/Makefile
@@ -14,6 +14,6 @@ USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_KDEBASE_VER=3
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext
.include <bsd.port.mk>
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 9e84bae56377..242be90809c3 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
CONFLICTS= yelp-3.[0-9]*
-USE_GETTEXT= yes
+USES= gettext
USE_BZIP2= yes
USE_XORG= ice
USE_GMAKE= yes