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

12 files changed, 27 insertions, 23 deletions

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"