gettext upgrade uber-patch (stage 3)

- switch devel/gettext (0.11.1) on, installing full package
- flip devel/gettext-old (0.10.35) to installing only static binaries
  with a "-old" suffix -- gettext-old will have its deorbit burn
  sequence initiated just after 4.6-RELEASE
- fix up ports for the new world order

Reviewed by:	portmgr

8 files changed, 20 insertions, 13 deletions

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