aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arabic/kde3-i18n/Makefile2
-rw-r--r--arabic/kde4-l10n/Makefile2
-rw-r--r--arabic/koffice-i18n/Makefile2
-rw-r--r--archivers/dpkg/Makefile2
-rw-r--r--archivers/gtar/Makefile2
-rw-r--r--archivers/libcomprex/Makefile2
-rw-r--r--archivers/rpm/Makefile2
-rw-r--r--astro/fooseti/Makefile2
-rw-r--r--astro/gpsdrive/Makefile2
-rw-r--r--astro/spacechart/Makefile2
-rw-r--r--audio/aumix/Makefile2
-rw-r--r--audio/cplay/Makefile2
-rw-r--r--audio/denemo/Makefile2
-rw-r--r--audio/lopster/Makefile2
-rw-r--r--audio/madplay/Makefile2
-rw-r--r--audio/normalize/Makefile2
-rw-r--r--audio/opmixer/Makefile2
-rw-r--r--audio/snd/Makefile2
-rw-r--r--audio/solfege/Makefile2
-rw-r--r--audio/swhplugins/Makefile2
-rw-r--r--audio/vorbis-tools/Makefile2
-rw-r--r--audio/xfce4-mixer/Makefile2
-rw-r--r--chinese/calligra-l10n-zh_TW/Makefile2
-rw-r--r--chinese/kde3-i18n-zh_CN/Makefile2
-rw-r--r--chinese/kde3-i18n-zh_TW/Makefile2
-rw-r--r--chinese/kde4-l10n-zh_CN/Makefile2
-rw-r--r--chinese/kde4-l10n-zh_TW/Makefile2
-rw-r--r--chinese/koffice-i18n-zh_TW/Makefile2
-rw-r--r--chinese/koffice-kde4-l10n-zh_TW/Makefile2
-rw-r--r--chinese/xcin25/Makefile2
-rw-r--r--chinese/zhcon/Makefile2
-rw-r--r--comms/gnokii/Makefile2
-rw-r--r--comms/gsmlib/Makefile2
-rw-r--r--comms/libticables/Makefile2
-rw-r--r--comms/tilp/Makefile2
-rw-r--r--converters/recode/Makefile2
-rw-r--r--databases/clip/Makefile2
-rw-r--r--databases/mysql-gui/Makefile2
-rw-r--r--databases/namazu2/Makefile2
-rw-r--r--databases/p5-DBD-Sybase/Makefile2
-rw-r--r--databases/p5-Search-Namazu/Makefile2
-rw-r--r--databases/postgresql-devel-server/Makefile2
-rw-r--r--databases/postgresql-devel/Makefile2
-rw-r--r--databases/postgresql7/Makefile2
-rw-r--r--databases/postgresql72/Makefile2
-rw-r--r--databases/postgresql73-server/Makefile2
-rw-r--r--databases/postgresql73/Makefile2
-rw-r--r--databases/postgresql74-server/Makefile2
-rw-r--r--databases/postgresql80-server/Makefile2
-rw-r--r--databases/postgresql81-server/Makefile2
-rw-r--r--databases/postgresql82-server/Makefile2
-rw-r--r--databases/postgresql83-server/Makefile2
-rw-r--r--databases/postgresql84-server/Makefile2
-rw-r--r--databases/postgresql90-server/Makefile2
-rw-r--r--databases/postgresql91-server/Makefile2
-rw-r--r--databases/postgresql92-server/Makefile2
-rw-r--r--databases/pxtools/Makefile2
-rw-r--r--databases/sqsh/Makefile2
-rw-r--r--deskutils/babytrans/Makefile2
-rw-r--r--deskutils/gcal/Makefile2
-rw-r--r--devel/ORBit/Makefile2
-rw-r--r--devel/argtable/Makefile2
-rw-r--r--devel/avr-gcc-3/Makefile2
-rw-r--r--devel/avr-gcc/Makefile2
-rw-r--r--devel/bison-devel/Makefile2
-rw-r--r--devel/bison/Makefile2
-rw-r--r--devel/bison175/Makefile2
-rw-r--r--devel/bison1875/Makefile2
-rw-r--r--devel/bison2/Makefile2
-rw-r--r--devel/bison20/Makefile2
-rw-r--r--devel/cook/Makefile2
-rw-r--r--devel/gindent/Makefile2
-rw-r--r--devel/glib20/Makefile2
-rw-r--r--devel/gmake/Makefile2
-rw-r--r--devel/gmake381/Makefile2
-rw-r--r--devel/i386-rtems-gcc/Makefile2
-rw-r--r--devel/ixlib/Makefile2
-rw-r--r--devel/libelf/Makefile2
-rw-r--r--devel/libticalcs/Makefile2
-rw-r--r--devel/libtifiles/Makefile2
-rw-r--r--devel/libzvbi/Makefile2
-rw-r--r--devel/maketool/Makefile2
-rw-r--r--devel/mingw-binutils/Makefile4
-rw-r--r--devel/mingw32-binutils/Makefile4
-rw-r--r--devel/motor/Makefile2
-rw-r--r--devel/p5-Locale-gettext/Makefile2
-rw-r--r--devel/popt/Makefile2
-rw-r--r--devel/ruby-gettext/Makefile2
-rw-r--r--devel/ruby-intl/Makefile2
-rw-r--r--devel/rubygem-gettext/Makefile2
-rw-r--r--devel/rubygem-locale/Makefile2
-rw-r--r--devel/yasm/Makefile2
-rw-r--r--dns/mydns-ng/Makefile2
-rw-r--r--dns/mydns/Makefile2
-rw-r--r--editors/calligra-l10n-da/Makefile2
-rw-r--r--editors/calligra-l10n-el/Makefile2
-rw-r--r--editors/calligra-l10n-en_GB/Makefile2
-rw-r--r--editors/calligra-l10n-es/Makefile2
-rw-r--r--editors/calligra-l10n-et/Makefile2
-rw-r--r--editors/calligra-l10n-it/Makefile2
-rw-r--r--editors/calligra-l10n-nb/Makefile2
-rw-r--r--editors/calligra-l10n-nl/Makefile2
-rw-r--r--editors/calligra-l10n-sv/Makefile2
-rw-r--r--editors/cooledit/Makefile2
-rw-r--r--editors/koffice-i18n-af/Makefile2
-rw-r--r--editors/koffice-i18n-bs/Makefile2
-rw-r--r--editors/koffice-i18n-cs/Makefile2
-rw-r--r--editors/koffice-i18n-da/Makefile2
-rw-r--r--editors/koffice-i18n-el/Makefile2
-rw-r--r--editors/koffice-i18n-en_GB/Makefile2
-rw-r--r--editors/koffice-i18n-eo/Makefile2
-rw-r--r--editors/koffice-i18n-es/Makefile2
-rw-r--r--editors/koffice-i18n-et/Makefile2
-rw-r--r--editors/koffice-i18n-it/Makefile2
-rw-r--r--editors/koffice-i18n-lt/Makefile2
-rw-r--r--editors/koffice-i18n-lv/Makefile2
-rw-r--r--editors/koffice-i18n-mt/Makefile2
-rw-r--r--editors/koffice-i18n-nb/Makefile2
-rw-r--r--editors/koffice-i18n-nl/Makefile2
-rw-r--r--editors/koffice-i18n-nn/Makefile2
-rw-r--r--editors/koffice-i18n-sk/Makefile2
-rw-r--r--editors/koffice-i18n-sl/Makefile2
-rw-r--r--editors/koffice-i18n-sv/Makefile2
-rw-r--r--editors/koffice-i18n-th/Makefile2
-rw-r--r--editors/koffice-i18n-tr/Makefile2
-rw-r--r--editors/koffice-i18n-ven/Makefile2
-rw-r--r--editors/koffice-i18n-xh/Makefile2
-rw-r--r--editors/koffice-i18n-zu/Makefile2
-rw-r--r--editors/koffice-kde4-l10n-da/Makefile2
-rw-r--r--editors/koffice-kde4-l10n-el/Makefile2
-rw-r--r--editors/koffice-kde4-l10n-en_GB/Makefile2
-rw-r--r--editors/koffice-kde4-l10n-es/Makefile2
-rw-r--r--editors/koffice-kde4-l10n-et/Makefile2
-rw-r--r--editors/koffice-kde4-l10n-it/Makefile2
-rw-r--r--editors/koffice-kde4-l10n-nb/Makefile2
-rw-r--r--editors/koffice-kde4-l10n-nl/Makefile2
-rw-r--r--editors/koffice-kde4-l10n-sv/Makefile2
-rw-r--r--editors/koffice-kde4-l10n-tr/Makefile2
-rw-r--r--editors/lpe/Makefile2
-rw-r--r--editors/nano/Makefile2
-rw-r--r--editors/poedit/Makefile2
-rw-r--r--editors/ssed/Makefile2
-rw-r--r--editors/xemacs-devel-mule/Makefile2
-rw-r--r--editors/xemacs21-mule/Makefile2
-rw-r--r--editors/yudit/Makefile2
-rw-r--r--editors/zoinks/Makefile2
-rw-r--r--emulators/gxmame/Makefile2
-rw-r--r--emulators/hercules/Makefile2
-rw-r--r--emulators/xsystem35/Makefile2
-rw-r--r--finance/grisbi/Makefile2
-rw-r--r--french/calligra-l10n/Makefile2
-rw-r--r--french/kde3-i18n/Makefile2
-rw-r--r--french/kde4-l10n/Makefile2
-rw-r--r--french/koffice-i18n/Makefile2
-rw-r--r--french/koffice-kde4-l10n/Makefile2
-rw-r--r--ftp/axel/Makefile2
-rw-r--r--ftp/lftp/Makefile2
-rw-r--r--ftp/pavuk/Makefile2
-rw-r--r--ftp/wget+ipv6/Makefile2
-rw-r--r--ftp/wget-devel/Makefile2
-rw-r--r--ftp/wget/Makefile2
-rw-r--r--games/freeciv-gtk2/Makefile2
-rw-r--r--games/freeciv/Makefile2
-rw-r--r--games/ggz-txt-client/Makefile2
-rw-r--r--games/gnmm/Makefile2
-rw-r--r--games/gtypist/Makefile2
-rw-r--r--games/lexter/Makefile2
-rw-r--r--games/lincity/Makefile2
-rw-r--r--games/macopix/Makefile2
-rw-r--r--games/tornado/Makefile2
-rw-r--r--games/xfce4-toys/Makefile2
-rw-r--r--games/xinvaders/Makefile2
-rw-r--r--german/calligra-l10n/Makefile2
-rw-r--r--german/kde3-i18n/Makefile2
-rw-r--r--german/kde4-l10n/Makefile2
-rw-r--r--german/koffice-i18n/Makefile2
-rw-r--r--german/koffice-kde4-l10n/Makefile2
-rw-r--r--graphics/gtkgraph/Makefile2
-rw-r--r--graphics/libexif/Makefile2
-rw-r--r--graphics/libgphoto2/Makefile2
-rw-r--r--graphics/lodju/Makefile2
-rw-r--r--graphics/osgedit/Makefile2
-rw-r--r--graphics/ruby-tgif/Makefile2
-rw-r--r--graphics/sane-backends/Makefile2
-rw-r--r--graphics/tgif-nls/Makefile2
-rw-r--r--hebrew/kde3-i18n/Makefile2
-rw-r--r--hebrew/kde4-l10n/Makefile2
-rw-r--r--hebrew/koffice-i18n/Makefile2
-rw-r--r--hungarian/kde3-i18n/Makefile2
-rw-r--r--hungarian/kde4-l10n/Makefile2
-rw-r--r--hungarian/koffice-i18n/Makefile2
-rw-r--r--irc/liece/Makefile2
-rw-r--r--irc/lostirc/Makefile2
-rw-r--r--irc/riece-emacs21/Makefile2
-rw-r--r--irc/riece/Makefile2
-rw-r--r--japanese/eb/Makefile2
-rw-r--r--japanese/eb3/Makefile2
-rw-r--r--japanese/kde3-i18n/Makefile2
-rw-r--r--japanese/kde4-l10n/Makefile2
-rw-r--r--japanese/koffice-i18n/Makefile2
-rw-r--r--japanese/koffice-kde4-l10n/Makefile2
-rw-r--r--japanese/mutt-devel/Makefile4
-rw-r--r--japanese/mutt/Makefile4
-rw-r--r--japanese/vflib/Makefile2
-rw-r--r--java/jdk13/Makefile2
-rw-r--r--java/jmp/Makefile2
-rw-r--r--korean/ami/Makefile2
-rw-r--r--korean/kde3-i18n/Makefile2
-rw-r--r--korean/kde4-l10n/Makefile2
-rw-r--r--korean/texinfo/Makefile2
-rw-r--r--lang/clisp/Makefile2
-rw-r--r--lang/gawk/Makefile2
-rw-r--r--lang/librep/Makefile2
-rw-r--r--lang/lush/Makefile2
-rw-r--r--lang/mdk/Makefile2
-rw-r--r--lang/open-cobol-devel/Makefile2
-rw-r--r--lang/open-cobol/Makefile2
-rw-r--r--lang/php4/Makefile2
-rw-r--r--lang/php5/Makefile2
-rw-r--r--lang/php53/Makefile2
-rw-r--r--mail/claws-mail/Makefile2
-rw-r--r--mail/elm/Makefile2
-rw-r--r--mail/elmo-devel/Makefile2
-rw-r--r--mail/elmo/Makefile2
-rw-r--r--mail/fetchmail/Makefile2
-rw-r--r--mail/filtermail/Makefile2
-rw-r--r--mail/kbiff/Makefile2
-rw-r--r--mail/mutt-devel/Makefile2
-rw-r--r--mail/mutt/Makefile2
-rw-r--r--mail/mutt14/Makefile2
-rw-r--r--mail/perdition/Makefile2
-rw-r--r--mail/spruce/Makefile2
-rw-r--r--mail/sylpheed-claws/Makefile2
-rw-r--r--mail/sylpheed-gtk2/Makefile2
-rw-r--r--mail/sylpheed/Makefile2
-rw-r--r--mail/sylpheed2-devel/Makefile2
-rw-r--r--mail/sylpheed2/Makefile2
-rw-r--r--mail/sylpheed3/Makefile2
-rw-r--r--math/oleo/Makefile2
-rw-r--r--misc/afbackup/Makefile2
-rw-r--r--misc/dirtree/Makefile2
-rw-r--r--misc/getopt/Makefile2
-rw-r--r--misc/gnome-mime-data/Makefile2
-rw-r--r--misc/gnomemimedata/Makefile2
-rw-r--r--misc/hello/Makefile2
-rw-r--r--misc/kcd-devel/Makefile2
-rw-r--r--misc/kcd/Makefile2
-rw-r--r--misc/kde3-i18n-af/Makefile2
-rw-r--r--misc/kde3-i18n-az/Makefile2
-rw-r--r--misc/kde3-i18n-bg/Makefile2
-rw-r--r--misc/kde3-i18n-bs/Makefile2
-rw-r--r--misc/kde3-i18n-ca/Makefile2
-rw-r--r--misc/kde3-i18n-cs/Makefile2
-rw-r--r--misc/kde3-i18n-da/Makefile2
-rw-r--r--misc/kde3-i18n-el/Makefile2
-rw-r--r--misc/kde3-i18n-en_GB/Makefile2
-rw-r--r--misc/kde3-i18n-eo/Makefile2
-rw-r--r--misc/kde3-i18n-es/Makefile2
-rw-r--r--misc/kde3-i18n-et/Makefile2
-rw-r--r--misc/kde3-i18n-fa/Makefile2
-rw-r--r--misc/kde3-i18n-fi/Makefile2
-rw-r--r--misc/kde3-i18n-hr/Makefile2
-rw-r--r--misc/kde3-i18n-id/Makefile2
-rw-r--r--misc/kde3-i18n-is/Makefile2
-rw-r--r--misc/kde3-i18n-it/Makefile2
-rw-r--r--misc/kde3-i18n-lt/Makefile2
-rw-r--r--misc/kde3-i18n-lv/Makefile2
-rw-r--r--misc/kde3-i18n-mk/Makefile2
-rw-r--r--misc/kde3-i18n-mt/Makefile2
-rw-r--r--misc/kde3-i18n-nb/Makefile2
-rw-r--r--misc/kde3-i18n-nl/Makefile2
-rw-r--r--misc/kde3-i18n-nn/Makefile2
-rw-r--r--misc/kde3-i18n-nso/Makefile2
-rw-r--r--misc/kde3-i18n-ro/Makefile2
-rw-r--r--misc/kde3-i18n-se/Makefile2
-rw-r--r--misc/kde3-i18n-sk/Makefile2
-rw-r--r--misc/kde3-i18n-sl/Makefile2
-rw-r--r--misc/kde3-i18n-sr/Makefile2
-rw-r--r--misc/kde3-i18n-ss/Makefile2
-rw-r--r--misc/kde3-i18n-sv/Makefile2
-rw-r--r--misc/kde3-i18n-ta/Makefile2
-rw-r--r--misc/kde3-i18n-th/Makefile2
-rw-r--r--misc/kde3-i18n-tr/Makefile2
-rw-r--r--misc/kde3-i18n-ven/Makefile2
-rw-r--r--misc/kde3-i18n-xh/Makefile2
-rw-r--r--misc/kde3-i18n-zu/Makefile2
-rw-r--r--misc/kde4-i18n-is/Makefile2
-rw-r--r--misc/kde4-l10n-bg/Makefile2
-rw-r--r--misc/kde4-l10n-ca/Makefile2
-rw-r--r--misc/kde4-l10n-cs/Makefile2
-rw-r--r--misc/kde4-l10n-da/Makefile2
-rw-r--r--misc/kde4-l10n-el/Makefile2
-rw-r--r--misc/kde4-l10n-en_GB/Makefile2
-rw-r--r--misc/kde4-l10n-eo/Makefile2
-rw-r--r--misc/kde4-l10n-es/Makefile2
-rw-r--r--misc/kde4-l10n-et/Makefile2
-rw-r--r--misc/kde4-l10n-fi/Makefile2
-rw-r--r--misc/kde4-l10n-is/Makefile2
-rw-r--r--misc/kde4-l10n-it/Makefile2
-rw-r--r--misc/kde4-l10n-lt/Makefile2
-rw-r--r--misc/kde4-l10n-lv/Makefile2
-rw-r--r--misc/kde4-l10n-mk/Makefile2
-rw-r--r--misc/kde4-l10n-nb/Makefile2
-rw-r--r--misc/kde4-l10n-nl/Makefile2
-rw-r--r--misc/kde4-l10n-nn/Makefile2
-rw-r--r--misc/kde4-l10n-ro/Makefile2
-rw-r--r--misc/kde4-l10n-sk/Makefile2
-rw-r--r--misc/kde4-l10n-sl/Makefile2
-rw-r--r--misc/kde4-l10n-sr/Makefile2
-rw-r--r--misc/kde4-l10n-sv/Makefile2
-rw-r--r--misc/kde4-l10n-ta/Makefile2
-rw-r--r--misc/kde4-l10n-th/Makefile2
-rw-r--r--misc/kde4-l10n-tr/Makefile2
-rw-r--r--misc/koffice-i18n-af/Makefile2
-rw-r--r--misc/koffice-i18n-bs/Makefile2
-rw-r--r--misc/koffice-i18n-cs/Makefile2
-rw-r--r--misc/koffice-i18n-da/Makefile2
-rw-r--r--misc/koffice-i18n-el/Makefile2
-rw-r--r--misc/koffice-i18n-en_GB/Makefile2
-rw-r--r--misc/koffice-i18n-eo/Makefile2
-rw-r--r--misc/koffice-i18n-es/Makefile2
-rw-r--r--misc/koffice-i18n-et/Makefile2
-rw-r--r--misc/koffice-i18n-it/Makefile2
-rw-r--r--misc/koffice-i18n-lt/Makefile2
-rw-r--r--misc/koffice-i18n-lv/Makefile2
-rw-r--r--misc/koffice-i18n-mt/Makefile2
-rw-r--r--misc/koffice-i18n-nb/Makefile2
-rw-r--r--misc/koffice-i18n-nl/Makefile2
-rw-r--r--misc/koffice-i18n-nn/Makefile2
-rw-r--r--misc/koffice-i18n-sk/Makefile2
-rw-r--r--misc/koffice-i18n-sl/Makefile2
-rw-r--r--misc/koffice-i18n-sv/Makefile2
-rw-r--r--misc/koffice-i18n-th/Makefile2
-rw-r--r--misc/koffice-i18n-tr/Makefile2
-rw-r--r--misc/koffice-i18n-ven/Makefile2
-rw-r--r--misc/koffice-i18n-xh/Makefile2
-rw-r--r--misc/koffice-i18n-zu/Makefile2
-rw-r--r--misc/kwatch/Makefile2
-rw-r--r--misc/mc/Makefile2
-rw-r--r--misc/pinfo/Makefile2
-rw-r--r--misc/upclient/Makefile2
-rw-r--r--misc/xfce4-iconbox/Makefile2
-rw-r--r--multimedia/libxine/Makefile2
-rw-r--r--multimedia/ogle-gui/Makefile2
-rw-r--r--multimedia/vlc-devel/Makefile2
-rw-r--r--multimedia/vlc/Makefile2
-rw-r--r--multimedia/xine/Makefile2
-rw-r--r--multimedia/xmps-opendivx-plugin/Makefile2
-rw-r--r--multimedia/xmps-win32-plugin/Makefile2
-rw-r--r--net-im/centericq/Makefile2
-rw-r--r--net-mgmt/ap-utils/Makefile2
-rw-r--r--net-mgmt/darkstat/Makefile2
-rw-r--r--net-mgmt/etherape/Makefile2
-rw-r--r--net-mgmt/ipv6calc/Makefile2
-rw-r--r--net-p2p/dctc-gui/Makefile2
-rw-r--r--net-p2p/gnunet/Makefile2
-rw-r--r--net-p2p/gtkhx/Makefile2
-rw-r--r--net-p2p/lopster/Makefile2
-rw-r--r--net-p2p/xmule/Makefile2
-rw-r--r--net/ap-utils/Makefile2
-rw-r--r--net/centericq/Makefile2
-rw-r--r--net/darkstat/Makefile2
-rw-r--r--net/dctc-gui/Makefile2
-rw-r--r--net/etherape/Makefile2
-rw-r--r--net/gnunet/Makefile2
-rw-r--r--net/gtkhx/Makefile2
-rw-r--r--net/ipv6calc/Makefile2
-rw-r--r--net/jwhois/Makefile2
-rw-r--r--net/nc6/Makefile2
-rw-r--r--net/netdude/Makefile2
-rw-r--r--net/ntop/Makefile2
-rw-r--r--net/tcpreen/Makefile2
-rw-r--r--net/whois/Makefile2
-rw-r--r--net/wol/Makefile2
-rw-r--r--net/xmule/Makefile2
-rw-r--r--news/slrn/Makefile2
-rw-r--r--news/tin/Makefile2
-rw-r--r--news/yencode/Makefile2
-rw-r--r--palm/coldsync/Makefile2
-rw-r--r--palm/jpilot/Makefile2
-rw-r--r--polish/calligra-l10n/Makefile2
-rw-r--r--polish/kde3-i18n/Makefile2
-rw-r--r--polish/kde4-l10n/Makefile2
-rw-r--r--polish/koffice-i18n/Makefile2
-rw-r--r--polish/koffice-kde4-l10n/Makefile2
-rw-r--r--portuguese/calligra-l10n-pt_BR/Makefile2
-rw-r--r--portuguese/calligra-l10n/Makefile2
-rw-r--r--portuguese/kde3-i18n-pt_BR/Makefile2
-rw-r--r--portuguese/kde3-i18n/Makefile2
-rw-r--r--portuguese/kde4-l10n-pt_BR/Makefile2
-rw-r--r--portuguese/kde4-l10n/Makefile2
-rw-r--r--portuguese/koffice-i18n-pt_BR/Makefile2
-rw-r--r--portuguese/koffice-i18n/Makefile2
-rw-r--r--portuguese/koffice-kde4-l10n-pt_BR/Makefile2
-rw-r--r--portuguese/koffice-kde4-l10n/Makefile2
-rw-r--r--print/cjk-lyx/Makefile2
-rw-r--r--print/gimp-print/Makefile2
-rw-r--r--print/gutenprint-base/Makefile2
-rw-r--r--print/gutenprint/Makefile2
-rw-r--r--print/lyx-devel/Makefile2
-rw-r--r--print/lyx/Makefile2
-rw-r--r--print/lyx14/Makefile2
-rw-r--r--print/lyx15/Makefile2
-rw-r--r--print/lyx16/Makefile2
-rw-r--r--print/xfce4-print/Makefile2
-rw-r--r--russian/calligra-l10n/Makefile2
-rw-r--r--russian/kde3-i18n/Makefile2
-rw-r--r--russian/kde4-l10n/Makefile2
-rw-r--r--russian/koffice-i18n/Makefile2
-rw-r--r--russian/koffice-kde4-l10n/Makefile2
-rw-r--r--security/authforce/Makefile2
-rw-r--r--security/fwlogwatch/Makefile2
-rw-r--r--security/gnupg-devel/Makefile2
-rw-r--r--security/gnupg/Makefile2
-rw-r--r--security/gnupg1/Makefile2
-rw-r--r--security/gsasl/Makefile2
-rw-r--r--security/gss/Makefile2
-rw-r--r--security/mcrypt/Makefile2
-rw-r--r--security/newpg/Makefile2
-rw-r--r--security/quintuple-agent/Makefile2
-rw-r--r--security/shishi/Makefile2
-rw-r--r--security/steghide/Makefile2
-rw-r--r--security/tinc/Makefile2
-rw-r--r--sysutils/apcupsd/Makefile2
-rw-r--r--sysutils/coreutils/Makefile2
-rw-r--r--sysutils/gcombust/Makefile2
-rw-r--r--sysutils/gtk-imonc/Makefile2
-rw-r--r--sysutils/mount.app/Makefile2
-rw-r--r--sysutils/xcdroast/Makefile2
-rw-r--r--sysutils/xfce4-mcs-manager/Makefile2
-rw-r--r--sysutils/xfce4-mcs-plugins/Makefile2
-rw-r--r--sysutils/xfce4-utils/Makefile2
-rw-r--r--textproc/gxmlviewer/Makefile2
-rw-r--r--textproc/libtre/Makefile2
-rw-r--r--textproc/modlogan/Makefile2
-rw-r--r--textproc/opensp/Makefile2
-rw-r--r--textproc/rotix/Makefile2
-rw-r--r--textproc/scrollkeeper/Makefile2
-rw-r--r--textproc/spellutils/Makefile2
-rw-r--r--ukrainian/calligra-l10n/Makefile2
-rw-r--r--ukrainian/kde3-i18n/Makefile2
-rw-r--r--ukrainian/kde4-l10n/Makefile2
-rw-r--r--ukrainian/koffice-i18n/Makefile2
-rw-r--r--ukrainian/koffice-kde4-l10n/Makefile2
-rw-r--r--vietnamese/kde3-i18n/Makefile2
-rw-r--r--www/amyc/Makefile2
-rw-r--r--www/kdewebdev/Makefile2
-rw-r--r--www/kdewebdev4/Makefile2
-rw-r--r--www/lynx-current/Makefile2
-rw-r--r--www/quanta/Makefile2
-rw-r--r--www/retawq/Makefile2
-rw-r--r--www/sitecopy/Makefile2
-rw-r--r--www/snownews/Makefile2
-rw-r--r--www/w3m/Makefile2
-rw-r--r--x11-fm/xfce4-fm/Makefile2
-rw-r--r--x11-fm/xfe/Makefile2
-rw-r--r--x11-fm/xnc/Makefile2
-rw-r--r--x11-toolkits/gtk12/Makefile2
-rw-r--r--x11-toolkits/pango/Makefile2
-rw-r--r--x11-wm/icewm/Makefile2
-rw-r--r--x11-wm/kappdock/Makefile2
-rw-r--r--x11-wm/ude/Makefile2
-rw-r--r--x11-wm/windowmaker/Makefile2
-rw-r--r--x11-wm/xfce4-desktop/Makefile2
-rw-r--r--x11-wm/xfce4-panel/Makefile2
-rw-r--r--x11-wm/xfce4-wm/Makefile2
-rw-r--r--x11/kdelibs3/Makefile2
-rw-r--r--x11/kdelibs4/Makefile2
-rw-r--r--x11/kgamma/Makefile2
-rw-r--r--x11/xfree86_xkb_xml/Makefile2
470 files changed, 474 insertions, 474 deletions
diff --git a/arabic/kde3-i18n/Makefile b/arabic/kde3-i18n/Makefile
index 6be3361bcca7..fa0513155ff1 100644
--- a/arabic/kde3-i18n/Makefile
+++ b/arabic/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/arabic/kde4-l10n/Makefile b/arabic/kde4-l10n/Makefile
index 6be3361bcca7..fa0513155ff1 100644
--- a/arabic/kde4-l10n/Makefile
+++ b/arabic/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/arabic/koffice-i18n/Makefile b/arabic/koffice-i18n/Makefile
index d6eb5343bb01..b64626f240b2 100644
--- a/arabic/koffice-i18n/Makefile
+++ b/arabic/koffice-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 2e8e94756bf2..1c166c67393f 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -14,7 +14,7 @@ DISTNAME= dpkg_${PORTVERSION}
MAINTAINER= perky@FreeBSD.org
COMMENT= Package maintenance system for Debian
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
GNU_CONFIGURE= yes
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 4d7891b5ae3f..5978da073582 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX= g
MAINTAINER= naddy@FreeBSD.org
COMMENT= GNU version of the traditional tar archiver
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
INFO= tar
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index 58c027d27973..106aabc3e69d 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= gnupdate
MAINTAINER= ports@FreeBSD.org
COMMENT= Transparently handles automatic compression and decompression of files
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
ltdl.4:${PORTSDIR}/devel/libltdl \
curl.2:${PORTSDIR}/ftp/curl
.if !exists(/usr/bin/bzip2)
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index ea29c0fd17f6..99c45201f00b 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= The Red Hat Package Manager
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
popt.0:${PORTSDIR}/devel/popt
.if !exists(/usr/bin/bzip2)
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
diff --git a/astro/fooseti/Makefile b/astro/fooseti/Makefile
index c6bc0ab4b95f..b48045e8919f 100644
--- a/astro/fooseti/Makefile
+++ b/astro/fooseti/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= # http://www-personal.engin.umich.edu/~agorski/fooseti/
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK+ frontend to SETI@Home
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
USE_GNOME= gtk12
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index c7688773a9b6..de4f5564b49c 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -20,7 +20,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/pre/}
MAINTAINER= molter@gufi.org
COMMENT= A GPS navigation system
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_GETOPT_LONG=yes
diff --git a/astro/spacechart/Makefile b/astro/spacechart/Makefile
index 0180c5048c62..79410107f58c 100644
--- a/astro/spacechart/Makefile
+++ b/astro/spacechart/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
COMMENT= SpaceChart is a star chart viewer for GNOME
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_REINPLACE= yes
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 3345a2ac819c..4aa6b4face37 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= trevor@FreeBSD.org
COMMENT= Audio mixer for X11, terminal, or command line
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
WANT_GNOME= yes
diff --git a/audio/cplay/Makefile b/audio/cplay/Makefile
index 440aa1865da2..f6f502786095 100644
--- a/audio/cplay/Makefile
+++ b/audio/cplay/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.tf.hut.fi/~flu/cplay/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= A curses based front-end for various audio players
-BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_PYTHON= yes
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 6a3ede41d10c..8f9841c14b97 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= trevor@FreeBSD.org
COMMENT= Graphical score editor
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
xml.5:${PORTSDIR}/textproc/libxml
GNU_CONFIGURE= yes
diff --git a/audio/lopster/Makefile b/audio/lopster/Makefile
index 2f64a3fc61ed..d32b56287e09 100644
--- a/audio/lopster/Makefile
+++ b/audio/lopster/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= roman@xpert.com
COMMENT= GTK+ client for Napster
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index 638796b1d6c1..60f0b3e53e4c 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= mad
MAINTAINER= asa@gascom.ru
COMMENT= Madplay MP3 player (part of MAD project)
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
mad.2:${PORTSDIR}/audio/libmad \
id3tag.2:${PORTSDIR}/audio/libid3tag
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 5b8478b0debd..9ce5cc0b99b6 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A tool for adjusting the volume of wave/MP3 files to a standard level
LIB_DEPENDS= mad.2:${PORTSDIR}/audio/mad \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
USE_GETOPT_LONG= yes
diff --git a/audio/opmixer/Makefile b/audio/opmixer/Makefile
index 0d7f6e1586ff..3f87bcaed2e7 100644
--- a/audio/opmixer/Makefile
+++ b/audio/opmixer/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= trevor@FreeBSD.org
COMMENT= Adjusts a mixer
LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
DOCDIR= share/doc/${PORTNAME}
USE_BZIP2= yes
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 2e094ca8b506..ef64448641a2 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= trevor@FreeBSD.org
COMMENT= Multitracking sound editor and utilities
LIB_DEPENDS= gsl.5:${PORTSDIR}/math/gsl \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
.if !defined(WITHOUT_ESD)
RUN_DEPENDS= esd:${PORTSDIR}/audio/esound
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 7ed20be7b4b4..872f1e07eb0f 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig11 \
xsltproc:${PORTSDIR}/textproc/libxslt \
${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
gm4:${PORTSDIR}/devel/m4 \
- msgfmt:${PORTSDIR}/devel/gettext
+ msgfmt:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
USE_X_PREFIX= yes
diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index 59e49337d432..319bb263aac0 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Steve Harris' huge Collection of LADSPA Plugins
BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
fftw.2:${PORTSDIR}/math/fftw
# includes assember code
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index f5497fe47dce..2d74249aac2e 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -17,7 +17,7 @@ COMMENT= Play, encode, and manage Ogg Vorbis files
LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \
curl.2:${PORTSDIR}/ftp/curl \
FLAC.5:${PORTSDIR}/audio/flac \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
speex.2:${PORTSDIR}/audio/speex \
vorbis.3:${PORTSDIR}/audio/libvorbis
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index b9c1b193464c..8d6fc5716faf 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 volume mixer module for xfce4-panel
BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
xfce4util.1:${PORTSDIR}/x11/libxfce4util \
xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
xml2.5:${PORTSDIR}/textproc/libxml2 \
diff --git a/chinese/calligra-l10n-zh_TW/Makefile b/chinese/calligra-l10n-zh_TW/Makefile
index fb49226afd4a..87b1524e0b5e 100644
--- a/chinese/calligra-l10n-zh_TW/Makefile
+++ b/chinese/calligra-l10n-zh_TW/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/chinese/kde3-i18n-zh_CN/Makefile b/chinese/kde3-i18n-zh_CN/Makefile
index 038a7b066f05..5fb9fb3e3186 100644
--- a/chinese/kde3-i18n-zh_CN/Makefile
+++ b/chinese/kde3-i18n-zh_CN/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Simplified Chinese messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/chinese/kde3-i18n-zh_TW/Makefile b/chinese/kde3-i18n-zh_TW/Makefile
index 312bbadcc790..0bce4c53189f 100644
--- a/chinese/kde3-i18n-zh_TW/Makefile
+++ b/chinese/kde3-i18n-zh_TW/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Traditional Chinese messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/chinese/kde4-l10n-zh_CN/Makefile b/chinese/kde4-l10n-zh_CN/Makefile
index 038a7b066f05..5fb9fb3e3186 100644
--- a/chinese/kde4-l10n-zh_CN/Makefile
+++ b/chinese/kde4-l10n-zh_CN/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Simplified Chinese messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/chinese/kde4-l10n-zh_TW/Makefile b/chinese/kde4-l10n-zh_TW/Makefile
index 312bbadcc790..0bce4c53189f 100644
--- a/chinese/kde4-l10n-zh_TW/Makefile
+++ b/chinese/kde4-l10n-zh_TW/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Traditional Chinese messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/chinese/koffice-i18n-zh_TW/Makefile b/chinese/koffice-i18n-zh_TW/Makefile
index fb49226afd4a..87b1524e0b5e 100644
--- a/chinese/koffice-i18n-zh_TW/Makefile
+++ b/chinese/koffice-i18n-zh_TW/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/chinese/koffice-kde4-l10n-zh_TW/Makefile b/chinese/koffice-kde4-l10n-zh_TW/Makefile
index fb49226afd4a..87b1524e0b5e 100644
--- a/chinese/koffice-kde4-l10n-zh_TW/Makefile
+++ b/chinese/koffice-kde4-l10n-zh_TW/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index 40ee3ce963a5..f9218d196600 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= kcwu@ck.tp.edu.tw
COMMENT= Chinese input method server under X
LIB_DEPENDS= tabe.2:${PORTSDIR}/chinese/libtabe \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
.if !defined(USE_DB2)
LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3
diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index e7f621025380..ba0151e9c354 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A fast Console Chinese System which supports framebuffer device
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-included-gettext=${LOCALBASE}
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index e8fa99f57fcb..0d441dfd51c4 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Tools to talk to Nokia cellular phones
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_REINPLACE= yes
USE_GMAKE= yes
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index 1fa08898e1c6..d2f9b0a19d2b 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.pxh.de/fs/gsmlib/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= A library to access GSM mobile phones through GSM modems
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile
index 3ce8fecb5435..4e40b2847dcc 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -16,7 +16,7 @@ COMMENT= TI calculator link cables library
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
WANT_AUTOMAKE_VER= 15
GNU_CONFIGURE= yes
diff --git a/comms/tilp/Makefile b/comms/tilp/Makefile
index 6e075e667597..2598a64c7c73 100644
--- a/comms/tilp/Makefile
+++ b/comms/tilp/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS= ticalcs-4.5:${PORTSDIR}/devel/libticalcs \
ticables.10:${PORTSDIR}/comms/libticables \
tifiles.5:${PORTSDIR}/devel/libtifiles \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_GNOME= gtk20 libglade2
USE_X_PREFIX= yes
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index dd24484449e8..ae0fe09a0063 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= recode
MAINTAINER= demon@FreeBSD.org
COMMENT= Converts files between character sets and usages
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_LIBTOOL= yes
USE_PERL5= yes
diff --git a/databases/clip/Makefile b/databases/clip/Makefile
index 612312cde7d2..3d22d967dfbd 100644
--- a/databases/clip/Makefile
+++ b/databases/clip/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
freetype.9:${PORTSDIR}/print/freetype2 \
gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra \
gd.4:${PORTSDIR}/graphics/gd \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 \
wget:${PORTSDIR}/ftp/wget
diff --git a/databases/mysql-gui/Makefile b/databases/mysql-gui/Makefile
index 53917da4adff..2d6a2ae09af4 100644
--- a/databases/mysql-gui/Makefile
+++ b/databases/mysql-gui/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= cyrille.lefevre@laposte.net
COMMENT= A graphical SQL client for MySQL
LIB_DEPENDS= sqlplus.1:${PORTSDIR}/databases/mysql++ \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
glut.3:${PORTSDIR}/graphics/libglut \
jpeg.9:${PORTSDIR}/graphics/jpeg \
fleditor.1:${PORTSDIR}/x11-toolkits/fl_editor \
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index bb30ef77d51c..45cde683c5c8 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -21,7 +21,7 @@ COMMENT= Full-text search system intended for easy use
BUILD_DEPENDS= ${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
RUN_DEPENDS= ${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
# xlHtml:${PORTSDIR}/textproc/xlhtml \
# wvHtml:${PORTSDIR}/textproc/wv
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index fedbd6a04f3f..915fa8df16cd 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= sheldonh@FreeBSD.org
COMMENT= A Sybase DBI driver for Perl 5
LIB_DEPENDS= ct.2:${PORTSDIR}/databases/freetds \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
PERL_CONFIGURE= yes
CONFIGURE_ENV+= SYBASE=${LOCALBASE}
diff --git a/databases/p5-Search-Namazu/Makefile b/databases/p5-Search-Namazu/Makefile
index 4e8e629fb65e..a6894dd1ceff 100644
--- a/databases/p5-Search-Namazu/Makefile
+++ b/databases/p5-Search-Namazu/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Namazu library module for perl
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
nmz.6:${PORTSDIR}/databases/namazu2
PERL_CONFIGURE= YES
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index cb361f7c9603..88a80cfda193 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -47,7 +47,7 @@ USE_GETOPT_LONG=yes
.if !defined(WITHOUT_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index 2087c78685f6..f1b49125afb0 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -45,7 +45,7 @@ USE_GETOPT_LONG=yes
.if !defined(WITHOUT_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index cb361f7c9603..88a80cfda193 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -47,7 +47,7 @@ USE_GETOPT_LONG=yes
.if !defined(WITHOUT_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql72/Makefile b/databases/postgresql72/Makefile
index 3648acfbf82e..5575131d65c8 100644
--- a/databases/postgresql72/Makefile
+++ b/databases/postgresql72/Makefile
@@ -47,7 +47,7 @@ USE_GETOPT_LONG=yes
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 92a5e17719b5..42ed594f544f 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -43,7 +43,7 @@ USE_GETOPT_LONG=yes
.if !defined(WITHOUT_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile
index 92a5e17719b5..42ed594f544f 100644
--- a/databases/postgresql73/Makefile
+++ b/databases/postgresql73/Makefile
@@ -43,7 +43,7 @@ USE_GETOPT_LONG=yes
.if !defined(WITHOUT_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index cb361f7c9603..88a80cfda193 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -47,7 +47,7 @@ USE_GETOPT_LONG=yes
.if !defined(WITHOUT_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index cb361f7c9603..88a80cfda193 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -47,7 +47,7 @@ USE_GETOPT_LONG=yes
.if !defined(WITHOUT_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index cb361f7c9603..88a80cfda193 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -47,7 +47,7 @@ USE_GETOPT_LONG=yes
.if !defined(WITHOUT_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index cb361f7c9603..88a80cfda193 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -47,7 +47,7 @@ USE_GETOPT_LONG=yes
.if !defined(WITHOUT_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index cb361f7c9603..88a80cfda193 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -47,7 +47,7 @@ USE_GETOPT_LONG=yes
.if !defined(WITHOUT_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index cb361f7c9603..88a80cfda193 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -47,7 +47,7 @@ USE_GETOPT_LONG=yes
.if !defined(WITHOUT_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index cb361f7c9603..88a80cfda193 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -47,7 +47,7 @@ USE_GETOPT_LONG=yes
.if !defined(WITHOUT_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index cb361f7c9603..88a80cfda193 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -47,7 +47,7 @@ USE_GETOPT_LONG=yes
.if !defined(WITHOUT_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index cb361f7c9603..88a80cfda193 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -47,7 +47,7 @@ USE_GETOPT_LONG=yes
.if !defined(WITHOUT_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/pxtools/Makefile b/databases/pxtools/Makefile
index 6970affedd43..cdba146947d0 100644
--- a/databases/pxtools/Makefile
+++ b/databases/pxtools/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://jan.kneschke.de/projects/pxtools/download/
MAINTAINER= jedgar@FreeBSD.org
COMMENT= Collection of tools to work with Paradox databases
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 8d4df64cb102..fe2fb7957393 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= kiesel@schlund.de
COMMENT= Interactive tool for querying Sybase database servers
LIB_DEPENDS= ct.2:${PORTSDIR}/databases/freetds \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/babytrans/Makefile b/deskutils/babytrans/Makefile
index 86221b50b289..9ed9e1dd975d 100644
--- a/deskutils/babytrans/Makefile
+++ b/deskutils/babytrans/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://fjolliton.free.fr/babytrans/
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK+/GNOME front-end for Babylon Translator .dic files
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_REINPLACE= yes
diff --git a/deskutils/gcal/Makefile b/deskutils/gcal/Makefile
index d9ef2a25d2fa..0c6b285845bb 100644
--- a/deskutils/gcal/Makefile
+++ b/deskutils/gcal/Makefile
@@ -18,7 +18,7 @@ COMMENT= The GNU Gregorian calendar program
# Global variables
#
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index ea2b8d8f9b58..aef7cb859d98 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= High-performance CORBA ORB with support for the C language
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile
index 5225bd993f15..21c7e1372276 100644
--- a/devel/argtable/Makefile
+++ b/devel/argtable/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= An ANSI C library for parsing GNU style command line arguments
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GETOPT_LONG= yes
WRKSRC= ${WRKDIR}/argtable2
diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index 0074090ac385..3df99afa2082 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -24,7 +24,7 @@ COMMENT= FSF GCC 3.3.1 for Atmel AVR 8-bit RISC cross-development
BUILD_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \
avr-ld:${PORTSDIR}/devel/avr-binutils \
autoheader:${PORTSDIR}/devel/autoconf \
- gettext:${PORTSDIR}/devel/gettext
+ gettext:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \
avr-ld:${PORTSDIR}/devel/avr-binutils
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 0074090ac385..3df99afa2082 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -24,7 +24,7 @@ COMMENT= FSF GCC 3.3.1 for Atmel AVR 8-bit RISC cross-development
BUILD_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \
avr-ld:${PORTSDIR}/devel/avr-binutils \
autoheader:${PORTSDIR}/devel/autoconf \
- gettext:${PORTSDIR}/devel/gettext
+ gettext:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \
avr-ld:${PORTSDIR}/devel/avr-binutils
diff --git a/devel/bison-devel/Makefile b/devel/bison-devel/Makefile
index 0c56476b12a2..3bfecb68c6c9 100644
--- a/devel/bison-devel/Makefile
+++ b/devel/bison-devel/Makefile
@@ -18,7 +18,7 @@ COMMENT= A parser generator from FSF, (mostly) compatible with Yacc
CONFLICTS= bison-[0-9]+
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 2e7af2f111d7..0f71e4b5320c 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= bison-[0-9]+
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
.if !defined(WITHOUT_NLS)
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB= NLS=""
.else
PLIST_SUB= NLS="@comment "
diff --git a/devel/bison175/Makefile b/devel/bison175/Makefile
index 2e7af2f111d7..0f71e4b5320c 100644
--- a/devel/bison175/Makefile
+++ b/devel/bison175/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= bison-[0-9]+
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
.if !defined(WITHOUT_NLS)
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB= NLS=""
.else
PLIST_SUB= NLS="@comment "
diff --git a/devel/bison1875/Makefile b/devel/bison1875/Makefile
index 0c56476b12a2..3bfecb68c6c9 100644
--- a/devel/bison1875/Makefile
+++ b/devel/bison1875/Makefile
@@ -18,7 +18,7 @@ COMMENT= A parser generator from FSF, (mostly) compatible with Yacc
CONFLICTS= bison-[0-9]+
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
diff --git a/devel/bison2/Makefile b/devel/bison2/Makefile
index 0c56476b12a2..3bfecb68c6c9 100644
--- a/devel/bison2/Makefile
+++ b/devel/bison2/Makefile
@@ -18,7 +18,7 @@ COMMENT= A parser generator from FSF, (mostly) compatible with Yacc
CONFLICTS= bison-[0-9]+
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
diff --git a/devel/bison20/Makefile b/devel/bison20/Makefile
index 0c56476b12a2..3bfecb68c6c9 100644
--- a/devel/bison20/Makefile
+++ b/devel/bison20/Makefile
@@ -18,7 +18,7 @@ COMMENT= A parser generator from FSF, (mostly) compatible with Yacc
CONFLICTS= bison-[0-9]+
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index 11c7f0503a29..6dbb29d0456c 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://gd.tuwien.ac.at/softeng/Aegis/cook/
MAINTAINER= jasone@canonware.com
COMMENT= Like make(1), but more powerful and clean
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib \
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 041a4f397b76..1dd721a9bd1b 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -18,7 +18,7 @@ DISTNAME= indent-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GNU indent
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 77dfa982fa7a..f7c31e392582 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -20,7 +20,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Some useful routines of C programming (current stable version)
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
NO_LATEST_LINK= yes
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index d149757b44f0..3dd167d6ca1a 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ade@FreeBSD.org
COMMENT= GNU version of 'make' utility
.if !defined(WITHOUT_NLS)
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
.endif
USE_BZIP2= yes
diff --git a/devel/gmake381/Makefile b/devel/gmake381/Makefile
index d149757b44f0..3dd167d6ca1a 100644
--- a/devel/gmake381/Makefile
+++ b/devel/gmake381/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ade@FreeBSD.org
COMMENT= GNU version of 'make' utility
.if !defined(WITHOUT_NLS)
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
.endif
USE_BZIP2= yes
diff --git a/devel/i386-rtems-gcc/Makefile b/devel/i386-rtems-gcc/Makefile
index 32ac2e289eec..4c7c9ee7dcc4 100644
--- a/devel/i386-rtems-gcc/Makefile
+++ b/devel/i386-rtems-gcc/Makefile
@@ -42,7 +42,7 @@ BUILD_DEPENDS= autoheader:${PORTSDIR}/devel/autoconf \
${LCLTARGET}-ld:${PORTSDIR}/devel/${LCLTARGET}-binutils
RUN_DEPENDS= ${LCLTARGET}-as:${PORTSDIR}/devel/${LCLTARGET}-binutils \
${LCLTARGET}-ld:${PORTSDIR}/devel/${LCLTARGET}-binutils
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
PKGNAMEPREFIX= ${LCLTARGET}-
USE_GMAKE= yes
diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile
index 7f340a4a5a17..e194d21031e8 100644
--- a/devel/ixlib/Makefile
+++ b/devel/ixlib/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A small C++ tools library based on STL
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile
index 46d0da5c7ad1..9fe563c2d2b9 100644
--- a/devel/libelf/Makefile
+++ b/devel/libelf/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= libs .
MAINTAINER= roam@FreeBSD.org
COMMENT= "A public ELF file access library similar to libelf(3) in Solaris"
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libticalcs/Makefile b/devel/libticalcs/Makefile
index a599aa598696..e783d5733bc1 100644
--- a/devel/libticalcs/Makefile
+++ b/devel/libticalcs/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS= ticables.10:${PORTSDIR}/comms/libticables \
tifiles.5:${PORTSDIR}/devel/libtifiles \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_GNOME= glib20
WANT_AUTOMAKE_VER= 15
diff --git a/devel/libtifiles/Makefile b/devel/libtifiles/Makefile
index 16586ca62859..53ab170db11a 100644
--- a/devel/libtifiles/Makefile
+++ b/devel/libtifiles/Makefile
@@ -16,7 +16,7 @@ COMMENT= TI calculator file types library
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
WANT_AUTOMAKE_VER= 15
GNU_CONFIGURE= yes
diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index d538cfca6000..ea518cec34a1 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= Routines to access raw VBI capture devices
LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_BZIP2= yes
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 754b8cbeee38..3693ca4eb851 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -15,7 +15,7 @@ COMMENT= GUI interface for make or gmake
LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
freetype.9:${PORTSDIR}/print/freetype2 \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
DOCS= COPYING COPYRIGHT ChangeLog TODO
GNU_CONFIGURE= yes
diff --git a/devel/mingw-binutils/Makefile b/devel/mingw-binutils/Makefile
index d619e72101ca..8e86eb326e66 100644
--- a/devel/mingw-binutils/Makefile
+++ b/devel/mingw-binutils/Makefile
@@ -18,8 +18,8 @@ DIST_SUBDIR= mingw
MAINTAINER= ports@FreeBSD.org
COMMENT= FSF binutils-2.11.90 for Windows cross-development
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-20011113
diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index 402ee8eee650..d804b9a152a9 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -25,8 +25,8 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= lev@FreeBSD.org
COMMENT= FSF binutils-2.14 for Windows cross-development
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
BINUTILVERSION= 2.14
PATCHVERSION= 90.20030807.1
diff --git a/devel/motor/Makefile b/devel/motor/Makefile
index a58bea0740f4..48a94532c466 100644
--- a/devel/motor/Makefile
+++ b/devel/motor/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://konst.org.ua/download/
MAINTAINER= ale@FreeBSD.org
COMMENT= A powerful text mode based programming IDE
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index f1bd0221c5fb..bc7b88eddfc2 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= Message handling functions
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
PERL_CONFIGURE= yes
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 5b12814af169..e2a09e657ff3 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ \
MAINTAINER= lioux@FreeBSD.org
COMMENT= A getopt(3) like library with a number of enhancements, from Redhat
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_LIBTOOL= yes
USE_REINPLACE= yes
diff --git a/devel/ruby-gettext/Makefile b/devel/ruby-gettext/Makefile
index 68e2c97466a5..499efd8a2546 100644
--- a/devel/ruby-gettext/Makefile
+++ b/devel/ruby-gettext/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
COMMENT= A Ruby implementation of the gettext library
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext \
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old \
racc:${PORTSDIR}/devel/ruby-racc
USE_RUBY= yes
diff --git a/devel/ruby-intl/Makefile b/devel/ruby-intl/Makefile
index edf90831a4f9..1813db62317f 100644
--- a/devel/ruby-intl/Makefile
+++ b/devel/ruby-intl/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
COMMENT= A simple wrapper of GNU gettext for Ruby
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
diff --git a/devel/rubygem-gettext/Makefile b/devel/rubygem-gettext/Makefile
index 68e2c97466a5..499efd8a2546 100644
--- a/devel/rubygem-gettext/Makefile
+++ b/devel/rubygem-gettext/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
COMMENT= A Ruby implementation of the gettext library
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext \
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old \
racc:${PORTSDIR}/devel/ruby-racc
USE_RUBY= yes
diff --git a/devel/rubygem-locale/Makefile b/devel/rubygem-locale/Makefile
index 68e2c97466a5..499efd8a2546 100644
--- a/devel/rubygem-locale/Makefile
+++ b/devel/rubygem-locale/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
COMMENT= A Ruby implementation of the gettext library
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext \
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old \
racc:${PORTSDIR}/devel/ruby-racc
USE_RUBY= yes
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 22b77b748b06..0abaa2f97dcf 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A complete rewrite of the NASM assembler
BUILD_DEPENDS= re2c:${PORTSDIR}/devel/re2c
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
USE_PERL5_BUILD= yes
diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile
index 66f5615d50ee..ba2f9a02a526 100644
--- a/dns/mydns-ng/Makefile
+++ b/dns/mydns-ng/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://mydns.bboy.net/download/
MAINTAINER= ale@FreeBSD.org
COMMENT= DNS server designed to utilize the MySQL database
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
GNU_CONFIGURE= yes
diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile
index 66f5615d50ee..ba2f9a02a526 100644
--- a/dns/mydns/Makefile
+++ b/dns/mydns/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://mydns.bboy.net/download/
MAINTAINER= ale@FreeBSD.org
COMMENT= DNS server designed to utilize the MySQL database
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
GNU_CONFIGURE= yes
diff --git a/editors/calligra-l10n-da/Makefile b/editors/calligra-l10n-da/Makefile
index 6d6c087830e6..7c012b50d52b 100644
--- a/editors/calligra-l10n-da/Makefile
+++ b/editors/calligra-l10n-da/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/calligra-l10n-el/Makefile b/editors/calligra-l10n-el/Makefile
index b0d648a96b14..572fa3fe4c29 100644
--- a/editors/calligra-l10n-el/Makefile
+++ b/editors/calligra-l10n-el/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/calligra-l10n-en_GB/Makefile b/editors/calligra-l10n-en_GB/Makefile
index 26a45f5d688c..b25ea03e1357 100644
--- a/editors/calligra-l10n-en_GB/Makefile
+++ b/editors/calligra-l10n-en_GB/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/calligra-l10n-es/Makefile b/editors/calligra-l10n-es/Makefile
index e388f3504c25..fb4046b9eaf0 100644
--- a/editors/calligra-l10n-es/Makefile
+++ b/editors/calligra-l10n-es/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/calligra-l10n-et/Makefile b/editors/calligra-l10n-et/Makefile
index 1fea51de7fdb..e5a4d6ee6651 100644
--- a/editors/calligra-l10n-et/Makefile
+++ b/editors/calligra-l10n-et/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/calligra-l10n-it/Makefile b/editors/calligra-l10n-it/Makefile
index 3fc03cf15485..f5a594aa4f31 100644
--- a/editors/calligra-l10n-it/Makefile
+++ b/editors/calligra-l10n-it/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/calligra-l10n-nb/Makefile b/editors/calligra-l10n-nb/Makefile
index 27f85da4f03a..7c28aca5d510 100644
--- a/editors/calligra-l10n-nb/Makefile
+++ b/editors/calligra-l10n-nb/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/calligra-l10n-nl/Makefile b/editors/calligra-l10n-nl/Makefile
index 12a6c72b948f..7e5debc700ea 100644
--- a/editors/calligra-l10n-nl/Makefile
+++ b/editors/calligra-l10n-nl/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/calligra-l10n-sv/Makefile b/editors/calligra-l10n-sv/Makefile
index 638307c159ee..9281468820a2 100644
--- a/editors/calligra-l10n-sv/Makefile
+++ b/editors/calligra-l10n-sv/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 4195f8c6052a..5522d893c358 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://cooledit.sourceforge.net/
MAINTAINER= ports@FreeBSD.org
COMMENT= Suite of utilities, including a GUI editor
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
vga.1:${PORTSDIR}/graphics/svgalib
USE_XPM= yes
diff --git a/editors/koffice-i18n-af/Makefile b/editors/koffice-i18n-af/Makefile
index def48abe484f..219e1aa145eb 100644
--- a/editors/koffice-i18n-af/Makefile
+++ b/editors/koffice-i18n-af/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-bs/Makefile b/editors/koffice-i18n-bs/Makefile
index 824892211bde..19d8b773c81f 100644
--- a/editors/koffice-i18n-bs/Makefile
+++ b/editors/koffice-i18n-bs/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-cs/Makefile b/editors/koffice-i18n-cs/Makefile
index efa46ed5ea08..c2a00b38ed58 100644
--- a/editors/koffice-i18n-cs/Makefile
+++ b/editors/koffice-i18n-cs/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-da/Makefile b/editors/koffice-i18n-da/Makefile
index 6d6c087830e6..7c012b50d52b 100644
--- a/editors/koffice-i18n-da/Makefile
+++ b/editors/koffice-i18n-da/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-el/Makefile b/editors/koffice-i18n-el/Makefile
index b0d648a96b14..572fa3fe4c29 100644
--- a/editors/koffice-i18n-el/Makefile
+++ b/editors/koffice-i18n-el/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-en_GB/Makefile b/editors/koffice-i18n-en_GB/Makefile
index 26a45f5d688c..b25ea03e1357 100644
--- a/editors/koffice-i18n-en_GB/Makefile
+++ b/editors/koffice-i18n-en_GB/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-eo/Makefile b/editors/koffice-i18n-eo/Makefile
index 8221d37e511a..2b7c66c37853 100644
--- a/editors/koffice-i18n-eo/Makefile
+++ b/editors/koffice-i18n-eo/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-es/Makefile b/editors/koffice-i18n-es/Makefile
index e388f3504c25..fb4046b9eaf0 100644
--- a/editors/koffice-i18n-es/Makefile
+++ b/editors/koffice-i18n-es/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-et/Makefile b/editors/koffice-i18n-et/Makefile
index 1fea51de7fdb..e5a4d6ee6651 100644
--- a/editors/koffice-i18n-et/Makefile
+++ b/editors/koffice-i18n-et/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-it/Makefile b/editors/koffice-i18n-it/Makefile
index 3fc03cf15485..f5a594aa4f31 100644
--- a/editors/koffice-i18n-it/Makefile
+++ b/editors/koffice-i18n-it/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-lt/Makefile b/editors/koffice-i18n-lt/Makefile
index 4faa57a40014..0a19c1abc594 100644
--- a/editors/koffice-i18n-lt/Makefile
+++ b/editors/koffice-i18n-lt/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-lv/Makefile b/editors/koffice-i18n-lv/Makefile
index c0a8494e128b..4bc1fd37bccc 100644
--- a/editors/koffice-i18n-lv/Makefile
+++ b/editors/koffice-i18n-lv/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-mt/Makefile b/editors/koffice-i18n-mt/Makefile
index caef66d9ec8e..4aa634005857 100644
--- a/editors/koffice-i18n-mt/Makefile
+++ b/editors/koffice-i18n-mt/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-nb/Makefile b/editors/koffice-i18n-nb/Makefile
index 27f85da4f03a..7c28aca5d510 100644
--- a/editors/koffice-i18n-nb/Makefile
+++ b/editors/koffice-i18n-nb/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-nl/Makefile b/editors/koffice-i18n-nl/Makefile
index 12a6c72b948f..7e5debc700ea 100644
--- a/editors/koffice-i18n-nl/Makefile
+++ b/editors/koffice-i18n-nl/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-nn/Makefile b/editors/koffice-i18n-nn/Makefile
index 26720a5a23c6..d95ddc22d5a2 100644
--- a/editors/koffice-i18n-nn/Makefile
+++ b/editors/koffice-i18n-nn/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-sk/Makefile b/editors/koffice-i18n-sk/Makefile
index 7c2a96df45f8..7978106b41b2 100644
--- a/editors/koffice-i18n-sk/Makefile
+++ b/editors/koffice-i18n-sk/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-sl/Makefile b/editors/koffice-i18n-sl/Makefile
index 0f26f21c6c54..2db559739f03 100644
--- a/editors/koffice-i18n-sl/Makefile
+++ b/editors/koffice-i18n-sl/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-sv/Makefile b/editors/koffice-i18n-sv/Makefile
index 638307c159ee..9281468820a2 100644
--- a/editors/koffice-i18n-sv/Makefile
+++ b/editors/koffice-i18n-sv/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-th/Makefile b/editors/koffice-i18n-th/Makefile
index d9c7a6a186ae..450a667497f4 100644
--- a/editors/koffice-i18n-th/Makefile
+++ b/editors/koffice-i18n-th/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-tr/Makefile b/editors/koffice-i18n-tr/Makefile
index 109aea9f60cb..f3f83e7d0015 100644
--- a/editors/koffice-i18n-tr/Makefile
+++ b/editors/koffice-i18n-tr/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-ven/Makefile b/editors/koffice-i18n-ven/Makefile
index 9eb74375e5ea..a9d34808add7 100644
--- a/editors/koffice-i18n-ven/Makefile
+++ b/editors/koffice-i18n-ven/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-xh/Makefile b/editors/koffice-i18n-xh/Makefile
index 18e79cfec0aa..bb13b680a96b 100644
--- a/editors/koffice-i18n-xh/Makefile
+++ b/editors/koffice-i18n-xh/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-i18n-zu/Makefile b/editors/koffice-i18n-zu/Makefile
index 40be932519d1..65ed22eac628 100644
--- a/editors/koffice-i18n-zu/Makefile
+++ b/editors/koffice-i18n-zu/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-kde4-l10n-da/Makefile b/editors/koffice-kde4-l10n-da/Makefile
index 6d6c087830e6..7c012b50d52b 100644
--- a/editors/koffice-kde4-l10n-da/Makefile
+++ b/editors/koffice-kde4-l10n-da/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-kde4-l10n-el/Makefile b/editors/koffice-kde4-l10n-el/Makefile
index b0d648a96b14..572fa3fe4c29 100644
--- a/editors/koffice-kde4-l10n-el/Makefile
+++ b/editors/koffice-kde4-l10n-el/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-kde4-l10n-en_GB/Makefile b/editors/koffice-kde4-l10n-en_GB/Makefile
index 26a45f5d688c..b25ea03e1357 100644
--- a/editors/koffice-kde4-l10n-en_GB/Makefile
+++ b/editors/koffice-kde4-l10n-en_GB/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-kde4-l10n-es/Makefile b/editors/koffice-kde4-l10n-es/Makefile
index e388f3504c25..fb4046b9eaf0 100644
--- a/editors/koffice-kde4-l10n-es/Makefile
+++ b/editors/koffice-kde4-l10n-es/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-kde4-l10n-et/Makefile b/editors/koffice-kde4-l10n-et/Makefile
index 1fea51de7fdb..e5a4d6ee6651 100644
--- a/editors/koffice-kde4-l10n-et/Makefile
+++ b/editors/koffice-kde4-l10n-et/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-kde4-l10n-it/Makefile b/editors/koffice-kde4-l10n-it/Makefile
index 3fc03cf15485..f5a594aa4f31 100644
--- a/editors/koffice-kde4-l10n-it/Makefile
+++ b/editors/koffice-kde4-l10n-it/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-kde4-l10n-nb/Makefile b/editors/koffice-kde4-l10n-nb/Makefile
index 27f85da4f03a..7c28aca5d510 100644
--- a/editors/koffice-kde4-l10n-nb/Makefile
+++ b/editors/koffice-kde4-l10n-nb/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-kde4-l10n-nl/Makefile b/editors/koffice-kde4-l10n-nl/Makefile
index 12a6c72b948f..7e5debc700ea 100644
--- a/editors/koffice-kde4-l10n-nl/Makefile
+++ b/editors/koffice-kde4-l10n-nl/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-kde4-l10n-sv/Makefile b/editors/koffice-kde4-l10n-sv/Makefile
index 638307c159ee..9281468820a2 100644
--- a/editors/koffice-kde4-l10n-sv/Makefile
+++ b/editors/koffice-kde4-l10n-sv/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/koffice-kde4-l10n-tr/Makefile b/editors/koffice-kde4-l10n-tr/Makefile
index 109aea9f60cb..f3f83e7d0015 100644
--- a/editors/koffice-kde4-l10n-tr/Makefile
+++ b/editors/koffice-kde4-l10n-tr/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index 266ee8395af0..0ff38d9449a0 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ryan@sasknow.com
COMMENT= A "lightweight programmer's editor" with syntax highlighting
LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_LIBTOOL= yes
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 5afeff3ff109..da7b847f1ea6 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.nano-editor.org/dist/v1.2/
MAINTAINER= naddy@FreeBSD.org
COMMENT= Nano's ANOther editor, an enhanced free Pico clone
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 6adeb6c781f6..ed053880e734 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Gettext catalogs (.po files) editor
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
USE_X_PREFIX= yes
diff --git a/editors/ssed/Makefile b/editors/ssed/Makefile
index 61b372b3c168..1b9c4594c435 100644
--- a/editors/ssed/Makefile
+++ b/editors/ssed/Makefile
@@ -15,7 +15,7 @@ DISTNAME= sed-${PORTVERSION}
MAINTAINER= verm@drunkmonk.net
COMMENT= Super-sed is a heavily enhanced version of sed
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv:${PORTSDIR}/converters/libiconv
GNU_CONFIGURE= yes
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 4027e7199aae..0378fa74bfba 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -32,7 +32,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
USE_XLIB= yes
USE_XPM= yes
.endif
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old \
${LIB_INPUT_METHOD}
XEMACS_MAJOR_VER?= 21
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 824b9cc2e7fc..cb38d163e570 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -32,7 +32,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
compface.1:${PORTSDIR}/mail/faces \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
${LIB_INPUT_METHOD}
XEMACS_MAJOR_VER?= 21
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index 48534cb4055e..ec131de8fa4a 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= jkoshy@freebsd.org
COMMENT= Multi-lingual unicode text editor with TTF support
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
USE_BZIP2= YES
USE_XLIB= YES
diff --git a/editors/zoinks/Makefile b/editors/zoinks/Makefile
index eeb4f708beeb..675a166e6d53 100644
--- a/editors/zoinks/Makefile
+++ b/editors/zoinks/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= mike@mikelockwood.com
COMMENT= An X11 programmer's editor and development environment
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
.if defined(WITH_IMLIB)
USE_GNOME= imlib
diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index 60fa241d06c7..3cb2d8d772c8 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -17,7 +17,7 @@ COMMENT= GXmame is a GTK frontend for xmame
RUN_DEPENDS= xmame:${PORTSDIR}/emulators/xmame
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_GZIP= yes
USE_XLIB= yes
diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index b8f578d75368..b76cc04e9c6c 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -17,7 +17,7 @@ COMMENT= The Hercules System/370, ESA/390, and z/Architecture Emulator
GNU_CONFIGURE= yes
USE_REINPLACE= yes
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
post-patch:
@${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/configure
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index 44a1e4d5e232..abaa53892d59 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -40,7 +40,7 @@ PATCHES= pastel.diff
.include <bsd.port.pre.mk>
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
FREETYPE_CONFIG?= ${LOCALBASE}/bin/freetype-config
diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index 08a6fe9ea985..542a26bbe9d9 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://grisbi.org/download/packages/${PORTVERSION}/sources/ \
MAINTAINER= thierry@pompo.net
COMMENT= A personnal accounting application
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
USE_X_PREFIX= yes
diff --git a/french/calligra-l10n/Makefile b/french/calligra-l10n/Makefile
index fb0d2e527f1d..065b53a14715 100644
--- a/french/calligra-l10n/Makefile
+++ b/french/calligra-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/french/kde3-i18n/Makefile b/french/kde3-i18n/Makefile
index ca5844ebeefd..cea781cacf37 100644
--- a/french/kde3-i18n/Makefile
+++ b/french/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/french/kde4-l10n/Makefile b/french/kde4-l10n/Makefile
index ca5844ebeefd..cea781cacf37 100644
--- a/french/kde4-l10n/Makefile
+++ b/french/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/french/koffice-i18n/Makefile b/french/koffice-i18n/Makefile
index fb0d2e527f1d..065b53a14715 100644
--- a/french/koffice-i18n/Makefile
+++ b/french/koffice-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/french/koffice-kde4-l10n/Makefile b/french/koffice-kde4-l10n/Makefile
index fb0d2e527f1d..065b53a14715 100644
--- a/french/koffice-kde4-l10n/Makefile
+++ b/french/koffice-kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/ftp/axel/Makefile b/ftp/axel/Makefile
index 07c5009b305e..2cb291fbfc29 100644
--- a/ftp/axel/Makefile
+++ b/ftp/axel/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.lintux.cx/downloads/
MAINTAINER= lintux@debian.org
COMMENT= A download accelerator
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
HAS_CONFIGURE= yes
diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index c135715caeca..afc8f9d9a6d8 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -34,7 +34,7 @@ MASTER_SITES= ftp://ftp.phear.org/pub/linux/networking/ftp/client/lftp/ \
MAINTAINER= fm@code.org.ua
COMMENT= Shell-like command line ftp client
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index 7b7af6d2ce01..6b6cc2d2f7f1 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -18,7 +18,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= HTTP, FTP and Gopher mirroring tool
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_OPENSSL= yes
WANT_GNOME= yes
diff --git a/ftp/wget+ipv6/Makefile b/ftp/wget+ipv6/Makefile
index c35e41861c12..e9524bb92fee 100644
--- a/ftp/wget+ipv6/Makefile
+++ b/ftp/wget+ipv6/Makefile
@@ -27,7 +27,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= sf@FreeBSD.org
COMMENT= Retrieve files from the Net via HTTP and FTP with IPv6 capability
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
diff --git a/ftp/wget-devel/Makefile b/ftp/wget-devel/Makefile
index 83ec80d85540..754d1e60e323 100644
--- a/ftp/wget-devel/Makefile
+++ b/ftp/wget-devel/Makefile
@@ -21,7 +21,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Retrieve files from the Net via HTTP and FTP
.if !defined(WITHOUT_NLS)
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
.endif
CONFLICTS= wget-*
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 55fd664ded24..4c9abc796ac7 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -24,7 +24,7 @@ MAINTAINER= sf@FreeBSD.org
COMMENT= Retrieve files from the Net via HTTP and FTP
.if !defined(WITHOUT_NLS)
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
.endif
CONFLICTS= wget-devel-*
diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile
index a20c053e0f26..bc692bbc2b9e 100644
--- a/games/freeciv-gtk2/Makefile
+++ b/games/freeciv-gtk2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.freeciv.org/pub/freeciv/stable/ \
MAINTAINER?= adam-ports@blacktabby.org
COMMENT?= A civilisation clone for X11; multiplayer
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_XPM= yes
USE_BZIP2= yes
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index a20c053e0f26..bc692bbc2b9e 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.freeciv.org/pub/freeciv/stable/ \
MAINTAINER?= adam-ports@blacktabby.org
COMMENT?= A civilisation clone for X11; multiplayer
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_XPM= yes
USE_BZIP2= yes
diff --git a/games/ggz-txt-client/Makefile b/games/ggz-txt-client/Makefile
index 4ae472c73913..5003a2af629a 100644
--- a/games/ggz-txt-client/Makefile
+++ b/games/ggz-txt-client/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ggz
MAINTAINER= ports@FreeBSD.org
COMMENT= The GGZ Gaming Zone - Console (Text) Frontend
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
ggz.1:${PORTSDIR}/games/libggz \
ggzcore.3:${PORTSDIR}/games/ggz-client-libs
diff --git a/games/gnmm/Makefile b/games/gnmm/Makefile
index 02ea2851a746..40221636a286 100644
--- a/games/gnmm/Makefile
+++ b/games/gnmm/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= gnome
MAINTAINER= barner@gmx.de
COMMENT= A "nine mens' morris" implementation for the GNOME Desktop Environment
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
USE_X_PREFIX= yes
diff --git a/games/gtypist/Makefile b/games/gtypist/Makefile
index 22a18b731571..3f9153ae54d7 100644
--- a/games/gtypist/Makefile
+++ b/games/gtypist/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= naddy@FreeBSD.org
COMMENT= Interactive typing tutor
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/games/lexter/Makefile b/games/lexter/Makefile
index 03992724e50c..55853e66dbcf 100644
--- a/games/lexter/Makefile
+++ b/games/lexter/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= games/arcade
MAINTAINER= markp@FreeBSD.org
COMMENT= A real-time word puzzle for text terminals
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include' \
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index 4778639dec01..abc830b4b98d 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Rich city simulation game for X
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index 831974a9588c..7728f68ce4c4 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -15,7 +15,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES}
MAINTAINER= esu@yk.rim.or.jp
COMMENT= Window sitter for X11
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/games/tornado/Makefile b/games/tornado/Makefile
index f409365c34d5..2bef6040c83b 100644
--- a/games/tornado/Makefile
+++ b/games/tornado/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://home.kcore.de/~kiza/linux/tornado/download/
MAINTAINER= minter@lunenburg.org
COMMENT= A curses-based game of weather destruction
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old
MAN6= tornado.6
MANLANG= "" de fr it ru
diff --git a/games/xfce4-toys/Makefile b/games/xfce4-toys/Makefile
index 286e31fd76a7..f0806c060fe5 100644
--- a/games/xfce4-toys/Makefile
+++ b/games/xfce4-toys/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= Toys for the XFce 4 panel
BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
xml2.5:${PORTSDIR}/textproc/libxml2 \
startup-notification-1.0:${PORTSDIR}/x11/startup-notification
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index f255b253b88c..b7e09deda8e6 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= games/arcade/invaders
MAINTAINER= ports@FreeBSD.org
COMMENT= Shoot-em-up them nasty little bugs
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
ONLY_FOR_ARCHS= i386
diff --git a/german/calligra-l10n/Makefile b/german/calligra-l10n/Makefile
index 937847bc647e..70089c4325a7 100644
--- a/german/calligra-l10n/Makefile
+++ b/german/calligra-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/german/kde3-i18n/Makefile b/german/kde3-i18n/Makefile
index 8b1db480f9c8..2fdcdfab1397 100644
--- a/german/kde3-i18n/Makefile
+++ b/german/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/german/kde4-l10n/Makefile b/german/kde4-l10n/Makefile
index 8b1db480f9c8..2fdcdfab1397 100644
--- a/german/kde4-l10n/Makefile
+++ b/german/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/german/koffice-i18n/Makefile b/german/koffice-i18n/Makefile
index 937847bc647e..70089c4325a7 100644
--- a/german/koffice-i18n/Makefile
+++ b/german/koffice-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/german/koffice-kde4-l10n/Makefile b/german/koffice-kde4-l10n/Makefile
index 937847bc647e..70089c4325a7 100644
--- a/german/koffice-kde4-l10n/Makefile
+++ b/german/koffice-kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index beb2b12f9dd8..929b714a5cb3 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= jedgar
MAINTAINER= jedgar@FreeBSD.org
COMMENT= Graphing calculator using GTK+
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index 5aea663fb103..876dcb74a3ff 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= yinjieh@csie.nctu.edu.tw
COMMENT= Library to read digital camera file meta-data
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GNOME= gnomehack gnometarget pkgconfig
USE_LIBTOOL= yes
diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index 041cd7f1d569..71b97acf7903 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= gphoto
MAINTAINER= ports@FreeBSD.org
COMMENT= A universal digital camera picture control tool
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
usb-0.1.7:${PORTSDIR}/devel/libusb \
exif.10:${PORTSDIR}/graphics/libexif
diff --git a/graphics/lodju/Makefile b/graphics/lodju/Makefile
index 57b423d5e970..f94d2a422959 100644
--- a/graphics/lodju/Makefile
+++ b/graphics/lodju/Makefile
@@ -17,7 +17,7 @@ COMMENT?= An image management tool for the X Window System
RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf \
gtk12-config:${PORTSDIR}/x11-toolkits/gtk12 \
- ${LOCALBASE}/include/libintl.h:${PORTSDIR}/devel/gettext
+ ${LOCALBASE}/include/libintl.h:${PORTSDIR}/devel/gettext-old
LIB_DEPENDS= glade-gnome:${PORTSDIR}/x11-toolkits/rep-gtk \
gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
diff --git a/graphics/osgedit/Makefile b/graphics/osgedit/Makefile
index f3f719171ee7..0d0bb3eeb001 100644
--- a/graphics/osgedit/Makefile
+++ b/graphics/osgedit/Makefile
@@ -17,7 +17,7 @@ COMMENT= An open editor for an open scenegraph
BUILD_DEPENDS= ${X11BASE}/lib/libosg.so:${PORTSDIR}/graphics/osg
LIB_DEPENDS= gtkgl-2.0.1:${PORTSDIR}/x11-toolkits/gtkglarea2 \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= ${X11BASE}/lib/libosg.so:${PORTSDIR}/graphics/osg
diff --git a/graphics/ruby-tgif/Makefile b/graphics/ruby-tgif/Makefile
index c29061cb6d22..1758234d8a96 100644
--- a/graphics/ruby-tgif/Makefile
+++ b/graphics/ruby-tgif/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= knu@FreeBSD.org
COMMENT= A Ruby extension library to draw Tgif graphics
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${TGIF_PORT}:build
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index bc7cd0ca8b15..8a35a193567d 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -18,7 +18,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION} \
MAINTAINER= ports@FreeBSD.org
COMMENT= API for access to scanners, digitals camera, frame grabbers etc
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
usb-0.1.7:${PORTSDIR}/devel/libusb \
jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/tgif-nls/Makefile b/graphics/tgif-nls/Makefile
index 55ee5bdad215..445c2367e690 100644
--- a/graphics/tgif-nls/Makefile
+++ b/graphics/tgif-nls/Makefile
@@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-QPL-${PORTVERSION}
MAINTAINER= one@netlab.is.tsukuba.ac.jp
COMMENT= A two-dimensional drawing tool with NLS message catalogs support
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= giftopnm:${PORTSDIR}/graphics/netpbm
USE_IMAKE= yes
diff --git a/hebrew/kde3-i18n/Makefile b/hebrew/kde3-i18n/Makefile
index e9eaec57bb69..5150996af697 100644
--- a/hebrew/kde3-i18n/Makefile
+++ b/hebrew/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/hebrew/kde4-l10n/Makefile b/hebrew/kde4-l10n/Makefile
index e9eaec57bb69..5150996af697 100644
--- a/hebrew/kde4-l10n/Makefile
+++ b/hebrew/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/hebrew/koffice-i18n/Makefile b/hebrew/koffice-i18n/Makefile
index d51097473fcc..66448e3c09ed 100644
--- a/hebrew/koffice-i18n/Makefile
+++ b/hebrew/koffice-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/hungarian/kde3-i18n/Makefile b/hungarian/kde3-i18n/Makefile
index 3ae317546743..a8381c947989 100644
--- a/hungarian/kde3-i18n/Makefile
+++ b/hungarian/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/hungarian/kde4-l10n/Makefile b/hungarian/kde4-l10n/Makefile
index 3ae317546743..a8381c947989 100644
--- a/hungarian/kde4-l10n/Makefile
+++ b/hungarian/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/hungarian/koffice-i18n/Makefile b/hungarian/koffice-i18n/Makefile
index efca14223e86..c260ee1e1d31 100644
--- a/hungarian/koffice-i18n/Makefile
+++ b/hungarian/koffice-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/irc/liece/Makefile b/irc/liece/Makefile
index e1960436def1..6d91ba07283e 100644
--- a/irc/liece/Makefile
+++ b/irc/liece/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= yoichi@FreeBSD.org
COMMENT= Yet another IRC client which runs under Emacsen
BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
- msgfmt:${PORTSDIR}/devel/gettext
+ msgfmt:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
ldcc:${PORTSDIR}/irc/liece-dcc
diff --git a/irc/lostirc/Makefile b/irc/lostirc/Makefile
index b52c22453052..dda8f91f5a8f 100644
--- a/irc/lostirc/Makefile
+++ b/irc/lostirc/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= rael@vectorstar.net
COMMENT= LostIRC is a simple and minimal IRC client for X
LIB_DEPENDS= gtkmm-2:${PORTSDIR}/x11-toolkits/gtk--2 \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_GNOME= gnomehack
diff --git a/irc/riece-emacs21/Makefile b/irc/riece-emacs21/Makefile
index e1960436def1..6d91ba07283e 100644
--- a/irc/riece-emacs21/Makefile
+++ b/irc/riece-emacs21/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= yoichi@FreeBSD.org
COMMENT= Yet another IRC client which runs under Emacsen
BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
- msgfmt:${PORTSDIR}/devel/gettext
+ msgfmt:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
ldcc:${PORTSDIR}/irc/liece-dcc
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index e1960436def1..6d91ba07283e 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= yoichi@FreeBSD.org
COMMENT= Yet another IRC client which runs under Emacsen
BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
- msgfmt:${PORTSDIR}/devel/gettext
+ msgfmt:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
ldcc:${PORTSDIR}/irc/liece-dcc
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index e017df6a1de3..475646c29f0a 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -21,7 +21,7 @@ PATCH_SITES= ${MASTER_SITES}
MAINTAINER= takamune2004@yahoo.co.jp
COMMENT= C library for accessing EB, EBG, EBXA and EPWING CD-ROM dictionaries
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
EBFILES= ${DISTNAME}${EXTRACT_SUFX}
LISTFILES= appendix/LIST \
diff --git a/japanese/eb3/Makefile b/japanese/eb3/Makefile
index e017df6a1de3..475646c29f0a 100644
--- a/japanese/eb3/Makefile
+++ b/japanese/eb3/Makefile
@@ -21,7 +21,7 @@ PATCH_SITES= ${MASTER_SITES}
MAINTAINER= takamune2004@yahoo.co.jp
COMMENT= C library for accessing EB, EBG, EBXA and EPWING CD-ROM dictionaries
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
EBFILES= ${DISTNAME}${EXTRACT_SUFX}
LISTFILES= appendix/LIST \
diff --git a/japanese/kde3-i18n/Makefile b/japanese/kde3-i18n/Makefile
index de86fb67b9e2..66059ae620fb 100644
--- a/japanese/kde3-i18n/Makefile
+++ b/japanese/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/japanese/kde4-l10n/Makefile b/japanese/kde4-l10n/Makefile
index de86fb67b9e2..66059ae620fb 100644
--- a/japanese/kde4-l10n/Makefile
+++ b/japanese/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/japanese/koffice-i18n/Makefile b/japanese/koffice-i18n/Makefile
index bf8c9d8f87cf..87b98355a2dc 100644
--- a/japanese/koffice-i18n/Makefile
+++ b/japanese/koffice-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/japanese/koffice-kde4-l10n/Makefile b/japanese/koffice-kde4-l10n/Makefile
index bf8c9d8f87cf..87b98355a2dc 100644
--- a/japanese/koffice-kde4-l10n/Makefile
+++ b/japanese/koffice-kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 58a24e7cc06c..781f4be41b02 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -27,9 +27,9 @@ COMMENT= Text-based mail client (Japanised development version)
LIB_DEPENDS= slang.2:${PORTSDIR}/japanese/libslang \
iconv.3:${PORTSDIR}/converters/libiconv
.if !defined(WITH_GETTEXT)
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
.else
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
.endif
.if defined(WITH_MUTT_CYRUS_SASL)
LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 66ed03a43abb..d4c85c30a2b1 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -27,9 +27,9 @@ COMMENT= Text-based mail client (Japanised Version)
LIB_DEPENDS= slang.2:${PORTSDIR}/japanese/libslang \
iconv.3:${PORTSDIR}/converters/libiconv
.if !defined(WITH_GETTEXT)
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
.else
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
.endif
.if defined(WITH_MUTT_CYRUS_SASL)
LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index 197df5b466a2..777411a67d8c 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= mita@FreeBSD.org
COMMENT= Japanese Vector font library
BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake-4
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
VFLIB_VERSION= 2.25.6
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index 0be8c63be83c..6a023daa3d61 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
zip:${PORTSDIR}/archivers/zip \
${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
.if !defined(WITHOUT_PLUGIN)
-BUILD_DEPENDS+= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= msgfmt:${PORTSDIR}/devel/gettext-old
LIB_DEPENDS= glib12.3:$(PORTSDIR)/devel/glib12 \
gtk12.2:$(PORTSDIR)/x11-toolkits/gtk12 \
nspr4.1:$(PORTSDIR)/devel/nspr
diff --git a/java/jmp/Makefile b/java/jmp/Makefile
index 20640fa3ed8f..621d648c7910 100644
--- a/java/jmp/Makefile
+++ b/java/jmp/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ronald@cs.vu.nl
COMMENT= Java Memory Profiler
BUILD_DEPENDS= ${LOCALBASE}/bin/bison:${PORTSDIR}/devel/bison
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old
CONFIGURE_ARGS= --with-includes="${JAVA_HOME}/include ${LOCALBASE}/include"
diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 33db61b4c654..6683a5fa6edb 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER= cjh@FreeBSD.org
COMMENT= Well-known Korean X11 Input Method
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
USE_X_PREFIX= yes
diff --git a/korean/kde3-i18n/Makefile b/korean/kde3-i18n/Makefile
index 86da0f17f8e0..e8f451780205 100644
--- a/korean/kde3-i18n/Makefile
+++ b/korean/kde3-i18n/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
IGNORE= Needs update from vendor.
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/korean/kde4-l10n/Makefile b/korean/kde4-l10n/Makefile
index 86da0f17f8e0..e8f451780205 100644
--- a/korean/kde4-l10n/Makefile
+++ b/korean/kde4-l10n/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
IGNORE= Needs update from vendor.
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/korean/texinfo/Makefile b/korean/texinfo/Makefile
index 7d672cdd2182..98aad63eac0f 100644
--- a/korean/texinfo/Makefile
+++ b/korean/texinfo/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-ko-${PORTVERSION}
MAINTAINER= cjh@FreeBSD.org
COMMENT= Korean enabled Texinfo formatter
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= ${LOCALBASE}/share/texmf/doc/latex/hlatex/uhc.ks:${PORTSDIR}/korean/hlatex
GNU_CONFIGURE= YES
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 0675b2250a17..310aa75666f3 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= henrik.motakef@web.de
COMMENT= An ANSI Common Lisp
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 7bdf34aa3c02..cda276fc9054 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= gawk
MAINTAINER= dd@FreeBSD.org
COMMENT= The GNU version of Awk
-BUILD_DEPENDS= ${LOCALBASE}/lib/libintl.a:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= ${LOCALBASE}/lib/libintl.a:${PORTSDIR}/devel/gettext-old
.include <bsd.port.pre.mk>
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 7808dcc1cf9e..4c09487784d5 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= An Emacs Lisp like runtime library
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB= GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} VERSION=${PORTVERSION}
diff --git a/lang/lush/Makefile b/lang/lush/Makefile
index 236f7dfe231a..3d8f2214ae49 100644
--- a/lang/lush/Makefile
+++ b/lang/lush/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= dyeske@yahoo.com
COMMENT= A high level object-oriented programming language
LIB_DEPENDS= SDL_image.10:${PORTSDIR}/graphics/sdl_image \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_GL= yes
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index 3b6222b5080f..b74297a39293 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= MIX Development Kit offers an emulation of MIX and MIXAL
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
guile.15:${PORTSDIR}/lang/guile
USE_REINPLACE= yes
diff --git a/lang/open-cobol-devel/Makefile b/lang/open-cobol-devel/Makefile
index 689994b4b82d..a66fac72b75f 100644
--- a/lang/open-cobol-devel/Makefile
+++ b/lang/open-cobol-devel/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= An open-source COBOL compiler
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
ltdl.4:${PORTSDIR}/devel/libltdl \
gmp.6:${PORTSDIR}/math/libgmp4
diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile
index 689994b4b82d..a66fac72b75f 100644
--- a/lang/open-cobol/Makefile
+++ b/lang/open-cobol/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= An open-source COBOL compiler
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
ltdl.4:${PORTSDIR}/devel/libltdl \
gmp.6:${PORTSDIR}/math/libgmp4
diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index a2de9d2385d5..00cb19651853 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -309,7 +309,7 @@ CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
.endif
.if defined(WITH_GETTEXT)
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
CONFIGURE_ARGS+=--with-gettext=${LOCALBASE}
.endif
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 35a267684095..a062df5f40da 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -300,7 +300,7 @@ CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
.endif
.if defined(WITH_GETTEXT)
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
CONFIGURE_ARGS+=--with-gettext=${LOCALBASE}
.endif
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 35a267684095..a062df5f40da 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -300,7 +300,7 @@ CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
.endif
.if defined(WITH_GETTEXT)
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
CONFIGURE_ARGS+=--with-gettext=${LOCALBASE}
.endif
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 857319c7feb0..5847e358dcb7 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= netchild@FreeBSD.org
COMMENT= A lightweight and very featureful GTK+ based e-mail and news client
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
THEMEVERSION= 20031130
THEMEFILE= sylpheed-iconset-${THEMEVERSION}.tar.gz
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 2d7eb5540269..23297a91d203 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= toasty@dragondata.com
COMMENT= A once-popular mail user agent, version 2.5.x
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
WRKSRC= ${WRKDIR}/elm${PORTVERSION}
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index d3793d473186..27ccf7b216cf 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= trevor@FreeBSD.org
COMMENT= Receive, filter, read, compose and send mail at the text console
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index d3793d473186..27ccf7b216cf 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= trevor@FreeBSD.org
COMMENT= Receive, filter, read, compose and send mail at the text console
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 5610556cdb96..b362b2b56c71 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -21,7 +21,7 @@ MASTER_SITE_SUBDIR= fetchmail
MAINTAINER= eik@FreeBSD.org
COMMENT= Batch mail retrieval utility for IMAP/POP2/POP3/APOP/KPOP/ETRN/ODMR
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old
.if defined(WITH_X11)
RUN_DEPENDS= ${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
.endif
diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile
index e7fabe35e951..14f2a4318cb8 100644
--- a/mail/filtermail/Makefile
+++ b/mail/filtermail/Makefile
@@ -19,7 +19,7 @@ DISTNAME= mailfilter-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Filter mail on a pop3 server: saves downloading spam
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
# This port is filtermail, but the author called it mailfilter. To avoid a
# clash with another port called mailfilter, we change all files
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 0c7078d5b67e..328fe371a3a7 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://devel-home.kde.org/~granroth/kbiff/
MAINTAINER= arved@FreeBSD.org
COMMENT= "Mail notification utility for KDE with nice features"
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index ad582879aae2..366c26256c58 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -176,7 +176,7 @@ SGML_USED= no
.endif
.if !defined(WITHOUT_NLS)
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
.endif
.if defined(NOPORTDOCS)
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 710689eaa527..02e85363fd63 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -40,7 +40,7 @@ WITH_SGML_DOCS?=yes
.endif
.if !defined(WITHOUT_NLS)
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
.endif
.if defined(WITH_SLANG)
LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 710689eaa527..02e85363fd63 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -40,7 +40,7 @@ WITH_SGML_DOCS?=yes
.endif
.if !defined(WITHOUT_NLS)
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
.endif
.if defined(WITH_SLANG)
LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index 33407bb03d08..e816bda04cea 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/
MAINTAINER= clement@FreeBSD.org
COMMENT= A POP3 & IMAP4 proxy that can map users to multiple backend servers
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
popt.0:${PORTSDIR}/devel/popt \
vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger \
vanessa_socket.0:${PORTSDIR}/devel/libvanessa_socket \
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index 6533fbdd6c75..feea8e5249c4 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= erich@tacni.net
COMMENT= A simple GTK based email client
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 857319c7feb0..5847e358dcb7 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= netchild@FreeBSD.org
COMMENT= A lightweight and very featureful GTK+ based e-mail and news client
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
THEMEVERSION= 20031130
THEMEFILE= sylpheed-iconset-${THEMEVERSION}.tar.gz
diff --git a/mail/sylpheed-gtk2/Makefile b/mail/sylpheed-gtk2/Makefile
index 3ace695db00a..e8d36cc90c74 100644
--- a/mail/sylpheed-gtk2/Makefile
+++ b/mail/sylpheed-gtk2/Makefile
@@ -15,7 +15,7 @@ DISTNAME= sylpheed-${PORTVERSION:R}-gtk2-${PORTVERSION:E}
MAINTAINER= jylefort@brutele.be
COMMENT= The GTK+ 2.0 port of a lightweight, featureful and fast e-mail client
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
USE_GMAKE= yes
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 3fb90a60592c..42422c892410 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1/a/}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A lightweight, featureful, and fast GTK+ based e-mail client
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
USE_BZIP2= yes
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index 3fb90a60592c..42422c892410 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1/a/}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A lightweight, featureful, and fast GTK+ based e-mail client
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
USE_BZIP2= yes
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index 3fb90a60592c..42422c892410 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1/a/}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A lightweight, featureful, and fast GTK+ based e-mail client
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
USE_BZIP2= yes
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index 3fb90a60592c..42422c892410 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1/a/}
MAINTAINER= oliver@FreeBSD.org
COMMENT= A lightweight, featureful, and fast GTK+ based e-mail client
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
USE_BZIP2= yes
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index ce23279377e3..16f19c035a0d 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= The GNU spreadsheet for X11 and terminals
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_PERL5_BUILD= yes
USE_BISON= yes
diff --git a/misc/afbackup/Makefile b/misc/afbackup/Makefile
index 69f9d8e112d4..f234f55782af 100644
--- a/misc/afbackup/Makefile
+++ b/misc/afbackup/Makefile
@@ -20,7 +20,7 @@ COMMENT= AF's backup system
WRKSRC= ${WRKDIR}/afbackup-3.3.5
PLIST= ${WRKSRC}/pkg-plist
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
.if ! defined(NO_DES)
USE_OPENSSL= yes
diff --git a/misc/dirtree/Makefile b/misc/dirtree/Makefile
index 26aac460ef38..3c95e29fbaeb 100644
--- a/misc/dirtree/Makefile
+++ b/misc/dirtree/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A command line tool for displaying directory trees
LIB_DEPENDS= LeoArg.2:${PORTSDIR}/devel/leoarg \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/misc/getopt/Makefile b/misc/getopt/Makefile
index 395ac5e1b788..a33be411803d 100644
--- a/misc/getopt/Makefile
+++ b/misc/getopt/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://huizen.dds.nl/~frodol/
MAINTAINER= sergei@FreeBSD.org
COMMENT= A getopt(1) replacement that supports GNU-style long options
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_GETOPT_LONG= yes
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index af8e21808185..de9cfa33fccd 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= A MIME and Application database for GNOME
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/misc/gnomemimedata/Makefile b/misc/gnomemimedata/Makefile
index af8e21808185..de9cfa33fccd 100644
--- a/misc/gnomemimedata/Makefile
+++ b/misc/gnomemimedata/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= A MIME and Application database for GNOME
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/misc/hello/Makefile b/misc/hello/Makefile
index 3e36683c88a5..d47fde67cd0d 100644
--- a/misc/hello/Makefile
+++ b/misc/hello/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= hello
MAINTAINER= shipley@dis.org
COMMENT= A utility for saying hello to the world and reading email
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_PERL5_BUILD= YES
GNU_CONFIGURE= YES
diff --git a/misc/kcd-devel/Makefile b/misc/kcd-devel/Makefile
index cede30093ecb..8d25b092bf52 100644
--- a/misc/kcd-devel/Makefile
+++ b/misc/kcd-devel/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Change directory in full-screen visual mode
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/misc/kcd/Makefile b/misc/kcd/Makefile
index cede30093ecb..8d25b092bf52 100644
--- a/misc/kcd/Makefile
+++ b/misc/kcd/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Change directory in full-screen visual mode
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/misc/kde3-i18n-af/Makefile b/misc/kde3-i18n-af/Makefile
index c89923f3d193..a029b18455aa 100644
--- a/misc/kde3-i18n-af/Makefile
+++ b/misc/kde3-i18n-af/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-az/Makefile b/misc/kde3-i18n-az/Makefile
index 21496a353365..c603acb7f3f5 100644
--- a/misc/kde3-i18n-az/Makefile
+++ b/misc/kde3-i18n-az/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
IGNORE= Needs update from vendor.
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-bg/Makefile b/misc/kde3-i18n-bg/Makefile
index ac6bb938a537..3ca1f3b512dd 100644
--- a/misc/kde3-i18n-bg/Makefile
+++ b/misc/kde3-i18n-bg/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-bs/Makefile b/misc/kde3-i18n-bs/Makefile
index 66a4309969f3..1f4c6b3c7026 100644
--- a/misc/kde3-i18n-bs/Makefile
+++ b/misc/kde3-i18n-bs/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ca/Makefile b/misc/kde3-i18n-ca/Makefile
index 1b6b17c9eeff..217155ef3125 100644
--- a/misc/kde3-i18n-ca/Makefile
+++ b/misc/kde3-i18n-ca/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-cs/Makefile b/misc/kde3-i18n-cs/Makefile
index 1c5c24ed0338..8ffe812d3a7b 100644
--- a/misc/kde3-i18n-cs/Makefile
+++ b/misc/kde3-i18n-cs/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-da/Makefile b/misc/kde3-i18n-da/Makefile
index a69e5304a828..687aaa1e807d 100644
--- a/misc/kde3-i18n-da/Makefile
+++ b/misc/kde3-i18n-da/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-el/Makefile b/misc/kde3-i18n-el/Makefile
index 8e5c0ece414f..45d386ceef20 100644
--- a/misc/kde3-i18n-el/Makefile
+++ b/misc/kde3-i18n-el/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-en_GB/Makefile b/misc/kde3-i18n-en_GB/Makefile
index 28d80930542e..aefad90a430d 100644
--- a/misc/kde3-i18n-en_GB/Makefile
+++ b/misc/kde3-i18n-en_GB/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-eo/Makefile b/misc/kde3-i18n-eo/Makefile
index 353ca070fd54..40de7273b375 100644
--- a/misc/kde3-i18n-eo/Makefile
+++ b/misc/kde3-i18n-eo/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-es/Makefile b/misc/kde3-i18n-es/Makefile
index b1a6ccaa1397..6a052b48d236 100644
--- a/misc/kde3-i18n-es/Makefile
+++ b/misc/kde3-i18n-es/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-et/Makefile b/misc/kde3-i18n-et/Makefile
index cc070da505e0..7314d0fc3f7f 100644
--- a/misc/kde3-i18n-et/Makefile
+++ b/misc/kde3-i18n-et/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-fa/Makefile b/misc/kde3-i18n-fa/Makefile
index 05917e15ec22..e92af8904548 100644
--- a/misc/kde3-i18n-fa/Makefile
+++ b/misc/kde3-i18n-fa/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-fi/Makefile b/misc/kde3-i18n-fi/Makefile
index 8a02e0e6178c..4c4b38b384d2 100644
--- a/misc/kde3-i18n-fi/Makefile
+++ b/misc/kde3-i18n-fi/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-hr/Makefile b/misc/kde3-i18n-hr/Makefile
index 2c2ef94d6b02..0cafbef5009d 100644
--- a/misc/kde3-i18n-hr/Makefile
+++ b/misc/kde3-i18n-hr/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-id/Makefile b/misc/kde3-i18n-id/Makefile
index 764fe2c1ce9e..5c1f374be786 100644
--- a/misc/kde3-i18n-id/Makefile
+++ b/misc/kde3-i18n-id/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
IGNORE= Needs update from vendor.
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-is/Makefile b/misc/kde3-i18n-is/Makefile
index 17702fc2e249..11f4e3a4a0da 100644
--- a/misc/kde3-i18n-is/Makefile
+++ b/misc/kde3-i18n-is/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-it/Makefile b/misc/kde3-i18n-it/Makefile
index 34c25a906deb..9dbb09df5f16 100644
--- a/misc/kde3-i18n-it/Makefile
+++ b/misc/kde3-i18n-it/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-lt/Makefile b/misc/kde3-i18n-lt/Makefile
index 00eaca27b12d..6d7642eb7677 100644
--- a/misc/kde3-i18n-lt/Makefile
+++ b/misc/kde3-i18n-lt/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-lv/Makefile b/misc/kde3-i18n-lv/Makefile
index cf3fad17b539..f41a43a34b2c 100644
--- a/misc/kde3-i18n-lv/Makefile
+++ b/misc/kde3-i18n-lv/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
IGNORE= Needs update from vendor.
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-mk/Makefile b/misc/kde3-i18n-mk/Makefile
index d5a6c35a251d..7507922cfd66 100644
--- a/misc/kde3-i18n-mk/Makefile
+++ b/misc/kde3-i18n-mk/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-mt/Makefile b/misc/kde3-i18n-mt/Makefile
index 9b0f03920d23..d02fafbad9e0 100644
--- a/misc/kde3-i18n-mt/Makefile
+++ b/misc/kde3-i18n-mt/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-nb/Makefile b/misc/kde3-i18n-nb/Makefile
index 5408b4a68ae5..0d2696ee9871 100644
--- a/misc/kde3-i18n-nb/Makefile
+++ b/misc/kde3-i18n-nb/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-nl/Makefile b/misc/kde3-i18n-nl/Makefile
index 984cb9761591..39759a588a7d 100644
--- a/misc/kde3-i18n-nl/Makefile
+++ b/misc/kde3-i18n-nl/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-nn/Makefile b/misc/kde3-i18n-nn/Makefile
index df452df47eb2..93bf8bc3a29d 100644
--- a/misc/kde3-i18n-nn/Makefile
+++ b/misc/kde3-i18n-nn/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-nso/Makefile b/misc/kde3-i18n-nso/Makefile
index 865da31117ec..228a32119213 100644
--- a/misc/kde3-i18n-nso/Makefile
+++ b/misc/kde3-i18n-nso/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ro/Makefile b/misc/kde3-i18n-ro/Makefile
index 0a69146f1795..8245432d482a 100644
--- a/misc/kde3-i18n-ro/Makefile
+++ b/misc/kde3-i18n-ro/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-se/Makefile b/misc/kde3-i18n-se/Makefile
index 36ac40e685b8..e39894c02f3a 100644
--- a/misc/kde3-i18n-se/Makefile
+++ b/misc/kde3-i18n-se/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-sk/Makefile b/misc/kde3-i18n-sk/Makefile
index 026c64020765..0b5ebf9fd219 100644
--- a/misc/kde3-i18n-sk/Makefile
+++ b/misc/kde3-i18n-sk/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-sl/Makefile b/misc/kde3-i18n-sl/Makefile
index b787e66ca080..88d37c52b059 100644
--- a/misc/kde3-i18n-sl/Makefile
+++ b/misc/kde3-i18n-sl/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-sr/Makefile b/misc/kde3-i18n-sr/Makefile
index 4db8233aa16d..67fd9fcd6450 100644
--- a/misc/kde3-i18n-sr/Makefile
+++ b/misc/kde3-i18n-sr/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ss/Makefile b/misc/kde3-i18n-ss/Makefile
index a33d3a3a59db..f569dcdb89f0 100644
--- a/misc/kde3-i18n-ss/Makefile
+++ b/misc/kde3-i18n-ss/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-sv/Makefile b/misc/kde3-i18n-sv/Makefile
index 76aa993f6011..2b14870f3f3e 100644
--- a/misc/kde3-i18n-sv/Makefile
+++ b/misc/kde3-i18n-sv/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ta/Makefile b/misc/kde3-i18n-ta/Makefile
index c8f039fc2f05..83d65805b2b8 100644
--- a/misc/kde3-i18n-ta/Makefile
+++ b/misc/kde3-i18n-ta/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-th/Makefile b/misc/kde3-i18n-th/Makefile
index 936542944511..2c85ec2a12f2 100644
--- a/misc/kde3-i18n-th/Makefile
+++ b/misc/kde3-i18n-th/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-tr/Makefile b/misc/kde3-i18n-tr/Makefile
index 52927a0e8ee5..cf7bb1904699 100644
--- a/misc/kde3-i18n-tr/Makefile
+++ b/misc/kde3-i18n-tr/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ven/Makefile b/misc/kde3-i18n-ven/Makefile
index 21a1c5625dda..80f43bca2594 100644
--- a/misc/kde3-i18n-ven/Makefile
+++ b/misc/kde3-i18n-ven/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-xh/Makefile b/misc/kde3-i18n-xh/Makefile
index 89360b755538..48f611cd19f2 100644
--- a/misc/kde3-i18n-xh/Makefile
+++ b/misc/kde3-i18n-xh/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-zu/Makefile b/misc/kde3-i18n-zu/Makefile
index 1eae5e12e625..904ecdbcbc6b 100644
--- a/misc/kde3-i18n-zu/Makefile
+++ b/misc/kde3-i18n-zu/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-i18n-is/Makefile b/misc/kde4-i18n-is/Makefile
index 17702fc2e249..11f4e3a4a0da 100644
--- a/misc/kde4-i18n-is/Makefile
+++ b/misc/kde4-i18n-is/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-bg/Makefile b/misc/kde4-l10n-bg/Makefile
index ac6bb938a537..3ca1f3b512dd 100644
--- a/misc/kde4-l10n-bg/Makefile
+++ b/misc/kde4-l10n-bg/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-ca/Makefile b/misc/kde4-l10n-ca/Makefile
index 1b6b17c9eeff..217155ef3125 100644
--- a/misc/kde4-l10n-ca/Makefile
+++ b/misc/kde4-l10n-ca/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-cs/Makefile b/misc/kde4-l10n-cs/Makefile
index 1c5c24ed0338..8ffe812d3a7b 100644
--- a/misc/kde4-l10n-cs/Makefile
+++ b/misc/kde4-l10n-cs/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-da/Makefile b/misc/kde4-l10n-da/Makefile
index a69e5304a828..687aaa1e807d 100644
--- a/misc/kde4-l10n-da/Makefile
+++ b/misc/kde4-l10n-da/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-el/Makefile b/misc/kde4-l10n-el/Makefile
index 8e5c0ece414f..45d386ceef20 100644
--- a/misc/kde4-l10n-el/Makefile
+++ b/misc/kde4-l10n-el/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-en_GB/Makefile b/misc/kde4-l10n-en_GB/Makefile
index 28d80930542e..aefad90a430d 100644
--- a/misc/kde4-l10n-en_GB/Makefile
+++ b/misc/kde4-l10n-en_GB/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-eo/Makefile b/misc/kde4-l10n-eo/Makefile
index 353ca070fd54..40de7273b375 100644
--- a/misc/kde4-l10n-eo/Makefile
+++ b/misc/kde4-l10n-eo/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-es/Makefile b/misc/kde4-l10n-es/Makefile
index b1a6ccaa1397..6a052b48d236 100644
--- a/misc/kde4-l10n-es/Makefile
+++ b/misc/kde4-l10n-es/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-et/Makefile b/misc/kde4-l10n-et/Makefile
index cc070da505e0..7314d0fc3f7f 100644
--- a/misc/kde4-l10n-et/Makefile
+++ b/misc/kde4-l10n-et/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-fi/Makefile b/misc/kde4-l10n-fi/Makefile
index 8a02e0e6178c..4c4b38b384d2 100644
--- a/misc/kde4-l10n-fi/Makefile
+++ b/misc/kde4-l10n-fi/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-is/Makefile b/misc/kde4-l10n-is/Makefile
index 17702fc2e249..11f4e3a4a0da 100644
--- a/misc/kde4-l10n-is/Makefile
+++ b/misc/kde4-l10n-is/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-it/Makefile b/misc/kde4-l10n-it/Makefile
index 34c25a906deb..9dbb09df5f16 100644
--- a/misc/kde4-l10n-it/Makefile
+++ b/misc/kde4-l10n-it/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-lt/Makefile b/misc/kde4-l10n-lt/Makefile
index 00eaca27b12d..6d7642eb7677 100644
--- a/misc/kde4-l10n-lt/Makefile
+++ b/misc/kde4-l10n-lt/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-lv/Makefile b/misc/kde4-l10n-lv/Makefile
index cf3fad17b539..f41a43a34b2c 100644
--- a/misc/kde4-l10n-lv/Makefile
+++ b/misc/kde4-l10n-lv/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
IGNORE= Needs update from vendor.
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-mk/Makefile b/misc/kde4-l10n-mk/Makefile
index d5a6c35a251d..7507922cfd66 100644
--- a/misc/kde4-l10n-mk/Makefile
+++ b/misc/kde4-l10n-mk/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-nb/Makefile b/misc/kde4-l10n-nb/Makefile
index 5408b4a68ae5..0d2696ee9871 100644
--- a/misc/kde4-l10n-nb/Makefile
+++ b/misc/kde4-l10n-nb/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-nl/Makefile b/misc/kde4-l10n-nl/Makefile
index 984cb9761591..39759a588a7d 100644
--- a/misc/kde4-l10n-nl/Makefile
+++ b/misc/kde4-l10n-nl/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-nn/Makefile b/misc/kde4-l10n-nn/Makefile
index df452df47eb2..93bf8bc3a29d 100644
--- a/misc/kde4-l10n-nn/Makefile
+++ b/misc/kde4-l10n-nn/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-ro/Makefile b/misc/kde4-l10n-ro/Makefile
index 0a69146f1795..8245432d482a 100644
--- a/misc/kde4-l10n-ro/Makefile
+++ b/misc/kde4-l10n-ro/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-sk/Makefile b/misc/kde4-l10n-sk/Makefile
index 026c64020765..0b5ebf9fd219 100644
--- a/misc/kde4-l10n-sk/Makefile
+++ b/misc/kde4-l10n-sk/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-sl/Makefile b/misc/kde4-l10n-sl/Makefile
index b787e66ca080..88d37c52b059 100644
--- a/misc/kde4-l10n-sl/Makefile
+++ b/misc/kde4-l10n-sl/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-sr/Makefile b/misc/kde4-l10n-sr/Makefile
index 4db8233aa16d..67fd9fcd6450 100644
--- a/misc/kde4-l10n-sr/Makefile
+++ b/misc/kde4-l10n-sr/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-sv/Makefile b/misc/kde4-l10n-sv/Makefile
index 76aa993f6011..2b14870f3f3e 100644
--- a/misc/kde4-l10n-sv/Makefile
+++ b/misc/kde4-l10n-sv/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-ta/Makefile b/misc/kde4-l10n-ta/Makefile
index c8f039fc2f05..83d65805b2b8 100644
--- a/misc/kde4-l10n-ta/Makefile
+++ b/misc/kde4-l10n-ta/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-th/Makefile b/misc/kde4-l10n-th/Makefile
index 936542944511..2c85ec2a12f2 100644
--- a/misc/kde4-l10n-th/Makefile
+++ b/misc/kde4-l10n-th/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-tr/Makefile b/misc/kde4-l10n-tr/Makefile
index 52927a0e8ee5..cf7bb1904699 100644
--- a/misc/kde4-l10n-tr/Makefile
+++ b/misc/kde4-l10n-tr/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-af/Makefile b/misc/koffice-i18n-af/Makefile
index def48abe484f..219e1aa145eb 100644
--- a/misc/koffice-i18n-af/Makefile
+++ b/misc/koffice-i18n-af/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-bs/Makefile b/misc/koffice-i18n-bs/Makefile
index 824892211bde..19d8b773c81f 100644
--- a/misc/koffice-i18n-bs/Makefile
+++ b/misc/koffice-i18n-bs/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-cs/Makefile b/misc/koffice-i18n-cs/Makefile
index efa46ed5ea08..c2a00b38ed58 100644
--- a/misc/koffice-i18n-cs/Makefile
+++ b/misc/koffice-i18n-cs/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-da/Makefile b/misc/koffice-i18n-da/Makefile
index 6d6c087830e6..7c012b50d52b 100644
--- a/misc/koffice-i18n-da/Makefile
+++ b/misc/koffice-i18n-da/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-el/Makefile b/misc/koffice-i18n-el/Makefile
index b0d648a96b14..572fa3fe4c29 100644
--- a/misc/koffice-i18n-el/Makefile
+++ b/misc/koffice-i18n-el/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-en_GB/Makefile b/misc/koffice-i18n-en_GB/Makefile
index 26a45f5d688c..b25ea03e1357 100644
--- a/misc/koffice-i18n-en_GB/Makefile
+++ b/misc/koffice-i18n-en_GB/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-eo/Makefile b/misc/koffice-i18n-eo/Makefile
index 8221d37e511a..2b7c66c37853 100644
--- a/misc/koffice-i18n-eo/Makefile
+++ b/misc/koffice-i18n-eo/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-es/Makefile b/misc/koffice-i18n-es/Makefile
index e388f3504c25..fb4046b9eaf0 100644
--- a/misc/koffice-i18n-es/Makefile
+++ b/misc/koffice-i18n-es/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-et/Makefile b/misc/koffice-i18n-et/Makefile
index 1fea51de7fdb..e5a4d6ee6651 100644
--- a/misc/koffice-i18n-et/Makefile
+++ b/misc/koffice-i18n-et/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-it/Makefile b/misc/koffice-i18n-it/Makefile
index 3fc03cf15485..f5a594aa4f31 100644
--- a/misc/koffice-i18n-it/Makefile
+++ b/misc/koffice-i18n-it/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-lt/Makefile b/misc/koffice-i18n-lt/Makefile
index 4faa57a40014..0a19c1abc594 100644
--- a/misc/koffice-i18n-lt/Makefile
+++ b/misc/koffice-i18n-lt/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-lv/Makefile b/misc/koffice-i18n-lv/Makefile
index c0a8494e128b..4bc1fd37bccc 100644
--- a/misc/koffice-i18n-lv/Makefile
+++ b/misc/koffice-i18n-lv/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-mt/Makefile b/misc/koffice-i18n-mt/Makefile
index caef66d9ec8e..4aa634005857 100644
--- a/misc/koffice-i18n-mt/Makefile
+++ b/misc/koffice-i18n-mt/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-nb/Makefile b/misc/koffice-i18n-nb/Makefile
index 27f85da4f03a..7c28aca5d510 100644
--- a/misc/koffice-i18n-nb/Makefile
+++ b/misc/koffice-i18n-nb/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-nl/Makefile b/misc/koffice-i18n-nl/Makefile
index 12a6c72b948f..7e5debc700ea 100644
--- a/misc/koffice-i18n-nl/Makefile
+++ b/misc/koffice-i18n-nl/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-nn/Makefile b/misc/koffice-i18n-nn/Makefile
index 26720a5a23c6..d95ddc22d5a2 100644
--- a/misc/koffice-i18n-nn/Makefile
+++ b/misc/koffice-i18n-nn/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-sk/Makefile b/misc/koffice-i18n-sk/Makefile
index 7c2a96df45f8..7978106b41b2 100644
--- a/misc/koffice-i18n-sk/Makefile
+++ b/misc/koffice-i18n-sk/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-sl/Makefile b/misc/koffice-i18n-sl/Makefile
index 0f26f21c6c54..2db559739f03 100644
--- a/misc/koffice-i18n-sl/Makefile
+++ b/misc/koffice-i18n-sl/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-sv/Makefile b/misc/koffice-i18n-sv/Makefile
index 638307c159ee..9281468820a2 100644
--- a/misc/koffice-i18n-sv/Makefile
+++ b/misc/koffice-i18n-sv/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-th/Makefile b/misc/koffice-i18n-th/Makefile
index d9c7a6a186ae..450a667497f4 100644
--- a/misc/koffice-i18n-th/Makefile
+++ b/misc/koffice-i18n-th/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-tr/Makefile b/misc/koffice-i18n-tr/Makefile
index 109aea9f60cb..f3f83e7d0015 100644
--- a/misc/koffice-i18n-tr/Makefile
+++ b/misc/koffice-i18n-tr/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-ven/Makefile b/misc/koffice-i18n-ven/Makefile
index 9eb74375e5ea..a9d34808add7 100644
--- a/misc/koffice-i18n-ven/Makefile
+++ b/misc/koffice-i18n-ven/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-xh/Makefile b/misc/koffice-i18n-xh/Makefile
index 18e79cfec0aa..bb13b680a96b 100644
--- a/misc/koffice-i18n-xh/Makefile
+++ b/misc/koffice-i18n-xh/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/koffice-i18n-zu/Makefile b/misc/koffice-i18n-zu/Makefile
index 40be932519d1..65ed22eac628 100644
--- a/misc/koffice-i18n-zu/Makefile
+++ b/misc/koffice-i18n-zu/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index 5c919cef9e47..19de06e02c37 100644
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= stable/apps/KDE3.x/admin/
MAINTAINER= kde@freebsd.org
COMMENT= KDE/Qt log file viewer
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 5f5d88442756..9cb03cdfcfe6 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= utils/file/managers/mc/
MAINTAINER= fjoe@FreeBSD.org
COMMENT= Midnight Commander, a free Norton Commander Clone
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
.include <bsd.port.pre.mk>
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index 2f10b4a251d3..5baa00c8be75 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://dione.ids.pl/~pborys/software/pinfo/
MAINTAINER= ports@FreeBSD.org
COMMENT= Ncurses based, lynx style info documentation browser
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile
index 30ddb191cbae..1effb7910df6 100644
--- a/misc/upclient/Makefile
+++ b/misc/upclient/Makefile
@@ -18,7 +18,7 @@ COMMENT= The Uptimes project client
# Global variables
#
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_REINPLACE= yes
ALL_TARGET= bsd
diff --git a/misc/xfce4-iconbox/Makefile b/misc/xfce4-iconbox/Makefile
index 7522a98b97e1..1e815ff62ca9 100644
--- a/misc/xfce4-iconbox/Makefile
+++ b/misc/xfce4-iconbox/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 icon box, an alternative taskbar
BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
xfce4util.1:${PORTSDIR}/x11/libxfce4util \
xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index baa43f0992c1..1f1c2afd36c2 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= FLAC.5:${PORTSDIR}/audio/flac \
mad.2:${PORTSDIR}/audio/libmad \
speex.2:${PORTSDIR}/audio/speex \
iconv.3:${PORTSDIR}/converters/libiconv \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
aa.1:${PORTSDIR}/graphics/aalib \
mng.1:${PORTSDIR}/graphics/libmng \
dvdread.3:${PORTSDIR}/multimedia/libdvdread
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index 05aa326d40d7..3627536e370e 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= An add-on graphical user interface for Ogle
BUILD_DEPENDS= ${LOCALBASE}/lib/ogle/libdvdcontrol.so.11:${PORTSDIR}/multimedia/ogle
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
glade-2.0:${PORTSDIR}/devel/libglade2 \
xml2.5:${PORTSDIR}/textproc/libxml2
RUN_DEPENDS= ogle:${PORTSDIR}/multimedia/ogle
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 0efa6a35c02c..ba87fd0fb44e 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
mad.2:${PORTSDIR}/audio/mad \
avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
a52.0:${PORTSDIR}/audio/liba52 \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv \
vorbis.3:${PORTSDIR}/audio/libvorbis \
FLAC.5:${PORTSDIR}/audio/flac \
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 0efa6a35c02c..ba87fd0fb44e 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
mad.2:${PORTSDIR}/audio/mad \
avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
a52.0:${PORTSDIR}/audio/liba52 \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv \
vorbis.3:${PORTSDIR}/audio/libvorbis \
FLAC.5:${PORTSDIR}/audio/flac \
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 2f08d5c379a3..88faadb8e1aa 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -18,7 +18,7 @@ COMMENT= An X11 multimedia player
LIB_DEPENDS= xine.9:${PORTSDIR}/multimedia/libxine \
aa.1:${PORTSDIR}/graphics/aalib \
png.5:${PORTSDIR}/graphics/png \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/multimedia/xmps-opendivx-plugin/Makefile b/multimedia/xmps-opendivx-plugin/Makefile
index f6d581d2351e..db3df2fddf7c 100644
--- a/multimedia/xmps-opendivx-plugin/Makefile
+++ b/multimedia/xmps-opendivx-plugin/Makefile
@@ -16,7 +16,7 @@ COMMENT= xmps plugin using OpenDivX decoding engine from Project Mayo
LIB_DEPENDS= divxdecore.0:${PORTSDIR}/multimedia/libdivxdecore \
xmps.0:${PORTSDIR}/multimedia/xmps \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
WRKSRC= ${WRKDIR}/${PORTNAME}-0.0.2
USE_GMAKE= yes
diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile
index ebd71f57843f..935316cf7cef 100644
--- a/multimedia/xmps-win32-plugin/Makefile
+++ b/multimedia/xmps-win32-plugin/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= xmps plugin for Win32 (TM) Codecs
LIB_DEPENDS= xmps.0:${PORTSDIR}/multimedia/xmps \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
USE_GMAKE= yes
diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index f9ed8d667dcb..813c8674062e 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://centericq.de/archive/source/releases/
MAINTAINER= clsung@dragon2.net
COMMENT= A text mode menu- and window-driven IM interface
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
USE_OPENSSL= yes
diff --git a/net-mgmt/ap-utils/Makefile b/net-mgmt/ap-utils/Makefile
index 71f50a4eb35a..449d48af832f 100644
--- a/net-mgmt/ap-utils/Makefile
+++ b/net-mgmt/ap-utils/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= daniel+aputils@pelleg.org
COMMENT= A set of utilities to configure and monitor wireless access points
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
USE_BZIP2= yes
diff --git a/net-mgmt/darkstat/Makefile b/net-mgmt/darkstat/Makefile
index 71ecde8e25c3..c9ec2d5f2ebb 100644
--- a/net-mgmt/darkstat/Makefile
+++ b/net-mgmt/darkstat/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --disable-nls
PLIST_SUB= NLS="@comment "
.else
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE}
PLIST_SUB= NLS=""
.endif
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 2819f9f5f0db..dcaad8b88488 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= samy@kerneled.com
COMMENT= A graphical network traffic visualization tool for gnome
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GNOME= libglade2 libgnomeui
USE_LIBTOOL= yes
diff --git a/net-mgmt/ipv6calc/Makefile b/net-mgmt/ipv6calc/Makefile
index 62624f43618f..b903a464c8c6 100644
--- a/net-mgmt/ipv6calc/Makefile
+++ b/net-mgmt/ipv6calc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
MAINTAINER= edwin@mavetju.org
COMMENT= Convert, change and calculate with IPv6 addresses
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index 53f8910da54f..ed6769a1b228 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -19,7 +19,7 @@ COMMENT= A GUI to DirectConnect (www.neo-modus.com) text client
BUILD_DEPENDS= dctc:${PORTSDIR}/net/dctc
LIB_DEPENDS= db4.0:${PORTSDIR}/databases/db4 \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index a9488e6efaa0..88b194a05394 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -17,7 +17,7 @@ DISTNAME= GNUnet-${PORTVERSION}
MAINTAINER= krion@FreeBSD.org
COMMENT= An anonymous, distributed, reputation-based network
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
ltdl.4:${PORTSDIR}/devel/libltdl
USE_LIBTOOL= yes
diff --git a/net-p2p/gtkhx/Makefile b/net-p2p/gtkhx/Makefile
index 7ed0490de05d..3860d88f9fe5 100644
--- a/net-p2p/gtkhx/Makefile
+++ b/net-p2p/gtkhx/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= gtkhx
MAINTAINER= jre@vineyard.net
COMMENT= A GTK+ version of Hx, a UNIX Hotline Client
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_XLIB= yes
USE_GNOME= gdkpixbuf
diff --git a/net-p2p/lopster/Makefile b/net-p2p/lopster/Makefile
index 2f64a3fc61ed..d32b56287e09 100644
--- a/net-p2p/lopster/Makefile
+++ b/net-p2p/lopster/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= roman@xpert.com
COMMENT= GTK+ client for Napster
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile
index 08b6b88ed8d1..eeeaa1c09bbc 100644
--- a/net-p2p/xmule/Makefile
+++ b/net-p2p/xmule/Makefile
@@ -17,7 +17,7 @@ COMMENT= Port of eMule eDonkey P2P client using wxWindows class library
#FORBIDDEN= Multiple vulnerabilities, see \
# http://security.e-matters.de/advisories/022003.html
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
expat.4:${PORTSDIR}/textproc/expat2 \
wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
diff --git a/net/ap-utils/Makefile b/net/ap-utils/Makefile
index 71f50a4eb35a..449d48af832f 100644
--- a/net/ap-utils/Makefile
+++ b/net/ap-utils/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= daniel+aputils@pelleg.org
COMMENT= A set of utilities to configure and monitor wireless access points
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
USE_BZIP2= yes
diff --git a/net/centericq/Makefile b/net/centericq/Makefile
index f9ed8d667dcb..813c8674062e 100644
--- a/net/centericq/Makefile
+++ b/net/centericq/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://centericq.de/archive/source/releases/
MAINTAINER= clsung@dragon2.net
COMMENT= A text mode menu- and window-driven IM interface
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
USE_OPENSSL= yes
diff --git a/net/darkstat/Makefile b/net/darkstat/Makefile
index 71ecde8e25c3..c9ec2d5f2ebb 100644
--- a/net/darkstat/Makefile
+++ b/net/darkstat/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --disable-nls
PLIST_SUB= NLS="@comment "
.else
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE}
PLIST_SUB= NLS=""
.endif
diff --git a/net/dctc-gui/Makefile b/net/dctc-gui/Makefile
index 53f8910da54f..ed6769a1b228 100644
--- a/net/dctc-gui/Makefile
+++ b/net/dctc-gui/Makefile
@@ -19,7 +19,7 @@ COMMENT= A GUI to DirectConnect (www.neo-modus.com) text client
BUILD_DEPENDS= dctc:${PORTSDIR}/net/dctc
LIB_DEPENDS= db4.0:${PORTSDIR}/databases/db4 \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 2819f9f5f0db..dcaad8b88488 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= samy@kerneled.com
COMMENT= A graphical network traffic visualization tool for gnome
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GNOME= libglade2 libgnomeui
USE_LIBTOOL= yes
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index a9488e6efaa0..88b194a05394 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -17,7 +17,7 @@ DISTNAME= GNUnet-${PORTVERSION}
MAINTAINER= krion@FreeBSD.org
COMMENT= An anonymous, distributed, reputation-based network
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
ltdl.4:${PORTSDIR}/devel/libltdl
USE_LIBTOOL= yes
diff --git a/net/gtkhx/Makefile b/net/gtkhx/Makefile
index 7ed0490de05d..3860d88f9fe5 100644
--- a/net/gtkhx/Makefile
+++ b/net/gtkhx/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= gtkhx
MAINTAINER= jre@vineyard.net
COMMENT= A GTK+ version of Hx, a UNIX Hotline Client
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_XLIB= yes
USE_GNOME= gdkpixbuf
diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile
index 62624f43618f..b903a464c8c6 100644
--- a/net/ipv6calc/Makefile
+++ b/net/ipv6calc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
MAINTAINER= edwin@mavetju.org
COMMENT= Convert, change and calculate with IPv6 addresses
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index 0b489bea0cca..6fee5534844c 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= jwhois
MAINTAINER= matusita@FreeBSD.org
COMMENT=An improved WHOIS client capable of selecting server to query
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=${PREFIX}/var/jwhois
diff --git a/net/nc6/Makefile b/net/nc6/Makefile
index 281533b0ac9f..d51b82f60f72 100644
--- a/net/nc6/Makefile
+++ b/net/nc6/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= filippo@widestore.net
COMMENT= Netcat clone with IPv6 support
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
MAN1= nc6.1
GNU_CONFIGURE= yes
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index bd516f8cd6ce..6e7f3eb5d57d 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= NETwork DUmp data Displayer and Editor for tcpdump tracefiles
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv \
ltdl.4:${PORTSDIR}/devel/libltdl
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index db442da908b1..cf00c0b0cae9 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -82,7 +82,7 @@ RUN_DEPENDS+= lsof:${PORTSDIR}/sysutils/lsof
.endif
.if defined(WITH_LOCALE)
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
CONFIGURE_ARGS+= --enable-i18n \
--with-localedir=${LOCALBASE}/share/locale
.endif
diff --git a/net/tcpreen/Makefile b/net/tcpreen/Makefile
index 0db6a9ea4564..46c43cd1df73 100644
--- a/net/tcpreen/Makefile
+++ b/net/tcpreen/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= Janos.Mohacsi@bsd.hu
COMMENT= A simple TCP session re-engineering tool
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
USE_GETOPT_LONG= yes
diff --git a/net/whois/Makefile b/net/whois/Makefile
index 8fb58a8975d3..f88662c355a7 100644
--- a/net/whois/Makefile
+++ b/net/whois/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= filippo@widestore.net
COMMENT= Marco d'Itri whois client
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
MAN1= whois.1
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 88e6976f7a06..f02f24997e75 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ahh
MAINTAINER= sergei@FreeBSD.org
COMMENT= Tool to wake up Wake-On-LAN compliant computers
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
GNU_CONFIGURE= yes
diff --git a/net/xmule/Makefile b/net/xmule/Makefile
index 08b6b88ed8d1..eeeaa1c09bbc 100644
--- a/net/xmule/Makefile
+++ b/net/xmule/Makefile
@@ -17,7 +17,7 @@ COMMENT= Port of eMule eDonkey P2P client using wxWindows class library
#FORBIDDEN= Multiple vulnerabilities, see \
# http://security.e-matters.de/advisories/022003.html
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
expat.4:${PORTSDIR}/textproc/expat2 \
wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 0daae67c1e9f..8001c77864c4 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -22,7 +22,7 @@ MAINTAINER= petef@FreeBSD.org
COMMENT= SLang-based newsreader
LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
USE_BZIP2= yes
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 1a709daabe79..677edbc9209e 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -19,7 +19,7 @@ COMMENT= Easy-to-use threaded newsreader with NOV/NNTP support
LIB_DEPENDS= uu.3:${PORTSDIR}/converters/uulib \
iconv.3:${PORTSDIR}/converters/libiconv \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
pcre.0:${PORTSDIR}/devel/pcre
USE_BZIP2= yes
diff --git a/news/yencode/Makefile b/news/yencode/Makefile
index 3b441ce87204..f7912d26987a 100644
--- a/news/yencode/Makefile
+++ b/news/yencode/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A free (GPL) encoder and decoder for the yEnc Usenet file format
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GETOPT_LONG= yes
GNU_CONFIGURE= yes
diff --git a/palm/coldsync/Makefile b/palm/coldsync/Makefile
index b05778febf58..2660af0c7bed 100644
--- a/palm/coldsync/Makefile
+++ b/palm/coldsync/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.coldsync.org/download/
MAINTAINER= arensb+freebsd-ports@ooblick.com
COMMENT= Synchronize a PalmPilot with a Unix workstation
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_REINPLACE= yes
REINPLACE_ARGS= -i "" -E
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 9cd969794470..bf4e7928985b 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= varju@webct.com
COMMENT= Desktop Organizer Software for the Palm Pilot
LIB_DEPENDS= pisock.8:${PORTSDIR}/palm/pilot-link \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
CONFIGURE_ARGS+= --with-pilot-prefix=${PREFIX}
.if defined(WITH_GTK2)
diff --git a/polish/calligra-l10n/Makefile b/polish/calligra-l10n/Makefile
index 5065aecbf077..d121329447df 100644
--- a/polish/calligra-l10n/Makefile
+++ b/polish/calligra-l10n/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/polish/kde3-i18n/Makefile b/polish/kde3-i18n/Makefile
index f0ca01962a2e..1c39b22ac9a7 100644
--- a/polish/kde3-i18n/Makefile
+++ b/polish/kde3-i18n/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/polish/kde4-l10n/Makefile b/polish/kde4-l10n/Makefile
index f0ca01962a2e..1c39b22ac9a7 100644
--- a/polish/kde4-l10n/Makefile
+++ b/polish/kde4-l10n/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/polish/koffice-i18n/Makefile b/polish/koffice-i18n/Makefile
index 5065aecbf077..d121329447df 100644
--- a/polish/koffice-i18n/Makefile
+++ b/polish/koffice-i18n/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/polish/koffice-kde4-l10n/Makefile b/polish/koffice-kde4-l10n/Makefile
index 5065aecbf077..d121329447df 100644
--- a/polish/koffice-kde4-l10n/Makefile
+++ b/polish/koffice-kde4-l10n/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/portuguese/calligra-l10n-pt_BR/Makefile b/portuguese/calligra-l10n-pt_BR/Makefile
index bf12b0311853..2403b1582b70 100644
--- a/portuguese/calligra-l10n-pt_BR/Makefile
+++ b/portuguese/calligra-l10n-pt_BR/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/portuguese/calligra-l10n/Makefile b/portuguese/calligra-l10n/Makefile
index c69f02b0c41d..5a85b81a6d29 100644
--- a/portuguese/calligra-l10n/Makefile
+++ b/portuguese/calligra-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/portuguese/kde3-i18n-pt_BR/Makefile b/portuguese/kde3-i18n-pt_BR/Makefile
index b5b8ede281c2..4011d13b47d2 100644
--- a/portuguese/kde3-i18n-pt_BR/Makefile
+++ b/portuguese/kde3-i18n-pt_BR/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/portuguese/kde3-i18n/Makefile b/portuguese/kde3-i18n/Makefile
index c2e1b9e744dc..6577c2fcfae6 100644
--- a/portuguese/kde3-i18n/Makefile
+++ b/portuguese/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/portuguese/kde4-l10n-pt_BR/Makefile b/portuguese/kde4-l10n-pt_BR/Makefile
index b5b8ede281c2..4011d13b47d2 100644
--- a/portuguese/kde4-l10n-pt_BR/Makefile
+++ b/portuguese/kde4-l10n-pt_BR/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/portuguese/kde4-l10n/Makefile b/portuguese/kde4-l10n/Makefile
index c2e1b9e744dc..6577c2fcfae6 100644
--- a/portuguese/kde4-l10n/Makefile
+++ b/portuguese/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/portuguese/koffice-i18n-pt_BR/Makefile b/portuguese/koffice-i18n-pt_BR/Makefile
index bf12b0311853..2403b1582b70 100644
--- a/portuguese/koffice-i18n-pt_BR/Makefile
+++ b/portuguese/koffice-i18n-pt_BR/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/portuguese/koffice-i18n/Makefile b/portuguese/koffice-i18n/Makefile
index c69f02b0c41d..5a85b81a6d29 100644
--- a/portuguese/koffice-i18n/Makefile
+++ b/portuguese/koffice-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/portuguese/koffice-kde4-l10n-pt_BR/Makefile b/portuguese/koffice-kde4-l10n-pt_BR/Makefile
index bf12b0311853..2403b1582b70 100644
--- a/portuguese/koffice-kde4-l10n-pt_BR/Makefile
+++ b/portuguese/koffice-kde4-l10n-pt_BR/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/portuguese/koffice-kde4-l10n/Makefile b/portuguese/koffice-kde4-l10n/Makefile
index c69f02b0c41d..5a85b81a6d29 100644
--- a/portuguese/koffice-kde4-l10n/Makefile
+++ b/portuguese/koffice-kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 5d0b08cd9ff8..fb2c8f3cf424 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -18,7 +18,7 @@ COMMENT= Document processor interfaced with LaTeX, with CJK support
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
latex:${PORTSDIR}/print/teTeX
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
forms.1:${PORTSDIR}/x11-toolkits/xforms
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
latex:${PORTSDIR}/print/teTeX
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index db97b93d397e..ba630cf8949a 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= GIMP Print Printer Driver
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index db97b93d397e..ba630cf8949a 100644
--- a/print/gutenprint-base/Makefile
+++ b/print/gutenprint-base/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= GIMP Print Printer Driver
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
diff --git a/print/gutenprint/Makefile b/print/gutenprint/Makefile
index db97b93d397e..ba630cf8949a 100644
--- a/print/gutenprint/Makefile
+++ b/print/gutenprint/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= GIMP Print Printer Driver
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 3d6f2408e7e3..b1d69d54bb02 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -17,7 +17,7 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG)
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
latex:${PORTSDIR}/print/teTeX
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
latex:${PORTSDIR}/print/teTeX
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 3d6f2408e7e3..b1d69d54bb02 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -17,7 +17,7 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG)
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
latex:${PORTSDIR}/print/teTeX
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
latex:${PORTSDIR}/print/teTeX
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 3d6f2408e7e3..b1d69d54bb02 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -17,7 +17,7 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG)
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
latex:${PORTSDIR}/print/teTeX
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
latex:${PORTSDIR}/print/teTeX
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 3d6f2408e7e3..b1d69d54bb02 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -17,7 +17,7 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG)
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
latex:${PORTSDIR}/print/teTeX
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
latex:${PORTSDIR}/print/teTeX
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 3d6f2408e7e3..b1d69d54bb02 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -17,7 +17,7 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG)
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
latex:${PORTSDIR}/print/teTeX
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
latex:${PORTSDIR}/print/teTeX
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 3c190d44bb9b..6bc445f0189b 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -19,7 +19,7 @@ DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 graphical frontend for printing
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
xfce4util.1:${PORTSDIR}/x11/libxfce4util \
xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
diff --git a/russian/calligra-l10n/Makefile b/russian/calligra-l10n/Makefile
index df504ea7f53c..096cd891c398 100644
--- a/russian/calligra-l10n/Makefile
+++ b/russian/calligra-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/russian/kde3-i18n/Makefile b/russian/kde3-i18n/Makefile
index 4b890a4d1893..adc9198838f0 100644
--- a/russian/kde3-i18n/Makefile
+++ b/russian/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/russian/kde4-l10n/Makefile b/russian/kde4-l10n/Makefile
index 4b890a4d1893..adc9198838f0 100644
--- a/russian/kde4-l10n/Makefile
+++ b/russian/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/russian/koffice-i18n/Makefile b/russian/koffice-i18n/Makefile
index df504ea7f53c..096cd891c398 100644
--- a/russian/koffice-i18n/Makefile
+++ b/russian/koffice-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/russian/koffice-kde4-l10n/Makefile b/russian/koffice-kde4-l10n/Makefile
index df504ea7f53c..096cd891c398 100644
--- a/russian/koffice-kde4-l10n/Makefile
+++ b/russian/koffice-kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/security/authforce/Makefile b/security/authforce/Makefile
index f265d1de70f7..58b0e0419941 100644
--- a/security/authforce/Makefile
+++ b/security/authforce/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ache@FreeBSD.org
COMMENT= HTTP authentication brute forcer
LIB_DEPENDS= curl.2:${PORTSDIR}/ftp/curl \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
USE_GETOPT_LONG=yes
diff --git a/security/fwlogwatch/Makefile b/security/fwlogwatch/Makefile
index c756d169570f..83d9b1960e13 100644
--- a/security/fwlogwatch/Makefile
+++ b/security/fwlogwatch/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://www.kybs.de/boris/sw/
MAINTAINER= jim@corebsd.or.id
COMMENT= A packet filter and firewall log analyzer
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
USE_REINPLACE= yes
diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index afd67e934594..668cfe30dff2 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -17,7 +17,7 @@ COMMENT= Prerelease package of GnuPG extensions for GnuPG 2.0
LIB_DEPENDS= gcrypt.6:${PORTSDIR}/security/libgcrypt \
iconv.3:${PORTSDIR}/converters/libiconv \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
ksba.7:${PORTSDIR}/security/libksba \
pth.20:${PORTSDIR}/devel/pth
RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 32f366b41668..1b9962315121 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= The GNU Privacy Guard
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= YES
USE_GMAKE= YES
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 32f366b41668..1b9962315121 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= The GNU Privacy Guard
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= YES
USE_GMAKE= YES
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 23b702c5b06d..076fbf65b156 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= GNU SASL Library
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
idn.12:${PORTSDIR}/devel/libidn \
gcrypt.6:${PORTSDIR}/security/libgcrypt \
ntlm.0:${PORTSDIR}/security/libntlm \
diff --git a/security/gss/Makefile b/security/gss/Makefile
index 810175da228d..c71a91674feb 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= GNU Generic Security Service Library
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
shishi.0:${PORTSDIR}/security/shishi
USE_PERL5_BUILD= yes
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 771c763fcc90..1e16ec0f7253 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -24,7 +24,7 @@ COMMENT= Replacement for crypt(1)
BUILD_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257
LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt/ \
mhash.2:${PORTSDIR}/security/mhash/ \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static --with-catgets
diff --git a/security/newpg/Makefile b/security/newpg/Makefile
index afd67e934594..668cfe30dff2 100644
--- a/security/newpg/Makefile
+++ b/security/newpg/Makefile
@@ -17,7 +17,7 @@ COMMENT= Prerelease package of GnuPG extensions for GnuPG 2.0
LIB_DEPENDS= gcrypt.6:${PORTSDIR}/security/libgcrypt \
iconv.3:${PORTSDIR}/converters/libiconv \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
ksba.7:${PORTSDIR}/security/libksba \
pth.20:${PORTSDIR}/devel/pth
RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \
diff --git a/security/quintuple-agent/Makefile b/security/quintuple-agent/Makefile
index 48d635a51be8..04593da41a58 100644
--- a/security/quintuple-agent/Makefile
+++ b/security/quintuple-agent/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.vibe.at/tools/q-agent/
MAINTAINER= stolz@i2.informatik.rwth-aachen.de
COMMENT= Quintuple Agent is a program that stores secrets for you
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
USE_GNOME= glib12
.ifndef(WITHOUT_X11)
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index efc9845cc228..acb123d886c2 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://josefsson.org/${PORTNAME}/releases/
MAINTAINER= ports@FreeBSD.org
COMMENT= A free implementation of the Kerberos 5 network security system
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
idn.12:${PORTSDIR}/devel/libidn \
tasn1.2:${PORTSDIR}/security/libtasn1
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index c16f5779f157..3980d776d9a7 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -17,7 +17,7 @@ COMMENT= "Steganography tool to hide data in binary files"
LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \
mhash.2:${PORTSDIR}/security/mhash \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_PERL5= yes
USE_LIBTOOL= yes
diff --git a/security/tinc/Makefile b/security/tinc/Makefile
index 206ce9b83ba2..b15543e890b1 100644
--- a/security/tinc/Makefile
+++ b/security/tinc/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= http://tinc.nl.linux.org/packages/ \
MAINTAINER= krion@FreeBSD.org
COMMENT= A Virtual Private Network (VPN) daemon
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old \
lzo.1:${PORTSDIR}/archivers/lzo
USE_OPENSSL= yes
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index d05f28e32b5e..f281ba053c39 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= Lars.Koeller@Uni-Bielefeld.de
COMMENT= A daemon for controlling APC UPS
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
gd.4:${PORTSDIR}/graphics/gd
USE_REINPLACE= yes
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 8828fdcb02cb..578a82d50855 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= jharris@widomaker.com
COMMENT= The Free Software Foundation's core utilities
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
CONFLICTS= sh-utils-* fileutils-* textutils-* id-utils-*
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 10987c5122fd..ba7b297723a8 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.abo.fi/~jmunsin/gcombust/
MAINTAINER= mcdouga9@msu.edu
COMMENT= A GTK+ frontend for mkisofs and cdrecord
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \
mkisofs:${PORTSDIR}/sysutils/mkisofs \
cdlabelgen:${PORTSDIR}/print/cdlabelgen
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index acf79da5a8db..d2fd06bbc3c6 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://userpage.fu-berlin.de/~zeank/gtk-imonc/download/
MAINTAINER= steffen@vogelreuter.de
COMMENT= A gtk based client to control an one disc fli4l router
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
diff --git a/sysutils/mount.app/Makefile b/sysutils/mount.app/Makefile
index 838d8d3eb890..ad8fbac3e01c 100644
--- a/sysutils/mount.app/Makefile
+++ b/sysutils/mount.app/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= mountapp
MAINTAINER= nm@web.am
COMMENT= Windowmaker application, Resembles wmmount with extra functionality
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
BUILD_DEPENDS+= ${X11BASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker
USE_GNOME= gtk12 glib12
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index a5d7574ee6c5..252593644e2e 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a./alpha/}
MAINTAINER= oliver@FreeBSD.org
COMMENT= Another X11 frontend to mkisofs/cdrecord
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \
mkisofs:${PORTSDIR}/sysutils/mkisofs
diff --git a/sysutils/xfce4-mcs-manager/Makefile b/sysutils/xfce4-mcs-manager/Makefile
index 0e82a3f7e6a8..45d5beb12dae 100644
--- a/sysutils/xfce4-mcs-manager/Makefile
+++ b/sysutils/xfce4-mcs-manager/Makefile
@@ -19,7 +19,7 @@ DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 settings manager
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
xfce4util.1:${PORTSDIR}/x11/libxfce4util \
xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
xfce4mcs-manager.1:${PORTSDIR}/x11/libxfce4mcs
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index f192f69443f3..c6648d78622b 100644
--- a/sysutils/xfce4-mcs-plugins/Makefile
+++ b/sysutils/xfce4-mcs-plugins/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 settings manager plugins
BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
xfce4util.1:${PORTSDIR}/x11/libxfce4util \
xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index bd75bfdc8d67..02c23d5c9615 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -19,7 +19,7 @@ DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 essential utilities and scripts
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
xfce4util.1:${PORTSDIR}/x11/libxfce4util \
xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
xfce4mcs-manager.1:${PORTSDIR}/sysutils/xfce4-mcs-manager
diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile
index ace7dd9aafce..5b6fe1db048c 100644
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= An xmlviewer with a netscape plugin, and now a bonobo control as well
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
xml2.5:${PORTSDIR}/textproc/libxml2
USE_REINPLACE= yes
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index 1abd05699c07..e853d8b537df 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -15,7 +15,7 @@ DISTNAME= tre-${PORTVERSION}
MAINTAINER= krion@FreeBSD.org
COMMENT= A lightweight fully POSIX compliant regexp matching library
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget pkgconfig
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index 72051ed02ce5..0b5a2bdd5ec7 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -17,7 +17,7 @@ COMMENT= A modular log file analysis program
LIB_DEPENDS= adns.1:${PORTSDIR}/dns/adns \
gd.4:${PORTSDIR}/graphics/gd \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
pcre.0:${PORTSDIR}/devel/pcre \
expat.4:${PORTSDIR}/textproc/expat2
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 6e247e22a02f..18c4024b096b 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= openjade
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= This package is a collection of SGML/XML tools called OpenSP
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
USE_GMAKE= YES
diff --git a/textproc/rotix/Makefile b/textproc/rotix/Makefile
index f15bfe6510a9..2bdf1408220f 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
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
HAS_CONFIGURE= yes
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index bad5e78e4fc4..e7f4ea6f4a96 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= An Open Document Cataloging Project
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
BUILD_DEPENDS= intltool-extract:${PORTSDIR}/textproc/intltool \
${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
diff --git a/textproc/spellutils/Makefile b/textproc/spellutils/Makefile
index e59443afccdd..fb5178144109 100644
--- a/textproc/spellutils/Makefile
+++ b/textproc/spellutils/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://home.worldonline.dk/byrial/spellutils/
MAINTAINER= thierry@pompo.net
COMMENT= Programs used to isolate some parts or texts before spell-checking
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
USE_BZIP2= yes
diff --git a/ukrainian/calligra-l10n/Makefile b/ukrainian/calligra-l10n/Makefile
index 6993b0cf6fef..4a2ad2d90f7f 100644
--- a/ukrainian/calligra-l10n/Makefile
+++ b/ukrainian/calligra-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/ukrainian/kde3-i18n/Makefile b/ukrainian/kde3-i18n/Makefile
index 79077cb2337c..5493c739fb5b 100644
--- a/ukrainian/kde3-i18n/Makefile
+++ b/ukrainian/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/ukrainian/kde4-l10n/Makefile b/ukrainian/kde4-l10n/Makefile
index 79077cb2337c..5493c739fb5b 100644
--- a/ukrainian/kde4-l10n/Makefile
+++ b/ukrainian/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/ukrainian/koffice-i18n/Makefile b/ukrainian/koffice-i18n/Makefile
index 6993b0cf6fef..4a2ad2d90f7f 100644
--- a/ukrainian/koffice-i18n/Makefile
+++ b/ukrainian/koffice-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/ukrainian/koffice-kde4-l10n/Makefile b/ukrainian/koffice-kde4-l10n/Makefile
index 6993b0cf6fef..4a2ad2d90f7f 100644
--- a/ukrainian/koffice-kde4-l10n/Makefile
+++ b/ukrainian/koffice-kde4-l10n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Localized messages and documentation for koffice
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/vietnamese/kde3-i18n/Makefile b/vietnamese/kde3-i18n/Makefile
index 040d65017811..9112a97951c8 100644
--- a/vietnamese/kde3-i18n/Makefile
+++ b/vietnamese/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
COMMENT= Localized messages and documentation for KDE3
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
USE_BZIP2= yes
diff --git a/www/amyc/Makefile b/www/amyc/Makefile
index 221d2ee3cfcb..e7db13dfe297 100644
--- a/www/amyc/Makefile
+++ b/www/amyc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.crevola.com/about/current/
MAINTAINER= petef@FreeBSD.org
COMMENT= Display the contents of your Netscape cache
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_AUTOCONF= yes
GNU_CONFIGURE= yes
diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile
index ed3b6f7dd890..e140cdd2beb9 100644
--- a/www/kdewebdev/Makefile
+++ b/www/kdewebdev/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@freebsd.org
COMMENT= Comprehensive html/website development environment
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index ed3b6f7dd890..e140cdd2beb9 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@freebsd.org
COMMENT= Comprehensive html/website development environment
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 58609aaaac8f..fc67113636da 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}2.8.5dev.17
MAINTAINER= ache@FreeBSD.org
COMMENT= A non-graphical, text-based World-Wide Web client
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
WRKSRC= ${WRKDIR}/${PORTNAME}2-8-5
USE_BZIP2= yes
diff --git a/www/quanta/Makefile b/www/quanta/Makefile
index ed3b6f7dd890..e140cdd2beb9 100644
--- a/www/quanta/Makefile
+++ b/www/quanta/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@freebsd.org
COMMENT= Comprehensive html/website development environment
-BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index 665b9609c161..ea0f3f20c196 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= An interactive, multi-threaded web browser for text terminals
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_REINPLACE= yes
HAS_CONFIGURE= yes
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index ee8416d4e098..36c23b0e5864 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.lyra.org/sitecopy/
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Maintains remote websites, uses FTP or WebDAV to sync up with local copy
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" \
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index 058712228ef7..18aa2dced43d 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= clsung@dragon2.net
COMMENT= A text mode RSS newsreader
BUILD_DEPENDS= ${LOCALBASE}/bin/xml2-config:${PORTSDIR}/textproc/libxml2
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
USE_GMAKE= yes
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 63d77deb01b5..d3fb4442ce34 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -65,7 +65,7 @@ PLIST_SUB+= JAPANESE="@comment "
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.5:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= NLS=""
.endif
diff --git a/x11-fm/xfce4-fm/Makefile b/x11-fm/xfce4-fm/Makefile
index 588e02aec4ae..b289b203cbe7 100644
--- a/x11-fm/xfce4-fm/Makefile
+++ b/x11-fm/xfce4-fm/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 file manager
BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
dbh.1:${PORTSDIR}/databases/dbh \
xml2.5:${PORTSDIR}/textproc/libxml2 \
xfce4util.1:${PORTSDIR}/x11/libxfce4util \
diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile
index 0113aa7d269b..eb746f522db5 100644
--- a/x11-fm/xfe/Makefile
+++ b/x11-fm/xfe/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ptiJo@noos.fr
COMMENT= Fast MS-Explorer like filemanager for X
LIB_DEPENDS= FOX:${PORTSDIR}/x11-toolkits/fox \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
png.5:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index ae8d96c2c81e..dec49057ad43 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -25,7 +25,7 @@ COMMENT= File manager for X Window
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_XLIB= yes
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index c7680549799c..ecbfbfdb090a 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -16,7 +16,7 @@ DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gimp Toolkit for X11 GUI (previous stable version)
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_PERL5= yes
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index c735f539d74b..9bb29c6cecf2 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -17,7 +17,7 @@ COMMENT= An open-source framework for the layout and rendering of i18n text
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/Xft \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 3659e2678f03..e773a8d7a499 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Window Manager designed for speed, usability and consistency
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
WANT_GNOME= yes
diff --git a/x11-wm/kappdock/Makefile b/x11-wm/kappdock/Makefile
index 5a252c4cb9e5..220d91feacce 100644
--- a/x11-wm/kappdock/Makefile
+++ b/x11-wm/kappdock/Makefile
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-0.46
MAINTAINER= jeremy@external.org
COMMENT= A dock-like applet for KDE3
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile
index a778ff116242..ba88e8d69a9a 100644
--- a/x11-wm/ude/Makefile
+++ b/x11-wm/ude/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= udeproject
MAINTAINER= ports@FreeBSD.org
COMMENT= Small, fast, compact windowmanager
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
jpeg.9:${PORTSDIR}/graphics/jpeg
USE_X_PREFIX= yes
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index db43f07071ab..c524a29dd8c3 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -19,7 +19,7 @@ COMMENT= GNUStep-compliant NeXTStep window manager clone
LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
.if !defined(WITHOUT_HERMES)
LIB_DEPENDS+= Hermes.1:${PORTSDIR}/graphics/Hermes
.endif
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 6aeab041b0fe..fc12a7f877f7 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 desktop background manager and root menu
BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
xml2.5:${PORTSDIR}/textproc/libxml2 \
xfce4util.1:${PORTSDIR}/x11/libxfce4util \
xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 1c87c08463b1..cb5a09f8312b 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 panel module
BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
xml2.5:${PORTSDIR}/textproc/libxml2 \
startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
xfce4util.1:${PORTSDIR}/x11/libxfce4util \
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 2c842e2e444a..3d27a8843c9e 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 window manager
BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old \
startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
xfce4util.1:${PORTSDIR}/x11/libxfce4util \
xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 16ba1fc31138..f3f19de1ae16 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
xml2.5:${PORTSDIR}/textproc/libxml2 \
xslt.2:${PORTSDIR}/textproc/libxslt \
pcre.0:${PORTSDIR}/devel/pcre \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
cups.2:${PORTSDIR}/print/cups-base
RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 16ba1fc31138..f3f19de1ae16 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
xml2.5:${PORTSDIR}/textproc/libxml2 \
xslt.2:${PORTSDIR}/textproc/libxslt \
pcre.0:${PORTSDIR}/devel/pcre \
- intl.5:${PORTSDIR}/devel/gettext \
+ intl.5:${PORTSDIR}/devel/gettext-old \
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
cups.2:${PORTSDIR}/print/cups-base
RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
diff --git a/x11/kgamma/Makefile b/x11/kgamma/Makefile
index d01adb780930..cbbbda5d9b5e 100644
--- a/x11/kgamma/Makefile
+++ b/x11/kgamma/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p./_pre/}
MAINTAINER= arved@FreeBSD.org
COMMENT= "KDE Control Center module for gamma calibration/correction of XFree86"
-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
USE_KDELIBS_VER= 3
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index d2e8a38a15a7..79ea7b3e2ac1 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
LIB_DEPENDS= iconv:${PORTSDIR}/converters/libiconv \
- intl.5:${PORTSDIR}/devel/gettext
+ intl.5:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_GMAKE= yes