aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arabic/kde3-i18n/Makefile3
-rw-r--r--arabic/kde4-l10n/Makefile3
-rw-r--r--archivers/gtar/Makefile3
-rw-r--r--archivers/rpm/Makefile9
-rw-r--r--astro/fooseti/Makefile4
-rw-r--r--astro/seti_applet/Makefile3
-rw-r--r--astro/spacechart/Makefile3
-rw-r--r--audio/aumix/Makefile3
-rw-r--r--audio/denemo/Makefile3
-rw-r--r--audio/kmikmod/Makefile3
-rw-r--r--audio/koog/Makefile3
-rw-r--r--audio/lopster/Makefile3
-rw-r--r--audio/mad/Makefile4
-rw-r--r--audio/normalize/Makefile3
-rw-r--r--audio/opmixer/Makefile3
-rw-r--r--audio/snd/Makefile3
-rw-r--r--audio/soribada/Makefile3
-rw-r--r--audio/umix/Makefile3
-rw-r--r--chinese/xcin25/Makefile4
-rw-r--r--chinese/zhcon/Makefile4
-rw-r--r--comms/gnokii/Makefile4
-rw-r--r--converters/recode/Makefile12
-rw-r--r--databases/mysql-gui/Makefile3
-rw-r--r--databases/namazu2/Makefile3
-rw-r--r--databases/p5-DBD-Sybase/Makefile3
-rw-r--r--databases/postgresql-devel-server/Makefile3
-rw-r--r--databases/postgresql-devel/Makefile3
-rw-r--r--databases/postgresql7/Makefile3
-rw-r--r--databases/postgresql73-server/Makefile3
-rw-r--r--databases/postgresql73/Makefile3
-rw-r--r--databases/postgresql74-server/Makefile3
-rw-r--r--databases/postgresql80-server/Makefile3
-rw-r--r--databases/postgresql81-server/Makefile3
-rw-r--r--databases/postgresql82-server/Makefile3
-rw-r--r--databases/postgresql83-server/Makefile3
-rw-r--r--databases/postgresql84-server/Makefile3
-rw-r--r--databases/postgresql90-server/Makefile3
-rw-r--r--databases/postgresql91-server/Makefile3
-rw-r--r--databases/postgresql92-server/Makefile3
-rw-r--r--databases/sqsh/Makefile3
-rw-r--r--deskutils/gcal/Makefile3
-rw-r--r--deskutils/gnome-utils/Makefile7
-rw-r--r--deskutils/gnomeutils2/Makefile7
-rw-r--r--devel/ORBit/Makefile3
-rw-r--r--devel/bonobo/Makefile7
-rw-r--r--devel/bug-buddy/Makefile7
-rw-r--r--devel/bugbuddy/Makefile7
-rw-r--r--devel/bugbuddy2/Makefile7
-rw-r--r--devel/cervisia/Makefile3
-rw-r--r--devel/cook/Makefile3
-rw-r--r--devel/gettext-old/Makefile22
-rw-r--r--devel/gettext-old/pkg-plist79
-rw-r--r--devel/gettext/Makefile23
-rw-r--r--devel/glib20/Makefile6
-rw-r--r--devel/gmake/Makefile3
-rw-r--r--devel/gmake381/Makefile3
-rw-r--r--devel/gnome-vfs/Makefile5
-rw-r--r--devel/gnome-vfs1/Makefile6
-rw-r--r--devel/gnomevfs/Makefile6
-rw-r--r--devel/gnomevfs2/Makefile5
-rw-r--r--devel/gtranslator/Makefile7
-rw-r--r--devel/ixlib/Makefile3
-rw-r--r--devel/kdevelop/Makefile3
-rw-r--r--devel/ktranslator/Makefile3
-rw-r--r--devel/motor/Makefile3
-rw-r--r--devel/objprelink/Makefile6
-rw-r--r--devel/objprelink/files/patch-binutils::libiberty::Makefile.in7
-rw-r--r--devel/p5-Locale-gettext/Makefile4
-rw-r--r--devel/popt/Makefile3
-rw-r--r--devel/ruby-intl/Makefile4
-rw-r--r--editors/calligra-l10n/Makefile3
-rw-r--r--editors/cooledit/Makefile3
-rw-r--r--editors/koffice-i18n/Makefile3
-rw-r--r--editors/koffice-kde4-l10n/Makefile3
-rw-r--r--editors/lpe/Makefile3
-rw-r--r--editors/nano/Makefile3
-rw-r--r--editors/poedit/Makefile6
-rw-r--r--editors/xemacs-devel-mule/Makefile3
-rw-r--r--editors/xemacs21-mule/Makefile2
-rw-r--r--editors/yudit/Makefile3
-rw-r--r--emulators/xsystem35/Makefile3
-rw-r--r--ftp/axel/Makefile3
-rw-r--r--ftp/lftp/Makefile3
-rw-r--r--ftp/pavuk/Makefile3
-rw-r--r--ftp/wget+ipv6/Makefile12
-rw-r--r--ftp/wget-devel/Makefile3
-rw-r--r--ftp/wget/Makefile3
-rw-r--r--games/eboard/Makefile3
-rw-r--r--games/freeciv-gtk2/Makefile4
-rw-r--r--games/freeciv/Makefile4
-rw-r--r--games/gnome-games/Makefile7
-rw-r--r--games/gnomegames/Makefile7
-rw-r--r--games/gnomegames2/Makefile7
-rw-r--r--games/gtypist/Makefile3
-rw-r--r--games/kbubbles/Makefile3
-rw-r--r--games/krogue/Makefile3
-rw-r--r--games/krubik/Makefile3
-rw-r--r--games/lexter/Makefile3
-rw-r--r--games/xinvaders/Makefile3
-rw-r--r--graphics/gphoto2/Makefile5
-rw-r--r--graphics/gtkgraph/Makefile3
-rw-r--r--graphics/gtksee/Makefile4
-rw-r--r--graphics/libxine/Makefile4
-rw-r--r--graphics/ogle-gui/Makefile5
-rw-r--r--graphics/ruby-tgif/Makefile4
-rw-r--r--graphics/tgif-nls/Makefile5
-rw-r--r--graphics/xine/Makefile4
-rw-r--r--graphics/xmps-opendivx-plugin/Makefile3
-rw-r--r--graphics/xmps-win32-plugin/Makefile3
-rw-r--r--hebrew/kde3-i18n/Makefile3
-rw-r--r--hebrew/kde4-l10n/Makefile3
-rw-r--r--hungarian/kde3-i18n/Makefile3
-rw-r--r--hungarian/kde4-l10n/Makefile3
-rw-r--r--irc/kvirc-devel/Makefile6
-rw-r--r--irc/kvirc/Makefile6
-rw-r--r--irc/liece/Makefile5
-rw-r--r--irc/riece-emacs21/Makefile5
-rw-r--r--irc/riece/Makefile5
-rw-r--r--irc/xchat-gnome/Makefile7
-rw-r--r--irc/xchat/Makefile7
-rw-r--r--irc/xchat1/Makefile7
-rw-r--r--irc/xchat2/Makefile7
-rw-r--r--japanese/eb/Makefile4
-rw-r--r--japanese/eb3/Makefile4
-rw-r--r--japanese/kebook/Makefile3
-rw-r--r--japanese/mutt-devel/Makefile5
-rw-r--r--japanese/mutt/Makefile5
-rw-r--r--japanese/samba/Makefile3
-rw-r--r--japanese/samba/files/patch-al0
-rw-r--r--japanese/samba20/Makefile3
-rw-r--r--japanese/vflib/Makefile4
-rw-r--r--korean/texinfo/Makefile3
-rw-r--r--lang/librep/Makefile3
-rw-r--r--lang/librep2/Makefile3
-rw-r--r--lang/mdk/Makefile5
-rw-r--r--mail/elm/Makefile4
-rw-r--r--mail/fetchmail/Makefile4
-rw-r--r--mail/kbiff/Makefile3
-rw-r--r--mail/mutt-devel/Makefile5
-rw-r--r--mail/mutt/Makefile3
-rw-r--r--mail/mutt14/Makefile3
-rw-r--r--mail/perdition/Makefile3
-rw-r--r--mail/spruce/Makefile8
-rw-r--r--math/oleo/Makefile4
-rw-r--r--misc/afbackup/Makefile4
-rw-r--r--misc/dirtree/Makefile3
-rw-r--r--misc/gnome-mime-data/Makefile4
-rw-r--r--misc/gnomemimedata/Makefile4
-rw-r--r--misc/gnomeutils/Makefile7
-rw-r--r--misc/gnomeutils2/Makefile7
-rw-r--r--misc/kde2-i18n/Makefile3
-rw-r--r--misc/kde3-i18n-af/Makefile3
-rw-r--r--misc/kde3-i18n-ar/Makefile3
-rw-r--r--misc/kde3-i18n-az/Makefile3
-rw-r--r--misc/kde3-i18n-bg/Makefile3
-rw-r--r--misc/kde3-i18n-bs/Makefile3
-rw-r--r--misc/kde3-i18n-ca/Makefile3
-rw-r--r--misc/kde3-i18n-cs/Makefile3
-rw-r--r--misc/kde3-i18n-da/Makefile3
-rw-r--r--misc/kde3-i18n-el/Makefile3
-rw-r--r--misc/kde3-i18n-en_GB/Makefile3
-rw-r--r--misc/kde3-i18n-eo/Makefile3
-rw-r--r--misc/kde3-i18n-es/Makefile3
-rw-r--r--misc/kde3-i18n-et/Makefile3
-rw-r--r--misc/kde3-i18n-fi/Makefile3
-rw-r--r--misc/kde3-i18n-he/Makefile3
-rw-r--r--misc/kde3-i18n-hr/Makefile3
-rw-r--r--misc/kde3-i18n-hu/Makefile3
-rw-r--r--misc/kde3-i18n-id/Makefile3
-rw-r--r--misc/kde3-i18n-is/Makefile3
-rw-r--r--misc/kde3-i18n-it/Makefile3
-rw-r--r--misc/kde3-i18n-lt/Makefile3
-rw-r--r--misc/kde3-i18n-lv/Makefile3
-rw-r--r--misc/kde3-i18n-mt/Makefile3
-rw-r--r--misc/kde3-i18n-nb/Makefile3
-rw-r--r--misc/kde3-i18n-nl/Makefile3
-rw-r--r--misc/kde3-i18n-nn/Makefile3
-rw-r--r--misc/kde3-i18n-pl/Makefile3
-rw-r--r--misc/kde3-i18n-pt/Makefile3
-rw-r--r--misc/kde3-i18n-pt_BR/Makefile3
-rw-r--r--misc/kde3-i18n-ro/Makefile3
-rw-r--r--misc/kde3-i18n-sk/Makefile3
-rw-r--r--misc/kde3-i18n-sl/Makefile3
-rw-r--r--misc/kde3-i18n-sr/Makefile3
-rw-r--r--misc/kde3-i18n-sv/Makefile3
-rw-r--r--misc/kde3-i18n-ta/Makefile3
-rw-r--r--misc/kde3-i18n-th/Makefile3
-rw-r--r--misc/kde3-i18n-tr/Makefile3
-rw-r--r--misc/kde3-i18n-ven/Makefile3
-rw-r--r--misc/kde3-i18n-vi/Makefile3
-rw-r--r--misc/kde3-i18n-xh/Makefile3
-rw-r--r--misc/kde3-i18n-zu/Makefile3
-rw-r--r--misc/kde3-i18n/Makefile3
-rw-r--r--misc/kde4-i18n-is/Makefile3
-rw-r--r--misc/kde4-l10n-bg/Makefile3
-rw-r--r--misc/kde4-l10n-ca/Makefile3
-rw-r--r--misc/kde4-l10n-cs/Makefile3
-rw-r--r--misc/kde4-l10n-da/Makefile3
-rw-r--r--misc/kde4-l10n-el/Makefile3
-rw-r--r--misc/kde4-l10n-en_GB/Makefile3
-rw-r--r--misc/kde4-l10n-eo/Makefile3
-rw-r--r--misc/kde4-l10n-es/Makefile3
-rw-r--r--misc/kde4-l10n-et/Makefile3
-rw-r--r--misc/kde4-l10n-fi/Makefile3
-rw-r--r--misc/kde4-l10n-is/Makefile3
-rw-r--r--misc/kde4-l10n-it/Makefile3
-rw-r--r--misc/kde4-l10n-lt/Makefile3
-rw-r--r--misc/kde4-l10n-lv/Makefile3
-rw-r--r--misc/kde4-l10n-nb/Makefile3
-rw-r--r--misc/kde4-l10n-nl/Makefile3
-rw-r--r--misc/kde4-l10n-nn/Makefile3
-rw-r--r--misc/kde4-l10n-ro/Makefile3
-rw-r--r--misc/kde4-l10n-sk/Makefile3
-rw-r--r--misc/kde4-l10n-sl/Makefile3
-rw-r--r--misc/kde4-l10n-sr/Makefile3
-rw-r--r--misc/kde4-l10n-sv/Makefile3
-rw-r--r--misc/kde4-l10n-ta/Makefile3
-rw-r--r--misc/kde4-l10n-th/Makefile3
-rw-r--r--misc/kde4-l10n-tr/Makefile3
-rw-r--r--misc/kde4-l10n/Makefile3
-rw-r--r--misc/koffice-i18n/Makefile3
-rw-r--r--misc/kwatch/Makefile3
-rw-r--r--misc/mc/Makefile4
-rw-r--r--misc/pinfo/Makefile4
-rw-r--r--misc/sh-utils/Makefile3
-rw-r--r--multimedia/libxine/Makefile4
-rw-r--r--multimedia/ogle-gui/Makefile5
-rw-r--r--multimedia/xine/Makefile4
-rw-r--r--multimedia/xmps-opendivx-plugin/Makefile3
-rw-r--r--multimedia/xmps-win32-plugin/Makefile3
-rw-r--r--net-im/centericq/Makefile6
-rw-r--r--net-im/gnomeicu/Makefile7
-rw-r--r--net-im/gnomeicu2/Makefile7
-rw-r--r--net-mgmt/etherape/Makefile3
-rw-r--r--net-mgmt/ipv6calc/Makefile3
-rw-r--r--net-p2p/dctc-gui/Makefile4
-rw-r--r--net-p2p/fidelio/Makefile3
-rw-r--r--net-p2p/gtkhx/Makefile5
-rw-r--r--net-p2p/lopster/Makefile3
-rw-r--r--net/centericq/Makefile6
-rw-r--r--net/dctc-gui/Makefile4
-rw-r--r--net/etherape/Makefile3
-rw-r--r--net/fidelio/Makefile3
-rw-r--r--net/gabber/Makefile7
-rw-r--r--net/gnomeicu/Makefile7
-rw-r--r--net/gnomeicu/gnomeicu/Makefile7
-rw-r--r--net/gnomeicu2/Makefile7
-rw-r--r--net/gtkhx/Makefile5
-rw-r--r--net/ipv6calc/Makefile3
-rw-r--r--net/jwhois/Makefile3
-rw-r--r--net/kdetelnet/Makefile3
-rw-r--r--net/kmud/Makefile3
-rw-r--r--net/ksamba/Makefile3
-rw-r--r--net/wol/Makefile7
-rw-r--r--news/tin/Makefile4
-rw-r--r--news/yencode/Makefile7
-rw-r--r--palm/coldsync/Makefile4
-rw-r--r--palm/jpilot/Makefile3
-rw-r--r--polish/kde3-i18n/Makefile3
-rw-r--r--polish/kde4-l10n/Makefile3
-rw-r--r--portuguese/kde3-i18n-pt_BR/Makefile3
-rw-r--r--portuguese/kde3-i18n/Makefile3
-rw-r--r--portuguese/kde4-l10n-pt_BR/Makefile3
-rw-r--r--portuguese/kde4-l10n/Makefile3
-rw-r--r--print/cjk-lyx/Makefile3
-rw-r--r--print/ktexshell/Makefile3
-rw-r--r--print/lyx-devel/Makefile3
-rw-r--r--print/lyx/Makefile3
-rw-r--r--print/lyx14/Makefile3
-rw-r--r--print/lyx15/Makefile3
-rw-r--r--print/lyx16/Makefile3
-rw-r--r--print/rlpr/Makefile3
-rw-r--r--russian/calligra-l10n/Makefile3
-rw-r--r--russian/kde2-i18n/Makefile3
-rw-r--r--russian/kde3-i18n/Makefile3
-rw-r--r--russian/kde4-l10n/Makefile3
-rw-r--r--russian/koffice-i18n/Makefile3
-rw-r--r--russian/koffice-kde4-l10n/Makefile3
-rw-r--r--security/fwlogwatch/Makefile3
-rw-r--r--security/gnupg/Makefile7
-rw-r--r--security/gnupg1/Makefile7
-rw-r--r--security/kssh/Makefile4
-rw-r--r--security/mcrypt/Makefile3
-rw-r--r--sysutils/apcupsd/Makefile3
-rw-r--r--sysutils/fileutils/Makefile3
-rw-r--r--sysutils/gcombust/Makefile3
-rw-r--r--sysutils/slmon/Makefile9
-rw-r--r--textproc/modlogan/Makefile3
-rw-r--r--textproc/rotix/Makefile3
-rw-r--r--textproc/textutils/Makefile3
-rw-r--r--vietnamese/kde3-i18n/Makefile3
-rw-r--r--www/amyc/Makefile4
-rw-r--r--www/cadaver/Makefile4
-rw-r--r--www/dillo-i18n/Makefile3
-rw-r--r--www/dillo/Makefile3
-rw-r--r--www/dillo2/Makefile3
-rw-r--r--www/galeon/Makefile8
-rw-r--r--www/galeon2/Makefile8
-rw-r--r--www/horde-devel/Makefile6
-rw-r--r--www/horde2/Makefile6
-rw-r--r--www/kdewebdev/Makefile3
-rw-r--r--www/kdewebdev4/Makefile3
-rw-r--r--www/lynx-current/Makefile3
-rw-r--r--www/mod_php3/scripts/configure.php2
-rw-r--r--www/mod_php4/scripts/configure.php2
-rw-r--r--www/mod_php5/scripts/configure.php2
-rw-r--r--www/quanta/Makefile3
-rw-r--r--www/retawq/Makefile3
-rw-r--r--www/sitecopy/Makefile4
-rw-r--r--x11-fm/nautilus/Makefile8
-rw-r--r--x11-fm/nautilus2/Makefile8
-rw-r--r--x11-toolkits/gtk12/Makefile4
-rw-r--r--x11-toolkits/pango/Makefile3
-rw-r--r--x11-wm/e16/Makefile4
-rw-r--r--x11-wm/enlightenment-devel/Makefile4
-rw-r--r--x11-wm/enlightenment/Makefile4
-rw-r--r--x11-wm/icewm/Makefile5
-rw-r--r--x11-wm/kappdock/Makefile3
-rw-r--r--x11-wm/kwix/Makefile3
-rw-r--r--x11-wm/ude/Makefile3
-rw-r--r--x11-wm/windowmaker/Makefile9
-rw-r--r--x11-wm/windowmaker/files/patch-po::Makefile.in18
-rw-r--r--x11/gnome-applets/Makefile7
-rw-r--r--x11/gnomeapplets/Makefile7
-rw-r--r--x11/gnomeapplets2/Makefile7
-rw-r--r--x11/gnomecore/Makefile8
-rw-r--r--x11/kde4-baseapps/Makefile4
-rw-r--r--x11/kde4-runtime/Makefile4
-rw-r--r--x11/kde4-workspace/Makefile4
-rw-r--r--x11/kdebase11/Makefile4
-rw-r--r--x11/kdebase2/Makefile4
-rw-r--r--x11/kdebase3/Makefile4
-rw-r--r--x11/kdebase4-runtime/Makefile4
-rw-r--r--x11/kdebase4-workspace/Makefile4
-rw-r--r--x11/kdebase4/Makefile4
335 files changed, 753 insertions, 673 deletions
diff --git a/arabic/kde3-i18n/Makefile b/arabic/kde3-i18n/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/arabic/kde3-i18n/Makefile
+++ b/arabic/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/arabic/kde4-l10n/Makefile b/arabic/kde4-l10n/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/arabic/kde4-l10n/Makefile
+++ b/arabic/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index bc4ca7c785ff..b0dbbb9d6bbe 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tar
PORTVERSION= 1.13.25
+PORTREVISION= 1
CATEGORIES= archivers sysutils
MASTER_SITES= ftp://alpha.gnu.org/gnu/tar/ \
ftp://ftp.sunsite.org.uk/Mirrors/alpha.gnu.org/gnu/tar/ \
@@ -15,7 +16,7 @@ PKGNAMEPREFIX= g
MAINTAINER= naddy@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index d61d20ac9cb9..a2800266f02f 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -7,14 +7,15 @@
PORTNAME= rpm
PORTVERSION= 3.0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \
ftp://ftp.mirror.ac.uk/sites/ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
+BUILD_DEPENDS= msgfmt-old:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
popt.0:${PORTSDIR}/devel/popt
.if !exists(/usr/bin/bzip2)
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
@@ -25,7 +26,9 @@ USE_AUTOMAKE_VER=14
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-glob
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+ LIBS="-L${LOCALBASE}/lib -lintl -liconv" \
+ MSGFMT="${LOCALBASE}/bin/msgfmt-old" \
+ XGETTEXT="${LOCALBASE}/bin/xgettext-old"
INSTALLS_SHLIB= yes
MAN1= gendiff.1
diff --git a/astro/fooseti/Makefile b/astro/fooseti/Makefile
index b535342abe7f..67874c37869a 100644
--- a/astro/fooseti/Makefile
+++ b/astro/fooseti/Makefile
@@ -7,13 +7,13 @@
PORTNAME= fooseti
PORTVERSION= 0.6.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= astro
MASTER_SITES= http://www-personal.engin.umich.edu/~agorski/fooseti/
MAINTAINER= petef@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
USE_GTK= yes
diff --git a/astro/seti_applet/Makefile b/astro/seti_applet/Makefile
index 7782d4b56058..abe43fd4da0f 100644
--- a/astro/seti_applet/Makefile
+++ b/astro/seti_applet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= seti_applet
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= astro gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
@@ -17,7 +18,7 @@ MAINTAINER= cyrille.lefevre@laposte.net
#
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
RUN_DEPENDS= ${LOCALBASE}/sbin/setiathome:${PORTSDIR}/astro/setiathome
USE_X_PREFIX= yes
diff --git a/astro/spacechart/Makefile b/astro/spacechart/Makefile
index 1be7dda041e5..57474af3d0c9 100644
--- a/astro/spacechart/Makefile
+++ b/astro/spacechart/Makefile
@@ -7,13 +7,14 @@
PORTNAME= spacechart
PORTVERSION= 0.9.4
+PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 089f416792c0..cd203cca8062 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aumix
PORTVERSION= 2.7
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://jpj.net/~trevor/aumix/ \
@@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= cpiazza@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
WANT_GTK= yes
GNU_CONFIGURE= yes
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index f044a4306769..1ff3d4cda8bf 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= denemo
PORTVERSION= 0.5.8
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= trevor@FreeBSD.org
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- intl.1:${PORTSDIR}/devel/gettext-old \
+ intl.2:${PORTSDIR}/devel/gettext \
xml.5:${PORTSDIR}/textproc/libxml
GNU_CONFIGURE= yes
diff --git a/audio/kmikmod/Makefile b/audio/kmikmod/Makefile
index deeb94222be1..8bbde88c0717 100644
--- a/audio/kmikmod/Makefile
+++ b/audio/kmikmod/Makefile
@@ -7,13 +7,14 @@
PORTNAME= kmikmod
PORTVERSION= 2.04
+PORTREVISION= 1
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= tom
MAINTAINER= tom@FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \
kdeui.3:${PORTSDIR}/x11/kdelibs11
diff --git a/audio/koog/Makefile b/audio/koog/Makefile
index f328972b2084..e02e2c75b99a 100644
--- a/audio/koog/Makefile
+++ b/audio/koog/Makefile
@@ -7,13 +7,14 @@
PORTNAME= koog
PORTVERSION= 0.3
+PORTREVISION= 1
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jeremy@external.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER= 2
USE_XPM= yes
diff --git a/audio/lopster/Makefile b/audio/lopster/Makefile
index 57d6231866cd..93d15b1ab5c5 100644
--- a/audio/lopster/Makefile
+++ b/audio/lopster/Makefile
@@ -7,13 +7,14 @@
PORTNAME= lopster
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= roman@xpert.com
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/audio/mad/Makefile b/audio/mad/Makefile
index 631068a2c82b..502832f2cd21 100644
--- a/audio/mad/Makefile
+++ b/audio/mad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mad
PORTVERSION= 0.14.2b
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.mars.org/pub/mpeg/
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= mad
MAINTAINER= jason@mastaler.com
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
WANT_ESOUND= yes
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 76f4ee6ac422..947d98834048 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -7,12 +7,13 @@
PORTNAME= normalize
PORTVERSION= 0.5.2
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.cs.columbia.edu/~cvaill/normalize/
MAINTAINER= greid@ukug.uk.freebsd.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
diff --git a/audio/opmixer/Makefile b/audio/opmixer/Makefile
index cbcc77ba21aa..4f21443e5d60 100644
--- a/audio/opmixer/Makefile
+++ b/audio/opmixer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= opmixer
PORTVERSION= 0.70
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= optronic
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= optronic
MAINTAINER= trevor@FreeBSD.org
LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
DOCDIR= share/doc/${PORTNAME}
USE_BZIP2= yes
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 09c0771aac25..9567e96127ed 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= snd
PORTVERSION= 5.5
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ccrma-ftp.stanford.edu/pub/Lisp/
@@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= trevor@FreeBSD.org
LIB_DEPENDS= gsl.0:${PORTSDIR}/math/gsl \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
.if defined(WITHOUT_ESD)
RUN_DEPENDS= esd:${PORTSDIR}/audio/esound
diff --git a/audio/soribada/Makefile b/audio/soribada/Makefile
index b2e985303006..2ab11ee389d5 100644
--- a/audio/soribada/Makefile
+++ b/audio/soribada/Makefile
@@ -7,12 +7,13 @@
PORTNAME= soribada
PORTVERSION= 0.7
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://soribada.kldp.org/depot/
MAINTAINER= cjh@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_GTK= yes
diff --git a/audio/umix/Makefile b/audio/umix/Makefile
index 50fccfd61c33..bba49ab6bb6f 100644
--- a/audio/umix/Makefile
+++ b/audio/umix/Makefile
@@ -6,13 +6,14 @@
#
PORTNAME= umix
+PORTREVISION= 1
PORTVERSION= 0.5
CATEGORIES= audio
MASTER_SITES= http://www.ionstream.fi/sakari/umix/files/
MAINTAINER= greid@ukug.uk.freebsd.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
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 055c599d2ede..d3afbb2c16fc 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xcin
PORTVERSION= 2.5.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= chinese x11
MASTER_SITES= ftp://xcin.linux.org.tw/pub/xcin/xcin/ \
http://chewing.oio.cx/download/ \
@@ -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-old \
+ intl.2:${PORTSDIR}/devel/gettext \
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 8b334a4b4f77..82bd1e746fe7 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -7,14 +7,14 @@
PORTNAME= zhcon
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= statue@freebsd.sinica.edu.tw
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-included-gettext=${LOCALBASE}
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 52ca5476a699..5c112a18d715 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnokii
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= comms
MASTER_SITES= ftp://ftp.gnokii.org/pub/gnokii/ \
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gnokii.org/pub/gnokii/ \
MAINTAINER= anders@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
USE_AUTOCONF= yes
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index a3f590e18956..3fc960fafd28 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -7,19 +7,23 @@
PORTNAME= recode
PORTVERSION= 3.6
+PORTREVISION= 1
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= recode
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt-old:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
- LDFLAGS=-L${LOCALBASE}/lib \
- LIBS=-lintl
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ LIBS="-lintl" \
+ MSGFMT="${LOCALBASE}/bin/msgfmt-old" \
+ XGETTEXT="${LOCALBASE}/bin/xgettext-old"
MAN1= recode.1
diff --git a/databases/mysql-gui/Makefile b/databases/mysql-gui/Makefile
index a9928f384d70..8ba172babbff 100644
--- a/databases/mysql-gui/Makefile
+++ b/databases/mysql-gui/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mysql-gui
PORTVERSION= 1.7.5
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= mirrors/mysql/Downloads/mysqlgui
@@ -15,7 +16,7 @@ DISTNAME= ${PORTNAME:S/-//}-${PORTVERSION}
MAINTAINER= cyrille.lefevre@laposte.net
LIB_DEPENDS= sqlplus.1:${PORTSDIR}/databases/mysql++ \
- intl.1:${PORTSDIR}/devel/gettext-old \
+ intl.2:${PORTSDIR}/devel/gettext \
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 8206b9684219..fdc96ef3553a 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -7,13 +7,14 @@
PORTNAME= namazu
PORTVERSION= 2.0.10
+PORTREVISION= 1
CATEGORIES+= databases www textproc
MASTER_SITES= http://www.namazu.org/stable/
PKGNAMESUFFIX= 2
MAINTAINER= knu@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
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 cc889a7c7979..f4b667917dc7 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -7,6 +7,7 @@
PORTNAME= DBD-Sybase
PORTVERSION= 0.91
+PORTREVISION= 1
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
@@ -16,7 +17,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-old
+ intl.2:${PORTSDIR}/devel/gettext
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index c1825160da27..e525414d3036 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
@@ -58,7 +59,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index c1825160da27..e525414d3036 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
@@ -58,7 +59,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index c1825160da27..e525414d3036 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
@@ -58,7 +59,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index c1825160da27..e525414d3036 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
@@ -58,7 +59,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile
index c1825160da27..e525414d3036 100644
--- a/databases/postgresql73/Makefile
+++ b/databases/postgresql73/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
@@ -58,7 +59,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index c1825160da27..e525414d3036 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
@@ -58,7 +59,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index c1825160da27..e525414d3036 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
@@ -58,7 +59,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index c1825160da27..e525414d3036 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
@@ -58,7 +59,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index c1825160da27..e525414d3036 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
@@ -58,7 +59,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index c1825160da27..e525414d3036 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
@@ -58,7 +59,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index c1825160da27..e525414d3036 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
@@ -58,7 +59,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index c1825160da27..e525414d3036 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
@@ -58,7 +59,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index c1825160da27..e525414d3036 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
@@ -58,7 +59,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index c1825160da27..e525414d3036 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.2.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
ftp://ftp.se.postgresql.org/pub/database/relational/postgresql/%SUBDIR%/ \
@@ -58,7 +59,7 @@ LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
CONFIGURE_ARGS+=--enable-nls
CONFIGURE_ENV+= "LIBS=-lintl"
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB+= GETTEXT=""
.else
PLIST_SUB+= GETTEXT="@comment "
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 15d274ea33e8..3cb85aabdbc5 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -6,6 +6,7 @@
PORTNAME= sqsh
PORTVERSION= 1.7
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://www.voicenet.com/~gray/
EXTRACT_SUFX= -src.tar.gz
@@ -13,7 +14,7 @@ EXTRACT_SUFX= -src.tar.gz
MAINTAINER= midom@dammit.lt
LIB_DEPENDS= tds.0:${PORTSDIR}/databases/freetds \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash1
GNU_CONFIGURE= yes
diff --git a/deskutils/gcal/Makefile b/deskutils/gcal/Makefile
index c83f611eb396..59864156983a 100644
--- a/deskutils/gcal/Makefile
+++ b/deskutils/gcal/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gcal
PORTVERSION= 3.01
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gcal
@@ -16,7 +17,7 @@ MAINTAINER= cyrille.lefevre@laposte.net
# Global variables
#
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index b20f47247062..85ef39c4877a 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomeutils
PORTVERSION= 1.4.1.2
+PORTREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-utils
@@ -14,7 +15,7 @@ DISTNAME= gnome-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
@@ -23,9 +24,7 @@ USE_GNOME= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-messages=/var/log/messages
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
MAN1= gcalc.1 gcharmap.1 gcolorsel.1 gdialog.1 gdict.1 gdiskfree.1 \
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index b20f47247062..85ef39c4877a 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomeutils
PORTVERSION= 1.4.1.2
+PORTREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-utils
@@ -14,7 +15,7 @@ DISTNAME= gnome-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
@@ -23,9 +24,7 @@ USE_GNOME= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-messages=/var/log/messages
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
MAN1= gcalc.1 gcharmap.1 gcolorsel.1 gdialog.1 gdict.1 gdiskfree.1 \
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 6b7d1b63f091..780fc6ee3950 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ORBit
PORTVERSION= 0.5.15
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/ORBit
@@ -15,7 +16,7 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
USE_BZIP2= yes
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index deebaf93d04c..579f3a74f9e1 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bonobo
PORTVERSION= 1.0.20
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/bonobo
@@ -14,7 +15,7 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gnomeprint.16:${PORTSDIR}/print/gnomeprint
USE_BZIP2= yes
@@ -25,9 +26,7 @@ USE_GNOMECTRL= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
pre-patch:
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 5e2c04b40c6d..5bce986d66df 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bugbuddy
PORTVERSION= 2.0.8
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/bug-buddy
@@ -14,16 +15,14 @@ DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= yes
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index 5e2c04b40c6d..5bce986d66df 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bugbuddy
PORTVERSION= 2.0.8
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/bug-buddy
@@ -14,16 +15,14 @@ DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= yes
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index 5e2c04b40c6d..5bce986d66df 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bugbuddy
PORTVERSION= 2.0.8
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/bug-buddy
@@ -14,16 +15,14 @@ DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= yes
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile
index 4362b431d337..539acc49e7ee 100644
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia/Makefile
@@ -6,6 +6,7 @@
PORTNAME= cervisia
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,7 +20,7 @@ QT_VER= ""
USE_KDELIBS_VER=2
QT_VER= 2
.endif
-LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index 163d6ccb13b1..3917645e4a20 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -7,12 +7,13 @@
PORTNAME= cook
PORTVERSION= 2.19
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.canb.auug.org.au/~millerp/cook/
MAINTAINER= jasone@freebsd.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
diff --git a/devel/gettext-old/Makefile b/devel/gettext-old/Makefile
index c9c2776b1eef..7d3ec04418d8 100644
--- a/devel/gettext-old/Makefile
+++ b/devel/gettext-old/Makefile
@@ -7,26 +7,26 @@
PORTNAME= gettext
PORTVERSION= 0.10.35
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gettext
-MAINTAINER= reg@FreeBSD.org
+MAINTAINER= portmgr@FreeBSD.org
-USE_LIBTOOL= yes
-INSTALLS_SHLIB= yes
+#BROKEN= "De-orbit burn sequence initiated"
-PLIST_SUB= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
+USE_LIBTOOL= yes
+CONFIGURE_ARGS= --disable-shared
pre-configure:
${RM} ${WRKSRC}/doc/gettext.info*
-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
+do-install:
+ ${INSTALL_SCRIPT} ${WRKSRC}/misc/gettextize \
+ ${PREFIX}/bin/gettextize-old
+.for file in gettext msgcmp msgcomm msgfmt msgmerge msgunfmt xgettext
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/${file} ${PREFIX}/bin/${file}-old
+.endfor
.include <bsd.port.mk>
diff --git a/devel/gettext-old/pkg-plist b/devel/gettext-old/pkg-plist
index 9e23936a2dbd..1b8771a44cb6 100644
--- a/devel/gettext-old/pkg-plist
+++ b/devel/gettext-old/pkg-plist
@@ -1,71 +1,8 @@
-bin/gettext
-bin/gettextize
-bin/msgcmp
-bin/msgcomm
-bin/msgfmt
-bin/msgmerge
-bin/msgunfmt
-bin/xgettext
-@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
-share/aclocal/gettext.m4
-share/aclocal/lcmessage.m4
-share/aclocal/progtest.m4
-share/gettext/ABOUT-NLS
-share/gettext/po/Makefile.in.in
-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/dcgettext.c
-share/gettext/intl/dgettext.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/linux-msg.sed
-share/gettext/intl/loadinfo.h
-share/gettext/intl/loadmsgcat.c
-share/gettext/intl/localealias.c
-share/gettext/intl/po2tbl.sed.in
-share/gettext/intl/xopen-msg.sed
-share/gettext/intl/textdomain.c
-share/locale/da/LC_MESSAGES/gettext.mo
-share/locale/de/LC_MESSAGES/gettext.mo
-share/locale/es/LC_MESSAGES/gettext.mo
-share/locale/fr/LC_MESSAGES/gettext.mo
-share/locale/ko/LC_MESSAGES/gettext.mo
-share/locale/nl/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/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
-@dirrm share/gettext/po
-@dirrm share/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
+bin/gettext-old
+bin/gettextize-old
+bin/msgcmp-old
+bin/msgcomm-old
+bin/msgfmt-old
+bin/msgmerge-old
+bin/msgunfmt-old
+bin/xgettext-old
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 47be45e075ee..e1dc6ead959d 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -7,11 +7,12 @@
PORTNAME= gettext
PORTVERSION= 0.11.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gettext
-MAINTAINER= sobomax@FreeBSD.org
+MAINTAINER= portmgr@FreeBSD.org
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
@@ -34,31 +35,11 @@ MAN3= bind_textdomain_codeset.3 bindtextdomain.3 dcgettext.3 \
pre-configure:
${RM} ${WRKSRC}/doc/gettext.info*
-.if !defined(WANT_FULL_GETTEXT)
-BINFILES= gettext msgattrib msgcat msgcmp msgcomm msgconv msgen \
- msgexec msgfilter msgfmt msggrep msginit msgmerge \
- msgunfmt msguniq ngettext xgettext
-PLIST= ${WRKDIR}/PLIST
-CONFIGURE_ARGS= --disable-shared
-.undef MAN1
-.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/glib20/Makefile b/devel/glib20/Makefile
index d409b380b4f0..793352db569c 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -7,6 +7,7 @@
PORTNAME= glib
PORTVERSION= 2.0.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta3,} \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -19,8 +20,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
- intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
NO_LATEST_LINK= "Unstable, development version."
@@ -29,7 +29,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
-CONFIGURE_ARGS= --enable-static
+CONFIGURE_ARGS= --enable-static --with-libiconv=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index f744548b3db0..3839cb40d85a 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmake
PORTVERSION= 3.79.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= make
@@ -14,7 +15,7 @@ DISTNAME= make-${PORTVERSION}
MAINTAINER= portmgr@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g
diff --git a/devel/gmake381/Makefile b/devel/gmake381/Makefile
index f744548b3db0..3839cb40d85a 100644
--- a/devel/gmake381/Makefile
+++ b/devel/gmake381/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmake
PORTVERSION= 3.79.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= make
@@ -14,7 +15,7 @@ DISTNAME= make-${PORTVERSION}
MAINTAINER= portmgr@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 20314dc20a73..53c51f135098 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomevfs2
PORTVERSION= 1.9.11
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta3
@@ -15,7 +16,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext \
+BUILD_DEPENDS= msgfmt:${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
@@ -29,8 +30,6 @@ INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new \
BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index d0ac3c965b9e..4f3ece4b8c7e 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomevfs
PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-vfs
@@ -16,7 +16,7 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext \
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext \
${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf \
iconv.3:${PORTSDIR}/converters/libiconv
@@ -34,8 +34,6 @@ INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new \
BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
pre-patch:
diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile
index d0ac3c965b9e..4f3ece4b8c7e 100644
--- a/devel/gnomevfs/Makefile
+++ b/devel/gnomevfs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomevfs
PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-vfs
@@ -16,7 +16,7 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext \
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext \
${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf \
iconv.3:${PORTSDIR}/converters/libiconv
@@ -34,8 +34,6 @@ INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new \
BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
pre-patch:
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 20314dc20a73..53c51f135098 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomevfs2
PORTVERSION= 1.9.11
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta3
@@ -15,7 +16,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext \
+BUILD_DEPENDS= msgfmt:${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
@@ -29,8 +30,6 @@ INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new \
BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 8a57169c1174..d0a90f1b83a0 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtranslator
PORTVERSION= 0.41
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= http://www.gtranslator.org/download/releases/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE}
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_GMAKE= yes
@@ -22,9 +23,7 @@ USE_GNOME= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --disable-debug
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv -lgnuregex" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv -lgnuregex"
MAN1= gtranslator.1 pozilla.sh.1
MANCOMPRESSED= yes
diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile
index 21c1bbf7aee5..7ba4c248584c 100644
--- a/devel/ixlib/Makefile
+++ b/devel/ixlib/Makefile
@@ -8,13 +8,14 @@
PORTNAME= ixlib
PORTVERSION= 0.96.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_NEWGCC= yes
USE_GMAKE= yes
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 8adaed121227..007dd8869438 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kdevelop
PORTVERSION= 2.0.2
+PORTREVISION= 1
CATEGORIES?= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/2.2.2/src
@@ -14,7 +15,7 @@ DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old \
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext \
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 8f5c797c1e35..83bae18d19c9 100644
--- a/devel/ktranslator/Makefile
+++ b/devel/ktranslator/Makefile
@@ -7,13 +7,14 @@
PORTNAME= ktranslator
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= Attic/old/1.1.2/apps/utils
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
USE_KDELIBS_VER=1
diff --git a/devel/motor/Makefile b/devel/motor/Makefile
index e30dca3d77a2..c7a578824e72 100644
--- a/devel/motor/Makefile
+++ b/devel/motor/Makefile
@@ -7,6 +7,7 @@
PORTNAME= motor
PORTVERSION= 3.2.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://konst.org.ua/download/ \
${MASTER_SITE_LOCAL}
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= sobomax
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
USE_GMAKE= yes
diff --git a/devel/objprelink/Makefile b/devel/objprelink/Makefile
index b9ac40479d44..3c7e3f415036 100644
--- a/devel/objprelink/Makefile
+++ b/devel/objprelink/Makefile
@@ -7,7 +7,7 @@
PORTNAME= objprelink
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel kde
MASTER_SITES= http://leon.bottou.com/objprelink/ \
${MASTER_SITE_SOURCEWARE}
@@ -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-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
ONLY_FOR_ARCHS= i386
BINUTILS_VER= 2.11.2
@@ -52,7 +52,7 @@ do-build:
${WRKSRC}/binutils/libiberty/libiberty.a \
-I${WRKSRC}/binutils/include -I${WRKSRC}/binutils/bfd \
-I${WRKSRC}/binutils/libiberty \
- -L${LOCALBASE}/lib -lintl
+ -L${LOCALBASE}/lib -lintl -liconv
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/objprelink ${PREFIX}/bin
diff --git a/devel/objprelink/files/patch-binutils::libiberty::Makefile.in b/devel/objprelink/files/patch-binutils::libiberty::Makefile.in
new file mode 100644
index 000000000000..09c73e1b13d7
--- /dev/null
+++ b/devel/objprelink/files/patch-binutils::libiberty::Makefile.in
@@ -0,0 +1,7 @@
+--- binutils/libiberty/Makefile.in.orig Sat Dec 9 10:10:41 2000
++++ binutils/libiberty/Makefile.in Wed Apr 3 19:01:38 2002
+@@ -95,3 +95,3 @@
+ # Subdirectories to recurse into. We need to override this during cleaning
+-SUBDIRS = testsuite
++SUBDIRS = # testsuite
+
diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index d9ccf3dacbe8..6be66b2cf095 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gettext
PORTVERSION= 1.01
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Locale
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
PERL_CONFIGURE= yes
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 1561ff140078..5531c1c7fb30 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -7,13 +7,14 @@
PORTNAME= popt
PORTVERSION= 1.5.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \
ftp://ftp.mirror.ac.uk/sites/ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/
MAINTAINER= ycheng@sinica.edu.tw
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
WRKSRC= ${WRKDIR}/${PORTNAME}-1.5
diff --git a/devel/ruby-intl/Makefile b/devel/ruby-intl/Makefile
index 5dd4d37c1fb6..cad2954c77f2 100644
--- a/devel/ruby-intl/Makefile
+++ b/devel/ruby-intl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= intl
PORTVERSION= 0.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel ruby
MASTER_SITES= http://www.page.sannet.ne.jp/hirata-naoto/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
diff --git a/editors/calligra-l10n/Makefile b/editors/calligra-l10n/Makefile
index 7d24616e6f21..f9912b166f88 100644
--- a/editors/calligra-l10n/Makefile
+++ b/editors/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= koffice-i18n
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= sahiro@crest.ocn.ne.jp
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
RUN_DEPENDS= koshell:${PORTSDIR}/editors/koffice
USE_KDELIBS_VER=2
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index c3c7f1b52f68..9501be3025f3 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cooledit
PORTVERSION= 3.17.5
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www.netins.net/showcase/Comput-IT/cooledit/src/
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= apps/editors/X/cooledit
MAINTAINER= brett@peloton.runet.edu
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
vga.1:${PORTSDIR}/graphics/svgalib
USE_LIBTOOL= yes
diff --git a/editors/koffice-i18n/Makefile b/editors/koffice-i18n/Makefile
index 7d24616e6f21..f9912b166f88 100644
--- a/editors/koffice-i18n/Makefile
+++ b/editors/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= koffice-i18n
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= sahiro@crest.ocn.ne.jp
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
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 7d24616e6f21..f9912b166f88 100644
--- a/editors/koffice-kde4-l10n/Makefile
+++ b/editors/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= koffice-i18n
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= sahiro@crest.ocn.ne.jp
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
RUN_DEPENDS= koshell:${PORTSDIR}/editors/koffice
USE_KDELIBS_VER=2
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index 48a2ee65c9db..65d67bddda49 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lpe
PORTVERSION= 1.2.6
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.twu.net/users/cdsmith/lpe/
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ryan@sasknow.com
LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
USE_LIBTOOL= yes
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 1cdcdeb5e115..e7992ac69497 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nano
PORTVERSION= 1.0.9
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU} \
http://www.nano-editor.org/dist/v1.0/
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= naddy@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 815cff0b490b..00414a2c336b 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -8,6 +8,7 @@
PORTNAME= poedit
PORTVERSION= 1.1.8
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,10 +18,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel \
- db3:${PORTSDIR}/databases/db3 \
- iconv:${PORTSDIR}/converters/libiconv
+ db3:${PORTSDIR}/databases/db3
PATCH_DIST_ARGS= -d ${PATCH_WRKSRC} -E ${PATCH_DIST_STRIP} -p1
USE_X_PREFIX= yes
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 0cfea5ad8aae..44b8a01d1124 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xemacs-devel-mule
PORTVERSION= ${XEMACS_VER}
+PORTREVISION= 1
CATEGORIES+= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL}
@@ -29,7 +30,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-old \
+ intl.2:${PORTSDIR}/devel/gettext \
${LIB_INPUT_METHOD}
XEMACS_MAJOR_VER?= 21
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index bfa59d137e39..e844f1a4f402 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-old \
+ intl.2:${PORTSDIR}/devel/gettext \
${LIB_INPUT_METHOD}
CONFIGURE_ARGS?=--with-x11 \
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index ed3de500f7b1..d4b351cce928 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yudit
PORTVERSION= 2.5.4
+PORTREVISION= 1
CATEGORIES= editors converters print
MASTER_SITES= http://yudit.org/download/ \
${MASTER_SITE_SUNSITE}
@@ -15,7 +16,7 @@ DISTNAME= ${PORTNAME}-2.5.4
MAINTAINER= jkoshy@freebsd.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
USE_XLIB= YES
CONFIGURE_ENV= LC_ALL=
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index b81150adb4c4..38da6bbdec85 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xsystem35
PORTVERSION= 1.4.2
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://www.aist-nara.ac.jp/~masaki-c/private/unitbase/xsys35/down/
@@ -37,7 +38,7 @@ PATCHES= pastel.diff
.include <bsd.port.pre.mk>
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
FREETYPE_CONFIG?= ${LOCALBASE}/bin/freetype-config
diff --git a/ftp/axel/Makefile b/ftp/axel/Makefile
index f963e8e1f200..7900a412d870 100644
--- a/ftp/axel/Makefile
+++ b/ftp/axel/Makefile
@@ -8,12 +8,13 @@
PORTNAME= axel
PORTVERSION= 1.0a
+PORTREVISION= 1
CATEGORIES= ftp
MASTER_SITES= http://www.lintux.cx/downloads/
MAINTAINER= lintux@debian.org
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
HAS_CONFIGURE= yes
diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index 0d3ef1c8292a..d5097eee015a 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lftp
PORTVERSION= 2.5.0a
+PORTREVISION= 1
CATEGORIES= ftp ipv6
MASTER_SITES= ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/ \
ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/ \
@@ -21,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-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_BZIP2= yes
USE_OPENSSL= yes
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index fd0844a8eb16..3e4287edc752 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pavuk
PORTVERSION= 0.9.28
+PORTREVISION= 1
CATEGORIES= ftp www
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www.idata.sk/~ondrej/sw/
@@ -16,7 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
WANT_GTK= yes
USE_OPENSSL= yes
diff --git a/ftp/wget+ipv6/Makefile b/ftp/wget+ipv6/Makefile
index 8575717bee0f..6a9f4c72c4d6 100644
--- a/ftp/wget+ipv6/Makefile
+++ b/ftp/wget+ipv6/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wget
PORTVERSION= 1.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp www ipv6
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/wget/pub/unix/util/wget/ \
@@ -24,8 +24,8 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= sf@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
-BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS= msgfmt-old:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
@@ -33,8 +33,10 @@ CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE}
.endif
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \
- LIBS=-L${LOCALBASE}/lib
+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib" \
+ MSGFMT="${LOCALBASE}/bin/msgfmt-old" \
+ XGETTEXT="${LOCALBASE}/bin/xgettext-old"
MAN1= wget.1
diff --git a/ftp/wget-devel/Makefile b/ftp/wget-devel/Makefile
index 8c2fb661e6ce..f05fc9092690 100644
--- a/ftp/wget-devel/Makefile
+++ b/ftp/wget-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wget
PORTVERSION= 1.8.1
+PORTREVISION= 1
CATEGORIES= ftp www
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/wget/pub/unix/util/wget/ \
@@ -21,7 +22,7 @@ EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= sf@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 8c2fb661e6ce..f05fc9092690 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wget
PORTVERSION= 1.8.1
+PORTREVISION= 1
CATEGORIES= ftp www
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/wget/pub/unix/util/wget/ \
@@ -21,7 +22,7 @@ EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= sf@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index 8f81774d33dc..6508b155a9ac 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -7,6 +7,7 @@
PORTNAME= eboard
PORTVERSION= 0.4.2
+PORTREVISION= 1
EXTRASVERSION= 1pl2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -15,7 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} eboard-extras-${EXTRASVERSION}.tar.gz
MAINTAINER= petef@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
USE_GTK= yes
diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile
index f6589334f306..954f255271f2 100644
--- a/games/freeciv-gtk2/Makefile
+++ b/games/freeciv-gtk2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freeciv
PORTVERSION= 1.12.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ftp://ftp.freeciv.org/pub/freeciv/stable/ \
ftp://ftp.netc.pt/pub/freeciv/stable/ \
@@ -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-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_XPM= yes
USE_BZIP2= yes
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index f6589334f306..954f255271f2 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freeciv
PORTVERSION= 1.12.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ftp://ftp.freeciv.org/pub/freeciv/stable/ \
ftp://ftp.netc.pt/pub/freeciv/stable/ \
@@ -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-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_XPM= yes
USE_BZIP2= yes
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index d04925771622..8870f4a6b789 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomegames
PORTVERSION= 1.4.0.3
+PORTREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-games
@@ -14,7 +15,7 @@ DISTNAME= gnome-games-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
USE_BZIP2= yes
@@ -25,9 +26,7 @@ GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
`gdk-pixbuf-config --cflags`" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile
index d04925771622..8870f4a6b789 100644
--- a/games/gnomegames/Makefile
+++ b/games/gnomegames/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomegames
PORTVERSION= 1.4.0.3
+PORTREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-games
@@ -14,7 +15,7 @@ DISTNAME= gnome-games-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
USE_BZIP2= yes
@@ -25,9 +26,7 @@ GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
`gdk-pixbuf-config --cflags`" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index d04925771622..8870f4a6b789 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomegames
PORTVERSION= 1.4.0.3
+PORTREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-games
@@ -14,7 +15,7 @@ DISTNAME= gnome-games-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
USE_BZIP2= yes
@@ -25,9 +26,7 @@ GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
`gdk-pixbuf-config --cflags`" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/games/gtypist/Makefile b/games/gtypist/Makefile
index 8c8215c524b5..073ab2910ede 100644
--- a/games/gtypist/Makefile
+++ b/games/gtypist/Makefile
@@ -6,13 +6,14 @@
PORTNAME= gtypist
PORTVERSION= 2.5
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= naddy@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/kbubbles/Makefile b/games/kbubbles/Makefile
index 54498a520301..6b841831ebe3 100644
--- a/games/kbubbles/Makefile
+++ b/games/kbubbles/Makefile
@@ -7,12 +7,13 @@
PORTNAME= kbubbles
PORTVERSION= 0.8.6
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://ftp.kde.com/Games/Other/KBubbles/
MAINTAINER= znerd@FreeBSD.org
-BUILD_DEPENDS= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= QwSpriteField.7:${PORTSDIR}/converters/kdesupport11
USE_KDELIBS_VER=1
diff --git a/games/krogue/Makefile b/games/krogue/Makefile
index 8e78471f471a..58fd7c9fc792 100644
--- a/games/krogue/Makefile
+++ b/games/krogue/Makefile
@@ -7,6 +7,7 @@
PORTNAME= krogue
PORTVERSION= 0.9.6.1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://ksi.ii.uj.edu.pl/krogue/dl/
DISTNAME= ${PORTNAME}-0.9.6pl1
@@ -14,7 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=1
USE_GMAKE= yes
diff --git a/games/krubik/Makefile b/games/krubik/Makefile
index b356336818f1..cbc808439598 100644
--- a/games/krubik/Makefile
+++ b/games/krubik/Makefile
@@ -7,12 +7,13 @@
PORTNAME= krubik
PORTVERSION= 1.06
+PORTREVISION= 1
CATEGORIES= games kde
MASTER_SITES= http://www.phys.uu.nl/~eendebak/kde/
MAINTAINER= jedgar@fxp.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=1
GNU_CONFIGURE= yes
diff --git a/games/lexter/Makefile b/games/lexter/Makefile
index a677624f19ea..c6deb71739b3 100644
--- a/games/lexter/Makefile
+++ b/games/lexter/Makefile
@@ -7,13 +7,14 @@
PORTNAME= lexter
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/arcade
MAINTAINER= markp@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include' \
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index c97cda8f3d39..2bce18e49a68 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -7,13 +7,14 @@
PORTNAME= xinvaders
PORTVERSION= 2.1.1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/arcade/invaders
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
NO_CDROM= "don't sell for profit"
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 7e7e37fbb631..dd32e53e5a29 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -7,14 +7,13 @@
PORTNAME= gphoto2
PORTVERSION= 2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://www.gphoto.net/dist/
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
- intl.1:${PORTSDIR}/devel/gettext-old \
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
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 aecde0765845..3396bb2aacf5 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -7,13 +7,14 @@
PORTNAME= gtkgraph
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= graphics math
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jedgar
MAINTAINER= jedgar@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index ece7fb273f84..8c5eaea88189 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -7,14 +7,14 @@
PORTNAME= gtksee
PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.linux.tucows.com/files/x11/graphics/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
MAINTAINER= dirk@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
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 85609723fb52..327dc8c1b6de 100644
--- a/graphics/libxine/Makefile
+++ b/graphics/libxine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xine
PORTVERSION= 0.9.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://xine.sourceforge.net/files/ \
${MASTER_SITE_SOURCEFORGE}
@@ -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-old
+ intl.2:${PORTSDIR}/devel/gettext
WRKSRC= ${WRKDIR}/${PORTNAME}-lib-${PORTVERSION}
diff --git a/graphics/ogle-gui/Makefile b/graphics/ogle-gui/Makefile
index 0cbf42e80c27..095785ddbc54 100644
--- a/graphics/ogle-gui/Makefile
+++ b/graphics/ogle-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ogle
PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics gnome
MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
PKGNAMESUFFIX= -gui
@@ -16,8 +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-old \
- iconv.3:${PORTSDIR}/converters/libiconv \
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
glade.4:${PORTSDIR}/devel/libglade \
xml2.5:${PORTSDIR}/textproc/libxml2
RUN_DEPENDS= ogle:${PORTSDIR}/graphics/ogle
diff --git a/graphics/ruby-tgif/Makefile b/graphics/ruby-tgif/Makefile
index 47fbc7e44cf1..929ed9fca7e3 100644
--- a/graphics/ruby-tgif/Makefile
+++ b/graphics/ruby-tgif/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tgif
PORTVERSION= 20010408
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics ruby
MASTER_SITES= http://www2s.biglobe.ne.jp/~Nori/ruby/dist/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
@@ -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-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
diff --git a/graphics/tgif-nls/Makefile b/graphics/tgif-nls/Makefile
index 55834c00443e..5896b4444bc7 100644
--- a/graphics/tgif-nls/Makefile
+++ b/graphics/tgif-nls/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tgif
PORTVERSION= 4.1.41
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ftp://bourbon.cs.umd.edu/pub/tgif/ \
ftp://ftp.cs.ucla.edu/pub/tgif/ \
@@ -16,8 +16,7 @@ PKGNAMESUFFIX= -nls
MAINTAINER= one@netlab.is.tsukuba.ac.jp
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
RUN_DEPENDS= giftopnm:${PORTSDIR}/graphics/netpbm
USE_IMAKE= yes
diff --git a/graphics/xine/Makefile b/graphics/xine/Makefile
index 661cca2668e1..f07390b8ba62 100644
--- a/graphics/xine/Makefile
+++ b/graphics/xine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xine
PORTVERSION= 0.9.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://xine.sourceforge.net/files/ \
${MASTER_SITE_SOURCEFORGE}
@@ -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-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_IMLIB= yes
diff --git a/graphics/xmps-opendivx-plugin/Makefile b/graphics/xmps-opendivx-plugin/Makefile
index 18116c232039..70541b1601f5 100644
--- a/graphics/xmps-opendivx-plugin/Makefile
+++ b/graphics/xmps-opendivx-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmps-opendivx-plugin
PORTVERSION= 0.0.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://download.projectmayo.com/dnload/divx4linux/xmps/
@@ -14,7 +15,7 @@ MAINTAINER= lioux@FreeBSD.org
LIB_DEPENDS= divxdecore.0:${PORTSDIR}/graphics/libdivxdecore \
xmps.0:${PORTSDIR}/graphics/xmps \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
WRKSRC= ${WRKDIR}/${PORTNAME}-0.0.2
USE_GMAKE= yes
diff --git a/graphics/xmps-win32-plugin/Makefile b/graphics/xmps-win32-plugin/Makefile
index 6f7167f219c4..e9cb901fdaab 100644
--- a/graphics/xmps-win32-plugin/Makefile
+++ b/graphics/xmps-win32-plugin/Makefile
@@ -7,13 +7,14 @@
PORTNAME= xmps-win32-plugin
PORTVERSION= 0.0.4
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://xmps.sourceforge.net/sources/
MAINTAINER= lioux@FreeBSD.org
LIB_DEPENDS= xmps.0:${PORTSDIR}/graphics/xmps \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
RUN_DEPENDS= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
USE_GMAKE= yes
diff --git a/hebrew/kde3-i18n/Makefile b/hebrew/kde3-i18n/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/hebrew/kde3-i18n/Makefile
+++ b/hebrew/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/hebrew/kde4-l10n/Makefile b/hebrew/kde4-l10n/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/hebrew/kde4-l10n/Makefile
+++ b/hebrew/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/hungarian/kde3-i18n/Makefile b/hungarian/kde3-i18n/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/hungarian/kde3-i18n/Makefile
+++ b/hungarian/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/hungarian/kde4-l10n/Makefile b/hungarian/kde4-l10n/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/hungarian/kde4-l10n/Makefile
+++ b/hungarian/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/irc/kvirc-devel/Makefile b/irc/kvirc-devel/Makefile
index c8178fae9440..9d659fccb275 100644
--- a/irc/kvirc-devel/Makefile
+++ b/irc/kvirc-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kvirc
PORTVERSION= 2.1.1
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= ftp://ftp.kvirc.net/kvirc/${PORTVERSION}/source/ \
ftp://ftp.kvirc.bz.nu/pub/mirror/kvirc/${PORTVERSION}/source/ \
@@ -14,7 +15,7 @@ MASTER_SITES= ftp://ftp.kvirc.net/kvirc/${PORTVERSION}/source/ \
MAINTAINER= trevor@FreeBSD.org
-BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt-old:${PORTSDIR}/devel/gettext-old
ALL_TARGET= kvirc
INSTALLS_SHLIB= yes
@@ -38,6 +39,7 @@ CONFIGURE_ARGS= --x-includes=$(X11BASE)/include \
--with-qt-name=qt2 \
--disable-static
-CONFIGURE_ENV+= SS_X_EXTRA_LIBS=-lxpg4
+CONFIGURE_ENV+= SS_X_EXTRA_LIBS="-lxpg4" \
+ SS_MSGFMT="${LOCALBASE}/bin/msgfmt-old"
.include <bsd.port.mk>
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index c8178fae9440..9d659fccb275 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kvirc
PORTVERSION= 2.1.1
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= ftp://ftp.kvirc.net/kvirc/${PORTVERSION}/source/ \
ftp://ftp.kvirc.bz.nu/pub/mirror/kvirc/${PORTVERSION}/source/ \
@@ -14,7 +15,7 @@ MASTER_SITES= ftp://ftp.kvirc.net/kvirc/${PORTVERSION}/source/ \
MAINTAINER= trevor@FreeBSD.org
-BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt-old:${PORTSDIR}/devel/gettext-old
ALL_TARGET= kvirc
INSTALLS_SHLIB= yes
@@ -38,6 +39,7 @@ CONFIGURE_ARGS= --x-includes=$(X11BASE)/include \
--with-qt-name=qt2 \
--disable-static
-CONFIGURE_ENV+= SS_X_EXTRA_LIBS=-lxpg4
+CONFIGURE_ENV+= SS_X_EXTRA_LIBS="-lxpg4" \
+ SS_MSGFMT="${LOCALBASE}/bin/msgfmt-old"
.include <bsd.port.mk>
diff --git a/irc/liece/Makefile b/irc/liece/Makefile
index 2096c17b11b9..7204b96500ee 100644
--- a/irc/liece/Makefile
+++ b/irc/liece/Makefile
@@ -7,6 +7,7 @@
PORTNAME= liece
PORTVERSION= 1.4.7
+PORTREVISION= 1
CATEGORIES= irc elisp
MASTER_SITES= http://www.unixuser.org/~ueno/liece/dist/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
@@ -14,9 +15,9 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
BUILD_DEPENDS+= ${LOCALBASE}/${LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
- ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
+ msgfmt:${PORTSDIR}/devel/gettext
RUN_DEPENDS+= ${LOCALBASE}/${LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
- ${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
+ ldcc:${PORTSDIR}/irc/liece-dcc
HAS_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/irc/riece-emacs21/Makefile b/irc/riece-emacs21/Makefile
index 2096c17b11b9..7204b96500ee 100644
--- a/irc/riece-emacs21/Makefile
+++ b/irc/riece-emacs21/Makefile
@@ -7,6 +7,7 @@
PORTNAME= liece
PORTVERSION= 1.4.7
+PORTREVISION= 1
CATEGORIES= irc elisp
MASTER_SITES= http://www.unixuser.org/~ueno/liece/dist/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
@@ -14,9 +15,9 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
BUILD_DEPENDS+= ${LOCALBASE}/${LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
- ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
+ msgfmt:${PORTSDIR}/devel/gettext
RUN_DEPENDS+= ${LOCALBASE}/${LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
- ${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
+ ldcc:${PORTSDIR}/irc/liece-dcc
HAS_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index 2096c17b11b9..7204b96500ee 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -7,6 +7,7 @@
PORTNAME= liece
PORTVERSION= 1.4.7
+PORTREVISION= 1
CATEGORIES= irc elisp
MASTER_SITES= http://www.unixuser.org/~ueno/liece/dist/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
@@ -14,9 +15,9 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
BUILD_DEPENDS+= ${LOCALBASE}/${LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
- ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
+ msgfmt:${PORTSDIR}/devel/gettext
RUN_DEPENDS+= ${LOCALBASE}/${LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
- ${LOCALBASE}/bin/ldcc:${PORTSDIR}/irc/liece-dcc
+ ldcc:${PORTSDIR}/irc/liece-dcc
HAS_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 7da23716f296..0b1a4802b3c4 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -7,14 +7,14 @@
PORTNAME= xchat
PORTVERSION= 1.8.8
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES+= irc gnome ipv6
MASTER_SITES= http://xchat.org/files/source/1.8/ \
http://xchat.linuxpower.org/files/source/1.8/
MAINTAINER?= jim@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
# This port has a slave port japanese/xchat. Do not carelessly overwrite
@@ -30,8 +30,7 @@ WANT_GNOME= yes
GNU_CONFIGURE= yes
# Assign with `+=' for slave ports
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl -liconv" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new
+ LIBS="-L${LOCALBASE}/lib -lintl -liconv"
CONFIGURE_ARGS+= --disable-python \
--without-included-gettext \
--enable-nls \
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 7da23716f296..0b1a4802b3c4 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -7,14 +7,14 @@
PORTNAME= xchat
PORTVERSION= 1.8.8
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES+= irc gnome ipv6
MASTER_SITES= http://xchat.org/files/source/1.8/ \
http://xchat.linuxpower.org/files/source/1.8/
MAINTAINER?= jim@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
# This port has a slave port japanese/xchat. Do not carelessly overwrite
@@ -30,8 +30,7 @@ WANT_GNOME= yes
GNU_CONFIGURE= yes
# Assign with `+=' for slave ports
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl -liconv" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new
+ LIBS="-L${LOCALBASE}/lib -lintl -liconv"
CONFIGURE_ARGS+= --disable-python \
--without-included-gettext \
--enable-nls \
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 7da23716f296..0b1a4802b3c4 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -7,14 +7,14 @@
PORTNAME= xchat
PORTVERSION= 1.8.8
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES+= irc gnome ipv6
MASTER_SITES= http://xchat.org/files/source/1.8/ \
http://xchat.linuxpower.org/files/source/1.8/
MAINTAINER?= jim@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
# This port has a slave port japanese/xchat. Do not carelessly overwrite
@@ -30,8 +30,7 @@ WANT_GNOME= yes
GNU_CONFIGURE= yes
# Assign with `+=' for slave ports
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl -liconv" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new
+ LIBS="-L${LOCALBASE}/lib -lintl -liconv"
CONFIGURE_ARGS+= --disable-python \
--without-included-gettext \
--enable-nls \
diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index 7da23716f296..0b1a4802b3c4 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -7,14 +7,14 @@
PORTNAME= xchat
PORTVERSION= 1.8.8
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES+= irc gnome ipv6
MASTER_SITES= http://xchat.org/files/source/1.8/ \
http://xchat.linuxpower.org/files/source/1.8/
MAINTAINER?= jim@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
# This port has a slave port japanese/xchat. Do not carelessly overwrite
@@ -30,8 +30,7 @@ WANT_GNOME= yes
GNU_CONFIGURE= yes
# Assign with `+=' for slave ports
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lintl -liconv" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new
+ LIBS="-L${LOCALBASE}/lib -lintl -liconv"
CONFIGURE_ARGS+= --disable-python \
--without-included-gettext \
--enable-nls \
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index fc7c81b0a2ec..098d80927f3c 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= eb
PORTVERSION= 3.2.1
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= ftp://ftp.sra.co.jp/pub/misc/eb/
DISTFILES= ${EBFILES} \
@@ -20,8 +21,7 @@ PATCH_SITES= ${MASTER_SITES}
MAINTAINER= takamune@avrl.mei.co.jp
BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
- iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
EBFILES= ${DISTNAME}${EXTRACT_SUFX}
LISTFILES= appendix/LIST \
diff --git a/japanese/eb3/Makefile b/japanese/eb3/Makefile
index fc7c81b0a2ec..098d80927f3c 100644
--- a/japanese/eb3/Makefile
+++ b/japanese/eb3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= eb
PORTVERSION= 3.2.1
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= ftp://ftp.sra.co.jp/pub/misc/eb/
DISTFILES= ${EBFILES} \
@@ -20,8 +21,7 @@ PATCH_SITES= ${MASTER_SITES}
MAINTAINER= takamune@avrl.mei.co.jp
BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
- iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
EBFILES= ${DISTNAME}${EXTRACT_SUFX}
LISTFILES= appendix/LIST \
diff --git a/japanese/kebook/Makefile b/japanese/kebook/Makefile
index 7b0186aa9a74..4e5f74ffee94 100644
--- a/japanese/kebook/Makefile
+++ b/japanese/kebook/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kebook
PORTVERSION= 0.3.5
+PORTREVISION= 1
CATEGORIES= japanese kde
MASTER_SITES= http://www.os.rim.or.jp/~s_mitu/library/kebook/ \
ftp://ftp.kde.gr.jp/pub/kde/unstable/contrib/
@@ -14,7 +15,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/eb2
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
USE_KDEBASE_VER=1
USE_BZIP2= yes
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 9d3201b69dcf..431a582e5599 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mutt
PORTVERSION= ${VERSION}.j${JP_VERSION}
+PORTREVISION= 1
CATEGORIES= japanese mail
MASTER_SITES= http://www.emaillab.org/mutt/1.3/ \
http://www5.xdsl.ne.jp/~shuna/mutt/distfiles/ \
@@ -22,10 +23,10 @@ MAINTAINER= shuna@pop16.odn.ne.jp
LIB_DEPENDS= slang.2:${PORTSDIR}/japanese/libslang \
iconv.3:${PORTSDIR}/converters/libiconv
.if !defined(WITH_GETTEXT)
-LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
.endif
.if defined(WITH_GETTEXT)
-BUILD_DEPENDS= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
.endif
RUN_DEPENDS= urlview:${PORTSDIR}/textproc/urlview
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 5e9dc020f8fc..8bb0f855721a 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mutt
PORTVERSION= ${VERSION}.j${JP_VERSION}
+PORTREVISION= 1
CATEGORIES= japanese mail
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
http://ha4.seikyou.ne.jp/home/Kohtaro.Hitomi/mutt/ \
@@ -27,10 +28,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-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
.endif
.if defined(WITH_GETTEXT)
-BUILD_DEPENDS= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
.endif
RUN_DEPENDS= urlview:${PORTSDIR}/textproc/urlview
diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index 5583b68b61ba..b392f78885e2 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -7,6 +7,7 @@
PORTNAME= samba
PORTVERSION= ${SAMBA_VERSION}.j${SAMBA_JA_VERSION}
+PORTREVISION= 1
CATEGORIES= japanese net
MASTER_SITES= ftp://ftp.samba.gr.jp/pub/samba-jp/%SUBDIR%/ \
ftp://ftp.iij.ad.jp/pub/SAMBA/samba-jp/%SUBDIR%/ \
@@ -19,7 +20,7 @@ DISTNAME= ${PORTNAME}-${SAMBA_VERSION}-ja-${SAMBA_JA_VERSION}
MAINTAINER= nakaji@jp.FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
SAMBA_VERSION= 2.2.2
SAMBA_JA_VERSION= 1.1
diff --git a/japanese/samba/files/patch-al b/japanese/samba/files/patch-al
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/japanese/samba/files/patch-al
+++ /dev/null
diff --git a/japanese/samba20/Makefile b/japanese/samba20/Makefile
index 29b6f53b1250..fb985a79d7ce 100644
--- a/japanese/samba20/Makefile
+++ b/japanese/samba20/Makefile
@@ -6,6 +6,7 @@
#
PORTNAME= samba
+PORTREVISION= 1
PORTVERSION= ${SAMBA_VERSION}.j${SAMBA_JA_VERSION}
CATEGORIES= japanese net
MASTER_SITES= ftp://ftp.samba.gr.jp/pub/samba-jp/%SUBDIR%/ \
@@ -19,7 +20,7 @@ DISTNAME= ${PORTNAME}-${SAMBA_VERSION}-ja-${SAMBA_JA_VERSION}
MAINTAINER= nakaji@jp.FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
NO_LATEST_LINK= yes
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index 1839ca2ea833..e8f8cc342817 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vflib
PORTVERSION= ${VFLIB_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese print
MASTER_SITES= ftp://gull.se.hiroshima-u.ac.jp/pub/TypeHack/
DISTNAME= VFlib2-${PORTVERSION}
@@ -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-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
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 5cffcaa65f18..295dc12abac2 100644
--- a/korean/texinfo/Makefile
+++ b/korean/texinfo/Makefile
@@ -7,13 +7,14 @@
PORTNAME= texinfo
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= korean print
MASTER_SITES= http://master.debian.or.kr/~cwryu/archive/texinfo-ko/
DISTNAME= ${PORTNAME}-ko-${PORTVERSION}
MAINTAINER= cjh@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
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 01c5923cff59..0a94ed46e482 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -7,6 +7,7 @@
PORTNAME= librep
PORTVERSION= 0.15.2
+PORTREVISION= 1
CATEGORIES= lang gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/librep
@@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR= stable/sources/librep
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB= GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} VERSION=${PORTVERSION}
diff --git a/lang/librep2/Makefile b/lang/librep2/Makefile
index 01c5923cff59..0a94ed46e482 100644
--- a/lang/librep2/Makefile
+++ b/lang/librep2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= librep
PORTVERSION= 0.15.2
+PORTREVISION= 1
CATEGORIES= lang gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/librep
@@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR= stable/sources/librep
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
PLIST_SUB= GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} VERSION=${PORTVERSION}
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index 1cc78a303d4a..1dfbe9a6e560 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -8,6 +8,7 @@
PORTNAME= mdk
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= lang gnome
MASTER_SITES= ${MASTER_SITE_GNU} \
${MASTER_SITE_SOURCEFORGE}
@@ -16,8 +17,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ijliao@FreeBSD.org
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- intl:${PORTSDIR}/devel/gettext-old \
- guile:${PORTSDIR}/lang/guile
+ intl.2:${PORTSDIR}/devel/gettext \
+ guile.9:${PORTSDIR}/lang/guile
USE_X_PREFIX= yes
USE_GNOME= yes
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 8ff4473d3771..0b1474b4da8f 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -7,14 +7,14 @@
PORTNAME= elm
PORTVERSION= 2.5.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.virginia.edu/pub/elm/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= toasty@dragondata.com
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
WRKSRC= ${WRKDIR}/elm${PORTVERSION}
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index c2be0a35c50b..ade45aa14ecc 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -11,14 +11,14 @@
PORTNAME= fetchmail
PORTVERSION= 5.9.6
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= http://www.tuxedo.org/~esr/fetchmail/ \
ftp://ftp.ccil.org/pub/esr/fetchmail/
MAINTAINER= ve@sci.fi
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
.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 cdb4b07d456a..f996eb05535a 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -7,12 +7,13 @@
PORTNAME= kbiff
PORTVERSION= 3.4.2
+PORTREVISION= 1
CATEGORIES= mail kde
MASTER_SITES= http://devel-home.kde.org/~granroth/kbiff/
MAINTAINER= kris@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 80217cedbf56..36b26db20827 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -51,7 +51,7 @@
PORTNAME= mutt-devel
PORTVERSION= 1.3.28
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES+= mail
.if defined(WITH_MUTT_NNTP)
CATEGORIES+= news
@@ -129,8 +129,7 @@ SGML_USED= no
SGML_USED= no
.endif
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
- iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
.if defined(NOPORTDOCS)
SGML_USED= no
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index d4723b3c570a..918d3bad9087 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -8,6 +8,7 @@
PORTNAME= mutt
PORTVERSION= 1.2.5.1
+PORTREVISION= 1
CATEGORIES+= mail
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
ftp://ftp.uib.no/pub/mutt/ \
@@ -42,7 +43,7 @@ WITH_DOCS= yes
.endif
.endif
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
.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 d4723b3c570a..918d3bad9087 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -8,6 +8,7 @@
PORTNAME= mutt
PORTVERSION= 1.2.5.1
+PORTREVISION= 1
CATEGORIES+= mail
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
ftp://ftp.uib.no/pub/mutt/ \
@@ -42,7 +43,7 @@ WITH_DOCS= yes
.endif
.endif
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
.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 89310c47b9b8..eec1ca0fe972 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -7,6 +7,7 @@
PORTNAME= perdition
PORTVERSION= 0.1.8
+PORTREVISION= 1
CATEGORIES= mail net security
MASTER_SITES= ftp://perdition.sourceforge.net/pub/perdition/%SUBDIR%/ \
ftp://ftp.au.vergenet.net/pub/perdition/%SUBDIR%/ \
@@ -17,7 +18,7 @@ MASTER_SITE_SUBDIR= ${PORTVERSION}
MAINTAINER= kkonstan@daemon.gr
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
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 9f4810e85e8e..f7130a7b2625 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -7,20 +7,24 @@
PORTNAME= spruce
PORTVERSION= 0.6.5
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= erich@tacni.net
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt-old:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GTK= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+ LIBS="-L${LOCALBASE}/lib" \
+ MSGFMT="${LOCALBASE}/bin/msgfmt-old" \
+ XGETTEXT="${LOCALBASE}/bin/xgettext-old"
MAN1= spruce.1
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index 039da6a69cc8..03483610e745 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -7,15 +7,15 @@
PORTNAME= oleo
PORTVERSION= 1.99.16
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
-USE_BISON= yes
USE_AUTOCONF_VER=213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/misc/afbackup/Makefile b/misc/afbackup/Makefile
index 78341b90353e..dc2c0ac949ae 100644
--- a/misc/afbackup/Makefile
+++ b/misc/afbackup/Makefile
@@ -7,7 +7,7 @@
PORTNAME= afbackup
PORTVERSION= 3.3.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= misc
MASTER_SITES= ftp://ftp.vic.com/af/ \
${MASTER_SITE_SOURCEFORGE}
@@ -20,7 +20,7 @@ MAINTAINER= voland@catpipe.net
WRKSRC= ${WRKDIR}/afbackup-3.3.5
PLIST= ${WRKSRC}/pkg-plist
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
.if ! defined(NO_DES)
USE_OPENSSL= yes
diff --git a/misc/dirtree/Makefile b/misc/dirtree/Makefile
index 77f4dc5c1844..be1e24033bfc 100644
--- a/misc/dirtree/Makefile
+++ b/misc/dirtree/Makefile
@@ -8,13 +8,14 @@
PORTNAME= dirtree
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://home.pages.at/kingleo/development/
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= LeoArg.2:${PORTSDIR}/devel/leoarg \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index 15a1ab2032d5..6faff93f13db 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomemimedata
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-mime-data
@@ -15,8 +15,6 @@ DISTNAME= gnome-mime-data-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
-
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GNOMELIBS= yes
diff --git a/misc/gnomemimedata/Makefile b/misc/gnomemimedata/Makefile
index 15a1ab2032d5..6faff93f13db 100644
--- a/misc/gnomemimedata/Makefile
+++ b/misc/gnomemimedata/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomemimedata
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-mime-data
@@ -15,8 +15,6 @@ DISTNAME= gnome-mime-data-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
-
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GNOMELIBS= yes
diff --git a/misc/gnomeutils/Makefile b/misc/gnomeutils/Makefile
index b20f47247062..85ef39c4877a 100644
--- a/misc/gnomeutils/Makefile
+++ b/misc/gnomeutils/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomeutils
PORTVERSION= 1.4.1.2
+PORTREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-utils
@@ -14,7 +15,7 @@ DISTNAME= gnome-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
@@ -23,9 +24,7 @@ USE_GNOME= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-messages=/var/log/messages
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
MAN1= gcalc.1 gcharmap.1 gcolorsel.1 gdialog.1 gdict.1 gdiskfree.1 \
diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index b20f47247062..85ef39c4877a 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomeutils
PORTVERSION= 1.4.1.2
+PORTREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-utils
@@ -14,7 +15,7 @@ DISTNAME= gnome-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
@@ -23,9 +24,7 @@ USE_GNOME= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-messages=/var/log/messages
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
MAN1= gcalc.1 gcharmap.1 gcolorsel.1 gdialog.1 gdict.1 gdiskfree.1 \
diff --git a/misc/kde2-i18n/Makefile b/misc/kde2-i18n/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde2-i18n/Makefile
+++ b/misc/kde2-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-af/Makefile b/misc/kde3-i18n-af/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-af/Makefile
+++ b/misc/kde3-i18n-af/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ar/Makefile b/misc/kde3-i18n-ar/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-ar/Makefile
+++ b/misc/kde3-i18n-ar/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-az/Makefile b/misc/kde3-i18n-az/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-az/Makefile
+++ b/misc/kde3-i18n-az/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-bg/Makefile b/misc/kde3-i18n-bg/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-bg/Makefile
+++ b/misc/kde3-i18n-bg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-bs/Makefile b/misc/kde3-i18n-bs/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-bs/Makefile
+++ b/misc/kde3-i18n-bs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ca/Makefile b/misc/kde3-i18n-ca/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-ca/Makefile
+++ b/misc/kde3-i18n-ca/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-cs/Makefile b/misc/kde3-i18n-cs/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-cs/Makefile
+++ b/misc/kde3-i18n-cs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-da/Makefile b/misc/kde3-i18n-da/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-da/Makefile
+++ b/misc/kde3-i18n-da/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-el/Makefile b/misc/kde3-i18n-el/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-el/Makefile
+++ b/misc/kde3-i18n-el/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-en_GB/Makefile b/misc/kde3-i18n-en_GB/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-en_GB/Makefile
+++ b/misc/kde3-i18n-en_GB/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-eo/Makefile b/misc/kde3-i18n-eo/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-eo/Makefile
+++ b/misc/kde3-i18n-eo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-es/Makefile b/misc/kde3-i18n-es/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-es/Makefile
+++ b/misc/kde3-i18n-es/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-et/Makefile b/misc/kde3-i18n-et/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-et/Makefile
+++ b/misc/kde3-i18n-et/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-fi/Makefile b/misc/kde3-i18n-fi/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-fi/Makefile
+++ b/misc/kde3-i18n-fi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-he/Makefile b/misc/kde3-i18n-he/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-he/Makefile
+++ b/misc/kde3-i18n-he/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-hr/Makefile b/misc/kde3-i18n-hr/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-hr/Makefile
+++ b/misc/kde3-i18n-hr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-hu/Makefile b/misc/kde3-i18n-hu/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-hu/Makefile
+++ b/misc/kde3-i18n-hu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-id/Makefile b/misc/kde3-i18n-id/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-id/Makefile
+++ b/misc/kde3-i18n-id/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-is/Makefile b/misc/kde3-i18n-is/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-is/Makefile
+++ b/misc/kde3-i18n-is/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-it/Makefile b/misc/kde3-i18n-it/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-it/Makefile
+++ b/misc/kde3-i18n-it/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-lt/Makefile b/misc/kde3-i18n-lt/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-lt/Makefile
+++ b/misc/kde3-i18n-lt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-lv/Makefile b/misc/kde3-i18n-lv/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-lv/Makefile
+++ b/misc/kde3-i18n-lv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-mt/Makefile b/misc/kde3-i18n-mt/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-mt/Makefile
+++ b/misc/kde3-i18n-mt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-nb/Makefile b/misc/kde3-i18n-nb/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-nb/Makefile
+++ b/misc/kde3-i18n-nb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-nl/Makefile b/misc/kde3-i18n-nl/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-nl/Makefile
+++ b/misc/kde3-i18n-nl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-nn/Makefile b/misc/kde3-i18n-nn/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-nn/Makefile
+++ b/misc/kde3-i18n-nn/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-pl/Makefile b/misc/kde3-i18n-pl/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-pl/Makefile
+++ b/misc/kde3-i18n-pl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-pt/Makefile b/misc/kde3-i18n-pt/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-pt/Makefile
+++ b/misc/kde3-i18n-pt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-pt_BR/Makefile b/misc/kde3-i18n-pt_BR/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-pt_BR/Makefile
+++ b/misc/kde3-i18n-pt_BR/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ro/Makefile b/misc/kde3-i18n-ro/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-ro/Makefile
+++ b/misc/kde3-i18n-ro/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-sk/Makefile b/misc/kde3-i18n-sk/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-sk/Makefile
+++ b/misc/kde3-i18n-sk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-sl/Makefile b/misc/kde3-i18n-sl/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-sl/Makefile
+++ b/misc/kde3-i18n-sl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-sr/Makefile b/misc/kde3-i18n-sr/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-sr/Makefile
+++ b/misc/kde3-i18n-sr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-sv/Makefile b/misc/kde3-i18n-sv/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-sv/Makefile
+++ b/misc/kde3-i18n-sv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ta/Makefile b/misc/kde3-i18n-ta/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-ta/Makefile
+++ b/misc/kde3-i18n-ta/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-th/Makefile b/misc/kde3-i18n-th/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-th/Makefile
+++ b/misc/kde3-i18n-th/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-tr/Makefile b/misc/kde3-i18n-tr/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-tr/Makefile
+++ b/misc/kde3-i18n-tr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-ven/Makefile b/misc/kde3-i18n-ven/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-ven/Makefile
+++ b/misc/kde3-i18n-ven/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-vi/Makefile b/misc/kde3-i18n-vi/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-vi/Makefile
+++ b/misc/kde3-i18n-vi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-xh/Makefile b/misc/kde3-i18n-xh/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-xh/Makefile
+++ b/misc/kde3-i18n-xh/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n-zu/Makefile b/misc/kde3-i18n-zu/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n-zu/Makefile
+++ b/misc/kde3-i18n-zu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde3-i18n/Makefile b/misc/kde3-i18n/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde3-i18n/Makefile
+++ b/misc/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-i18n-is/Makefile b/misc/kde4-i18n-is/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-i18n-is/Makefile
+++ b/misc/kde4-i18n-is/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-bg/Makefile b/misc/kde4-l10n-bg/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-bg/Makefile
+++ b/misc/kde4-l10n-bg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-ca/Makefile b/misc/kde4-l10n-ca/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-ca/Makefile
+++ b/misc/kde4-l10n-ca/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-cs/Makefile b/misc/kde4-l10n-cs/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-cs/Makefile
+++ b/misc/kde4-l10n-cs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-da/Makefile b/misc/kde4-l10n-da/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-da/Makefile
+++ b/misc/kde4-l10n-da/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-el/Makefile b/misc/kde4-l10n-el/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-el/Makefile
+++ b/misc/kde4-l10n-el/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-en_GB/Makefile b/misc/kde4-l10n-en_GB/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-en_GB/Makefile
+++ b/misc/kde4-l10n-en_GB/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-eo/Makefile b/misc/kde4-l10n-eo/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-eo/Makefile
+++ b/misc/kde4-l10n-eo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-es/Makefile b/misc/kde4-l10n-es/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-es/Makefile
+++ b/misc/kde4-l10n-es/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-et/Makefile b/misc/kde4-l10n-et/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-et/Makefile
+++ b/misc/kde4-l10n-et/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-fi/Makefile b/misc/kde4-l10n-fi/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-fi/Makefile
+++ b/misc/kde4-l10n-fi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-is/Makefile b/misc/kde4-l10n-is/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-is/Makefile
+++ b/misc/kde4-l10n-is/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-it/Makefile b/misc/kde4-l10n-it/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-it/Makefile
+++ b/misc/kde4-l10n-it/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-lt/Makefile b/misc/kde4-l10n-lt/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-lt/Makefile
+++ b/misc/kde4-l10n-lt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-lv/Makefile b/misc/kde4-l10n-lv/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-lv/Makefile
+++ b/misc/kde4-l10n-lv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-nb/Makefile b/misc/kde4-l10n-nb/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-nb/Makefile
+++ b/misc/kde4-l10n-nb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-nl/Makefile b/misc/kde4-l10n-nl/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-nl/Makefile
+++ b/misc/kde4-l10n-nl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-nn/Makefile b/misc/kde4-l10n-nn/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-nn/Makefile
+++ b/misc/kde4-l10n-nn/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-ro/Makefile b/misc/kde4-l10n-ro/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-ro/Makefile
+++ b/misc/kde4-l10n-ro/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-sk/Makefile b/misc/kde4-l10n-sk/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-sk/Makefile
+++ b/misc/kde4-l10n-sk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-sl/Makefile b/misc/kde4-l10n-sl/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-sl/Makefile
+++ b/misc/kde4-l10n-sl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-sr/Makefile b/misc/kde4-l10n-sr/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-sr/Makefile
+++ b/misc/kde4-l10n-sr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-sv/Makefile b/misc/kde4-l10n-sv/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-sv/Makefile
+++ b/misc/kde4-l10n-sv/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-ta/Makefile b/misc/kde4-l10n-ta/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-ta/Makefile
+++ b/misc/kde4-l10n-ta/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-th/Makefile b/misc/kde4-l10n-th/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-th/Makefile
+++ b/misc/kde4-l10n-th/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n-tr/Makefile b/misc/kde4-l10n-tr/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n-tr/Makefile
+++ b/misc/kde4-l10n-tr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/kde4-l10n/Makefile b/misc/kde4-l10n/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/misc/kde4-l10n/Makefile
+++ b/misc/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/misc/koffice-i18n/Makefile b/misc/koffice-i18n/Makefile
index 7d24616e6f21..f9912b166f88 100644
--- a/misc/koffice-i18n/Makefile
+++ b/misc/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= koffice-i18n
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= sahiro@crest.ocn.ne.jp
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
RUN_DEPENDS= koshell:${PORTSDIR}/editors/koffice
USE_KDELIBS_VER=2
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index 77e54a924c90..03b08124b1fb 100644
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kwatch
PORTVERSION= 2.2.0
+PORTREVISION= 1
CATEGORIES= misc kde
MASTER_SITES= http://www.m-j-s.net/pub/kde/ \
${MASTER_SITE_KDE}
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= unstable/apps/utils
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER= 2
GNU_CONFIGURE= yes
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index f9f393f42c69..8c4e34a48d53 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -7,14 +7,14 @@
PORTNAME= mc
PORTVERSION= 4.5.54
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/mc
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
.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 8826b63ee353..f878babffda7 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -7,13 +7,13 @@
PORTNAME= pinfo
PORTVERSION= 0.6.5p2
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://zeus.polsl.gliwice.pl/~pborys/stable-version/
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
- intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/misc/sh-utils/Makefile b/misc/sh-utils/Makefile
index 2c2954f115ea..b9db1c33a7a1 100644
--- a/misc/sh-utils/Makefile
+++ b/misc/sh-utils/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sh-utils
PORTVERSION= 2.0
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= sh-utils
@@ -16,7 +17,7 @@ MAINTAINER= cyrille.lefevre@laposte.net
# Global variables
#
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 85609723fb52..327dc8c1b6de 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xine
PORTVERSION= 0.9.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://xine.sourceforge.net/files/ \
${MASTER_SITE_SOURCEFORGE}
@@ -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-old
+ intl.2:${PORTSDIR}/devel/gettext
WRKSRC= ${WRKDIR}/${PORTNAME}-lib-${PORTVERSION}
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index 0cbf42e80c27..095785ddbc54 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ogle
PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics gnome
MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
PKGNAMESUFFIX= -gui
@@ -16,8 +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-old \
- iconv.3:${PORTSDIR}/converters/libiconv \
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
glade.4:${PORTSDIR}/devel/libglade \
xml2.5:${PORTSDIR}/textproc/libxml2
RUN_DEPENDS= ogle:${PORTSDIR}/graphics/ogle
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 661cca2668e1..f07390b8ba62 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xine
PORTVERSION= 0.9.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://xine.sourceforge.net/files/ \
${MASTER_SITE_SOURCEFORGE}
@@ -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-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_IMLIB= yes
diff --git a/multimedia/xmps-opendivx-plugin/Makefile b/multimedia/xmps-opendivx-plugin/Makefile
index 18116c232039..70541b1601f5 100644
--- a/multimedia/xmps-opendivx-plugin/Makefile
+++ b/multimedia/xmps-opendivx-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmps-opendivx-plugin
PORTVERSION= 0.0.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://download.projectmayo.com/dnload/divx4linux/xmps/
@@ -14,7 +15,7 @@ MAINTAINER= lioux@FreeBSD.org
LIB_DEPENDS= divxdecore.0:${PORTSDIR}/graphics/libdivxdecore \
xmps.0:${PORTSDIR}/graphics/xmps \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
WRKSRC= ${WRKDIR}/${PORTNAME}-0.0.2
USE_GMAKE= yes
diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile
index 6f7167f219c4..e9cb901fdaab 100644
--- a/multimedia/xmps-win32-plugin/Makefile
+++ b/multimedia/xmps-win32-plugin/Makefile
@@ -7,13 +7,14 @@
PORTNAME= xmps-win32-plugin
PORTVERSION= 0.0.4
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://xmps.sourceforge.net/sources/
MAINTAINER= lioux@FreeBSD.org
LIB_DEPENDS= xmps.0:${PORTSDIR}/graphics/xmps \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
RUN_DEPENDS= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
USE_GMAKE= yes
diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index 1f325facc4ca..c972124c3329 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -8,14 +8,14 @@
PORTNAME= centericq
PORTVERSION= 4.6.9
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://konst.org.ua/download/
MAINTAINER= ijliao@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
- sigc.1:${PORTSDIR}/devel/libsigc++ \
- iconv:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
+ sigc.1:${PORTSDIR}/devel/libsigc++
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index 162f028a5d4a..408d81195d6e 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomeicu
PORTVERSION= 0.98.2
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnomeicu
@@ -19,7 +20,7 @@ USE_GNOME= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
BUILD_DEPENDS+= gnet-config:${PORTSDIR}/net/gnet \
- msgfmt-new:${PORTSDIR}/devel/gettext
+ msgfmt:${PORTSDIR}/devel/gettext
.if defined(WITH_DANTE)
LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante
SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
@@ -40,9 +41,7 @@ SOCKSLIBS= -lsocks5
CONFIGURE_ARGS= --with-statusmenu
CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
- CFLAGS="${CFLAGS}" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ CFLAGS="${CFLAGS}"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
pre-patch:
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index 162f028a5d4a..408d81195d6e 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomeicu
PORTVERSION= 0.98.2
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnomeicu
@@ -19,7 +20,7 @@ USE_GNOME= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
BUILD_DEPENDS+= gnet-config:${PORTSDIR}/net/gnet \
- msgfmt-new:${PORTSDIR}/devel/gettext
+ msgfmt:${PORTSDIR}/devel/gettext
.if defined(WITH_DANTE)
LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante
SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
@@ -40,9 +41,7 @@ SOCKSLIBS= -lsocks5
CONFIGURE_ARGS= --with-statusmenu
CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
- CFLAGS="${CFLAGS}" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ CFLAGS="${CFLAGS}"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
pre-patch:
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index d149c26069c3..ecbc4ace42e8 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -7,13 +7,14 @@
PORTNAME= etherape
PORTVERSION= 0.8.2
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= petef@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
USE_GNOME= yes
diff --git a/net-mgmt/ipv6calc/Makefile b/net-mgmt/ipv6calc/Makefile
index 45f74237353c..585a0fe3c0bf 100644
--- a/net-mgmt/ipv6calc/Makefile
+++ b/net-mgmt/ipv6calc/Makefile
@@ -7,12 +7,13 @@
PORTNAME= ipv6calc
PORTVERSION= 0.38
+PORTREVISION= 1
CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
MAINTAINER= edwin@mavetju.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
GNU_CONFIGURE= yes
diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index 8fe0e7a9191f..470845ae1e06 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dctc
PORTVERSION= 0.51
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= http://ac2i.tzo.com/dctc/
PKGNAMESUFFIX= -gui
@@ -17,8 +18,7 @@ MAINTAINER= lioux@FreeBSD.org
BUILD_DEPENDS= dctc:${PORTSDIR}/net/dctc
LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \
db4.0:${PORTSDIR}/databases/db4 \
- iconv.3:${PORTSDIR}/converters/libiconv \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GNOMELIBS= yes
USE_GTK= yes
diff --git a/net-p2p/fidelio/Makefile b/net-p2p/fidelio/Makefile
index 6ac49f627e2d..9a4726fdcdf7 100644
--- a/net-p2p/fidelio/Makefile
+++ b/net-p2p/fidelio/Makefile
@@ -7,13 +7,14 @@
PORTNAME= fidelio
PORTVERSION= 0.9.6
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
xml2.5:${PORTSDIR}/textproc/libxml2
XML_CONFIG?= ${LOCALBASE}/bin/xml2-config
diff --git a/net-p2p/gtkhx/Makefile b/net-p2p/gtkhx/Makefile
index c6377d7a86be..4329b7ab4b23 100644
--- a/net-p2p/gtkhx/Makefile
+++ b/net-p2p/gtkhx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkhx
PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtkhx
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR= gtkhx
MAINTAINER= jre@vineyard.net
LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
- intl.1:${PORTSDIR}/devel/gettext-old \
- iconv.3:${PORTSDIR}/converters/libiconv
+ intl.2:${PORTSDIR}/devel/gettext
USE_XLIB= yes
USE_GLIB= yes
diff --git a/net-p2p/lopster/Makefile b/net-p2p/lopster/Makefile
index 57d6231866cd..93d15b1ab5c5 100644
--- a/net-p2p/lopster/Makefile
+++ b/net-p2p/lopster/Makefile
@@ -7,13 +7,14 @@
PORTNAME= lopster
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= roman@xpert.com
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net/centericq/Makefile b/net/centericq/Makefile
index 1f325facc4ca..c972124c3329 100644
--- a/net/centericq/Makefile
+++ b/net/centericq/Makefile
@@ -8,14 +8,14 @@
PORTNAME= centericq
PORTVERSION= 4.6.9
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://konst.org.ua/download/
MAINTAINER= ijliao@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
- sigc.1:${PORTSDIR}/devel/libsigc++ \
- iconv:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
+ sigc.1:${PORTSDIR}/devel/libsigc++
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net/dctc-gui/Makefile b/net/dctc-gui/Makefile
index 8fe0e7a9191f..470845ae1e06 100644
--- a/net/dctc-gui/Makefile
+++ b/net/dctc-gui/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dctc
PORTVERSION= 0.51
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= http://ac2i.tzo.com/dctc/
PKGNAMESUFFIX= -gui
@@ -17,8 +18,7 @@ MAINTAINER= lioux@FreeBSD.org
BUILD_DEPENDS= dctc:${PORTSDIR}/net/dctc
LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \
db4.0:${PORTSDIR}/databases/db4 \
- iconv.3:${PORTSDIR}/converters/libiconv \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GNOMELIBS= yes
USE_GTK= yes
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index d149c26069c3..ecbc4ace42e8 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -7,13 +7,14 @@
PORTNAME= etherape
PORTVERSION= 0.8.2
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= petef@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
USE_GNOME= yes
diff --git a/net/fidelio/Makefile b/net/fidelio/Makefile
index 6ac49f627e2d..9a4726fdcdf7 100644
--- a/net/fidelio/Makefile
+++ b/net/fidelio/Makefile
@@ -7,13 +7,14 @@
PORTNAME= fidelio
PORTVERSION= 0.9.6
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
xml2.5:${PORTSDIR}/textproc/libxml2
XML_CONFIG?= ${LOCALBASE}/bin/xml2-config
diff --git a/net/gabber/Makefile b/net/gabber/Makefile
index 41a20520203d..ba8dad2404f0 100644
--- a/net/gabber/Makefile
+++ b/net/gabber/Makefile
@@ -7,13 +7,14 @@
PORTNAME= gabber
PORTVERSION= 0.8.6
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
.if defined(WITH_XMMS)
BUILD_DEPENDS+= xmms-config:${PORTSDIR}/audio/xmms
.endif
@@ -25,9 +26,7 @@ USE_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LDFLAGS="-L${LOCALBASE}/lib"
.if !defined(WITH_XMMS)
CONFIGURE_ARGS= --disable-xmms
.endif
diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile
index 162f028a5d4a..408d81195d6e 100644
--- a/net/gnomeicu/Makefile
+++ b/net/gnomeicu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomeicu
PORTVERSION= 0.98.2
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnomeicu
@@ -19,7 +20,7 @@ USE_GNOME= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
BUILD_DEPENDS+= gnet-config:${PORTSDIR}/net/gnet \
- msgfmt-new:${PORTSDIR}/devel/gettext
+ msgfmt:${PORTSDIR}/devel/gettext
.if defined(WITH_DANTE)
LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante
SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
@@ -40,9 +41,7 @@ SOCKSLIBS= -lsocks5
CONFIGURE_ARGS= --with-statusmenu
CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
- CFLAGS="${CFLAGS}" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ CFLAGS="${CFLAGS}"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
pre-patch:
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
index 162f028a5d4a..408d81195d6e 100644
--- a/net/gnomeicu/gnomeicu/Makefile
+++ b/net/gnomeicu/gnomeicu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomeicu
PORTVERSION= 0.98.2
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnomeicu
@@ -19,7 +20,7 @@ USE_GNOME= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
BUILD_DEPENDS+= gnet-config:${PORTSDIR}/net/gnet \
- msgfmt-new:${PORTSDIR}/devel/gettext
+ msgfmt:${PORTSDIR}/devel/gettext
.if defined(WITH_DANTE)
LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante
SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
@@ -40,9 +41,7 @@ SOCKSLIBS= -lsocks5
CONFIGURE_ARGS= --with-statusmenu
CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
- CFLAGS="${CFLAGS}" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ CFLAGS="${CFLAGS}"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
pre-patch:
diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile
index 162f028a5d4a..408d81195d6e 100644
--- a/net/gnomeicu2/Makefile
+++ b/net/gnomeicu2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomeicu
PORTVERSION= 0.98.2
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnomeicu
@@ -19,7 +20,7 @@ USE_GNOME= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
BUILD_DEPENDS+= gnet-config:${PORTSDIR}/net/gnet \
- msgfmt-new:${PORTSDIR}/devel/gettext
+ msgfmt:${PORTSDIR}/devel/gettext
.if defined(WITH_DANTE)
LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante
SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
@@ -40,9 +41,7 @@ SOCKSLIBS= -lsocks5
CONFIGURE_ARGS= --with-statusmenu
CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
- CFLAGS="${CFLAGS}" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ CFLAGS="${CFLAGS}"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
pre-patch:
diff --git a/net/gtkhx/Makefile b/net/gtkhx/Makefile
index c6377d7a86be..4329b7ab4b23 100644
--- a/net/gtkhx/Makefile
+++ b/net/gtkhx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkhx
PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtkhx
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR= gtkhx
MAINTAINER= jre@vineyard.net
LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
- intl.1:${PORTSDIR}/devel/gettext-old \
- iconv.3:${PORTSDIR}/converters/libiconv
+ intl.2:${PORTSDIR}/devel/gettext
USE_XLIB= yes
USE_GLIB= yes
diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile
index 45f74237353c..585a0fe3c0bf 100644
--- a/net/ipv6calc/Makefile
+++ b/net/ipv6calc/Makefile
@@ -7,12 +7,13 @@
PORTNAME= ipv6calc
PORTVERSION= 0.38
+PORTREVISION= 1
CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
MAINTAINER= edwin@mavetju.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
GNU_CONFIGURE= yes
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index c0d4b73f667e..4e2b4118c5ed 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -7,13 +7,14 @@
PORTNAME= jwhois
PORTVERSION= 3.1.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= jwhois
MAINTAINER= matusita@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=${PREFIX}/var/jwhois
diff --git a/net/kdetelnet/Makefile b/net/kdetelnet/Makefile
index 0196d71cb3e0..797fb45d3a42 100644
--- a/net/kdetelnet/Makefile
+++ b/net/kdetelnet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ktelnet
PORTVERSION= 2.0.43
+PORTREVISION= 1
CATEGORIES= net kde
MASTER_SITES= http://www.spaghetti-code.de/download/ktelnet/
DISTNAME= ${PORTNAME}${PORTVERSION:S/./-/}
@@ -14,7 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_GMAKE= yes
diff --git a/net/kmud/Makefile b/net/kmud/Makefile
index ffebabf6ae99..9fc4503f3bef 100644
--- a/net/kmud/Makefile
+++ b/net/kmud/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kmud
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.kmud.de/pub/kmud/
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
USE_KDEBASE_VER=1
USE_LIBTOOL= yes
diff --git a/net/ksamba/Makefile b/net/ksamba/Makefile
index 08577984bc54..62e272c6aac7 100644
--- a/net/ksamba/Makefile
+++ b/net/ksamba/Makefile
@@ -7,12 +7,13 @@
PORTNAME= ksamba
PORTVERSION= 0.3.4
+PORTREVISION= 1
CATEGORIES= net kde
MASTER_SITES= ${MASTER_SITE_KDE} \
http://www.kneschke.de/projekte/ksamba/download/
MASTER_SITE_SUBDIR= unstable/apps/network
-BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=1
USE_GMAKE= yes
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 2982aa3595de..393b79a66f0e 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -8,16 +8,15 @@
PORTNAME= wol
PORTVERSION= 0.6.0
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ahh
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old \
- iconv.3:${PORTSDIR}/converters/libiconv \
- gnugetopt:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \
+ gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 0d4c979e1ee6..5662bad4a7f9 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tin
PORTVERSION= 1.5.11
+PORTREVISION= 1
CATEGORIES+= news
MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v1.5/ \
ftp://nuxi.ucdavis.edu/pub/tin/v1.5/ \
@@ -15,8 +16,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-old \
- iconv.3:${PORTSDIR}/converters/libiconv
+ intl.2:${PORTSDIR}/devel/gettext
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/news/yencode/Makefile b/news/yencode/Makefile
index c6c9b1b41b0b..d30e5dd7aa60 100644
--- a/news/yencode/Makefile
+++ b/news/yencode/Makefile
@@ -8,17 +8,16 @@
PORTNAME= yencode
PORTVERSION= 0.46
+PORTREVISION= 1
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt \
- iconv:${PORTSDIR}/converters/libiconv \
- intl:${PORTSDIR}/devel/gettext
+LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
+ intl.2:${PORTSDIR}/devel/gettext
-USE_BISON= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lgnugetopt"
diff --git a/palm/coldsync/Makefile b/palm/coldsync/Makefile
index 4a5889c0fa15..aa2ae9851176 100644
--- a/palm/coldsync/Makefile
+++ b/palm/coldsync/Makefile
@@ -7,13 +7,13 @@
PORTNAME= coldsync
PORTVERSION= 2.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= palm comms
MASTER_SITES= http://www.coldsync.org/download/
MAINTAINER= arensb+freebsd-ports@ooblick.com
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
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 0358bde2e673..59f6bd600c00 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -8,13 +8,14 @@
PORTNAME= jpilot
PORTVERSION= 0.99.2
+PORTREVISION= 1
CATEGORIES+= palm comms
MASTER_SITES= http://jpilot.org/
MAINTAINER?= varju@webct.com
LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GTK= yes
USE_LIBTOOL= yes
diff --git a/polish/kde3-i18n/Makefile b/polish/kde3-i18n/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/polish/kde3-i18n/Makefile
+++ b/polish/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/polish/kde4-l10n/Makefile b/polish/kde4-l10n/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/polish/kde4-l10n/Makefile
+++ b/polish/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/portuguese/kde3-i18n-pt_BR/Makefile b/portuguese/kde3-i18n-pt_BR/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/portuguese/kde3-i18n-pt_BR/Makefile
+++ b/portuguese/kde3-i18n-pt_BR/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/portuguese/kde3-i18n/Makefile b/portuguese/kde3-i18n/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/portuguese/kde3-i18n/Makefile
+++ b/portuguese/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/portuguese/kde4-l10n-pt_BR/Makefile b/portuguese/kde4-l10n-pt_BR/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/portuguese/kde4-l10n-pt_BR/Makefile
+++ b/portuguese/kde4-l10n-pt_BR/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/portuguese/kde4-l10n/Makefile b/portuguese/kde4-l10n/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/portuguese/kde4-l10n/Makefile
+++ b/portuguese/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 4f54f4f3f61b..6330e2e0cd9b 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lyx
PORTVERSION= 1.1.6.4
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://stone.phys.pusan.ac.kr/pub/CJK-LyX/
PKGNAMEPREFIX= cjk-
@@ -20,7 +21,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-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
USE_XPM= yes
diff --git a/print/ktexshell/Makefile b/print/ktexshell/Makefile
index f46caecf3a37..99fb7904856e 100644
--- a/print/ktexshell/Makefile
+++ b/print/ktexshell/Makefile
@@ -7,13 +7,14 @@
PORTNAME= ktexshell
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= print kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ktexshell
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_GMAKE= yes
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 9b50875f6df4..e17457a7f1e7 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lyx
PORTVERSION= 1.1.6.4
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -26,7 +27,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-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
USE_AUTOCONF= yes
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 9b50875f6df4..e17457a7f1e7 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lyx
PORTVERSION= 1.1.6.4
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -26,7 +27,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-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
USE_AUTOCONF= yes
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 9b50875f6df4..e17457a7f1e7 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lyx
PORTVERSION= 1.1.6.4
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -26,7 +27,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-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
USE_AUTOCONF= yes
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 9b50875f6df4..e17457a7f1e7 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lyx
PORTVERSION= 1.1.6.4
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -26,7 +27,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-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
USE_AUTOCONF= yes
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 9b50875f6df4..e17457a7f1e7 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lyx
PORTVERSION= 1.1.6.4
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -26,7 +27,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-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
USE_AUTOCONF= yes
diff --git a/print/rlpr/Makefile b/print/rlpr/Makefile
index 1638055e4fd6..6be9585e671e 100644
--- a/print/rlpr/Makefile
+++ b/print/rlpr/Makefile
@@ -7,13 +7,14 @@
PORTNAME= rlpr
PORTVERSION= 2.02
+PORTREVISION= 1
CATEGORIES= print net
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/printing
MAINTAINER= mi@aldan.algebra.com
-#LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+#LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
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 5735ab9d85e6..ca9522251a0d 100644
--- a/russian/calligra-l10n/Makefile
+++ b/russian/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= koffice-i18n
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= russian kde misc
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src
@@ -17,7 +18,7 @@ MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
RUN_DEPENDS= koshell:${PORTSDIR}/editors/koffice
USE_KDELIBS_VER=2
diff --git a/russian/kde2-i18n/Makefile b/russian/kde2-i18n/Makefile
index f09703073d61..82cba8d0385c 100644
--- a/russian/kde2-i18n/Makefile
+++ b/russian/kde2-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES= russian kde misc
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -17,7 +18,7 @@ MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/russian/kde3-i18n/Makefile b/russian/kde3-i18n/Makefile
index f09703073d61..82cba8d0385c 100644
--- a/russian/kde3-i18n/Makefile
+++ b/russian/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES= russian kde misc
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -17,7 +18,7 @@ MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/russian/kde4-l10n/Makefile b/russian/kde4-l10n/Makefile
index f09703073d61..82cba8d0385c 100644
--- a/russian/kde4-l10n/Makefile
+++ b/russian/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES= russian kde misc
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -17,7 +18,7 @@ MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/russian/koffice-i18n/Makefile b/russian/koffice-i18n/Makefile
index 5735ab9d85e6..ca9522251a0d 100644
--- a/russian/koffice-i18n/Makefile
+++ b/russian/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= koffice-i18n
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= russian kde misc
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src
@@ -17,7 +18,7 @@ MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
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 5735ab9d85e6..ca9522251a0d 100644
--- a/russian/koffice-kde4-l10n/Makefile
+++ b/russian/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= koffice-i18n
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= russian kde misc
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src
@@ -17,7 +18,7 @@ MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
RUN_DEPENDS= koshell:${PORTSDIR}/editors/koffice
USE_KDELIBS_VER=2
diff --git a/security/fwlogwatch/Makefile b/security/fwlogwatch/Makefile
index a6bd9525622e..024ccfe06100 100644
--- a/security/fwlogwatch/Makefile
+++ b/security/fwlogwatch/Makefile
@@ -8,12 +8,13 @@
PORTNAME= fwlogwatch
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://www.kyb.uni-stuttgart.de/boris/sw/
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
INSTALL_TARGET= install install-config install-i18n
MANCOMPRESSES= no
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 0152e33b90de..bdf071e0bf21 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnupg
PORTVERSION= 1.0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/pub/gcrypt/%SUBDIR%/ \
ftp://pgp.iijlab.net/pub/%SUBDIR%/ \
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= gnupg
MAINTAINER= kuriyama@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
#RESTRICTED= "Crypto; export-controlled"
GNU_CONFIGURE= YES
@@ -25,9 +25,6 @@ MLINKS= gpg.1 gpgm.1
.include <bsd.port.pre.mk>
-.if exists(${PREFIX}/lib/libiconv.so)
-LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
-.endif
.if exists(${PREFIX}/lib/libgdbm.so)
LIB_DEPENDS+= gdbm.2:${PORTSDIR}/databases/gdbm
.endif
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 0152e33b90de..bdf071e0bf21 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnupg
PORTVERSION= 1.0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/pub/gcrypt/%SUBDIR%/ \
ftp://pgp.iijlab.net/pub/%SUBDIR%/ \
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= gnupg
MAINTAINER= kuriyama@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
#RESTRICTED= "Crypto; export-controlled"
GNU_CONFIGURE= YES
@@ -25,9 +25,6 @@ MLINKS= gpg.1 gpgm.1
.include <bsd.port.pre.mk>
-.if exists(${PREFIX}/lib/libiconv.so)
-LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
-.endif
.if exists(${PREFIX}/lib/libgdbm.so)
LIB_DEPENDS+= gdbm.2:${PORTSDIR}/databases/gdbm
.endif
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index d8d1b5064a5d..d77f09d1e12c 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -7,13 +7,13 @@
PORTNAME= kssh
PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://www.geocities.com/bilibao/
MAINTAINER= kevlo@FreeBSD.org
-BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
GNU_CONFIGURE= yes
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index ed176da956dd..26393605e62d 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -9,6 +9,7 @@
PORTNAME= mcrypt
PORTVERSION= 2.5.6
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ftp://argeas.cs-net.gr/pub/unix/mcrypt/ \
ftp://mcrypt.hellug.gr/pub/mcrypt/ \
@@ -18,7 +19,7 @@ MAINTAINER= trevor@FreeBSD.org
LIB_DEPENDS= mcrypt.6:${PORTSDIR}/security/libmcrypt/ \
mhash.2:${PORTSDIR}/security/mhash/ \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
post-patch:
${RM} -f ${WRKSRC}/configure
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 217f0ce189d4..40e2e4504839 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -7,12 +7,13 @@
PORTNAME= apcupsd
PORTVERSION= 3.8.5
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.apcupsd.org/pub/apcupsd/stable/tar/
MAINTAINER= Lars.Koeller@Uni-Bielefeld.de
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
STARTUP_SCRIPT= apcupsd.sh.sample
PLIST_SUB= STARTUP_SCRIPT=${STARTUP_SCRIPT}
diff --git a/sysutils/fileutils/Makefile b/sysutils/fileutils/Makefile
index 2e56c901a654..c534a77b6962 100644
--- a/sysutils/fileutils/Makefile
+++ b/sysutils/fileutils/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fileutils
PORTVERSION= 4.1
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= fileutils
@@ -16,7 +17,7 @@ MAINTAINER= cyrille.lefevre@laposte.net
# Global variables
#
-LIB_DEPEND= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPEND= intl.2:${PORTSDIR}/devel/gettext
USE_PERL5= yes
USE_LIBTOOL= yes
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index be33aabb3ec2..07c2de67d020 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -7,12 +7,13 @@
PORTNAME= gcombust
PORTVERSION= 0.1.47
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.abo.fi/~jmunsin/gcombust/
MAINTAINER= mcdouga9@msu.edu
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \
mkisofs:${PORTSDIR}/sysutils/mkisofs \
cdlabelgen:${PORTSDIR}/print/cdlabelgen
diff --git a/sysutils/slmon/Makefile b/sysutils/slmon/Makefile
index b18fc761f62a..733e0217be0d 100644
--- a/sysutils/slmon/Makefile
+++ b/sysutils/slmon/Makefile
@@ -8,16 +8,17 @@
PORTNAME= slmon
PORTVERSION= 0.5.9
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= slang:${PORTSDIR}/devel/libslang \
- gtop:${PORTSDIR}/devel/libgtop \
- intl:${PORTSDIR}/devel/gettext-old \
- gnugetopt:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang \
+ gtop.1:${PORTSDIR}/devel/libgtop \
+ intl.2:${PORTSDIR}/devel/gettext \
+ gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
GNU_CONFIGURE= yes
LIBGTOP_CONFIG= ${LOCALBASE}/bin/libgtop-config
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index b3fd549a601b..277972f35d3e 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -7,6 +7,7 @@
PORTNAME= modlogan
PORTVERSION= 0.7.12
+PORTREVISION= 1
CATEGORIES= textproc www
MASTER_SITES= http://jan.kneschke.de/projects/modlogan/download/ \
${MASTER_SITE_SOURCEFORGE}
@@ -15,7 +16,7 @@ MAINTAINER= netchild@FreeBSD.org
LIB_DEPENDS= adns.1:${PORTSDIR}/net/adns \
gd.2:${PORTSDIR}/graphics/gd \
- intl.1:${PORTSDIR}/devel/gettext-old \
+ intl.2:${PORTSDIR}/devel/gettext \
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 d5b74de39132..0a95f152c1b7 100644
--- a/textproc/rotix/Makefile
+++ b/textproc/rotix/Makefile
@@ -8,12 +8,13 @@
PORTNAME= rotix
PORTVERSION= 0.82
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/
MAINTAINER= lintux@debian.org
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
HAS_CONFIGURE= yes
diff --git a/textproc/textutils/Makefile b/textproc/textutils/Makefile
index f878dc2d58ee..eeefcc5e3aaa 100644
--- a/textproc/textutils/Makefile
+++ b/textproc/textutils/Makefile
@@ -7,13 +7,14 @@
PORTNAME= textutils
PORTVERSION= 2.0
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= textutils
MAINTAINER= aw1@stade.co.uk
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/vietnamese/kde3-i18n/Makefile b/vietnamese/kde3-i18n/Makefile
index a98ed835b61a..b20c579ae4b6 100644
--- a/vietnamese/kde3-i18n/Makefile
+++ b/vietnamese/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kde-i18n
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -16,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
USE_BZIP2= yes
diff --git a/www/amyc/Makefile b/www/amyc/Makefile
index bb1158675199..80ada03e1849 100644
--- a/www/amyc/Makefile
+++ b/www/amyc/Makefile
@@ -7,13 +7,13 @@
PORTNAME= amyc
PORTVERSION= 0.9.159
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://www.crevola.com/about/current/
MAINTAINER= petef@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_AUTOCONF= yes
GNU_CONFIGURE= yes
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 5a8b54a1ed18..38bb9f6e6fa5 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cadaver
PORTVERSION= 0.18.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://www.webdav.org/cadaver/
@@ -16,7 +16,7 @@ MAINTAINER= tarkhil@over.ru
BROKEN= "Dependency out of date"
LIB_DEPENDS= neon.18:${PORTSDIR}/www/neon \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
.ifndef NO_OPENSSL
USE_OPENSSL= yes
diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile
index f19ed74d52cc..6cd0a7b34587 100644
--- a/www/dillo-i18n/Makefile
+++ b/www/dillo-i18n/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dillo
PORTVERSION= 0.6.4
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://dillo.cipsga.org.br/download/ \
ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -15,7 +16,7 @@ MAINTAINER= anders@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GTK= yes
GNU_CONFIGURE= yes
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index f19ed74d52cc..6cd0a7b34587 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dillo
PORTVERSION= 0.6.4
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://dillo.cipsga.org.br/download/ \
ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -15,7 +16,7 @@ MAINTAINER= anders@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GTK= yes
GNU_CONFIGURE= yes
diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index f19ed74d52cc..6cd0a7b34587 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dillo
PORTVERSION= 0.6.4
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://dillo.cipsga.org.br/download/ \
ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -15,7 +16,7 @@ MAINTAINER= anders@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GTK= yes
GNU_CONFIGURE= yes
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index fe610a55fbb5..cc9dfb3299ef 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= galeon
PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -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
+ msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
@@ -38,9 +38,7 @@ CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla" \
--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
--enable-nautilus-view
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
MAN1= galeon.1
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index fe610a55fbb5..cc9dfb3299ef 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= galeon
PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -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
+ msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
@@ -38,9 +38,7 @@ CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla" \
--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
--enable-nautilus-view
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
MAN1= galeon.1
diff --git a/www/horde-devel/Makefile b/www/horde-devel/Makefile
index 133cfc7d43c8..966b8e6f2c5a 100644
--- a/www/horde-devel/Makefile
+++ b/www/horde-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= horde
PORTVERSION= 2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= ftp://ftp.horde.org/pub/horde/tarballs/
PKGNAMESUFFIX= -devel
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
#
#-----------------------------------------------------------------------
-LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
.if !defined(WITHOUT_MCAL)
LIB_DEPENDS+= mcal.0:${PORTSDIR}/misc/libmcal
.endif
@@ -75,7 +75,7 @@ pre-install:
${ECHO_MSG} "" ; \
${FALSE} ; \
fi
- @if ! ${LDCONFIG} -r | ${GREP} -q -e "lintl.1"; then \
+ @if ! ${LDCONFIG} -r | ${GREP} -q -e "lintl.2"; then \
${ECHO_MSG} "" ; \
${ECHO_MSG} "Please configure PHP with gettext support." ; \
${ECHO_MSG} "" ; \
diff --git a/www/horde2/Makefile b/www/horde2/Makefile
index 133cfc7d43c8..966b8e6f2c5a 100644
--- a/www/horde2/Makefile
+++ b/www/horde2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= horde
PORTVERSION= 2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= ftp://ftp.horde.org/pub/horde/tarballs/
PKGNAMESUFFIX= -devel
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
#
#-----------------------------------------------------------------------
-LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext
.if !defined(WITHOUT_MCAL)
LIB_DEPENDS+= mcal.0:${PORTSDIR}/misc/libmcal
.endif
@@ -75,7 +75,7 @@ pre-install:
${ECHO_MSG} "" ; \
${FALSE} ; \
fi
- @if ! ${LDCONFIG} -r | ${GREP} -q -e "lintl.1"; then \
+ @if ! ${LDCONFIG} -r | ${GREP} -q -e "lintl.2"; then \
${ECHO_MSG} "" ; \
${ECHO_MSG} "Please configure PHP with gettext support." ; \
${ECHO_MSG} "" ; \
diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile
index 98ad75a22a61..9e0285ce9aa8 100644
--- a/www/kdewebdev/Makefile
+++ b/www/kdewebdev/Makefile
@@ -7,6 +7,7 @@
PORTNAME= quanta
PORTVERSION= 2.0p1
+PORTREVISION= 1
CATEGORIES= www kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,7 +22,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= jeremy@external.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 98ad75a22a61..9e0285ce9aa8 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= quanta
PORTVERSION= 2.0p1
+PORTREVISION= 1
CATEGORIES= www kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,7 +22,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= jeremy@external.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 7b1540589ed2..0c9ab0b6af6f 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -7,13 +7,14 @@
PORTNAME= lynx
PORTVERSION= 2.8.5d7
+PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= http://lynx.isc.org/current/
DISTNAME= ${PORTNAME}2.8.5dev.7
MAINTAINER= ache@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
WRKSRC= ${WRKDIR}/${PORTNAME}2-8-5
USE_BZIP2= yes
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index ebda8f793310..d8ed8bd55600 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -154,7 +154,7 @@ while [ "$1" ]; do
echo "CONFIGURE_ARGS+=--with-ftp"
;;
\"gettext\")
- echo "LIB_DEPENDS+= intl.1:\${PORTSDIR}/devel/gettext"
+ echo "LIB_DEPENDS+= intl.2:\${PORTSDIR}/devel/gettext"
echo "CONFIGURE_ARGS+=--with-gettext=\${PREFIX}"
;;
\"YP\")
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 47d875cb814a..32a156902c3b 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -263,7 +263,7 @@ while [ "$1" ]; do
echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libcurl.a:\${PORTSDIR}/ftp/curl"
;;
\"gettext\")
- echo "LIB_DEPENDS+= intl.1:\${PORTSDIR}/devel/gettext"
+ echo "LIB_DEPENDS+= intl.2:\${PORTSDIR}/devel/gettext"
echo "CONFIGURE_ARGS+=--with-gettext=\${LOCALBASE}"
;;
\"iconv\")
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 47d875cb814a..32a156902c3b 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -263,7 +263,7 @@ while [ "$1" ]; do
echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libcurl.a:\${PORTSDIR}/ftp/curl"
;;
\"gettext\")
- echo "LIB_DEPENDS+= intl.1:\${PORTSDIR}/devel/gettext"
+ echo "LIB_DEPENDS+= intl.2:\${PORTSDIR}/devel/gettext"
echo "CONFIGURE_ARGS+=--with-gettext=\${LOCALBASE}"
;;
\"iconv\")
diff --git a/www/quanta/Makefile b/www/quanta/Makefile
index 98ad75a22a61..9e0285ce9aa8 100644
--- a/www/quanta/Makefile
+++ b/www/quanta/Makefile
@@ -7,6 +7,7 @@
PORTNAME= quanta
PORTVERSION= 2.0p1
+PORTREVISION= 1
CATEGORIES= www kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,7 +22,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= jeremy@external.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index 4a19b4593a88..e31cd3a61c60 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -8,13 +8,14 @@
PORTNAME= retawq
PORTVERSION= 0.0.6
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lintl
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index 40c5cc749147..78de174ae2d6 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -7,13 +7,13 @@
PORTNAME= sitecopy
PORTVERSION= 0.11.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://www.lyra.org/sitecopy/
MAINTAINER= olgeni@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
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 7348985c029d..391ac07a7e5b 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nautilus
PORTVERSION= 1.0.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/nautilus
@@ -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
+ msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= medusa.0:${PORTSDIR}/sysutils/medusa \
freetype.9:${PORTSDIR}/print/freetype2 \
eel.0:${PORTSDIR}/x11-toolkits/eel
@@ -41,9 +41,7 @@ INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
- LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}"
CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \
--with-freetype2-include-place=${LOCALBASE}/include/freetype2
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 7348985c029d..391ac07a7e5b 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nautilus
PORTVERSION= 1.0.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/nautilus
@@ -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
+ msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= medusa.0:${PORTSDIR}/sysutils/medusa \
freetype.9:${PORTSDIR}/print/freetype2 \
eel.0:${PORTSDIR}/x11-toolkits/eel
@@ -41,9 +41,7 @@ INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
- LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}"
CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \
--with-freetype2-include-place=${LOCALBASE}/include/freetype2
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 7921fc31b1c3..1d7b27e1feb5 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk
PORTVERSION= 1.2.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gtk+
@@ -15,7 +15,7 @@ DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_PERL5= yes
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index e29dac765dec..20a1e74beaf3 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pango
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta3,} \
ftp://ftp.gtk.org/pub/gtk/v1.3/ \
@@ -19,7 +20,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-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index ef52bcca3c9f..bc8dcb289a93 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enlightenment
PORTVERSION= 0.16.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://freebsd.sinica.edu.tw/pub/clive/
@@ -23,7 +23,7 @@ MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \
ghttp.1:${PORTSDIR}/www/libghttp \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index ef52bcca3c9f..bc8dcb289a93 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enlightenment
PORTVERSION= 0.16.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://freebsd.sinica.edu.tw/pub/clive/
@@ -23,7 +23,7 @@ MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \
ghttp.1:${PORTSDIR}/www/libghttp \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index ef52bcca3c9f..bc8dcb289a93 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enlightenment
PORTVERSION= 0.16.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://freebsd.sinica.edu.tw/pub/clive/
@@ -23,7 +23,7 @@ MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \
ghttp.1:${PORTSDIR}/www/libghttp \
- intl.1:${PORTSDIR}/devel/gettext-old
+ intl.2:${PORTSDIR}/devel/gettext
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index d77be3ce8ced..c9a8ba350d4f 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icewm
PORTVERSION= 1.0.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,8 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-2
MAINTAINER= nakai@FreeBSD.org
BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
- iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
WANT_GNOME= yes
diff --git a/x11-wm/kappdock/Makefile b/x11-wm/kappdock/Makefile
index 03b1e1254023..4ef27189fe0f 100644
--- a/x11-wm/kappdock/Makefile
+++ b/x11-wm/kappdock/Makefile
@@ -7,13 +7,14 @@
PORTNAME= kappdock
PORTVERSION= 0.43
+PORTREVISION= 1
CATEGORIES= x11-wm kde
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-old
+ intl.2:${PORTSDIR}/devel/gettext
INSTALLS_SHLIB= yes
USE_XLIB= yes
diff --git a/x11-wm/kwix/Makefile b/x11-wm/kwix/Makefile
index 135c40347a49..8a442f877130 100644
--- a/x11-wm/kwix/Makefile
+++ b/x11-wm/kwix/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kwix
PORTVERSION= 1.0.9
+PORTREVISION= 1
CATEGORIES= x11-wm kde
MASTER_SITES= ftp://ftp.kde.com/pub/Art_Music/Themes/KwiX/ \
ftp://ftp.thekompany.com/pub/kwix/
@@ -14,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}kb
MAINTAINER= demon@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDEBASE_VER=2
USE_GMAKE= yes
diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile
index 8ec12bff9182..050c52eff1d9 100644
--- a/x11-wm/ude/Makefile
+++ b/x11-wm/ude/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ude
PORTVERSION= 0.2.7b.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ude.the-coffeeshop.dk/pub/UDE/
@@ -15,7 +16,7 @@ DISTNAME= ${PORTNAME}-0.2.7b-BETA
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 25f78c351f8c..a05a69192a25 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -7,6 +7,7 @@
PORTNAME= windowmaker
PORTVERSION= 0.80.0
+PORTREVISION= 1
CATEGORIES= x11-wm windowmaker
MASTER_SITES= ${MASTER_SITE_WINDOWMAKER}
MASTER_SITE_SUBDIR= source/release
@@ -14,11 +15,11 @@ DISTNAME= WindowMaker-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${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-old \
+ intl.2:${PORTSDIR}/devel/gettext \
Hermes.1:${PORTSDIR}/graphics/Hermes
RUN_DEPENDS= ${X11BASE}/share/WindowMaker/Themes/Checker.themed/style:${PORTSDIR}/graphics/wmicons
@@ -32,9 +33,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= X11BASE=${X11BASE} \
LIBS="-L${LOCALBASE}/lib -lintl" \
CPPFLAGS="-I${LOCALBASE}/include" \
- LINGUAS="${LINGUAS}" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LINGUAS="${LINGUAS}"
CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \
--with-nlsdir=${PREFIX}/share/locale \
--with-libs-from="-L${LOCALBASE}/lib" \
diff --git a/x11-wm/windowmaker/files/patch-po::Makefile.in b/x11-wm/windowmaker/files/patch-po::Makefile.in
deleted file mode 100644
index c6f82604b428..000000000000
--- a/x11-wm/windowmaker/files/patch-po::Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in 2001/07/24 08:40:08 1.1
-+++ po/Makefile.in 2001/07/24 08:40:37
-@@ -215,10 +215,10 @@
-
-
- .po.mo:
-- msgfmt -o $@ $<
-+ msgfmt-new -o $@ $<
-
- WindowMaker.pot: $(POTFILES)
-- xgettext --default-domain=WindowMaker \
-+ $(XGETTEXT) --default-domain=WindowMaker \
- --add-comments --keyword=_ $(POTFILES)
- if cmp -s WindowMaker.po WindowMaker.pot; then \
- rm -f WindowMaker.po; \
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 127ff116f9e3..dc7df156e15a 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomeapplets
PORTVERSION= 1.4.0.5
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-applets
@@ -14,7 +15,7 @@ DISTNAME= gnome-applets-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
@@ -22,9 +23,7 @@ USE_GMAKE= yes
USE_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
MAN1= another_clock_applet.1 asclock_applet.1 battery_applet.1 \
cdplayer_applet.1 charpick_applet.1 clockmail_applet.1 \
diff --git a/x11/gnomeapplets/Makefile b/x11/gnomeapplets/Makefile
index 127ff116f9e3..dc7df156e15a 100644
--- a/x11/gnomeapplets/Makefile
+++ b/x11/gnomeapplets/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomeapplets
PORTVERSION= 1.4.0.5
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-applets
@@ -14,7 +15,7 @@ DISTNAME= gnome-applets-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
@@ -22,9 +23,7 @@ USE_GMAKE= yes
USE_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
MAN1= another_clock_applet.1 asclock_applet.1 battery_applet.1 \
cdplayer_applet.1 charpick_applet.1 clockmail_applet.1 \
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 127ff116f9e3..dc7df156e15a 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomeapplets
PORTVERSION= 1.4.0.5
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-applets
@@ -14,7 +15,7 @@ DISTNAME= gnome-applets-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
USE_X_PREFIX= yes
@@ -22,9 +23,7 @@ USE_GMAKE= yes
USE_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
MAN1= another_clock_applet.1 asclock_applet.1 battery_applet.1 \
cdplayer_applet.1 charpick_applet.1 clockmail_applet.1 \
diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index 70c384b5e899..d190e807c519 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomecore
PORTVERSION= 1.4.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-core
@@ -15,7 +15,7 @@ DISTNAME= gnome-core-${PORTVERSION}
MAINTAINER?= gnome@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= gtkhtml.21:${PORTSDIR}/www/gtkhtml
RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio
@@ -27,9 +27,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \
--with-gtkhtml=${X11BASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib" \
- MSGFMT=${LOCALBASE}/bin/msgfmt-new \
- XGETTEXT=${LOCALBASE}/bin/xgettext-new
+ LIBS="-L${LOCALBASE}/lib"
MAN1= deskguide_applet.1 gmenu.1 gnome-about.1 gnome-convert.1 \
gnome-download.1 gnome-edit.1 gnome-hint-properties-capplet.1 \
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 042ef81f0608..3c5876f985f2 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdebase
PORTVERSION= 2.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -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-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
SOMAJOR= 4
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 042ef81f0608..3c5876f985f2 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdebase
PORTVERSION= 2.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -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-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
SOMAJOR= 4
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 042ef81f0608..3c5876f985f2 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdebase
PORTVERSION= 2.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -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-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
SOMAJOR= 4
diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index 6a6a27b6e86c..1793f438504b 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdebase
PORTVERSION= 1.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= Attic/old/1.1.2/distribution/tar/generic/source/bz2
@@ -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-old
+ intl.2:${PORTSDIR}/devel/gettext
NO_LATEST_LINK= yes
USE_XLIB= yes
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 042ef81f0608..3c5876f985f2 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdebase
PORTVERSION= 2.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -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-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
SOMAJOR= 4
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 042ef81f0608..3c5876f985f2 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdebase
PORTVERSION= 2.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -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-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
SOMAJOR= 4
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 042ef81f0608..3c5876f985f2 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdebase
PORTVERSION= 2.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -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-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
SOMAJOR= 4
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 042ef81f0608..3c5876f985f2 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdebase
PORTVERSION= 2.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -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-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
SOMAJOR= 4
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 042ef81f0608..3c5876f985f2 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdebase
PORTVERSION= 2.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -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-old
+LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
USE_KDELIBS_VER=2
SOMAJOR= 4