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

9 files changed, 18 insertions, 35 deletions

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; \