aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CVSROOT/modules2
-rw-r--r--arabic/kde3-i18n/Makefile2
-rw-r--r--arabic/kde4-l10n/Makefile2
-rw-r--r--archivers/gtar/Makefile2
-rw-r--r--archivers/rpm/Makefile2
-rw-r--r--astro/fooseti/Makefile2
-rw-r--r--astro/seti_applet/Makefile2
-rw-r--r--astro/spacechart/Makefile2
-rw-r--r--audio/aumix/Makefile2
-rw-r--r--audio/denemo/Makefile2
-rw-r--r--audio/kmikmod/Makefile2
-rw-r--r--audio/koog/Makefile2
-rw-r--r--audio/lopster/Makefile2
-rw-r--r--audio/mad/Makefile2
-rw-r--r--audio/normalize/Makefile2
-rw-r--r--audio/opmixer/Makefile2
-rw-r--r--audio/snd/Makefile2
-rw-r--r--audio/soribada/Makefile2
-rw-r--r--audio/umix/Makefile2
-rw-r--r--chinese/xcin25/Makefile2
-rw-r--r--chinese/zhcon/Makefile2
-rw-r--r--comms/gnokii/Makefile2
-rw-r--r--converters/recode/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/postgresql-devel-server/Makefile2
-rw-r--r--databases/postgresql-devel/Makefile2
-rw-r--r--databases/postgresql7/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/sqsh/Makefile2
-rw-r--r--deskutils/gcal/Makefile2
-rw-r--r--deskutils/gnome-utils/Makefile2
-rw-r--r--deskutils/gnomeutils2/Makefile2
-rw-r--r--devel/Makefile2
-rw-r--r--devel/ORBit/Makefile2
-rw-r--r--devel/bonobo/Makefile2
-rw-r--r--devel/bug-buddy/Makefile2
-rw-r--r--devel/bugbuddy/Makefile2
-rw-r--r--devel/bugbuddy2/Makefile2
-rw-r--r--devel/cervisia/Makefile2
-rw-r--r--devel/cook/Makefile2
-rw-r--r--devel/gettext-devel/Makefile65
-rw-r--r--devel/gettext-devel/distinfo1
-rw-r--r--devel/gettext-devel/files/patch-ad16
-rw-r--r--devel/gettext-devel/files/patch-ae67
-rw-r--r--devel/gettext-devel/files/patch-ak11
-rw-r--r--devel/gettext-devel/pkg-comment1
-rw-r--r--devel/gettext-devel/pkg-descr5
-rw-r--r--devel/gettext-devel/pkg-plist122
-rw-r--r--devel/gettext/Makefile41
-rw-r--r--devel/gettext/distinfo2
-rw-r--r--devel/gettext/files/patch-Makefile.in (renamed from devel/gettext-devel/files/patch-Makefile.in)2
-rw-r--r--devel/gettext/files/patch-ad40
-rw-r--r--devel/gettext/files/patch-ae76
-rw-r--r--devel/gettext/files/patch-af10
-rw-r--r--devel/gettext/files/patch-ah11
-rw-r--r--devel/gettext/files/patch-ai12
-rw-r--r--devel/gettext/files/patch-doc::Makefile.in (renamed from devel/gettext-devel/files/patch-doc::Makefile.in)2
-rw-r--r--devel/gettext/files/patch-intl::Makefile.in (renamed from devel/gettext-devel/files/patch-intl::Makefile.in)0
-rw-r--r--devel/gettext/files/patch-lib::Makefile.in (renamed from devel/gettext-devel/files/patch-lib::Makefile.in)0
-rw-r--r--devel/gettext/files/patch-ltmain.sh (renamed from devel/gettext-devel/files/patch-ltmain.sh)2
-rw-r--r--devel/gettext/files/patch-man::Makefile.in (renamed from devel/gettext-devel/files/patch-man::Makefile.in)2
-rw-r--r--devel/gettext/pkg-plist71
-rw-r--r--devel/glib20/Makefile2
-rw-r--r--devel/gmake/Makefile2
-rw-r--r--devel/gmake381/Makefile2
-rw-r--r--devel/gnome-vfs/Makefile2
-rw-r--r--devel/gnome-vfs1/Makefile2
-rw-r--r--devel/gnomevfs/Makefile2
-rw-r--r--devel/gnomevfs2/Makefile2
-rw-r--r--devel/gtranslator/Makefile2
-rw-r--r--devel/ixlib/Makefile2
-rw-r--r--devel/kdevelop/Makefile2
-rw-r--r--devel/ktranslator/Makefile2
-rw-r--r--devel/motor/Makefile2
-rw-r--r--devel/objprelink/Makefile2
-rw-r--r--devel/p5-Locale-gettext/Makefile2
-rw-r--r--devel/popt/Makefile2
-rw-r--r--devel/ruby-intl/Makefile2
-rw-r--r--editors/calligra-l10n/Makefile2
-rw-r--r--editors/cooledit/Makefile2
-rw-r--r--editors/koffice-i18n/Makefile2
-rw-r--r--editors/koffice-kde4-l10n/Makefile2
-rw-r--r--editors/lpe/Makefile2
-rw-r--r--editors/nano/Makefile2
-rw-r--r--editors/poedit/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--emulators/xsystem35/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/eboard/Makefile2
-rw-r--r--games/freeciv-gtk2/Makefile2
-rw-r--r--games/freeciv/Makefile2
-rw-r--r--games/gnome-games/Makefile2
-rw-r--r--games/gnomegames/Makefile2
-rw-r--r--games/gnomegames2/Makefile2
-rw-r--r--games/gtypist/Makefile2
-rw-r--r--games/kbubbles/Makefile2
-rw-r--r--games/kpuzzle/Makefile2
-rw-r--r--games/krogue/Makefile2
-rw-r--r--games/krubik/Makefile2
-rw-r--r--games/lexter/Makefile2
-rw-r--r--games/xinvaders/Makefile2
-rw-r--r--graphics/gphoto2/Makefile2
-rw-r--r--graphics/gtkgraph/Makefile2
-rw-r--r--graphics/gtksee/Makefile2
-rw-r--r--graphics/libxine/Makefile2
-rw-r--r--graphics/ogle-gui/Makefile2
-rw-r--r--graphics/ruby-tgif/Makefile2
-rw-r--r--graphics/tgif-nls/Makefile4
-rw-r--r--graphics/xine/Makefile2
-rw-r--r--graphics/xmps-opendivx-plugin/Makefile2
-rw-r--r--graphics/xmps-win32-plugin/Makefile2
-rw-r--r--hebrew/kde3-i18n/Makefile2
-rw-r--r--hebrew/kde4-l10n/Makefile2
-rw-r--r--hungarian/kde3-i18n/Makefile2
-rw-r--r--hungarian/kde4-l10n/Makefile2
-rw-r--r--irc/kvirc-devel/Makefile2
-rw-r--r--irc/kvirc/Makefile2
-rw-r--r--irc/liece/Makefile2
-rw-r--r--irc/riece-emacs21/Makefile2
-rw-r--r--irc/riece/Makefile2
-rw-r--r--irc/xchat-gnome/Makefile2
-rw-r--r--irc/xchat/Makefile2
-rw-r--r--irc/xchat1/Makefile2
-rw-r--r--irc/xchat2/Makefile2
-rw-r--r--japanese/kebook/Makefile2
-rw-r--r--japanese/mutt-devel/Makefile4
-rw-r--r--japanese/mutt/Makefile4
-rw-r--r--japanese/samba/Makefile2
-rw-r--r--japanese/samba20/Makefile2
-rw-r--r--japanese/vflib/Makefile2
-rw-r--r--korean/texinfo/Makefile2
-rw-r--r--lang/librep/Makefile2
-rw-r--r--lang/librep2/Makefile2
-rw-r--r--lang/mdk/Makefile2
-rw-r--r--mail/elm/Makefile2
-rw-r--r--mail/fetchmail/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--math/oleo/Makefile2
-rw-r--r--misc/afbackup/Makefile2
-rw-r--r--misc/dirtree/Makefile2
-rw-r--r--misc/gnomeutils/Makefile2
-rw-r--r--misc/gnomeutils2/Makefile2
-rw-r--r--misc/kde2-i18n/Makefile2
-rw-r--r--misc/kde3-i18n-af/Makefile2
-rw-r--r--misc/kde3-i18n-ar/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-fi/Makefile2
-rw-r--r--misc/kde3-i18n-he/Makefile2
-rw-r--r--misc/kde3-i18n-hr/Makefile2
-rw-r--r--misc/kde3-i18n-hu/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-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-pl/Makefile2
-rw-r--r--misc/kde3-i18n-pt/Makefile2
-rw-r--r--misc/kde3-i18n-pt_BR/Makefile2
-rw-r--r--misc/kde3-i18n-ro/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-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-vi/Makefile2
-rw-r--r--misc/kde3-i18n-xh/Makefile2
-rw-r--r--misc/kde3-i18n-zu/Makefile2
-rw-r--r--misc/kde3-i18n/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-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/kde4-l10n/Makefile2
-rw-r--r--misc/koffice-i18n/Makefile2
-rw-r--r--misc/kwatch/Makefile2
-rw-r--r--misc/mc/Makefile2
-rw-r--r--misc/pinfo/Makefile2
-rw-r--r--misc/sh-utils/Makefile2
-rw-r--r--multimedia/libxine/Makefile2
-rw-r--r--multimedia/ogle-gui/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/etherape/Makefile2
-rw-r--r--net-mgmt/ipv6calc/Makefile2
-rw-r--r--net-p2p/dctc-gui/Makefile2
-rw-r--r--net-p2p/fidelio/Makefile2
-rw-r--r--net-p2p/gtkhx/Makefile2
-rw-r--r--net-p2p/lopster/Makefile2
-rw-r--r--net/centericq/Makefile2
-rw-r--r--net/dctc-gui/Makefile2
-rw-r--r--net/etherape/Makefile2
-rw-r--r--net/fidelio/Makefile2
-rw-r--r--net/gabber/Makefile2
-rw-r--r--net/gtkhx/Makefile2
-rw-r--r--net/ipv6calc/Makefile2
-rw-r--r--net/jwhois/Makefile2
-rw-r--r--net/kdetelnet/Makefile2
-rw-r--r--net/kmud/Makefile2
-rw-r--r--net/ksamba/Makefile2
-rw-r--r--net/wol/Makefile2
-rw-r--r--news/tin/Makefile2
-rw-r--r--palm/coldsync/Makefile2
-rw-r--r--palm/jpilot/Makefile2
-rw-r--r--polish/kde3-i18n/Makefile2
-rw-r--r--polish/kde4-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--print/cjk-lyx/Makefile2
-rw-r--r--print/ktexshell/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/rlpr/Makefile2
-rw-r--r--russian/calligra-l10n/Makefile2
-rw-r--r--russian/kde2-i18n/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/fwlogwatch/Makefile2
-rw-r--r--security/gnupg/Makefile2
-rw-r--r--security/gnupg1/Makefile2
-rw-r--r--security/kssh/Makefile2
-rw-r--r--security/mcrypt/Makefile2
-rw-r--r--sysutils/apcupsd/Makefile2
-rw-r--r--sysutils/fileutils/Makefile2
-rw-r--r--sysutils/gcombust/Makefile2
-rw-r--r--sysutils/gfslicer/Makefile2
-rw-r--r--sysutils/slmon/Makefile2
-rw-r--r--textproc/modlogan/Makefile2
-rw-r--r--textproc/rotix/Makefile2
-rw-r--r--textproc/textutils/Makefile2
-rw-r--r--vietnamese/kde3-i18n/Makefile2
-rw-r--r--www/amyc/Makefile2
-rw-r--r--www/cadaver/Makefile2
-rw-r--r--www/dillo-i18n/Makefile2
-rw-r--r--www/dillo/Makefile2
-rw-r--r--www/dillo2/Makefile2
-rw-r--r--www/galeon/Makefile2
-rw-r--r--www/galeon2/Makefile2
-rw-r--r--www/horde-devel/Makefile2
-rw-r--r--www/horde2/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--x11-fm/nautilus/Makefile2
-rw-r--r--x11-fm/nautilus2/Makefile2
-rw-r--r--x11-toolkits/gtk12/Makefile2
-rw-r--r--x11-toolkits/pango/Makefile2
-rw-r--r--x11-wm/e16/Makefile2
-rw-r--r--x11-wm/enlightenment-devel/Makefile2
-rw-r--r--x11-wm/enlightenment/Makefile2
-rw-r--r--x11-wm/icewm/Makefile2
-rw-r--r--x11-wm/kappdock/Makefile2
-rw-r--r--x11-wm/kwix/Makefile2
-rw-r--r--x11-wm/ude/Makefile2
-rw-r--r--x11-wm/windowmaker/Makefile4
-rw-r--r--x11/gnome-applets/Makefile2
-rw-r--r--x11/gnomeapplets/Makefile2
-rw-r--r--x11/gnomeapplets2/Makefile2
-rw-r--r--x11/gnomecore/Makefile2
-rw-r--r--x11/kde4-baseapps/Makefile2
-rw-r--r--x11/kde4-runtime/Makefile2
-rw-r--r--x11/kde4-workspace/Makefile2
-rw-r--r--x11/kdebase11/Makefile2
-rw-r--r--x11/kdebase2/Makefile2
-rw-r--r--x11/kdebase3/Makefile2
-rw-r--r--x11/kdebase4-runtime/Makefile2
-rw-r--r--x11/kdebase4-workspace/Makefile2
-rw-r--r--x11/kdebase4/Makefile2
342 files changed, 468 insertions, 739 deletions
diff --git a/CVSROOT/modules b/CVSROOT/modules
index 634deed411df..c067816501fd 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -1754,7 +1754,7 @@ getfacl src/bin/getfacl
getmail ports/mail/getmail
getopt src/usr.bin/getopt
gettext ports/devel/gettext
-gettext-devel ports/devel/gettext-devel
+gettext-old ports/devel/gettext-old
getty src/libexec/getty
getxml ports/devel/getxml
gevas ports/x11-toolkits/gevas
diff --git a/arabic/kde3-i18n/Makefile b/arabic/kde3-i18n/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/arabic/kde3-i18n/Makefile
+++ b/arabic/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/arabic/kde4-l10n/Makefile b/arabic/kde4-l10n/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/arabic/kde4-l10n/Makefile
+++ b/arabic/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 79f584b3b03f..bc4ca7c785ff 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= g
MAINTAINER= naddy@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index 316b753f3d7c..d61d20ac9cb9 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${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 39cfb9623475..b535342abe7f 100644
--- a/astro/fooseti/Makefile
+++ b/astro/fooseti/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www-personal.engin.umich.edu/~agorski/fooseti/
MAINTAINER= petef@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
USE_GTK= yes
diff --git a/astro/seti_applet/Makefile b/astro/seti_applet/Makefile
index 77e20eec183d..7782d4b56058 100644
--- a/astro/seti_applet/Makefile
+++ b/astro/seti_applet/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= cyrille.lefevre@laposte.net
#
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= ${LOCALBASE}/sbin/setiathome:${PORTSDIR}/astro/setiathome
USE_X_PREFIX= yes
diff --git a/astro/spacechart/Makefile b/astro/spacechart/Makefile
index 1a0bd59fa073..1be7dda041e5 100644
--- a/astro/spacechart/Makefile
+++ b/astro/spacechart/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 9a2df4de4299..089f416792c0 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= cpiazza@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
WANT_GTK= yes
GNU_CONFIGURE= yes
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index a9a45f34951e..f044a4306769 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= trevor@FreeBSD.org
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- intl.1:${PORTSDIR}/devel/gettext \
+ intl.1:${PORTSDIR}/devel/gettext-old \
xml.5:${PORTSDIR}/textproc/libxml
GNU_CONFIGURE= yes
diff --git a/audio/kmikmod/Makefile b/audio/kmikmod/Makefile
index 365b71ff7183..deeb94222be1 100644
--- a/audio/kmikmod/Makefile
+++ b/audio/kmikmod/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= tom
MAINTAINER= tom@FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \
kdeui.3:${PORTSDIR}/x11/kdelibs11
diff --git a/audio/koog/Makefile b/audio/koog/Makefile
index 8bc023357284..f328972b2084 100644
--- a/audio/koog/Makefile
+++ b/audio/koog/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jeremy@external.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER= 2
USE_XPM= yes
diff --git a/audio/lopster/Makefile b/audio/lopster/Makefile
index 07a608e47a4a..57d6231866cd 100644
--- a/audio/lopster/Makefile
+++ b/audio/lopster/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= roman@xpert.com
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/audio/mad/Makefile b/audio/mad/Makefile
index d0397214775a..631068a2c82b 100644
--- a/audio/mad/Makefile
+++ b/audio/mad/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= mad
MAINTAINER= jason@mastaler.com
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
WANT_ESOUND= yes
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 289fc7c6bfc3..76f4ee6ac422 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.cs.columbia.edu/~cvaill/normalize/
MAINTAINER= greid@ukug.uk.freebsd.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
diff --git a/audio/opmixer/Makefile b/audio/opmixer/Makefile
index 33bcb74f0433..cbcc77ba21aa 100644
--- a/audio/opmixer/Makefile
+++ b/audio/opmixer/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= optronic
MAINTAINER= trevor@FreeBSD.org
LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
DOCDIR= share/doc/${PORTNAME}
USE_BZIP2= yes
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 00a1db1db055..09c0771aac25 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= trevor@FreeBSD.org
LIB_DEPENDS= gsl.0:${PORTSDIR}/math/gsl \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
.if defined(WITHOUT_ESD)
RUN_DEPENDS= esd:${PORTSDIR}/audio/esound
diff --git a/audio/soribada/Makefile b/audio/soribada/Makefile
index 93168f54b320..be01331aff26 100644
--- a/audio/soribada/Makefile
+++ b/audio/soribada/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://soribada.kldp.org/
MAINTAINER= cjh@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_GTK= yes
diff --git a/audio/umix/Makefile b/audio/umix/Makefile
index f9712947e496..50fccfd61c33 100644
--- a/audio/umix/Makefile
+++ b/audio/umix/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.ionstream.fi/sakari/umix/files/
MAINTAINER= greid@ukug.uk.freebsd.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV= CC="$(CC) -I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index bc951a961fdc..055c599d2ede 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -17,7 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} chewing-2001Nov01-snapshot.tar.gz
MAINTAINER= keith@FreeBSD.org
LIB_DEPENDS= tabe.0:${PORTSDIR}/chinese/libtabe \
- intl.1:${PORTSDIR}/devel/gettext \
+ intl.1:${PORTSDIR}/devel/gettext-old \
db2.0:${PORTSDIR}/databases/db
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts \
${LOCALBASE}/share/tabe/libtabe-0.2.2:${PORTSDIR}/chinese/libtabe
diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index aee62bb1b178..2518b7becbc5 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= statue@freebsd.sinica.edu.tw
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-included-gettext=${LOCALBASE}
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 1e45b4c6605c..52ca5476a699 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gnokii.org/pub/gnokii/ \
MAINTAINER= anders@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_AUTOCONF= yes
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index 158e37a9ec4e..a3f590e18956 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= recode
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
diff --git a/databases/mysql-gui/Makefile b/databases/mysql-gui/Makefile
index 6bb7422e78f9..7074fb5ae223 100644
--- a/databases/mysql-gui/Makefile
+++ b/databases/mysql-gui/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME:S/-//}-${PORTVERSION}
MAINTAINER= cyrille.lefevre@laposte.net
LIB_DEPENDS= sqlplus.1:${PORTSDIR}/databases/mysql++ \
- intl.1:${PORTSDIR}/devel/gettext \
+ intl.1:${PORTSDIR}/devel/gettext-old \
glut.3:${PORTSDIR}/graphics/Mesa3 \
jpeg.9:${PORTSDIR}/graphics/jpeg \
fleditor.1:${PORTSDIR}/x11-toolkits/fl_editor \
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index f4c218fb5623..8206b9684219 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -13,7 +13,7 @@ PKGNAMESUFFIX= 2
MAINTAINER= knu@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
BUILD_DEPENDS= ${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
RUN_DEPENDS= ${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
# xlHtml:${PORTSDIR}/textproc/xlhtml \
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index d86b9fdc061b..cc889a7c7979 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= sheldonh@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
LIB_DEPENDS= ct.0:${PORTSDIR}/databases/freetds \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${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 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql73/Makefile
+++ b/databases/postgresql73/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
.if defined(WITH_GETTEXT)
CONFIGURE_ARGS+=--enable-nls
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 03635b895357..15d274ea33e8 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX= -src.tar.gz
MAINTAINER= midom@dammit.lt
LIB_DEPENDS= tds.0:${PORTSDIR}/databases/freetds \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash1
GNU_CONFIGURE= yes
diff --git a/deskutils/gcal/Makefile b/deskutils/gcal/Makefile
index afa975ec27a1..c83f611eb396 100644
--- a/deskutils/gcal/Makefile
+++ b/deskutils/gcal/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= cyrille.lefevre@laposte.net
# Global variables
#
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index fa2a727c884a..b20f47247062 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -14,7 +14,7 @@ DISTNAME= gnome-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index fa2a727c884a..b20f47247062 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -14,7 +14,7 @@ DISTNAME= gnome-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
diff --git a/devel/Makefile b/devel/Makefile
index ba1a3bceb57b..5ecba71fafb0 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -168,7 +168,7 @@
SUBDIR += gengameng
SUBDIR += gengetopt
SUBDIR += gettext
- SUBDIR += gettext-devel
+ SUBDIR += gettext-old
SUBDIR += getxml
SUBDIR += gide
SUBDIR += gindent
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 8766b597aacd..edca641789ac 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
USE_BZIP2= yes
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index a2b816a8f417..cd05fb1ec832 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= stable/sources/bonobo
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gnomeprint.16:${PORTSDIR}/print/gnomeprint
USE_X_PREFIX= yes
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index e2f28aa1bbbc..5e2c04b40c6d 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -14,7 +14,7 @@ DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index e2f28aa1bbbc..5e2c04b40c6d 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -14,7 +14,7 @@ DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index e2f28aa1bbbc..5e2c04b40c6d 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -14,7 +14,7 @@ DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile
index 68df3c1ac41a..4362b431d337 100644
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia/Makefile
@@ -19,7 +19,7 @@ QT_VER= ""
USE_KDELIBS_VER=2
QT_VER= 2
.endif
-LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index 14069a5d7d4d..163d6ccb13b1 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.canb.auug.org.au/~millerp/cook/
MAINTAINER= jasone@freebsd.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
diff --git a/devel/gettext-devel/Makefile b/devel/gettext-devel/Makefile
deleted file mode 100644
index 56e1cbec1c33..000000000000
--- a/devel/gettext-devel/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# New ports collection makefile for: gettext
-# Date created: 16 March 1998
-# Whom: Yukihiro Nakai <Nakai@technologist.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= gettext
-PORTVERSION= 0.10.40
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= gettext
-
-MAINTAINER= sobomax@FreeBSD.org
-
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
-
-NO_LATEST_LINK= yes
-
-USE_BISON= yes
-INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-PLIST_SUB= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
-
-MAN3= bind_textdomain_codeset.3 bindtextdomain.3 dcgettext.3 \
- dcngettext.3 dgettext.3 dngettext.3 gettext.3 ngettext.3 \
- textdomain.3
-
-# X X X - I know, but it doesn't work with BSD iconv yet. :(((
-post-patch:
- @${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
- 's|-liconv|-lgiconv|g ; s|iconv\.h|giconv\.h|g'
-
-pre-configure:
- ${RM} ${WRKSRC}/doc/gettext.info*
-
-.if !defined(WANT_FULL_GETTEXT)
-BINFILES= gettext msgcmp msgcomm msgfmt msgmerge msgunfmt \
- ngettext xgettext
-PLIST= ${WRKDIR}/PLIST
-CONFIGURE_ARGS= --disable-shared
-.undef MAN3
-.undef INSTALLS_SHLIB
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/misc/gettextize \
- ${PREFIX}/bin/gettextize-new
- @${ECHO_CMD} bin/gettextize-new > ${WRKDIR}/PLIST
-.for file in ${BINFILES}
- ${INSTALL_PROGRAM} ${WRKSRC}/src/${file} ${PREFIX}/bin/${file}-new
- @${ECHO_CMD} bin/${file}-new >> ${WRKDIR}/PLIST
-.endfor
-.else
-post-install:
- @install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
- ${MKDIR} ${PREFIX}/share/emacs/site-lisp
- ${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
- ${PREFIX}/share/emacs/site-lisp/po-mode.el
- ${MKDIR} ${X11BASE}/share/locale
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/gettext-devel/distinfo b/devel/gettext-devel/distinfo
deleted file mode 100644
index 65665a4b56df..000000000000
--- a/devel/gettext-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gettext-0.10.40.tar.gz) = 6a17767b47ffb45b4866cec9fb0a39b0
diff --git a/devel/gettext-devel/files/patch-ad b/devel/gettext-devel/files/patch-ad
deleted file mode 100644
index be0cbd6eb450..000000000000
--- a/devel/gettext-devel/files/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- misc/Makefile.in.orig Sat Sep 15 03:48:07 2001
-+++ misc/Makefile.in Mon Nov 26 13:54:29 2001
-@@ -165,10 +165,8 @@
- list='$(lisp_LISP)'; for p in $$list; do \
- if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \
-- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p; \
- if test -f $${p}c; then \
- echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \
-- $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \
- else : ; fi; \
- done; \
- else : ; fi
diff --git a/devel/gettext-devel/files/patch-ae b/devel/gettext-devel/files/patch-ae
deleted file mode 100644
index c24ab0e425cc..000000000000
--- a/devel/gettext-devel/files/patch-ae
+++ /dev/null
@@ -1,67 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig Sat Sep 15 03:47:29 2001
-+++ configure Mon Nov 26 13:56:11 2001
-@@ -1220,13 +1220,13 @@
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
--if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-- ACLOCAL=aclocal
-- echo "$ac_t""found" 1>&6
--else
-+#if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-+# ACLOCAL=aclocal
-+# echo "$ac_t""found" 1>&6
-+#else
- ACLOCAL="$missing_dir/missing aclocal"
- echo "$ac_t""missing" 1>&6
--fi
-+#fi
-
- echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
- echo "configure:1233: checking for working autoconf" >&5
-@@ -1246,13 +1246,13 @@
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
--if (automake --version) < /dev/null > /dev/null 2>&1; then
-- AUTOMAKE=automake
-- echo "$ac_t""found" 1>&6
--else
-+#if (automake --version) < /dev/null > /dev/null 2>&1; then
-+# AUTOMAKE=automake
-+# echo "$ac_t""found" 1>&6
-+#else
- AUTOMAKE="$missing_dir/missing automake"
- echo "$ac_t""missing" 1>&6
--fi
-+#fi
-
- echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
- echo "configure:1259: checking for working autoheader" >&5
-@@ -8375,7 +8375,7 @@
- ;;
- esac
- fi
--EMACS="$ac_cv_path_EMACS"
-+EMACS=no
- if test -n "$EMACS"; then
- echo "$ac_t""$EMACS" 1>&6
- else
-@@ -8677,10 +8677,10 @@
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@PACKAGE@%$PACKAGE%g
- s%@VERSION@%$VERSION%g
--s%@ACLOCAL@%$ACLOCAL%g
--s%@AUTOCONF@%$AUTOCONF%g
--s%@AUTOMAKE@%$AUTOMAKE%g
--s%@AUTOHEADER@%$AUTOHEADER%g
-+s%@ACLOCAL@%/usr/bin/true%g
-+s%@AUTOCONF@%/usr/bin/true%g
-+s%@AUTOMAKE@%/usr/bin/true%g
-+s%@AUTOHEADER@%/usr/bin/true%g
- s%@MAKEINFO@%$MAKEINFO%g
- s%@SET_MAKE@%$SET_MAKE%g
- s%@CC@%$CC%g
diff --git a/devel/gettext-devel/files/patch-ak b/devel/gettext-devel/files/patch-ak
deleted file mode 100644
index 3cc93a5361fd..000000000000
--- a/devel/gettext-devel/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/po-mode.el.orig Sun Jan 23 22:35:10 2000
-+++ misc/po-mode.el Sun Jan 23 22:35:39 2000
-@@ -330,7 +330,7 @@
- :type 'face
- :group 'po)
-
--(defcustom po-gzip-uuencode-command "gzip -9 | uuencode -m"
-+(defcustom po-gzip-uuencode-command "gzip -9 | uuencode"
- "*The filter to use for preparing a mail invoice of the PO file.
- Normally \"gzip -9 | uuencode -m\", remove the -9 for lesser compression,
- or remove the -m if you are not using the GNU version of `uuencode'."
diff --git a/devel/gettext-devel/pkg-comment b/devel/gettext-devel/pkg-comment
deleted file mode 100644
index 03f01568ee37..000000000000
--- a/devel/gettext-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU gettext package
diff --git a/devel/gettext-devel/pkg-descr b/devel/gettext-devel/pkg-descr
deleted file mode 100644
index 24fee26e0c26..000000000000
--- a/devel/gettext-devel/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This is the GNU gettext package. It is interesting for authors or
-maintainers of other packages or programs which they want to see
-internationalized. As one step the handling of messages in different
-languages should be implemented. For this task GNU gettext provides
-the needed tools and library functions.
diff --git a/devel/gettext-devel/pkg-plist b/devel/gettext-devel/pkg-plist
deleted file mode 100644
index 42bc8b3edebb..000000000000
--- a/devel/gettext-devel/pkg-plist
+++ /dev/null
@@ -1,122 +0,0 @@
-bin/gettext
-bin/gettextize
-bin/msgcmp
-bin/msgcomm
-bin/msgfmt
-bin/msgmerge
-bin/msgunfmt
-bin/ngettext
-bin/xgettext
-include/libintl.h
-@unexec install-info --delete %D/info/gettext.info %D/info/dir
-info/gettext.info
-@exec install-info %D/info/gettext.info %D/info/dir
-lib/libintl.a
-lib/libintl.so
-lib/libintl.so.1
-@comment libdata/charset.alias
-share/aclocal/codeset.m4
-share/aclocal/gettext.m4
-share/aclocal/glibc21.m4
-share/aclocal/iconv.m4
-share/aclocal/isc-posix.m4
-share/aclocal/lcmessage.m4
-share/aclocal/progtest.m4
-share/doc/gettext/bind_textdomain_codeset.3.html
-share/doc/gettext/bindtextdomain.3.html
-share/doc/gettext/gettext.3.html
-share/doc/gettext/gettext_1.html
-share/doc/gettext/gettext_10.html
-share/doc/gettext/gettext_11.html
-share/doc/gettext/gettext_12.html
-share/doc/gettext/gettext_13.html
-share/doc/gettext/gettext_14.html
-share/doc/gettext/gettext_2.html
-share/doc/gettext/gettext_3.html
-share/doc/gettext/gettext_4.html
-share/doc/gettext/gettext_5.html
-share/doc/gettext/gettext_6.html
-share/doc/gettext/gettext_7.html
-share/doc/gettext/gettext_8.html
-share/doc/gettext/gettext_9.html
-share/doc/gettext/gettext_foot.html
-share/doc/gettext/gettext_toc.html
-share/doc/gettext/ngettext.3.html
-share/doc/gettext/textdomain.3.html
-share/emacs/site-lisp/po-mode.el
-share/gettext/ABOUT-NLS
-share/gettext/intl/COPYING.LIB-2
-share/gettext/intl/COPYING.LIB-2.1
-share/gettext/intl/ChangeLog
-share/gettext/intl/Makefile.in
-share/gettext/intl/VERSION
-share/gettext/intl/bindtextdom.c
-share/gettext/intl/config.charset
-share/gettext/intl/dcgettext.c
-share/gettext/intl/dcigettext.c
-share/gettext/intl/dcngettext.c
-share/gettext/intl/dgettext.c
-share/gettext/intl/dngettext.c
-share/gettext/intl/explodename.c
-share/gettext/intl/finddomain.c
-share/gettext/intl/gettext.c
-share/gettext/intl/gettext.h
-share/gettext/intl/gettextP.h
-share/gettext/intl/hash-string.h
-share/gettext/intl/intl-compat.c
-share/gettext/intl/l10nflist.c
-share/gettext/intl/libgettext.h
-share/gettext/intl/libgnuintl.h
-share/gettext/intl/loadinfo.h
-share/gettext/intl/loadmsgcat.c
-share/gettext/intl/localcharset.c
-share/gettext/intl/locale.alias
-share/gettext/intl/localealias.c
-share/gettext/intl/ngettext.c
-share/gettext/intl/plural.c
-share/gettext/intl/plural.y
-share/gettext/intl/ref-add.sin
-share/gettext/intl/ref-del.sin
-share/gettext/intl/textdomain.c
-share/gettext/po/Makefile.in.in
-share/locale/cs/LC_MESSAGES/gettext.mo
-share/locale/da/LC_MESSAGES/gettext.mo
-share/locale/de/LC_MESSAGES/gettext.mo
-share/locale/el/LC_MESSAGES/gettext.mo
-share/locale/en@boldquot/LC_MESSAGES/gettext.mo
-share/locale/en@quot/LC_MESSAGES/gettext.mo
-share/locale/es/LC_MESSAGES/gettext.mo
-share/locale/et/LC_MESSAGES/gettext.mo
-share/locale/fr/LC_MESSAGES/gettext.mo
-share/locale/gl/LC_MESSAGES/gettext.mo
-share/locale/id/LC_MESSAGES/gettext.mo
-share/locale/it/LC_MESSAGES/gettext.mo
-share/locale/ja/LC_MESSAGES/gettext.mo
-share/locale/ko/LC_MESSAGES/gettext.mo
-share/locale/locale.alias
-share/locale/nl/LC_MESSAGES/gettext.mo
-share/locale/nn/LC_MESSAGES/gettext.mo
-share/locale/no/LC_MESSAGES/gettext.mo
-share/locale/pl/LC_MESSAGES/gettext.mo
-share/locale/pt/LC_MESSAGES/gettext.mo
-share/locale/pt_BR/LC_MESSAGES/gettext.mo
-share/locale/ru/LC_MESSAGES/gettext.mo
-share/locale/sl/LC_MESSAGES/gettext.mo
-share/locale/sv/LC_MESSAGES/gettext.mo
-share/locale/tr/LC_MESSAGES/gettext.mo
-share/locale/zh/LC_MESSAGES/gettext.mo
-@dirrm share/gettext/po
-@dirrm share/gettext/intl
-@dirrm share/gettext
-@dirrm share/doc/gettext
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
-@exec mkdir -p %%LOCALBASE%%/share/locale
-@unexec rmdir %%LOCALBASE%%/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/* 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale 2>/dev/null || true
-@exec mkdir -p %%X11BASE%%/share/locale
-@unexec rmdir %%X11BASE%%/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/share/locale/* 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/share/locale 2>/dev/null || true
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index c9c2776b1eef..56e1cbec1c33 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -6,27 +6,60 @@
#
PORTNAME= gettext
-PORTVERSION= 0.10.35
-PORTREVISION= 1
+PORTVERSION= 0.10.40
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gettext
-MAINTAINER= reg@FreeBSD.org
+MAINTAINER= sobomax@FreeBSD.org
-USE_LIBTOOL= yes
+LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+
+NO_LATEST_LINK= yes
+
+USE_BISON= yes
INSTALLS_SHLIB= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
PLIST_SUB= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
+MAN3= bind_textdomain_codeset.3 bindtextdomain.3 dcgettext.3 \
+ dcngettext.3 dgettext.3 dngettext.3 gettext.3 ngettext.3 \
+ textdomain.3
+
+# X X X - I know, but it doesn't work with BSD iconv yet. :(((
+post-patch:
+ @${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
+ 's|-liconv|-lgiconv|g ; s|iconv\.h|giconv\.h|g'
+
pre-configure:
${RM} ${WRKSRC}/doc/gettext.info*
+.if !defined(WANT_FULL_GETTEXT)
+BINFILES= gettext msgcmp msgcomm msgfmt msgmerge msgunfmt \
+ ngettext xgettext
+PLIST= ${WRKDIR}/PLIST
+CONFIGURE_ARGS= --disable-shared
+.undef MAN3
+.undef INSTALLS_SHLIB
+
+do-install:
+ ${INSTALL_SCRIPT} ${WRKSRC}/misc/gettextize \
+ ${PREFIX}/bin/gettextize-new
+ @${ECHO_CMD} bin/gettextize-new > ${WRKDIR}/PLIST
+.for file in ${BINFILES}
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/${file} ${PREFIX}/bin/${file}-new
+ @${ECHO_CMD} bin/${file}-new >> ${WRKDIR}/PLIST
+.endfor
+.else
post-install:
@install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
${MKDIR} ${PREFIX}/share/emacs/site-lisp
${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
${PREFIX}/share/emacs/site-lisp/po-mode.el
${MKDIR} ${X11BASE}/share/locale
+.endif
.include <bsd.port.mk>
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index c78c8247570c..65665a4b56df 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1 +1 @@
-MD5 (gettext-0.10.35.tar.gz) = f29d32b82217b9d89fcda66328752acc
+MD5 (gettext-0.10.40.tar.gz) = 6a17767b47ffb45b4866cec9fb0a39b0
diff --git a/devel/gettext-devel/files/patch-Makefile.in b/devel/gettext/files/patch-Makefile.in
index 3c1a3ac9bb7c..c517c45ae926 100644
--- a/devel/gettext-devel/files/patch-Makefile.in
+++ b/devel/gettext/files/patch-Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/devel/gettext/files/Attic/patch-Makefile.in,v 1.1 2002-03-15 19:43:48 ade Exp $
--- Makefile.in 2001/05/29 09:22:43 1.1
+++ Makefile.in 2001/05/29 09:23:01
diff --git a/devel/gettext/files/patch-ad b/devel/gettext/files/patch-ad
index 3a0c6f4c39f6..be0cbd6eb450 100644
--- a/devel/gettext/files/patch-ad
+++ b/devel/gettext/files/patch-ad
@@ -1,24 +1,16 @@
---- misc/Makefile.in.orig Fri May 1 14:47:40 1998
-+++ misc/Makefile.in Thu Dec 3 20:11:52 1998
-@@ -164,10 +164,8 @@
- @list='$(lisp_LISP)'; for p in $$list; do \
- if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \
-- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p; \
- if test -f $${p}c; then \
- echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \
-- $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \
- else : ; fi; \
- done
-
---- doc/Makefile.in.orig Thu Dec 3 20:12:35 1998
-+++ doc/Makefile.in Thu Dec 3 20:12:51 1998
-@@ -79,7 +79,7 @@
- LIBOBJS = @LIBOBJS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- NM = @NM@
+
+$FreeBSD$
+
+--- misc/Makefile.in.orig Sat Sep 15 03:48:07 2001
++++ misc/Makefile.in Mon Nov 26 13:54:29 2001
+@@ -165,10 +165,8 @@
+ list='$(lisp_LISP)'; for p in $$list; do \
+ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \
+- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p; \
+ if test -f $${p}c; then \
+ echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \
+- $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \
+ else : ; fi; \
+ done; \
+ else : ; fi
diff --git a/devel/gettext/files/patch-ae b/devel/gettext/files/patch-ae
index 920d368fe4ed..c24ab0e425cc 100644
--- a/devel/gettext/files/patch-ae
+++ b/devel/gettext/files/patch-ae
@@ -1,6 +1,9 @@
---- configure.orig Fri May 1 01:48:25 1998
-+++ configure Tue Jan 1 07:05:49 2002
-@@ -837,52 +837,52 @@
+
+$FreeBSD$
+
+--- configure.orig Sat Sep 15 03:47:29 2001
++++ configure Mon Nov 26 13:56:11 2001
+@@ -1220,13 +1220,13 @@
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -18,25 +21,8 @@
+#fi
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
- echo "configure:850: checking for working autoconf" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
--if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-- AUTOCONF=autoconf
-- echo "$ac_t""found" 1>&6
--else
-+#if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-+# AUTOCONF=autoconf
-+# echo "$ac_t""found" 1>&6
-+#else
- AUTOCONF="$missing_dir/missing autoconf"
- echo "$ac_t""missing" 1>&6
--fi
-+#fi
-
- echo $ac_n "checking for working automake""... $ac_c" 1>&6
- echo "configure:863: checking for working automake" >&5
+ echo "configure:1233: checking for working autoconf" >&5
+@@ -1246,13 +1246,13 @@
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -54,35 +40,8 @@
+#fi
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
- echo "configure:876: checking for working autoheader" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
--if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-- AUTOHEADER=autoheader
-- echo "$ac_t""found" 1>&6
--else
-+#if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-+# AUTOHEADER=autoheader
-+# echo "$ac_t""found" 1>&6
-+#else
- AUTOHEADER="$missing_dir/missing autoheader"
- echo "$ac_t""missing" 1>&6
--fi
-+#fi
-
- echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
- echo "configure:889: checking for working makeinfo" >&5
-@@ -3958,7 +3958,7 @@
- fi
-
-
-- l=
-+ l=l
-
-
- test -d po || mkdir po
-@@ -4004,7 +4004,7 @@
+ echo "configure:1259: checking for working autoheader" >&5
+@@ -8375,7 +8375,7 @@
;;
esac
fi
@@ -91,3 +50,18 @@
if test -n "$EMACS"; then
echo "$ac_t""$EMACS" 1>&6
else
+@@ -8677,10 +8677,10 @@
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
+ s%@PACKAGE@%$PACKAGE%g
+ s%@VERSION@%$VERSION%g
+-s%@ACLOCAL@%$ACLOCAL%g
+-s%@AUTOCONF@%$AUTOCONF%g
+-s%@AUTOMAKE@%$AUTOMAKE%g
+-s%@AUTOHEADER@%$AUTOHEADER%g
++s%@ACLOCAL@%/usr/bin/true%g
++s%@AUTOCONF@%/usr/bin/true%g
++s%@AUTOMAKE@%/usr/bin/true%g
++s%@AUTOHEADER@%/usr/bin/true%g
+ s%@MAKEINFO@%$MAKEINFO%g
+ s%@SET_MAKE@%$SET_MAKE%g
+ s%@CC@%$CC%g
diff --git a/devel/gettext/files/patch-af b/devel/gettext/files/patch-af
deleted file mode 100644
index 7da1ef001b32..000000000000
--- a/devel/gettext/files/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/locale.alias.orig Sat Oct 19 23:40:54 1996
-+++ misc/locale.alias Thu Dec 3 20:11:52 1998
-@@ -40,6 +40,7 @@
- icelandic is_IS.ISO-8859-1
- italian it_CH.ISO-8859-1
- japanese ja_JP.EUC
-+korean ko_KR.EUC
- norwegian no_NO.ISO-8859-1
- polish pl_PL.ISO-8859-2
- portuguese pt_PT.ISO-8859-1
diff --git a/devel/gettext/files/patch-ah b/devel/gettext/files/patch-ah
deleted file mode 100644
index a45dc903c3b9..000000000000
--- a/devel/gettext/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- intl/Makefile.in.orig Wed Feb 17 02:18:40 1999
-+++ intl/Makefile.in Wed Feb 17 02:30:13 1999
-@@ -119,7 +119,7 @@
- $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
- fi; \
- $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
-- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
-+ $(LIBTOOL) --mode=install $(INSTALL) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
- else \
- : ; \
- fi
diff --git a/devel/gettext/files/patch-ai b/devel/gettext/files/patch-ai
deleted file mode 100644
index 6a780fdd2d68..000000000000
--- a/devel/gettext/files/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
---- m4/gettext.m4.orig Fri Dec 24 20:23:44 1999
-+++ m4/gettext.m4 Fri Dec 24 20:25:52 1999
-@@ -73,6 +73,9 @@
- INSTOBJEXT=.mo
- fi
- fi
-+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
-+ INTLLIBS='-lintl'
-+ fi
- ])
-
- if test "$CATOBJEXT" = "NONE"; then
diff --git a/devel/gettext-devel/files/patch-doc::Makefile.in b/devel/gettext/files/patch-doc::Makefile.in
index 80533cd81c08..61e9567457ae 100644
--- a/devel/gettext-devel/files/patch-doc::Makefile.in
+++ b/devel/gettext/files/patch-doc::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/devel/gettext/files/Attic/patch-doc::Makefile.in,v 1.1 2002-03-15 19:43:48 ade Exp $
--- doc/Makefile.in.orig Wed May 23 23:48:53 2001
+++ doc/Makefile.in Tue May 29 11:38:28 2001
diff --git a/devel/gettext-devel/files/patch-intl::Makefile.in b/devel/gettext/files/patch-intl::Makefile.in
index 66817ee0b75e..66817ee0b75e 100644
--- a/devel/gettext-devel/files/patch-intl::Makefile.in
+++ b/devel/gettext/files/patch-intl::Makefile.in
diff --git a/devel/gettext-devel/files/patch-lib::Makefile.in b/devel/gettext/files/patch-lib::Makefile.in
index d2b83eca79fd..d2b83eca79fd 100644
--- a/devel/gettext-devel/files/patch-lib::Makefile.in
+++ b/devel/gettext/files/patch-lib::Makefile.in
diff --git a/devel/gettext-devel/files/patch-ltmain.sh b/devel/gettext/files/patch-ltmain.sh
index 98cb05e4ddb3..90e76b8f2b14 100644
--- a/devel/gettext-devel/files/patch-ltmain.sh
+++ b/devel/gettext/files/patch-ltmain.sh
@@ -1,5 +1,5 @@
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/devel/gettext/files/Attic/patch-ltmain.sh,v 1.1 2002-03-15 19:43:48 ade Exp $
--- ltmain.sh 2001/08/27 09:51:26 1.1
+++ ltmain.sh 2001/08/27 09:51:42
diff --git a/devel/gettext-devel/files/patch-man::Makefile.in b/devel/gettext/files/patch-man::Makefile.in
index 860777a595d7..d8bead54467f 100644
--- a/devel/gettext-devel/files/patch-man::Makefile.in
+++ b/devel/gettext/files/patch-man::Makefile.in
@@ -1,5 +1,5 @@
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/devel/gettext/files/Attic/patch-man::Makefile.in,v 1.1 2002-03-15 19:43:48 ade Exp $
--- man/Makefile.in 2001/05/29 08:45:39 1.1
+++ man/Makefile.in 2001/05/29 08:46:06
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index 9e23936a2dbd..42bc8b3edebb 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -5,26 +5,58 @@ bin/msgcomm
bin/msgfmt
bin/msgmerge
bin/msgunfmt
+bin/ngettext
bin/xgettext
+include/libintl.h
@unexec install-info --delete %D/info/gettext.info %D/info/dir
info/gettext.info
@exec install-info %D/info/gettext.info %D/info/dir
-include/libintl.h
lib/libintl.a
lib/libintl.so
lib/libintl.so.1
+@comment libdata/charset.alias
+share/aclocal/codeset.m4
share/aclocal/gettext.m4
+share/aclocal/glibc21.m4
+share/aclocal/iconv.m4
+share/aclocal/isc-posix.m4
share/aclocal/lcmessage.m4
share/aclocal/progtest.m4
+share/doc/gettext/bind_textdomain_codeset.3.html
+share/doc/gettext/bindtextdomain.3.html
+share/doc/gettext/gettext.3.html
+share/doc/gettext/gettext_1.html
+share/doc/gettext/gettext_10.html
+share/doc/gettext/gettext_11.html
+share/doc/gettext/gettext_12.html
+share/doc/gettext/gettext_13.html
+share/doc/gettext/gettext_14.html
+share/doc/gettext/gettext_2.html
+share/doc/gettext/gettext_3.html
+share/doc/gettext/gettext_4.html
+share/doc/gettext/gettext_5.html
+share/doc/gettext/gettext_6.html
+share/doc/gettext/gettext_7.html
+share/doc/gettext/gettext_8.html
+share/doc/gettext/gettext_9.html
+share/doc/gettext/gettext_foot.html
+share/doc/gettext/gettext_toc.html
+share/doc/gettext/ngettext.3.html
+share/doc/gettext/textdomain.3.html
+share/emacs/site-lisp/po-mode.el
share/gettext/ABOUT-NLS
-share/gettext/po/Makefile.in.in
+share/gettext/intl/COPYING.LIB-2
+share/gettext/intl/COPYING.LIB-2.1
share/gettext/intl/ChangeLog
share/gettext/intl/Makefile.in
share/gettext/intl/VERSION
share/gettext/intl/bindtextdom.c
-share/gettext/intl/cat-compat.c
+share/gettext/intl/config.charset
share/gettext/intl/dcgettext.c
+share/gettext/intl/dcigettext.c
+share/gettext/intl/dcngettext.c
share/gettext/intl/dgettext.c
+share/gettext/intl/dngettext.c
share/gettext/intl/explodename.c
share/gettext/intl/finddomain.c
share/gettext/intl/gettext.c
@@ -34,30 +66,49 @@ share/gettext/intl/hash-string.h
share/gettext/intl/intl-compat.c
share/gettext/intl/l10nflist.c
share/gettext/intl/libgettext.h
-share/gettext/intl/linux-msg.sed
+share/gettext/intl/libgnuintl.h
share/gettext/intl/loadinfo.h
share/gettext/intl/loadmsgcat.c
+share/gettext/intl/localcharset.c
+share/gettext/intl/locale.alias
share/gettext/intl/localealias.c
-share/gettext/intl/po2tbl.sed.in
-share/gettext/intl/xopen-msg.sed
+share/gettext/intl/ngettext.c
+share/gettext/intl/plural.c
+share/gettext/intl/plural.y
+share/gettext/intl/ref-add.sin
+share/gettext/intl/ref-del.sin
share/gettext/intl/textdomain.c
+share/gettext/po/Makefile.in.in
+share/locale/cs/LC_MESSAGES/gettext.mo
share/locale/da/LC_MESSAGES/gettext.mo
share/locale/de/LC_MESSAGES/gettext.mo
+share/locale/el/LC_MESSAGES/gettext.mo
+share/locale/en@boldquot/LC_MESSAGES/gettext.mo
+share/locale/en@quot/LC_MESSAGES/gettext.mo
share/locale/es/LC_MESSAGES/gettext.mo
+share/locale/et/LC_MESSAGES/gettext.mo
share/locale/fr/LC_MESSAGES/gettext.mo
+share/locale/gl/LC_MESSAGES/gettext.mo
+share/locale/id/LC_MESSAGES/gettext.mo
+share/locale/it/LC_MESSAGES/gettext.mo
+share/locale/ja/LC_MESSAGES/gettext.mo
share/locale/ko/LC_MESSAGES/gettext.mo
+share/locale/locale.alias
share/locale/nl/LC_MESSAGES/gettext.mo
+share/locale/nn/LC_MESSAGES/gettext.mo
share/locale/no/LC_MESSAGES/gettext.mo
-share/locale/no@nynorsk/LC_MESSAGES/gettext.mo
share/locale/pl/LC_MESSAGES/gettext.mo
share/locale/pt/LC_MESSAGES/gettext.mo
+share/locale/pt_BR/LC_MESSAGES/gettext.mo
+share/locale/ru/LC_MESSAGES/gettext.mo
share/locale/sl/LC_MESSAGES/gettext.mo
share/locale/sv/LC_MESSAGES/gettext.mo
-share/locale/locale.alias
-share/emacs/site-lisp/po-mode.el
-@dirrm share/gettext/intl
+share/locale/tr/LC_MESSAGES/gettext.mo
+share/locale/zh/LC_MESSAGES/gettext.mo
@dirrm share/gettext/po
+@dirrm share/gettext/intl
@dirrm share/gettext
+@dirrm share/doc/gettext
@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/* 2>/dev/null || true
@unexec rmdir %D/share/locale 2>/dev/null || true
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index b7edb142e8cf..6f0d8cb8bdef 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
NO_LATEST_LINK= "Unstable, development version."
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index b7be23333d09..f744548b3db0 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -14,7 +14,7 @@ DISTNAME= make-${PORTVERSION}
MAINTAINER= portmgr@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g
diff --git a/devel/gmake381/Makefile b/devel/gmake381/Makefile
index b7be23333d09..f744548b3db0 100644
--- a/devel/gmake381/Makefile
+++ b/devel/gmake381/Makefile
@@ -14,7 +14,7 @@ DISTNAME= make-${PORTVERSION}
MAINTAINER= portmgr@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index ce8c377d7b4f..fba0dbb1da9c 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel \
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext \
${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
LIB_DEPENDS= gconf-2.5:${PORTSDIR}/devel/gconf2 \
bonobo-2.0:${PORTSDIR}/devel/libbonobo
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 40b90d917fc3..42e5afd76137 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -15,7 +15,7 @@ DISTNAME= gnome-vfs-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel \
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext \
${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf
.if !exists(/usr/bin/bzip2)
diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile
index 40b90d917fc3..42e5afd76137 100644
--- a/devel/gnomevfs/Makefile
+++ b/devel/gnomevfs/Makefile
@@ -15,7 +15,7 @@ DISTNAME= gnome-vfs-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel \
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext \
${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf
.if !exists(/usr/bin/bzip2)
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index ce8c377d7b4f..fba0dbb1da9c 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel \
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext \
${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
LIB_DEPENDS= gconf-2.5:${PORTSDIR}/devel/gconf2 \
bonobo-2.0:${PORTSDIR}/devel/libbonobo
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 001c68473265..59b26ba64bed 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile
index 3469c2dfaca5..21c1bbf7aee5 100644
--- a/devel/ixlib/Makefile
+++ b/devel/ixlib/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_NEWGCC= yes
USE_GMAKE= yes
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 5b141e827a02..89fd4472b804 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext \
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old \
autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake
diff --git a/devel/ktranslator/Makefile b/devel/ktranslator/Makefile
index e76d8dbb2aac..8f5c797c1e35 100644
--- a/devel/ktranslator/Makefile
+++ b/devel/ktranslator/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= Attic/old/1.1.2/apps/utils
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
USE_KDELIBS_VER=1
diff --git a/devel/motor/Makefile b/devel/motor/Makefile
index ab049ffd3004..e30dca3d77a2 100644
--- a/devel/motor/Makefile
+++ b/devel/motor/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= sobomax
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
USE_GMAKE= yes
diff --git a/devel/objprelink/Makefile b/devel/objprelink/Makefile
index 10ec5044c412..b9ac40479d44 100644
--- a/devel/objprelink/Makefile
+++ b/devel/objprelink/Makefile
@@ -16,7 +16,7 @@ DISTFILES= objprelink.c.gz binutils-${BINUTILS_VER}.tar.bz2
MAINTAINER= dominic_marks@btinternet.com
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
ONLY_FOR_ARCHS= i386
BINUTILS_VER= 2.11.2
diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index f8744350054e..d9ccf3dacbe8 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
PERL_CONFIGURE= yes
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 9a2d635b567b..1561ff140078 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \
MAINTAINER= ycheng@sinica.edu.tw
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
WRKSRC= ${WRKDIR}/${PORTNAME}-1.5
diff --git a/devel/ruby-intl/Makefile b/devel/ruby-intl/Makefile
index 4db1a654257f..5dd4d37c1fb6 100644
--- a/devel/ruby-intl/Makefile
+++ b/devel/ruby-intl/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
diff --git a/editors/calligra-l10n/Makefile b/editors/calligra-l10n/Makefile
index 885b09c87a1e..7d24616e6f21 100644
--- a/editors/calligra-l10n/Makefile
+++ b/editors/calligra-l10n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= sahiro@crest.ocn.ne.jp
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= koshell:${PORTSDIR}/editors/koffice
USE_KDELIBS_VER=2
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 5eaa36b3fd6a..c3c7f1b52f68 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= apps/editors/X/cooledit
MAINTAINER= brett@peloton.runet.edu
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
vga.1:${PORTSDIR}/graphics/svgalib
USE_LIBTOOL= yes
diff --git a/editors/koffice-i18n/Makefile b/editors/koffice-i18n/Makefile
index 885b09c87a1e..7d24616e6f21 100644
--- a/editors/koffice-i18n/Makefile
+++ b/editors/koffice-i18n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= sahiro@crest.ocn.ne.jp
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= koshell:${PORTSDIR}/editors/koffice
USE_KDELIBS_VER=2
diff --git a/editors/koffice-kde4-l10n/Makefile b/editors/koffice-kde4-l10n/Makefile
index 885b09c87a1e..7d24616e6f21 100644
--- a/editors/koffice-kde4-l10n/Makefile
+++ b/editors/koffice-kde4-l10n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= sahiro@crest.ocn.ne.jp
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= koshell:${PORTSDIR}/editors/koffice
USE_KDELIBS_VER=2
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index 0f28f86e9eba..48a2ee65c9db 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ryan@sasknow.com
LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_LIBTOOL= yes
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index fc328eeb89ea..b3632258ccfa 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= naddy@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index ae55a97d4688..2e6cdb9eac3f 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel \
db3:${PORTSDIR}/databases/db3 \
giconv:${PORTSDIR}/converters/libiconv
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 0538968a0690..0cfea5ad8aae 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
compface.1:${PORTSDIR}/mail/faces \
- intl.1:${PORTSDIR}/devel/gettext \
+ intl.1:${PORTSDIR}/devel/gettext-old \
${LIB_INPUT_METHOD}
XEMACS_MAJOR_VER?= 21
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index f7d820b3f31e..bfa59d137e39 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -33,7 +33,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORT
RUN_DEPENDS= ${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
.endif
LIB_DEPENDS= compface.1:${PORTSDIR}/mail/faces \
- intl.1:${PORTSDIR}/devel/gettext \
+ intl.1:${PORTSDIR}/devel/gettext-old \
${LIB_INPUT_METHOD}
CONFIGURE_ARGS?=--with-x11 \
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index eefddef5230c..ed3de500f7b1 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-2.5.4
MAINTAINER= jkoshy@freebsd.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
USE_XLIB= YES
CONFIGURE_ENV= LC_ALL=
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index e4ddd6bc0de4..b81150adb4c4 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -37,7 +37,7 @@ PATCHES= pastel.diff
.include <bsd.port.pre.mk>
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
FREETYPE_CONFIG?= ${LOCALBASE}/bin/freetype-config
diff --git a/ftp/axel/Makefile b/ftp/axel/Makefile
index 6d2418a7fe12..8885d8412078 100644
--- a/ftp/axel/Makefile
+++ b/ftp/axel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.lintux.cx/downloads/
MAINTAINER= lintux@debian.org
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
HAS_CONFIGURE= yes
diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index bae4ec193cb4..3d9ce911a7d2 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -22,7 +22,7 @@ MASTER_SITES= ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/ \
MAINTAINER= fm@astral.ntu-kpi.kiev.ua
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
USE_OPENSSL= yes
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index 1c14ada63903..fd0844a8eb16 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
WANT_GTK= yes
USE_OPENSSL= yes
diff --git a/ftp/wget+ipv6/Makefile b/ftp/wget+ipv6/Makefile
index df3a9703779b..53ef87b1cdda 100644
--- a/ftp/wget+ipv6/Makefile
+++ b/ftp/wget+ipv6/Makefile
@@ -23,7 +23,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= sf@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
BUILD_DEPENDS= giconv:${PORTSDIR}/converters/libiconv
.if !defined(WITHOUT_SSL)
diff --git a/ftp/wget-devel/Makefile b/ftp/wget-devel/Makefile
index f5aad87039f9..8c2fb661e6ce 100644
--- a/ftp/wget-devel/Makefile
+++ b/ftp/wget-devel/Makefile
@@ -21,7 +21,7 @@ EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= sf@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index f5aad87039f9..8c2fb661e6ce 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -21,7 +21,7 @@ EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= sf@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index 22adf3736a6a..01babfc38c40 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -15,7 +15,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} eboard-extras-${EXTRASVERSION}.tar.gz
MAINTAINER= petef@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
USE_GTK= yes
diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile
index cda75e3f3a6e..f6589334f306 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
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_XPM= yes
USE_BZIP2= yes
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index cda75e3f3a6e..f6589334f306 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
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_XPM= yes
USE_BZIP2= yes
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index cbee96797aea..d04925771622 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -14,7 +14,7 @@ DISTNAME= gnome-games-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
USE_BZIP2= yes
diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile
index cbee96797aea..d04925771622 100644
--- a/games/gnomegames/Makefile
+++ b/games/gnomegames/Makefile
@@ -14,7 +14,7 @@ DISTNAME= gnome-games-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
USE_BZIP2= yes
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index cbee96797aea..d04925771622 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -14,7 +14,7 @@ DISTNAME= gnome-games-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
USE_BZIP2= yes
diff --git a/games/gtypist/Makefile b/games/gtypist/Makefile
index cd3bd7843840..8c8215c524b5 100644
--- a/games/gtypist/Makefile
+++ b/games/gtypist/Makefile
@@ -12,7 +12,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= naddy@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/kbubbles/Makefile b/games/kbubbles/Makefile
index 97ccd794da2d..54498a520301 100644
--- a/games/kbubbles/Makefile
+++ b/games/kbubbles/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://ftp.kde.com/Games/Other/KBubbles/
MAINTAINER= znerd@FreeBSD.org
-BUILD_DEPENDS= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
LIB_DEPENDS= QwSpriteField.7:${PORTSDIR}/converters/kdesupport11
USE_KDELIBS_VER=1
diff --git a/games/kpuzzle/Makefile b/games/kpuzzle/Makefile
index 53a06a6e8e20..b08908e32202 100644
--- a/games/kpuzzle/Makefile
+++ b/games/kpuzzle/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= unstable/apps/games
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_AUTOCONF= yes
diff --git a/games/krogue/Makefile b/games/krogue/Makefile
index 53469cf796d7..8e78471f471a 100644
--- a/games/krogue/Makefile
+++ b/games/krogue/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=1
USE_GMAKE= yes
diff --git a/games/krubik/Makefile b/games/krubik/Makefile
index c6fa50d6a7b6..b356336818f1 100644
--- a/games/krubik/Makefile
+++ b/games/krubik/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.phys.uu.nl/~eendebak/kde/
MAINTAINER= jedgar@fxp.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=1
GNU_CONFIGURE= yes
diff --git a/games/lexter/Makefile b/games/lexter/Makefile
index d139aa055cd7..a677624f19ea 100644
--- a/games/lexter/Makefile
+++ b/games/lexter/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= games/arcade
MAINTAINER= markp@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include' \
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 2f945e128507..c97cda8f3d39 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= games/arcade/invaders
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
NO_CDROM= "don't sell for profit"
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 4ee53c54e42e..8a8cb1e74eee 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.gphoto.net/dist/
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv \
- intl.1:${PORTSDIR}/devel/gettext \
+ intl.1:${PORTSDIR}/devel/gettext-old \
usb-0.1.5:${PORTSDIR}/devel/libusb \
aa.1:${PORTSDIR}/graphics/aalib \
jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index b9c6a9594eae..aecde0765845 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= jedgar
MAINTAINER= jedgar@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index b4e98546982e..ece7fb273f84 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.linux.tucows.com/files/x11/graphics/ \
MAINTAINER= dirk@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/graphics/libxine/Makefile b/graphics/libxine/Makefile
index 9c8a099b881b..85609723fb52 100644
--- a/graphics/libxine/Makefile
+++ b/graphics/libxine/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= nobutaka@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/libavcodec.a:${PORTSDIR}/graphics/ffmpeg
LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \
aa.1:${PORTSDIR}/graphics/aalib \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
WRKSRC= ${WRKDIR}/${PORTNAME}-lib-${PORTVERSION}
diff --git a/graphics/ogle-gui/Makefile b/graphics/ogle-gui/Makefile
index 1afa59c7347b..5db265eb6860 100644
--- a/graphics/ogle-gui/Makefile
+++ b/graphics/ogle-gui/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}_gui-${PORTVERSION}
MAINTAINER= lioux@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/ogle/libdvdcontrol.so.5:${PORTSDIR}/graphics/ogle
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
giconv.2:${PORTSDIR}/converters/libiconv \
glade.4:${PORTSDIR}/devel/libglade \
xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/graphics/ruby-tgif/Makefile b/graphics/ruby-tgif/Makefile
index 432ddb1de6b9..526840f5242d 100644
--- a/graphics/ruby-tgif/Makefile
+++ b/graphics/ruby-tgif/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${TGIF_PORT}:build
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
diff --git a/graphics/tgif-nls/Makefile b/graphics/tgif-nls/Makefile
index 747d0d7a5675..55834c00443e 100644
--- a/graphics/tgif-nls/Makefile
+++ b/graphics/tgif-nls/Makefile
@@ -16,8 +16,8 @@ PKGNAMESUFFIX= -nls
MAINTAINER= one@netlab.is.tsukuba.ac.jp
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= giftopnm:${PORTSDIR}/graphics/netpbm
USE_IMAKE= yes
diff --git a/graphics/xine/Makefile b/graphics/xine/Makefile
index ae82b8c3406c..661cca2668e1 100644
--- a/graphics/xine/Makefile
+++ b/graphics/xine/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= nobutaka@FreeBSD.org
LIB_DEPENDS= xine.0:${PORTSDIR}/graphics/libxine \
aa.1:${PORTSDIR}/graphics/aalib \
png.5:${PORTSDIR}/graphics/png \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_IMLIB= yes
diff --git a/graphics/xmps-opendivx-plugin/Makefile b/graphics/xmps-opendivx-plugin/Makefile
index e04c1e7da828..18116c232039 100644
--- a/graphics/xmps-opendivx-plugin/Makefile
+++ b/graphics/xmps-opendivx-plugin/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= lioux@FreeBSD.org
LIB_DEPENDS= divxdecore.0:${PORTSDIR}/graphics/libdivxdecore \
xmps.0:${PORTSDIR}/graphics/xmps \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
WRKSRC= ${WRKDIR}/${PORTNAME}-0.0.2
USE_GMAKE= yes
diff --git a/graphics/xmps-win32-plugin/Makefile b/graphics/xmps-win32-plugin/Makefile
index e8399daf87f8..6f7167f219c4 100644
--- a/graphics/xmps-win32-plugin/Makefile
+++ b/graphics/xmps-win32-plugin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://xmps.sourceforge.net/sources/
MAINTAINER= lioux@FreeBSD.org
LIB_DEPENDS= xmps.0:${PORTSDIR}/graphics/xmps \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
USE_GMAKE= yes
diff --git a/hebrew/kde3-i18n/Makefile b/hebrew/kde3-i18n/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/hebrew/kde3-i18n/Makefile
+++ b/hebrew/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/hebrew/kde4-l10n/Makefile b/hebrew/kde4-l10n/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/hebrew/kde4-l10n/Makefile
+++ b/hebrew/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/hungarian/kde3-i18n/Makefile b/hungarian/kde3-i18n/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/hungarian/kde3-i18n/Makefile
+++ b/hungarian/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/hungarian/kde4-l10n/Makefile b/hungarian/kde4-l10n/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/hungarian/kde4-l10n/Makefile
+++ b/hungarian/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/irc/kvirc-devel/Makefile b/irc/kvirc-devel/Makefile
index 72cae851c4a8..c8178fae9440 100644
--- a/irc/kvirc-devel/Makefile
+++ b/irc/kvirc-devel/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.kvirc.net/kvirc/${PORTVERSION}/source/ \
MAINTAINER= trevor@FreeBSD.org
-BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext-old
ALL_TARGET= kvirc
INSTALLS_SHLIB= yes
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index 72cae851c4a8..c8178fae9440 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.kvirc.net/kvirc/${PORTVERSION}/source/ \
MAINTAINER= trevor@FreeBSD.org
-BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext-old
ALL_TARGET= kvirc
INSTALLS_SHLIB= yes
diff --git a/irc/liece/Makefile b/irc/liece/Makefile
index 51fa8ac1a8d0..5f11982625a0 100644
--- a/irc/liece/Makefile
+++ b/irc/liece/Makefile
@@ -14,7 +14,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
- ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+ ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
diff --git a/irc/riece-emacs21/Makefile b/irc/riece-emacs21/Makefile
index 51fa8ac1a8d0..5f11982625a0 100644
--- a/irc/riece-emacs21/Makefile
+++ b/irc/riece-emacs21/Makefile
@@ -14,7 +14,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
- ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+ ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index 51fa8ac1a8d0..5f11982625a0 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -14,7 +14,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
BUILD_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
- ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+ ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS+= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX} \
${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 4ef462898995..853ab23557ae 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://xchat.org/files/source/1.8/ \
MAINTAINER?= jim@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
# This port has a slave port japanese/xchat. Do not carelessly overwrite
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 4ef462898995..853ab23557ae 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://xchat.org/files/source/1.8/ \
MAINTAINER?= jim@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
# This port has a slave port japanese/xchat. Do not carelessly overwrite
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 4ef462898995..853ab23557ae 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://xchat.org/files/source/1.8/ \
MAINTAINER?= jim@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
# This port has a slave port japanese/xchat. Do not carelessly overwrite
diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index 4ef462898995..853ab23557ae 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://xchat.org/files/source/1.8/ \
MAINTAINER?= jim@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
# This port has a slave port japanese/xchat. Do not carelessly overwrite
diff --git a/japanese/kebook/Makefile b/japanese/kebook/Makefile
index b26cbc06bec5..68c244df8353 100644
--- a/japanese/kebook/Makefile
+++ b/japanese/kebook/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.os.rim.or.jp/~s_mitu/library/kebook/ \
MAINTAINER= hige@higesoft.os.rim.or.jp
LIB_DEPENDS= eb.3:${PORTSDIR}/japanese/eb
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
USE_KDEBASE_VER=1
USE_BZIP2= yes
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 19faa1605ee1..8778b57ebf4d 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -22,10 +22,10 @@ MAINTAINER= shuna@pop16.odn.ne.jp
LIB_DEPENDS= slang.2:${PORTSDIR}/japanese/libslang \
giconv.2:${PORTSDIR}/converters/libiconv
.if !defined(WITH_GETTEXT)
-LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext-old
.endif
.if defined(WITH_GETTEXT)
-BUILD_DEPENDS= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
.endif
RUN_DEPENDS= urlview:${PORTSDIR}/textproc/urlview
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 829cca47434f..5e9dc020f8fc 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -27,10 +27,10 @@ MAINTAINER= shuna@pop16.odn.ne.jp
LIB_DEPENDS= slang.2:${PORTSDIR}/japanese/libslang
.if !defined(WITH_GETTEXT)
-LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext-old
.endif
.if defined(WITH_GETTEXT)
-BUILD_DEPENDS= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
.endif
RUN_DEPENDS= urlview:${PORTSDIR}/textproc/urlview
diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index 5995ea8184c8..37008cbda8bf 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -19,7 +19,7 @@ DISTNAME= ${PORTNAME}-${SAMBA_VERSION}-ja-${SAMBA_JA_VERSION}
MAINTAINER= nakaji@jp.FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
SAMBA_VERSION= 2.2.2
SAMBA_JA_VERSION= 1.0
diff --git a/japanese/samba20/Makefile b/japanese/samba20/Makefile
index 3908ba650cb1..29b6f53b1250 100644
--- a/japanese/samba20/Makefile
+++ b/japanese/samba20/Makefile
@@ -19,7 +19,7 @@ DISTNAME= ${PORTNAME}-${SAMBA_VERSION}-ja-${SAMBA_JA_VERSION}
MAINTAINER= nakaji@jp.FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
NO_LATEST_LINK= yes
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index 52e66d21a53a..1839ca2ea833 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= mita@FreeBSD.org
BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake-4
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho.ttf:${PORTSDIR}/japanese/kochi-ttfonts
VFLIB_VERSION= 2.25.6
diff --git a/korean/texinfo/Makefile b/korean/texinfo/Makefile
index 3f20c3922f12..5cffcaa65f18 100644
--- a/korean/texinfo/Makefile
+++ b/korean/texinfo/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}-ko-${PORTVERSION}
MAINTAINER= cjh@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= ${LOCALBASE}/share/texmf/doc/latex/hlatex/uhc.ks:${PORTSDIR}/korean/hlatex
GNU_CONFIGURE= YES
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index a91161ea0554..3491d8946850 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= stable/sources/librep
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
.if !exists(/usr/lib/libgmp.so)
LIB_DEPENDS+= gmp.3:${PORTSDIR}/math/libgmp
.endif
diff --git a/lang/librep2/Makefile b/lang/librep2/Makefile
index a91161ea0554..3491d8946850 100644
--- a/lang/librep2/Makefile
+++ b/lang/librep2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= stable/sources/librep
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
.if !exists(/usr/lib/libgmp.so)
LIB_DEPENDS+= gmp.3:${PORTSDIR}/math/libgmp
.endif
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index 78c0347baf92..1cc78a303d4a 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ijliao@FreeBSD.org
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- intl:${PORTSDIR}/devel/gettext \
+ intl:${PORTSDIR}/devel/gettext-old \
guile:${PORTSDIR}/lang/guile
USE_X_PREFIX= yes
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index f4f7a22e7e43..8ff4473d3771 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= toasty@dragondata.com
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
WRKSRC= ${WRKDIR}/elm${PORTVERSION}
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 97b7bc06d37b..c2be0a35c50b 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES= http://www.tuxedo.org/~esr/fetchmail/ \
MAINTAINER= ve@sci.fi
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
.if defined(WITH_X11)
USE_PYTHON= yes
RUN_DEPENDS= ${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 9736c90c7728..cdb4b07d456a 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://devel-home.kde.org/~granroth/kbiff/
MAINTAINER= kris@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index e8d0fde018f9..a59f16f58103 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -129,7 +129,7 @@ SGML_USED= no
SGML_USED= no
.endif
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
giconv.2:${PORTSDIR}/converters/libiconv
.if defined(NOPORTDOCS)
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index ad11b0f96a16..d4723b3c570a 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -42,7 +42,7 @@ WITH_DOCS= yes
.endif
.endif
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
.if defined(WITH_SLANG)
LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang
.elif defined(WITH_NCURSES_PORT)
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index ad11b0f96a16..d4723b3c570a 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -42,7 +42,7 @@ WITH_DOCS= yes
.endif
.endif
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
.if defined(WITH_SLANG)
LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang
.elif defined(WITH_NCURSES_PORT)
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index 860f79090d64..89310c47b9b8 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR= ${PORTVERSION}
MAINTAINER= kkonstan@daemon.gr
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
popt.0:${PORTSDIR}/devel/popt \
gdbm.2:${PORTSDIR}/databases/gdbm \
vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger \
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index 5b0309a2bd0c..9f4810e85e8e 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= erich@tacni.net
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index 5637a5ac2c32..666318ac6067 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_BISON= yes
USE_AUTOCONF_VER=213
diff --git a/misc/afbackup/Makefile b/misc/afbackup/Makefile
index 4392d06e97cb..daa800c1c93e 100644
--- a/misc/afbackup/Makefile
+++ b/misc/afbackup/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= voland@catpipe.net
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 f433fa30becf..77f4dc5c1844 100644
--- a/misc/dirtree/Makefile
+++ b/misc/dirtree/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://home.pages.at/kingleo/development/
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= LeoArg.2:${PORTSDIR}/devel/leoarg \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/misc/gnomeutils/Makefile b/misc/gnomeutils/Makefile
index fa2a727c884a..b20f47247062 100644
--- a/misc/gnomeutils/Makefile
+++ b/misc/gnomeutils/Makefile
@@ -14,7 +14,7 @@ DISTNAME= gnome-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index fa2a727c884a..b20f47247062 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -14,7 +14,7 @@ DISTNAME= gnome-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
diff --git a/misc/kde2-i18n/Makefile b/misc/kde2-i18n/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde2-i18n/Makefile
+++ b/misc/kde2-i18n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-af/Makefile b/misc/kde3-i18n-af/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-af/Makefile
+++ b/misc/kde3-i18n-af/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ar/Makefile b/misc/kde3-i18n-ar/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-ar/Makefile
+++ b/misc/kde3-i18n-ar/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-az/Makefile b/misc/kde3-i18n-az/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-az/Makefile
+++ b/misc/kde3-i18n-az/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-bg/Makefile b/misc/kde3-i18n-bg/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-bg/Makefile
+++ b/misc/kde3-i18n-bg/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-bs/Makefile b/misc/kde3-i18n-bs/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-bs/Makefile
+++ b/misc/kde3-i18n-bs/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ca/Makefile b/misc/kde3-i18n-ca/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-ca/Makefile
+++ b/misc/kde3-i18n-ca/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-cs/Makefile b/misc/kde3-i18n-cs/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-cs/Makefile
+++ b/misc/kde3-i18n-cs/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-da/Makefile b/misc/kde3-i18n-da/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-da/Makefile
+++ b/misc/kde3-i18n-da/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-el/Makefile b/misc/kde3-i18n-el/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-el/Makefile
+++ b/misc/kde3-i18n-el/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-en_GB/Makefile b/misc/kde3-i18n-en_GB/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-en_GB/Makefile
+++ b/misc/kde3-i18n-en_GB/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-eo/Makefile b/misc/kde3-i18n-eo/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-eo/Makefile
+++ b/misc/kde3-i18n-eo/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-es/Makefile b/misc/kde3-i18n-es/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-es/Makefile
+++ b/misc/kde3-i18n-es/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-et/Makefile b/misc/kde3-i18n-et/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-et/Makefile
+++ b/misc/kde3-i18n-et/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-fi/Makefile b/misc/kde3-i18n-fi/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-fi/Makefile
+++ b/misc/kde3-i18n-fi/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-he/Makefile b/misc/kde3-i18n-he/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-he/Makefile
+++ b/misc/kde3-i18n-he/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-hr/Makefile b/misc/kde3-i18n-hr/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-hr/Makefile
+++ b/misc/kde3-i18n-hr/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-hu/Makefile b/misc/kde3-i18n-hu/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-hu/Makefile
+++ b/misc/kde3-i18n-hu/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-id/Makefile b/misc/kde3-i18n-id/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-id/Makefile
+++ b/misc/kde3-i18n-id/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-is/Makefile b/misc/kde3-i18n-is/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-is/Makefile
+++ b/misc/kde3-i18n-is/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-it/Makefile b/misc/kde3-i18n-it/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-it/Makefile
+++ b/misc/kde3-i18n-it/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-lt/Makefile b/misc/kde3-i18n-lt/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-lt/Makefile
+++ b/misc/kde3-i18n-lt/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-lv/Makefile b/misc/kde3-i18n-lv/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-lv/Makefile
+++ b/misc/kde3-i18n-lv/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-mt/Makefile b/misc/kde3-i18n-mt/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-mt/Makefile
+++ b/misc/kde3-i18n-mt/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-nb/Makefile b/misc/kde3-i18n-nb/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-nb/Makefile
+++ b/misc/kde3-i18n-nb/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-nl/Makefile b/misc/kde3-i18n-nl/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-nl/Makefile
+++ b/misc/kde3-i18n-nl/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-nn/Makefile b/misc/kde3-i18n-nn/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-nn/Makefile
+++ b/misc/kde3-i18n-nn/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-pl/Makefile b/misc/kde3-i18n-pl/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-pl/Makefile
+++ b/misc/kde3-i18n-pl/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-pt/Makefile b/misc/kde3-i18n-pt/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-pt/Makefile
+++ b/misc/kde3-i18n-pt/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-pt_BR/Makefile b/misc/kde3-i18n-pt_BR/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-pt_BR/Makefile
+++ b/misc/kde3-i18n-pt_BR/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ro/Makefile b/misc/kde3-i18n-ro/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-ro/Makefile
+++ b/misc/kde3-i18n-ro/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-sk/Makefile b/misc/kde3-i18n-sk/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-sk/Makefile
+++ b/misc/kde3-i18n-sk/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-sl/Makefile b/misc/kde3-i18n-sl/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-sl/Makefile
+++ b/misc/kde3-i18n-sl/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-sr/Makefile b/misc/kde3-i18n-sr/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-sr/Makefile
+++ b/misc/kde3-i18n-sr/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-sv/Makefile b/misc/kde3-i18n-sv/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-sv/Makefile
+++ b/misc/kde3-i18n-sv/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ta/Makefile b/misc/kde3-i18n-ta/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-ta/Makefile
+++ b/misc/kde3-i18n-ta/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-th/Makefile b/misc/kde3-i18n-th/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-th/Makefile
+++ b/misc/kde3-i18n-th/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-tr/Makefile b/misc/kde3-i18n-tr/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-tr/Makefile
+++ b/misc/kde3-i18n-tr/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ven/Makefile b/misc/kde3-i18n-ven/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-ven/Makefile
+++ b/misc/kde3-i18n-ven/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-vi/Makefile b/misc/kde3-i18n-vi/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-vi/Makefile
+++ b/misc/kde3-i18n-vi/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-xh/Makefile b/misc/kde3-i18n-xh/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-xh/Makefile
+++ b/misc/kde3-i18n-xh/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-zu/Makefile b/misc/kde3-i18n-zu/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n-zu/Makefile
+++ b/misc/kde3-i18n-zu/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n/Makefile b/misc/kde3-i18n/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde3-i18n/Makefile
+++ b/misc/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-i18n-is/Makefile b/misc/kde4-i18n-is/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-i18n-is/Makefile
+++ b/misc/kde4-i18n-is/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-bg/Makefile b/misc/kde4-l10n-bg/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-bg/Makefile
+++ b/misc/kde4-l10n-bg/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-ca/Makefile b/misc/kde4-l10n-ca/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-ca/Makefile
+++ b/misc/kde4-l10n-ca/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-cs/Makefile b/misc/kde4-l10n-cs/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-cs/Makefile
+++ b/misc/kde4-l10n-cs/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-da/Makefile b/misc/kde4-l10n-da/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-da/Makefile
+++ b/misc/kde4-l10n-da/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-el/Makefile b/misc/kde4-l10n-el/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-el/Makefile
+++ b/misc/kde4-l10n-el/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-en_GB/Makefile b/misc/kde4-l10n-en_GB/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-en_GB/Makefile
+++ b/misc/kde4-l10n-en_GB/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-eo/Makefile b/misc/kde4-l10n-eo/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-eo/Makefile
+++ b/misc/kde4-l10n-eo/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-es/Makefile b/misc/kde4-l10n-es/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-es/Makefile
+++ b/misc/kde4-l10n-es/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-et/Makefile b/misc/kde4-l10n-et/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-et/Makefile
+++ b/misc/kde4-l10n-et/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-fi/Makefile b/misc/kde4-l10n-fi/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-fi/Makefile
+++ b/misc/kde4-l10n-fi/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-is/Makefile b/misc/kde4-l10n-is/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-is/Makefile
+++ b/misc/kde4-l10n-is/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-it/Makefile b/misc/kde4-l10n-it/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-it/Makefile
+++ b/misc/kde4-l10n-it/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-lt/Makefile b/misc/kde4-l10n-lt/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-lt/Makefile
+++ b/misc/kde4-l10n-lt/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-lv/Makefile b/misc/kde4-l10n-lv/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-lv/Makefile
+++ b/misc/kde4-l10n-lv/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-nb/Makefile b/misc/kde4-l10n-nb/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-nb/Makefile
+++ b/misc/kde4-l10n-nb/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-nl/Makefile b/misc/kde4-l10n-nl/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-nl/Makefile
+++ b/misc/kde4-l10n-nl/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-nn/Makefile b/misc/kde4-l10n-nn/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-nn/Makefile
+++ b/misc/kde4-l10n-nn/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-ro/Makefile b/misc/kde4-l10n-ro/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-ro/Makefile
+++ b/misc/kde4-l10n-ro/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-sk/Makefile b/misc/kde4-l10n-sk/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-sk/Makefile
+++ b/misc/kde4-l10n-sk/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-sl/Makefile b/misc/kde4-l10n-sl/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-sl/Makefile
+++ b/misc/kde4-l10n-sl/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-sr/Makefile b/misc/kde4-l10n-sr/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-sr/Makefile
+++ b/misc/kde4-l10n-sr/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-sv/Makefile b/misc/kde4-l10n-sv/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-sv/Makefile
+++ b/misc/kde4-l10n-sv/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-ta/Makefile b/misc/kde4-l10n-ta/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-ta/Makefile
+++ b/misc/kde4-l10n-ta/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-th/Makefile b/misc/kde4-l10n-th/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-th/Makefile
+++ b/misc/kde4-l10n-th/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-tr/Makefile b/misc/kde4-l10n-tr/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n-tr/Makefile
+++ b/misc/kde4-l10n-tr/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n/Makefile b/misc/kde4-l10n/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/misc/kde4-l10n/Makefile
+++ b/misc/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/koffice-i18n/Makefile b/misc/koffice-i18n/Makefile
index 885b09c87a1e..7d24616e6f21 100644
--- a/misc/koffice-i18n/Makefile
+++ b/misc/koffice-i18n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= sahiro@crest.ocn.ne.jp
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= koshell:${PORTSDIR}/editors/koffice
USE_KDELIBS_VER=2
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index 418dc4a9730e..77e54a924c90 100644
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= unstable/apps/utils
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER= 2
GNU_CONFIGURE= yes
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 08dc1ac3414c..f9f393f42c69 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= stable/sources/mc
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
.if defined(WITH_NCURSES_PORT)
LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
.elif defined(WITH_SLANG)
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index b231edac52b9..8aa54456b828 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://zeus.polsl.gliwice.pl/~pborys/stable-version/
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/misc/sh-utils/Makefile b/misc/sh-utils/Makefile
index d496c2a33b8b..2c2954f115ea 100644
--- a/misc/sh-utils/Makefile
+++ b/misc/sh-utils/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= cyrille.lefevre@laposte.net
# Global variables
#
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 9c8a099b881b..85609723fb52 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= nobutaka@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/libavcodec.a:${PORTSDIR}/graphics/ffmpeg
LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \
aa.1:${PORTSDIR}/graphics/aalib \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
WRKSRC= ${WRKDIR}/${PORTNAME}-lib-${PORTVERSION}
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index 1afa59c7347b..5db265eb6860 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}_gui-${PORTVERSION}
MAINTAINER= lioux@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/ogle/libdvdcontrol.so.5:${PORTSDIR}/graphics/ogle
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
giconv.2:${PORTSDIR}/converters/libiconv \
glade.4:${PORTSDIR}/devel/libglade \
xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index ae82b8c3406c..661cca2668e1 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= nobutaka@FreeBSD.org
LIB_DEPENDS= xine.0:${PORTSDIR}/graphics/libxine \
aa.1:${PORTSDIR}/graphics/aalib \
png.5:${PORTSDIR}/graphics/png \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_IMLIB= yes
diff --git a/multimedia/xmps-opendivx-plugin/Makefile b/multimedia/xmps-opendivx-plugin/Makefile
index e04c1e7da828..18116c232039 100644
--- a/multimedia/xmps-opendivx-plugin/Makefile
+++ b/multimedia/xmps-opendivx-plugin/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= lioux@FreeBSD.org
LIB_DEPENDS= divxdecore.0:${PORTSDIR}/graphics/libdivxdecore \
xmps.0:${PORTSDIR}/graphics/xmps \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${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 e8399daf87f8..6f7167f219c4 100644
--- a/multimedia/xmps-win32-plugin/Makefile
+++ b/multimedia/xmps-win32-plugin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://xmps.sourceforge.net/sources/
MAINTAINER= lioux@FreeBSD.org
LIB_DEPENDS= xmps.0:${PORTSDIR}/graphics/xmps \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${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 db771862a62f..9514ab633fb7 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://konst.org.ua/download/
MAINTAINER= ijliao@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
sigc.1:${PORTSDIR}/devel/libsigc++
USE_GMAKE= yes
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index a7f08afea87f..c2e4814584b0 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= petef@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
USE_GNOME= yes
diff --git a/net-mgmt/ipv6calc/Makefile b/net-mgmt/ipv6calc/Makefile
index 9a3be5268277..45f74237353c 100644
--- a/net-mgmt/ipv6calc/Makefile
+++ b/net-mgmt/ipv6calc/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
MAINTAINER= edwin@mavetju.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
GNU_CONFIGURE= yes
diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index 381dea9c130e..34383c2a420f 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= lioux@FreeBSD.org
BUILD_DEPENDS= dctc:${PORTSDIR}/net/dctc
LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \
iconv.2:${PORTSDIR}/converters/iconv \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GNOMELIBS= yes
USE_GTK= yes
diff --git a/net-p2p/fidelio/Makefile b/net-p2p/fidelio/Makefile
index 03cbde09054e..3943c298ddce 100644
--- a/net-p2p/fidelio/Makefile
+++ b/net-p2p/fidelio/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
xml2.5:${PORTSDIR}/textproc/libxml2
XML_CONFIG?= ${LOCALBASE}/bin/xml2-config
diff --git a/net-p2p/gtkhx/Makefile b/net-p2p/gtkhx/Makefile
index a14579aa712e..478c9518bc4e 100644
--- a/net-p2p/gtkhx/Makefile
+++ b/net-p2p/gtkhx/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= gtkhx
MAINTAINER= jre@vineyard.net
LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf:install \
- intl.1:${PORTSDIR}/devel/gettext:install \
+ intl.1:${PORTSDIR}/devel/gettext-old \
iconv.2:${PORTSDIR}/converters/iconv:install
USE_XLIB= yes
diff --git a/net-p2p/lopster/Makefile b/net-p2p/lopster/Makefile
index 07a608e47a4a..57d6231866cd 100644
--- a/net-p2p/lopster/Makefile
+++ b/net-p2p/lopster/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= roman@xpert.com
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net/centericq/Makefile b/net/centericq/Makefile
index db771862a62f..9514ab633fb7 100644
--- a/net/centericq/Makefile
+++ b/net/centericq/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://konst.org.ua/download/
MAINTAINER= ijliao@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
sigc.1:${PORTSDIR}/devel/libsigc++
USE_GMAKE= yes
diff --git a/net/dctc-gui/Makefile b/net/dctc-gui/Makefile
index 381dea9c130e..34383c2a420f 100644
--- a/net/dctc-gui/Makefile
+++ b/net/dctc-gui/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= lioux@FreeBSD.org
BUILD_DEPENDS= dctc:${PORTSDIR}/net/dctc
LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \
iconv.2:${PORTSDIR}/converters/iconv \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GNOMELIBS= yes
USE_GTK= yes
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index a7f08afea87f..c2e4814584b0 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= petef@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
USE_GNOME= yes
diff --git a/net/fidelio/Makefile b/net/fidelio/Makefile
index 03cbde09054e..3943c298ddce 100644
--- a/net/fidelio/Makefile
+++ b/net/fidelio/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
xml2.5:${PORTSDIR}/textproc/libxml2
XML_CONFIG?= ${LOCALBASE}/bin/xml2-config
diff --git a/net/gabber/Makefile b/net/gabber/Makefile
index ceac56c9cf95..6041aa9b93ce 100644
--- a/net/gabber/Makefile
+++ b/net/gabber/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
.if defined(WITH_XMMS)
BUILD_DEPENDS+= xmms-config:${PORTSDIR}/audio/xmms
.endif
diff --git a/net/gtkhx/Makefile b/net/gtkhx/Makefile
index a14579aa712e..478c9518bc4e 100644
--- a/net/gtkhx/Makefile
+++ b/net/gtkhx/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= gtkhx
MAINTAINER= jre@vineyard.net
LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf:install \
- intl.1:${PORTSDIR}/devel/gettext:install \
+ intl.1:${PORTSDIR}/devel/gettext-old \
iconv.2:${PORTSDIR}/converters/iconv:install
USE_XLIB= yes
diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile
index 9a3be5268277..45f74237353c 100644
--- a/net/ipv6calc/Makefile
+++ b/net/ipv6calc/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
MAINTAINER= edwin@mavetju.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
GNU_CONFIGURE= yes
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index 3c186e4a22b8..c0d4b73f667e 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= jwhois
MAINTAINER= matusita@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=${PREFIX}/var/jwhois
diff --git a/net/kdetelnet/Makefile b/net/kdetelnet/Makefile
index bf7b0a9ec95e..0196d71cb3e0 100644
--- a/net/kdetelnet/Makefile
+++ b/net/kdetelnet/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_GMAKE= yes
diff --git a/net/kmud/Makefile b/net/kmud/Makefile
index a02dfbb90660..ffebabf6ae99 100644
--- a/net/kmud/Makefile
+++ b/net/kmud/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext-old
USE_KDEBASE_VER=1
USE_LIBTOOL= yes
diff --git a/net/ksamba/Makefile b/net/ksamba/Makefile
index ffb3635299d8..08577984bc54 100644
--- a/net/ksamba/Makefile
+++ b/net/ksamba/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_KDE} \
http://www.kneschke.de/projekte/ksamba/download/
MASTER_SITE_SUBDIR= unstable/apps/network
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=1
USE_GMAKE= yes
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 184e86757da2..f50945b2bdfa 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ahh
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old \
giconv:${PORTSDIR}/converters/libiconv \
gnugetopt:${PORTSDIR}/devel/libgnugetopt
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 477d07eba199..d48cd9d2ddcc 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v1.5/ \
MAINTAINER?= ache@FreeBSD.org
LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib \
- intl.1:${PORTSDIR}/devel/gettext \
+ intl.1:${PORTSDIR}/devel/gettext-old \
giconv.2:${PORTSDIR}/converters/libiconv
USE_BZIP2= yes
diff --git a/palm/coldsync/Makefile b/palm/coldsync/Makefile
index e7d872b17701..dd30935b870c 100644
--- a/palm/coldsync/Makefile
+++ b/palm/coldsync/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.ooblick.com/software/coldsync/
MAINTAINER= arensb+freebsd-ports@ooblick.com
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Palm/PDB.pm:${PORTSDIR}/palm/p5-Palm
GNU_CONFIGURE= yes
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 7b1908c7c50c..0358bde2e673 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://jpilot.org/
MAINTAINER?= varju@webct.com
LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GTK= yes
USE_LIBTOOL= yes
diff --git a/polish/kde3-i18n/Makefile b/polish/kde3-i18n/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/polish/kde3-i18n/Makefile
+++ b/polish/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/polish/kde4-l10n/Makefile b/polish/kde4-l10n/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/polish/kde4-l10n/Makefile
+++ b/polish/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/portuguese/kde3-i18n-pt_BR/Makefile b/portuguese/kde3-i18n-pt_BR/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/portuguese/kde3-i18n-pt_BR/Makefile
+++ b/portuguese/kde3-i18n-pt_BR/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/portuguese/kde3-i18n/Makefile b/portuguese/kde3-i18n/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/portuguese/kde3-i18n/Makefile
+++ b/portuguese/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/portuguese/kde4-l10n-pt_BR/Makefile b/portuguese/kde4-l10n-pt_BR/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/portuguese/kde4-l10n-pt_BR/Makefile
+++ b/portuguese/kde4-l10n-pt_BR/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/portuguese/kde4-l10n/Makefile b/portuguese/kde4-l10n/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/portuguese/kde4-l10n/Makefile
+++ b/portuguese/kde4-l10n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 05c0774d5987..eae9f21f2d68 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_XPM= yes
diff --git a/print/ktexshell/Makefile b/print/ktexshell/Makefile
index 806c84214989..f46caecf3a37 100644
--- a/print/ktexshell/Makefile
+++ b/print/ktexshell/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ktexshell
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_GMAKE= yes
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 0097bfbba491..9b50875f6df4 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_AUTOCONF= yes
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 0097bfbba491..9b50875f6df4 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_AUTOCONF= yes
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 0097bfbba491..9b50875f6df4 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_AUTOCONF= yes
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 0097bfbba491..9b50875f6df4 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_AUTOCONF= yes
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 0097bfbba491..9b50875f6df4 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.endif
LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_AUTOCONF= yes
diff --git a/print/rlpr/Makefile b/print/rlpr/Makefile
index 48cfaefdf92f..1638055e4fd6 100644
--- a/print/rlpr/Makefile
+++ b/print/rlpr/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= system/printing
MAINTAINER= mi@aldan.algebra.com
-#LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+#LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
#CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib -lintl"
diff --git a/russian/calligra-l10n/Makefile b/russian/calligra-l10n/Makefile
index 0af4c652339a..5735ab9d85e6 100644
--- a/russian/calligra-l10n/Makefile
+++ b/russian/calligra-l10n/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= koshell:${PORTSDIR}/editors/koffice
USE_KDELIBS_VER=2
diff --git a/russian/kde2-i18n/Makefile b/russian/kde2-i18n/Makefile
index 0e1ad06377c3..f09703073d61 100644
--- a/russian/kde2-i18n/Makefile
+++ b/russian/kde2-i18n/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/russian/kde3-i18n/Makefile b/russian/kde3-i18n/Makefile
index 0e1ad06377c3..f09703073d61 100644
--- a/russian/kde3-i18n/Makefile
+++ b/russian/kde3-i18n/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/russian/kde4-l10n/Makefile b/russian/kde4-l10n/Makefile
index 0e1ad06377c3..f09703073d61 100644
--- a/russian/kde4-l10n/Makefile
+++ b/russian/kde4-l10n/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/russian/koffice-i18n/Makefile b/russian/koffice-i18n/Makefile
index 0af4c652339a..5735ab9d85e6 100644
--- a/russian/koffice-i18n/Makefile
+++ b/russian/koffice-i18n/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= koshell:${PORTSDIR}/editors/koffice
USE_KDELIBS_VER=2
diff --git a/russian/koffice-kde4-l10n/Makefile b/russian/koffice-kde4-l10n/Makefile
index 0af4c652339a..5735ab9d85e6 100644
--- a/russian/koffice-kde4-l10n/Makefile
+++ b/russian/koffice-kde4-l10n/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= koshell:${PORTSDIR}/editors/koffice
USE_KDELIBS_VER=2
diff --git a/security/fwlogwatch/Makefile b/security/fwlogwatch/Makefile
index 6140d70e355d..a6bd9525622e 100644
--- a/security/fwlogwatch/Makefile
+++ b/security/fwlogwatch/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.kyb.uni-stuttgart.de/boris/sw/
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old
INSTALL_TARGET= install install-config install-i18n
MANCOMPRESSES= no
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index fd906dc0a540..933904fa388c 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= gnupg
MAINTAINER= kuriyama@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
#RESTRICTED= "Crypto; export-controlled"
GNU_CONFIGURE= YES
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index fd906dc0a540..933904fa388c 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= gnupg
MAINTAINER= kuriyama@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
#RESTRICTED= "Crypto; export-controlled"
GNU_CONFIGURE= YES
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index aca56efeb0ac..d8d1b5064a5d 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.geocities.com/bilibao/
MAINTAINER= kevlo@FreeBSD.org
-BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
GNU_CONFIGURE= yes
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 9e0e1d93d44a..ed176da956dd 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= trevor@FreeBSD.org
LIB_DEPENDS= mcrypt.6:${PORTSDIR}/security/libmcrypt/ \
mhash.2:${PORTSDIR}/security/mhash/ \
- intl.1:${PORTSDIR}/devel/gettext/
+ intl.1:${PORTSDIR}/devel/gettext-old
post-patch:
${RM} -f ${WRKSRC}/configure
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index fe608bd0fe85..217f0ce189d4 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.apcupsd.org/pub/apcupsd/stable/tar/
MAINTAINER= Lars.Koeller@Uni-Bielefeld.de
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
STARTUP_SCRIPT= apcupsd.sh.sample
PLIST_SUB= STARTUP_SCRIPT=${STARTUP_SCRIPT}
diff --git a/sysutils/fileutils/Makefile b/sysutils/fileutils/Makefile
index 9677b6d29d15..2e56c901a654 100644
--- a/sysutils/fileutils/Makefile
+++ b/sysutils/fileutils/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= cyrille.lefevre@laposte.net
# Global variables
#
-LIB_DEPEND= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPEND= intl.1:${PORTSDIR}/devel/gettext-old
USE_PERL5= yes
USE_LIBTOOL= yes
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 55eff47c09bb..be33aabb3ec2 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.abo.fi/~jmunsin/gcombust/
MAINTAINER= mcdouga9@msu.edu
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \
mkisofs:${PORTSDIR}/sysutils/mkisofs \
cdlabelgen:${PORTSDIR}/print/cdlabelgen
diff --git a/sysutils/gfslicer/Makefile b/sysutils/gfslicer/Makefile
index a4298f9ba7a2..4be71ee13624 100644
--- a/sysutils/gfslicer/Makefile
+++ b/sysutils/gfslicer/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.geocities.com/gfslicer/
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_GTK= yes
diff --git a/sysutils/slmon/Makefile b/sysutils/slmon/Makefile
index a809ac7aa336..0c780a60d93e 100644
--- a/sysutils/slmon/Makefile
+++ b/sysutils/slmon/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= slang:${PORTSDIR}/devel/libslang \
gtop:${PORTSDIR}/devel/libgtop \
- intl:${PORTSDIR}/devel/gettext \
+ intl:${PORTSDIR}/devel/gettext-old \
gnugetopt:${PORTSDIR}/devel/libgnugetopt
GNU_CONFIGURE= yes
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index d25c94a4eeb8..647ec7e488ce 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= Alexander@Leidinger.net
LIB_DEPENDS= adns.1:${PORTSDIR}/net/adns \
gd.2:${PORTSDIR}/graphics/gd \
- intl.1:${PORTSDIR}/devel/gettext \
+ intl.1:${PORTSDIR}/devel/gettext-old \
pcre.0:${PORTSDIR}/devel/pcre \
xml2.5:${PORTSDIR}/textproc/libxml2 \
ltdl.1:${PORTSDIR}/devel/libtool
diff --git a/textproc/rotix/Makefile b/textproc/rotix/Makefile
index d25df33e743c..d4b036962a78 100644
--- a/textproc/rotix/Makefile
+++ b/textproc/rotix/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://elektron.its.tudelft.nl/~hemmin98/
MAINTAINER= lintux@debian.org
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
diff --git a/textproc/textutils/Makefile b/textproc/textutils/Makefile
index bb0333c09ab6..f878dc2d58ee 100644
--- a/textproc/textutils/Makefile
+++ b/textproc/textutils/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= textutils
MAINTAINER= aw1@stade.co.uk
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/vietnamese/kde3-i18n/Makefile b/vietnamese/kde3-i18n/Makefile
index 09e2da57fbf6..a98ed835b61a 100644
--- a/vietnamese/kde3-i18n/Makefile
+++ b/vietnamese/kde3-i18n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/www/amyc/Makefile b/www/amyc/Makefile
index 75396bfbf813..bb1158675199 100644
--- a/www/amyc/Makefile
+++ b/www/amyc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.crevola.com/about/current/
MAINTAINER= petef@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_AUTOCONF= yes
GNU_CONFIGURE= yes
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 2c1376b525f4..c16d30812d0d 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.webdav.org/cadaver/
MAINTAINER= tarkhil@over.ru
LIB_DEPENDS= neon.18:${PORTSDIR}/www/neon \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
.ifndef NO_OPENSSL
USE_OPENSSL= yes
diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile
index 6cffed93169e..6528ba27bd18 100644
--- a/www/dillo-i18n/Makefile
+++ b/www/dillo-i18n/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= greid@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GTK= yes
GNU_CONFIGURE= yes
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 6cffed93169e..6528ba27bd18 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= greid@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GTK= yes
GNU_CONFIGURE= yes
diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index 6cffed93169e..6528ba27bd18 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= greid@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GTK= yes
GNU_CONFIGURE= yes
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index fc2eb24d7903..7a11b5af16b6 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} \
- msgfmt-new:${PORTSDIR}/devel/gettext-devel
+ msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index fc2eb24d7903..7a11b5af16b6 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} \
- msgfmt-new:${PORTSDIR}/devel/gettext-devel
+ msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
diff --git a/www/horde-devel/Makefile b/www/horde-devel/Makefile
index f676cc232938..f08f6b60ce9c 100644
--- a/www/horde-devel/Makefile
+++ b/www/horde-devel/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
#
#-----------------------------------------------------------------------
-LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext-old
.if !defined(WITHOUT_MCAL)
LIB_DEPENDS+= mcal.0:${PORTSDIR}/misc/libmcal
.endif
diff --git a/www/horde2/Makefile b/www/horde2/Makefile
index f676cc232938..f08f6b60ce9c 100644
--- a/www/horde2/Makefile
+++ b/www/horde2/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
#
#-----------------------------------------------------------------------
-LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext-old
.if !defined(WITHOUT_MCAL)
LIB_DEPENDS+= mcal.0:${PORTSDIR}/misc/libmcal
.endif
diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile
index 1fe4c3dc71ad..98ad75a22a61 100644
--- a/www/kdewebdev/Makefile
+++ b/www/kdewebdev/Makefile
@@ -21,7 +21,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= jeremy@external.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 1fe4c3dc71ad..98ad75a22a61 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -21,7 +21,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= jeremy@external.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 8560cc14d35c..7b1540589ed2 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}2.8.5dev.7
MAINTAINER= ache@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
WRKSRC= ${WRKDIR}/${PORTNAME}2-8-5
USE_BZIP2= yes
diff --git a/www/quanta/Makefile b/www/quanta/Makefile
index 1fe4c3dc71ad..98ad75a22a61 100644
--- a/www/quanta/Makefile
+++ b/www/quanta/Makefile
@@ -21,7 +21,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= jeremy@external.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index ba1e43c39618..4a19b4593a88 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old
CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lintl
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index f1a81efe0ac4..40c5cc749147 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.lyra.org/sitecopy/
MAINTAINER= olgeni@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 2611ee497d1a..95daea13b8ea 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= stable/sources/nautilus
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 \
- msgfmt-new:${PORTSDIR}/devel/gettext-devel
+ msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= medusa.0:${PORTSDIR}/sysutils/medusa \
freetype.9:${PORTSDIR}/print/freetype2 \
eel.0:${PORTSDIR}/x11-toolkits/eel
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 2611ee497d1a..95daea13b8ea 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= stable/sources/nautilus
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 \
- msgfmt-new:${PORTSDIR}/devel/gettext-devel
+ msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= medusa.0:${PORTSDIR}/sysutils/medusa \
freetype.9:${PORTSDIR}/print/freetype2 \
eel.0:${PORTSDIR}/x11-toolkits/eel
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 03931acaba02..7921fc31b1c3 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -15,7 +15,7 @@ DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_PERL5= yes
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 310d2e842680..3de30d881c51 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 \
freetype.9:${PORTSDIR}/print/freetype2 \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index d22ac8e14052..50a226824c55 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -27,7 +27,7 @@ MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \
ghttp.1:${PORTSDIR}/www/libghttp \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index d22ac8e14052..50a226824c55 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -27,7 +27,7 @@ MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \
ghttp.1:${PORTSDIR}/www/libghttp \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index d22ac8e14052..50a226824c55 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -27,7 +27,7 @@ MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \
ghttp.1:${PORTSDIR}/www/libghttp \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 2edffd4a4a1f..a8b116a49931 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-2
MAINTAINER= nakai@FreeBSD.org
BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
giconv.2:${PORTSDIR}/converters/libiconv
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/kappdock/Makefile b/x11-wm/kappdock/Makefile
index e69ed9605e1f..03b1e1254023 100644
--- a/x11-wm/kappdock/Makefile
+++ b/x11-wm/kappdock/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.Informatik.Uni-Oldenburg.DE/~bigboss/kappdock/
MAINTAINER= jeremy@external.org
LIB_DEPENDS= kdeui.4:${PORTSDIR}/x11/kdelibs2 \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
INSTALLS_SHLIB= yes
USE_XLIB= yes
diff --git a/x11-wm/kwix/Makefile b/x11-wm/kwix/Makefile
index f4b7a8cf77f9..135c40347a49 100644
--- a/x11-wm/kwix/Makefile
+++ b/x11-wm/kwix/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}kb
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDEBASE_VER=2
USE_GMAKE= yes
diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile
index 401ec3002dc2..8ec12bff9182 100644
--- a/x11-wm/ude/Makefile
+++ b/x11-wm/ude/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-0.2.7b-BETA
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index c0a41c2a38d9..25f78c351f8c 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -14,11 +14,11 @@ DISTNAME= WindowMaker-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
- intl.1:${PORTSDIR}/devel/gettext \
+ intl.1:${PORTSDIR}/devel/gettext-old \
Hermes.1:${PORTSDIR}/graphics/Hermes
RUN_DEPENDS= ${X11BASE}/share/WindowMaker/Themes/Checker.themed/style:${PORTSDIR}/graphics/wmicons
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index b4b72a86c569..127ff116f9e3 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -14,7 +14,7 @@ DISTNAME= gnome-applets-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
diff --git a/x11/gnomeapplets/Makefile b/x11/gnomeapplets/Makefile
index b4b72a86c569..127ff116f9e3 100644
--- a/x11/gnomeapplets/Makefile
+++ b/x11/gnomeapplets/Makefile
@@ -14,7 +14,7 @@ DISTNAME= gnome-applets-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index b4b72a86c569..127ff116f9e3 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -14,7 +14,7 @@ DISTNAME= gnome-applets-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index 3fdecc134363..70c384b5e899 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -15,7 +15,7 @@ DISTNAME= gnome-core-${PORTVERSION}
MAINTAINER?= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
+BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtkhtml.21:${PORTSDIR}/www/gtkhtml
RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 8c4aa2a9dfb5..66e26fa7ceeb 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
SOMAJOR= 4
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 8c4aa2a9dfb5..66e26fa7ceeb 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
SOMAJOR= 4
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 8c4aa2a9dfb5..66e26fa7ceeb 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
SOMAJOR= 4
diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index d2b5ef1f0996..6a6a27b6e86c 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= kde@FreeBSD.org
BUILD_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \
- intl.1:${PORTSDIR}/devel/gettext
+ intl.1:${PORTSDIR}/devel/gettext-old
NO_LATEST_LINK= yes
USE_XLIB= yes
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 8c4aa2a9dfb5..66e26fa7ceeb 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
SOMAJOR= 4
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 8c4aa2a9dfb5..66e26fa7ceeb 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
SOMAJOR= 4
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 8c4aa2a9dfb5..66e26fa7ceeb 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
SOMAJOR= 4
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 8c4aa2a9dfb5..66e26fa7ceeb 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
SOMAJOR= 4
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 8c4aa2a9dfb5..66e26fa7ceeb 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
USE_KDELIBS_VER=2
SOMAJOR= 4