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

10 files changed, 20 insertions, 12 deletions

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=