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

27 files changed, 81 insertions, 157 deletions

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