Add USE_GETTEXT and bump PORTREVISION.

Submitted by:	trevor
Tested by:	bento

468 files changed, 1038 insertions, 1032 deletions

diff --git a/arabic/kde3-i18n/Makefile b/arabic/kde3-i18n/Makefile
index fa0513155ff1..19afb337b7c8 100644
--- a/arabic/kde3-i18n/Makefile
+++ b/arabic/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	arabic kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/arabic/kde4-l10n/Makefile b/arabic/kde4-l10n/Makefile
index fa0513155ff1..19afb337b7c8 100644
--- a/arabic/kde4-l10n/Makefile
+++ b/arabic/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	arabic kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/arabic/koffice-i18n/Makefile b/arabic/koffice-i18n/Makefile
index b64626f240b2..3e891f65e20b 100644
--- a/arabic/koffice-i18n/Makefile
+++ b/arabic/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	arabic kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 1c166c67393f..9a7313c83325 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	dpkg
 PORTVERSION=	1.9.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	http://ftp.debian.org/debian/pool/main/d/dpkg/
 DISTNAME=	dpkg_${PORTVERSION}
@@ -14,10 +14,10 @@ DISTNAME=	dpkg_${PORTVERSION}
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Package maintenance system for Debian
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_AUTOCONF=	213
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 5978da073582..3f0d3dd61db4 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tar
 PORTVERSION=	1.13.25
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,10 +16,9 @@ PKGNAMEPREFIX=	g
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	GNU version of the traditional tar archiver
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 INFO=		tar
 
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g
 CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include' \
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index 106aabc3e69d..512c0514e669 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libcomprex
 PORTVERSION=	0.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnupdate
@@ -16,13 +16,13 @@ MASTER_SITE_SUBDIR=	gnupdate
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Transparently handles automatic compression and decompression of files
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		ltdl.4:${PORTSDIR}/devel/libltdl \
+LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl \
 		curl.2:${PORTSDIR}/ftp/curl
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
+USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	# none
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index 99c45201f00b..cef50f9783fb 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rpm
 PORTVERSION=	3.0.6
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	archivers
 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/
@@ -15,12 +15,12 @@ MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Red Hat Package Manager
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		popt.0:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=14
 USE_REINPLACE=	yes
diff --git a/astro/fooseti/Makefile b/astro/fooseti/Makefile
index b48045e8919f..a5486c0c748b 100644
--- a/astro/fooseti/Makefile
+++ b/astro/fooseti/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fooseti
 PORTVERSION=	0.6.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro
 # mastersite disappeared February 2003
 MASTER_SITES=	# http://www-personal.engin.umich.edu/~agorski/fooseti/
@@ -15,9 +15,8 @@ MASTER_SITES=	# http://www-personal.engin.umich.edu/~agorski/fooseti/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ frontend to SETI@Home
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_GNOME=	gtk12
 
 .include <bsd.port.mk>
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index de4f5564b49c..af3612997610 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gpsdrive
 PORTVERSION=	2.07.r7
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://gpsdrive.kraftvoll.at/     \
 		http://www.gpsdrive.cc/           \
@@ -20,10 +21,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/pre/}
 MAINTAINER=	molter@gufi.org
 COMMENT=	A GPS navigation system
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 USE_GETOPT_LONG=yes
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/astro/spacechart/Makefile b/astro/spacechart/Makefile
index 79410107f58c..738ce24c3259 100644
--- a/astro/spacechart/Makefile
+++ b/astro/spacechart/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spacechart
 PORTVERSION=	0.9.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	pat@FreeBSD.org
 COMMENT=	SpaceChart is a star chart viewer for GNOME
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 4aa6b4face37..59fc2b72b0b3 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aumix
 PORTVERSION=	2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://jpj.net/~trevor/aumix/ \
@@ -17,9 +17,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Audio mixer for X11, terminal, or command line
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
diff --git a/audio/cplay/Makefile b/audio/cplay/Makefile
index f6f502786095..a4049dfef1cb 100644
--- a/audio/cplay/Makefile
+++ b/audio/cplay/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cplay
 PORTVERSION=	1.49
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.tf.hut.fi/~flu/cplay/ \
 		http://www.tf.hut.fi/~flu/cplay/old/
@@ -14,8 +15,7 @@ MASTER_SITES=	http://www.tf.hut.fi/~flu/cplay/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A curses based front-end for various audio players
 
-BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 MAN1=		cplay.1
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 8f9841c14b97..51c11bccf011 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	denemo
 PORTVERSION=	0.5.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Graphical score editor
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		xml.5:${PORTSDIR}/textproc/libxml
+LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
 
 GNU_CONFIGURE=	yes
 PLIST=		${WRKDIR}/pkg-plist
@@ -25,6 +24,7 @@ DOCS=		AUTHORS ChangeLog DESIGN GOALS NEWS README TODO
 DOCDIR=		share/doc/${PORTNAME}
 USE_BISON=	yes
 USE_GETOPT_LONG=yes
+USE_GETTEXT=	yes
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 
diff --git a/audio/lopster/Makefile b/audio/lopster/Makefile
index d32b56287e09..3e7bea46780d 100644
--- a/audio/lopster/Makefile
+++ b/audio/lopster/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lopster
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +15,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	roman@xpert.com
 COMMENT=	GTK+ client for Napster
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index 60f0b3e53e4c..dab32ef3efc6 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	madplay
 PORTVERSION=	0.15.0b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.mars.org/pub/mpeg/
@@ -16,12 +16,12 @@ MASTER_SITE_SUBDIR=	mad
 MAINTAINER=	asa@gascom.ru
 COMMENT=	Madplay MP3 player (part of MAD project)
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		mad.2:${PORTSDIR}/audio/libmad \
+LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
 		id3tag.2:${PORTSDIR}/audio/libid3tag
 
 WANT_GNOME=	yes
 
+USE_GETTEXT=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 9ce5cc0b99b6..e99e1d34506e 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -7,18 +7,18 @@
 
 PORTNAME=	normalize
 PORTVERSION=	0.7.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www1.cs.columbia.edu/~cvaill/normalize/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for adjusting the volume of wave/MP3 files to a standard level
 
-LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/mad \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/mad
 
 USE_BZIP2=	yes
 USE_GETOPT_LONG=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/audio/opmixer/Makefile b/audio/opmixer/Makefile
index 3f87bcaed2e7..010b8c71432d 100644
--- a/audio/opmixer/Makefile
+++ b/audio/opmixer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	opmixer
 PORTVERSION=	0.70
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	optronic
@@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR=	optronic
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Adjusts a mixer
 
-LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
 
 DOCDIR=		share/doc/${PORTNAME}
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 PLIST=		${WRKDIR}/pkg-plist
 WRKSRC=		${WRKDIR}/opmixer
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index ef64448641a2..1897ef527e30 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		snd
 PORTVERSION=		5.5
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		trevor@FreeBSD.org
 COMMENT=		Multitracking sound editor and utilities
 
-LIB_DEPENDS=		gsl.5:${PORTSDIR}/math/gsl \
-			intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=		gsl.5:${PORTSDIR}/math/gsl
 
 .if !defined(WITHOUT_ESD)
 RUN_DEPENDS=		esd:${PORTSDIR}/audio/esound
@@ -72,6 +71,7 @@ MAKEFILE=	makefile
 PLIST=		${WRKDIR}/pkg-plist
 .if !defined(WITHOUT_X11)
 PREFIX=		${X11BASE}
+USE_GETTEXT=	yes
 USE_GNOME=	gtk12
 USE_XLIB=	yes
 .endif
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 00886904a052..1c18e32fcc0c 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	solfege
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free eartraining software
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext-old \
-		gm4:${PORTSDIR}/devel/m4 \
+BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		swig:${PORTSDIR}/devel/swig11 \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
@@ -27,6 +27,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix libgtkhtml
 USE_PYTHON=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4
 CONFIGURE_ARGS=	--disable-oss-sound \
diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index 319bb263aac0..c46dfbe5f176 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	swhplugins
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://plugin.org.uk/releases/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
@@ -16,12 +16,12 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Steve Harris' huge Collection of LADSPA Plugins
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		fftw.2:${PORTSDIR}/math/fftw
+LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
 
 # includes assember code
 ONLY_FOR_ARCHS=	i386
 
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 2d74249aac2e..5d3514740788 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vorbis-tools
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.vorbis.com/files/1.0.1/unix/
@@ -17,10 +18,10 @@ COMMENT=	Play, encode, and manage Ogg Vorbis files
 LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
 		curl.2:${PORTSDIR}/ftp/curl \
 		FLAC.5:${PORTSDIR}/audio/flac \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		speex.2:${PORTSDIR}/audio/speex \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
 
+USE_GETTEXT=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 8d6fc5716faf..8237a2437238 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-mixer
 PORTVERSION=	4.0.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
                 ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/xfce-${PORTVERSION}/src/ \
@@ -19,13 +19,13 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 volume mixer module for xfce4-panel
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
+LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
+USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
diff --git a/chinese/calligra-l10n-zh_TW/Makefile b/chinese/calligra-l10n-zh_TW/Makefile
index 87b1524e0b5e..b30244ff6d3a 100644
--- a/chinese/calligra-l10n-zh_TW/Makefile
+++ b/chinese/calligra-l10n-zh_TW/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/chinese/kde3-i18n-zh_CN/Makefile b/chinese/kde3-i18n-zh_CN/Makefile
index 5fb9fb3e3186..3abeacb30824 100644
--- a/chinese/kde3-i18n-zh_CN/Makefile
+++ b/chinese/kde3-i18n-zh_CN/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Simplified Chinese messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/chinese/kde3-i18n-zh_TW/Makefile b/chinese/kde3-i18n-zh_TW/Makefile
index 0bce4c53189f..56d640ab742b 100644
--- a/chinese/kde3-i18n-zh_TW/Makefile
+++ b/chinese/kde3-i18n-zh_TW/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Traditional Chinese messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/chinese/kde4-l10n-zh_CN/Makefile b/chinese/kde4-l10n-zh_CN/Makefile
index 5fb9fb3e3186..3abeacb30824 100644
--- a/chinese/kde4-l10n-zh_CN/Makefile
+++ b/chinese/kde4-l10n-zh_CN/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Simplified Chinese messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/chinese/kde4-l10n-zh_TW/Makefile b/chinese/kde4-l10n-zh_TW/Makefile
index 0bce4c53189f..56d640ab742b 100644
--- a/chinese/kde4-l10n-zh_TW/Makefile
+++ b/chinese/kde4-l10n-zh_TW/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Traditional Chinese messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/chinese/koffice-i18n-zh_TW/Makefile b/chinese/koffice-i18n-zh_TW/Makefile
index 87b1524e0b5e..b30244ff6d3a 100644
--- a/chinese/koffice-i18n-zh_TW/Makefile
+++ b/chinese/koffice-i18n-zh_TW/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/chinese/koffice-kde4-l10n-zh_TW/Makefile b/chinese/koffice-kde4-l10n-zh_TW/Makefile
index 87b1524e0b5e..b30244ff6d3a 100644
--- a/chinese/koffice-kde4-l10n-zh_TW/Makefile
+++ b/chinese/koffice-kde4-l10n-zh_TW/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	chinese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index f9218d196600..bcc199157377 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcin
 PORTVERSION=	2.5.3.p2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese x11
 MASTER_SITES=	ftp://xcin.linux.org.tw/pub/xcin/xcin/ \
 		ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/ \
@@ -19,7 +19,6 @@ MAINTAINER=	kcwu@ck.tp.edu.tw
 COMMENT=	Chinese input method server under X
 
 LIB_DEPENDS=	tabe.2:${PORTSDIR}/chinese/libtabe \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		iconv.3:${PORTSDIR}/converters/libiconv
 .if !defined(USE_DB2)
 LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
@@ -30,6 +29,7 @@ RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcf
 		${LOCALBASE}/share/tabe/libtabe-0.2.5:${PORTSDIR}/chinese/libtabe
 
 WRKSRC=		${WRKDIR}/xcin
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index ba0151e9c354..112bc493a1a8 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zhcon
 PORTVERSION=	0.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,10 +15,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A fast Console Chinese System which supports framebuffer device
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-included-gettext=${LOCALBASE}
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index a82e1095a292..c22e5c4467a0 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnokii
 PORTVERSION=	0.5.8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
@@ -17,9 +18,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools to talk to Nokia cellular phones
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_REINPLACE=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index d2f9b0a19d2b..619cc349df63 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -8,16 +8,15 @@
 
 PORTNAME=	gsmlib
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	http://www.pxh.de/fs/gsmlib/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library to access GSM mobile phones through GSM modems
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_GETOPT_LONG=	yes
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile
index 4e40b2847dcc..9df731908f2c 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libticables
 PORTVERSION=	3.7.7
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tilp
@@ -16,10 +17,10 @@ COMMENT=	TI calculator link cables library
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 
 WANT_AUTOMAKE_VER=	15
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/comms/tilp/Makefile b/comms/tilp/Makefile
index 2598a64c7c73..9bbcb8019f7b 100644
--- a/comms/tilp/Makefile
+++ b/comms/tilp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tilp
 PORTVERSION=	6.68
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tilp
@@ -17,9 +18,9 @@ COMMENT=	TI Linking Program
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	ticalcs-4.5:${PORTSDIR}/devel/libticalcs \
 		ticables.10:${PORTSDIR}/comms/libticables \
-		tifiles.5:${PORTSDIR}/devel/libtifiles \
-		intl.5:${PORTSDIR}/devel/gettext-old
+		tifiles.5:${PORTSDIR}/devel/libtifiles
 
+USE_GETTEXT=	yes
 USE_GNOME=	gtk20 libglade2
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index ae0fe09a0063..5ad5edfcdc2e 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	recode
 PORTVERSION=	3.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	recode
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	recode
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Converts files between character sets and usages
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_LIBTOOL=	yes
 USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
diff --git a/databases/clip/Makefile b/databases/clip/Makefile
index 3d22d967dfbd..6415a5e03672 100644
--- a/databases/clip/Makefile
+++ b/databases/clip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clip
 PORTVERSION=	1.1.5.1
+PORTREVISION=	1
 CATEGORIES=	databases lang
 MASTER_SITES=	ftp://ftp.linux.ru.net/mirrors/clip/	\
 		ftp://ftp.lastik.ru/clip/		\
@@ -17,6 +18,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	xBase and Clipper language compatible compiler
 
+USE_GETTEXT=	yes
+
 .include <bsd.port.pre.mk>
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2			\
@@ -26,7 +29,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg		\
 		freetype.9:${PORTSDIR}/print/freetype2		\
 		gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra	\
 		gd.4:${PORTSDIR}/graphics/gd			\
-		intl.5:${PORTSDIR}/devel/gettext-old		\
 		iconv.3:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2			\
 		wget:${PORTSDIR}/ftp/wget
diff --git a/databases/mysql-gui/Makefile b/databases/mysql-gui/Makefile
index 2d6a2ae09af4..974597dfdec9 100644
--- a/databases/mysql-gui/Makefile
+++ b/databases/mysql-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mysql-gui
 PORTVERSION=	1.7.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://mysql.ftp.cvut.cz/Downloads/%SUBDIR%/ \
 		http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/%SUBDIR%/ \
@@ -19,13 +19,13 @@ MAINTAINER=	cyrille.lefevre@laposte.net
 COMMENT=	A graphical SQL client for MySQL
 
 LIB_DEPENDS=	sqlplus.1:${PORTSDIR}/databases/mysql++ \
- 		intl.5:${PORTSDIR}/devel/gettext-old \
  		glut.3:${PORTSDIR}/graphics/libglut \
  		jpeg.9:${PORTSDIR}/graphics/jpeg \
  		fleditor.1:${PORTSDIR}/x11-toolkits/fl_editor \
 		flvw.1:${PORTSDIR}/x11-toolkits/flvw
 PATCH_DEPENDS=	${X11BASE}/include/FL/Fl_Editor.H:${PORTSDIR}/x11-toolkits/fl_editor
 
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-/-src-/}
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index 45cde683c5c8..5c0825dcec07 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	namazu
 PORTVERSION=	2.0.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	databases www textproc
 MASTER_SITES=	http://www.namazu.org/stable/
 PKGNAMESUFFIX=	2
@@ -21,13 +21,13 @@ COMMENT=	Full-text search system intended for easy use
 
 BUILD_DEPENDS=	${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
 RUN_DEPENDS=	${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 #		xlHtml:${PORTSDIR}/textproc/xlhtml \
 #		wvHtml:${PORTSDIR}/textproc/wv
 
 PM_BASE=	${SITE_PERL}
 
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-perl5="${PERL}" \
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index 915fa8df16cd..0dd0d3986916 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	DBD-Sybase
 PORTVERSION=	1.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBD
@@ -16,11 +16,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sheldonh@FreeBSD.org
 COMMENT=	A Sybase DBI driver for Perl 5
 
-LIB_DEPENDS=	ct.2:${PORTSDIR}/databases/freetds \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	ct.2:${PORTSDIR}/databases/freetds
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ENV+=	SYBASE=${LOCALBASE}
+USE_GETTEXT=	yes
 
 MAN3=		DBD::Sybase.3
 
diff --git a/databases/p5-Search-Namazu/Makefile b/databases/p5-Search-Namazu/Makefile
index a6894dd1ceff..8ab5361ee5b5 100644
--- a/databases/p5-Search-Namazu/Makefile
+++ b/databases/p5-Search-Namazu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Search-Namazu
 PORTVERSION=	0.92
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases perl5
 MASTER_SITES=	http://www.namazu.org/~knok/
 PKGNAMEPREFIX=	p5-
@@ -15,10 +15,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Namazu library module for perl
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		nmz.6:${PORTSDIR}/databases/namazu2
+LIB_DEPENDS=	nmz.6:${PORTSDIR}/databases/namazu2
 
 PERL_CONFIGURE=	YES
+USE_GETTEXT=	yes
 CONFIGURE_ENV=	PREFIX=${PREFIX}
 MAN3=		Search::Namazu.3
 
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index 88a80cfda193..63c4b73098a2 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.4.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 USE_BZIP2=	YES
+USE_GETTEXT=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -47,7 +48,6 @@ USE_GETOPT_LONG=yes
 
 .if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index f1b49125afb0..e447233b8302 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.5.2003.12.03
+PORTREVISION=	1
 CATEGORIES?=	databases
 MASTER_SITES=	http://freebsd.sean.chittenden.org/ports/ \
 		http://people.freebsd.org/~seanc/ports/
@@ -20,6 +21,7 @@ COMMENT=	Development snapshots of PostgreSQL's latest features
 CONFLICTS=	postgresql7*
 CONFIGURE_ENV+=	DOCBOOKSTYLE=${LOCALBASE}/share/sgml/docbook/3.1/
 USE_BZIP2=	YES
+USE_GETTEXT=	yes
 USE_GMAKE=	YES
 USE_PERL5_BUILD=	YES
 GNU_CONFIGURE=	YES
@@ -45,7 +47,6 @@ USE_GETOPT_LONG=yes
 
 .if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index 88a80cfda193..63c4b73098a2 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.4.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 USE_BZIP2=	YES
+USE_GETTEXT=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -47,7 +48,6 @@ USE_GETOPT_LONG=yes
 
 .if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql72/Makefile b/databases/postgresql72/Makefile
index 0258001302b9..69c5be110d67 100644
--- a/databases/postgresql72/Makefile
+++ b/databases/postgresql72/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -48,8 +48,8 @@ USE_GETOPT_LONG=yes
 CONFIGURE_ARGS+=--enable-nls
 CONFIGURE_ENV+=	"LIBS=-lintl"
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
+USE_GETTEXT=	yes
 .else
 PLIST_SUB+=	GETTEXT="@comment "
 .endif
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index fd34750cda63..d0801f6586cf 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.3.5
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -44,8 +44,8 @@ USE_GETOPT_LONG=yes
 
 .if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
+USE_GETTEXT=	yes
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile
index fd34750cda63..d0801f6586cf 100644
--- a/databases/postgresql73/Makefile
+++ b/databases/postgresql73/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.3.5
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -44,8 +44,8 @@ USE_GETOPT_LONG=yes
 
 .if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
+USE_GETTEXT=	yes
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 88a80cfda193..63c4b73098a2 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.4.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 USE_BZIP2=	YES
+USE_GETTEXT=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -47,7 +48,6 @@ USE_GETOPT_LONG=yes
 
 .if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 88a80cfda193..63c4b73098a2 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.4.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 USE_BZIP2=	YES
+USE_GETTEXT=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -47,7 +48,6 @@ USE_GETOPT_LONG=yes
 
 .if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 88a80cfda193..63c4b73098a2 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.4.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 USE_BZIP2=	YES
+USE_GETTEXT=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -47,7 +48,6 @@ USE_GETOPT_LONG=yes
 
 .if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 88a80cfda193..63c4b73098a2 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.4.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 USE_BZIP2=	YES
+USE_GETTEXT=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -47,7 +48,6 @@ USE_GETOPT_LONG=yes
 
 .if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 88a80cfda193..63c4b73098a2 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.4.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 USE_BZIP2=	YES
+USE_GETTEXT=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -47,7 +48,6 @@ USE_GETOPT_LONG=yes
 
 .if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 88a80cfda193..63c4b73098a2 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.4.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 USE_BZIP2=	YES
+USE_GETTEXT=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -47,7 +48,6 @@ USE_GETOPT_LONG=yes
 
 .if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 88a80cfda193..63c4b73098a2 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.4.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 USE_BZIP2=	YES
+USE_GETTEXT=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -47,7 +48,6 @@ USE_GETOPT_LONG=yes
 
 .if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 88a80cfda193..63c4b73098a2 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.4.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 USE_BZIP2=	YES
+USE_GETTEXT=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -47,7 +48,6 @@ USE_GETOPT_LONG=yes
 
 .if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 88a80cfda193..63c4b73098a2 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	7.4.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 USE_BZIP2=	YES
+USE_GETTEXT=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -47,7 +48,6 @@ USE_GETOPT_LONG=yes
 
 .if !defined(WITHOUT_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/databases/pxtools/Makefile b/databases/pxtools/Makefile
index cdba146947d0..410716d95273 100644
--- a/databases/pxtools/Makefile
+++ b/databases/pxtools/Makefile
@@ -7,17 +7,16 @@
 
 PORTNAME=	pxtools
 PORTVERSION=	0.0.19
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	http://jan.kneschke.de/projects/pxtools/download/
 
 MAINTAINER=	jedgar@FreeBSD.org
 COMMENT=	Collection of tools to work with Paradox databases
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index fe2fb7957393..3bf2bf1d1ed2 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	sqsh
 PORTVERSION=	2.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqsh.org/
 EXTRACT_SUFX=	-src.tar.gz
@@ -14,9 +14,9 @@ EXTRACT_SUFX=	-src.tar.gz
 MAINTAINER=	kiesel@schlund.de
 COMMENT=	Interactive tool for querying Sybase database servers
 
-LIB_DEPENDS=	ct.2:${PORTSDIR}/databases/freetds \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	ct.2:${PORTSDIR}/databases/freetds
 
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SYBASE="${LOCALBASE}"
diff --git a/deskutils/babytrans/Makefile b/deskutils/babytrans/Makefile
index 9ed9e1dd975d..4ac5fe1c92ee 100644
--- a/deskutils/babytrans/Makefile
+++ b/deskutils/babytrans/Makefile
@@ -8,15 +8,14 @@
 
 PORTNAME=	babytrans
 PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://fjolliton.free.fr/babytrans/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+/GNOME front-end for Babylon Translator .dic files
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gtk12 gnomehack gnomeprefix
diff --git a/deskutils/gcal/Makefile b/deskutils/gcal/Makefile
index 0c6b285845bb..2899da80baac 100644
--- a/deskutils/gcal/Makefile
+++ b/deskutils/gcal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		gcal
 PORTVERSION=		3.01
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		deskutils
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gcal
@@ -18,8 +18,7 @@ COMMENT=	The GNU Gregorian calendar program
 # Global variables
 #
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 
 # required to rebuild info files if needed.
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index aef7cb859d98..c4a0c6a1249c 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ORBit
 PORTVERSION=	0.5.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/ORBit/0.5
@@ -16,9 +16,8 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	High-performance CORBA ORB with support for the C language
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib12 gnometarget
 INSTALLS_SHLIB=	yes
diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile
index 21c7e1372276..dd5ff0b974a9 100644
--- a/devel/argtable/Makefile
+++ b/devel/argtable/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	argtable
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +16,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An ANSI C library for parsing GNU style command line arguments
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_GETOPT_LONG=	yes
+USE_GETTEXT=	yes
 WRKSRC=		${WRKDIR}/argtable2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index 3df99afa2082..4fcbffb33a7c 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	3.3.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITES+=	http://people.freebsd.org/~joerg/:local
@@ -23,10 +24,10 @@ COMMENT=	FSF GCC 3.3.1 for Atmel AVR 8-bit RISC cross-development
 
 BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
 		avr-ld:${PORTSDIR}/devel/avr-binutils \
-		autoheader:${PORTSDIR}/devel/autoconf \
-		gettext:${PORTSDIR}/devel/gettext-old
+		autoheader:${PORTSDIR}/devel/autoconf
 RUN_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
 		avr-ld:${PORTSDIR}/devel/avr-binutils
+USE_GETTEXT=	yes
 
 WRKSRC=		${WRKDIR}/gcc-${PORTVERSION}
 
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 3df99afa2082..4fcbffb33a7c 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	3.3.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITES+=	http://people.freebsd.org/~joerg/:local
@@ -23,10 +24,10 @@ COMMENT=	FSF GCC 3.3.1 for Atmel AVR 8-bit RISC cross-development
 
 BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
 		avr-ld:${PORTSDIR}/devel/avr-binutils \
-		autoheader:${PORTSDIR}/devel/autoconf \
-		gettext:${PORTSDIR}/devel/gettext-old
+		autoheader:${PORTSDIR}/devel/autoconf
 RUN_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
 		avr-ld:${PORTSDIR}/devel/avr-binutils
+USE_GETTEXT=	yes
 
 WRKSRC=		${WRKDIR}/gcc-${PORTVERSION}
 
diff --git a/devel/bison-devel/Makefile b/devel/bison-devel/Makefile
index 33c85f433030..e7ee86f34150 100644
--- a/devel/bison-devel/Makefile
+++ b/devel/bison-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bison
 PORTVERSION=	1.875
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,11 +18,11 @@ COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
 CONFLICTS=	bison-[0-9]+
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 NO_LATEST_LINK=	yes
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 0f71e4b5320c..337d7fc5bc21 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bison
 PORTVERSION=	1.75
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,6 @@ CONFLICTS=	bison-[0-9]+
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 .if !defined(WITHOUT_NLS)
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB=	NLS=""
 .else
 PLIST_SUB=	NLS="@comment "
@@ -27,6 +26,7 @@ PLIST_SUB=	NLS="@comment "
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 .if defined(WITHOUT_NLS)
diff --git a/devel/bison175/Makefile b/devel/bison175/Makefile
index 0f71e4b5320c..337d7fc5bc21 100644
--- a/devel/bison175/Makefile
+++ b/devel/bison175/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bison
 PORTVERSION=	1.75
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,6 @@ CONFLICTS=	bison-[0-9]+
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 .if !defined(WITHOUT_NLS)
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 PLIST_SUB=	NLS=""
 .else
 PLIST_SUB=	NLS="@comment "
@@ -27,6 +26,7 @@ PLIST_SUB=	NLS="@comment "
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 .if defined(WITHOUT_NLS)
diff --git a/devel/bison1875/Makefile b/devel/bison1875/Makefile
index 33c85f433030..e7ee86f34150 100644
--- a/devel/bison1875/Makefile
+++ b/devel/bison1875/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bison
 PORTVERSION=	1.875
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,11 +18,11 @@ COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
 CONFLICTS=	bison-[0-9]+
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 NO_LATEST_LINK=	yes
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/bison2/Makefile b/devel/bison2/Makefile
index 33c85f433030..e7ee86f34150 100644
--- a/devel/bison2/Makefile
+++ b/devel/bison2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bison
 PORTVERSION=	1.875
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,11 +18,11 @@ COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
 CONFLICTS=	bison-[0-9]+
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 NO_LATEST_LINK=	yes
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/bison20/Makefile b/devel/bison20/Makefile
index 33c85f433030..e7ee86f34150 100644
--- a/devel/bison20/Makefile
+++ b/devel/bison20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bison
 PORTVERSION=	1.875
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,11 +18,11 @@ COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
 CONFLICTS=	bison-[0-9]+
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 NO_LATEST_LINK=	yes
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index 6dbb29d0456c..adcf8b8c6922 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -7,14 +7,13 @@
 
 PORTNAME=	cook
 PORTVERSION=	2.24
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://gd.tuwien.ac.at/softeng/Aegis/cook/
 
 MAINTAINER=	jasone@canonware.com
 COMMENT=	Like make(1), but more powerful and clean
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib \
 		YACC=yacc
@@ -23,6 +22,7 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAN1=	c_incl.1 cook.1 cook_bom.1 cook_lic.1 cook_rsh.1 cookfp.1 cooktime.1 \
 	find_libs.1 make2cook.1 roffpp.1
 MANCOMPRESSED=	no
+USE_GETTEXT=	yes
 
 # Make sure that the whole directory tree exists.
 pre-install:
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 1dd721a9bd1b..31a19c27f117 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gindent
 PORTVERSION=	2.2.8a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://home.hccnet.nl/d.ingamells/ \
 		${MASTER_SITE_GNU}
@@ -18,8 +18,7 @@ DISTNAME=	indent-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU indent
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index f7c31e392582..74653f48b586 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	glib
 PORTVERSION=	2.2.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.2,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
@@ -20,11 +21,10 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Some useful routines of C programming (current stable version)
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 NO_LATEST_LINK=	yes
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 3dd167d6ca1a..42ca4768687c 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmake
 PORTVERSION=	3.80
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	make
@@ -17,10 +17,10 @@ MAINTAINER=	ade@FreeBSD.org
 COMMENT=	GNU version of 'make' utility
 
 .if !defined(WITHOUT_NLS)
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 .endif
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--program-prefix=g
diff --git a/devel/gmake381/Makefile b/devel/gmake381/Makefile
index 3dd167d6ca1a..42ca4768687c 100644
--- a/devel/gmake381/Makefile
+++ b/devel/gmake381/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmake
 PORTVERSION=	3.80
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	make
@@ -17,10 +17,10 @@ MAINTAINER=	ade@FreeBSD.org
 COMMENT=	GNU version of 'make' utility
 
 .if !defined(WITHOUT_NLS)
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 .endif
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--program-prefix=g
diff --git a/devel/i386-rtems-gcc/Makefile b/devel/i386-rtems-gcc/Makefile
index 4c7c9ee7dcc4..419f09514593 100644
--- a/devel/i386-rtems-gcc/Makefile
+++ b/devel/i386-rtems-gcc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	3.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE} \
 		${MASTER_SITE_GNU:S/$/:gcc/}
@@ -33,6 +33,7 @@ GCCNAME=	gcc-${GCCVERSION}
 PLIST_SUB+=	"GCCVERSION=${GCCVERSION}"
 NEWLIBNAME=	newlib-1.11.0
 PLIST=		${PKGDIR}/pkg-plist.${LCLTARGET}
+USE_GETTEXT=	yes
 
 # autoheader is used by the port but autoconf is not, setting USE_AUTOCONF
 # will break the port.  Since USE_AUTOHEADER sets USE_AUTOCONF, this is
@@ -42,7 +43,6 @@ BUILD_DEPENDS=	autoheader:${PORTSDIR}/devel/autoconf \
 		${LCLTARGET}-ld:${PORTSDIR}/devel/${LCLTARGET}-binutils
 RUN_DEPENDS=	${LCLTARGET}-as:${PORTSDIR}/devel/${LCLTARGET}-binutils \
 		${LCLTARGET}-ld:${PORTSDIR}/devel/${LCLTARGET}-binutils
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 
 PKGNAMEPREFIX=	${LCLTARGET}-
 USE_GMAKE=	yes
diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile
index e194d21031e8..92c494fd2d40 100644
--- a/devel/ixlib/Makefile
+++ b/devel/ixlib/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ixlib
 PORTVERSION=	0.96.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,8 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A small C++ tools library based on STL
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile
index 9fe563c2d2b9..251218225b0f 100644
--- a/devel/libelf/Makefile
+++ b/devel/libelf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libelf
 PORTVERSION=	0.8.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.stud.uni-hannover.de/~michael/software/ \
@@ -16,14 +17,13 @@ MASTER_SITE_SUBDIR=	libs .
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	"A public ELF file access library similar to libelf(3) in Solaris"
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 CONFIGURE_ARGS+=	--enable-shared --disable-compat
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	LIBVER=${PORTVERSION:R}
+USE_GETTEXT=	yes
 
 NOMAN=		defined
 
diff --git a/devel/libticalcs/Makefile b/devel/libticalcs/Makefile
index e783d5733bc1..2e28cbc10efc 100644
--- a/devel/libticalcs/Makefile
+++ b/devel/libticalcs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libticalcs
 PORTVERSION=	4.5.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tilp
@@ -17,9 +18,9 @@ COMMENT=	TI calculator library
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	ticables.10:${PORTSDIR}/comms/libticables \
-		tifiles.5:${PORTSDIR}/devel/libtifiles \
-		intl.5:${PORTSDIR}/devel/gettext-old
+		tifiles.5:${PORTSDIR}/devel/libtifiles
 
+USE_GETTEXT=	yes
 USE_GNOME=	glib20
 WANT_AUTOMAKE_VER=	15
 GNU_CONFIGURE=	yes
diff --git a/devel/libtifiles/Makefile b/devel/libtifiles/Makefile
index 53ab170db11a..5a48830431ac 100644
--- a/devel/libtifiles/Makefile
+++ b/devel/libtifiles/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libtifiles
 PORTVERSION=	0.5.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tilp
@@ -16,10 +17,10 @@ COMMENT=	TI calculator file types library
 
 BUILD_DEPENDS=  pkg-config:${PORTSDIR}/devel/pkgconfig
 RUN_DEPENDS=    pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 
 WANT_AUTOMAKE_VER=	15
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index ea518cec34a1..d761f7152516 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libzvbi
 PORTVERSION=	0.2.5
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	zapping
@@ -16,9 +16,9 @@ DISTNAME=	${PORTNAME:S/lib//}-${PORTVERSION}
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Routines to access raw VBI capture devices
 
-LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 3693ca4eb851..9b3c39a073ac 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	maketool
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.alphalink.com.au/~gnb/maketool/downloads/
 
@@ -14,14 +15,14 @@ MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	GUI interface for make or gmake
 
 LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		intl.5:${PORTSDIR}/devel/gettext-old
+		freetype.9:${PORTSDIR}/print/freetype2
 
 DOCS=		COPYING COPYRIGHT ChangeLog TODO
 GNU_CONFIGURE=	yes
 MAN1=		maketool.1
 PLIST=		${WRKDIR}/pkg-plist
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GNOME=	atk glib20 gtk20 pango
 USE_X_PREFIX=	yes
 
diff --git a/devel/mingw-binutils/Makefile b/devel/mingw-binutils/Makefile
index 8e86eb326e66..9464a6103b8a 100644
--- a/devel/mingw-binutils/Makefile
+++ b/devel/mingw-binutils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	binutils
 PORTVERSION=	2.11.92
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mingw
@@ -18,11 +18,9 @@ DIST_SUBDIR=	mingw
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FSF binutils-2.11.90 for Windows cross-development
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext-old
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-20011113
 
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--target=i386-mingw32msvc
diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index d804b9a152a9..c7b3769dcabf 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -7,8 +7,8 @@
 
 PORTNAME=	binutils
 PORTVERSION=	${BINUTILVERSION}.${PATCHVERSION}
+PORTREVISION=	2
 PORTEPOCH=	1
-PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
@@ -25,15 +25,13 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	FSF binutils-2.14 for Windows cross-development
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext-old
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 BINUTILVERSION=	2.14
 PATCHVERSION=	90.20030807.1
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${BINUTILVERSION}
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
diff --git a/devel/motor/Makefile b/devel/motor/Makefile
index 48a94532c466..54cb4eb06b33 100644
--- a/devel/motor/Makefile
+++ b/devel/motor/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	motor
 PORTVERSION=	3.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://konst.org.ua/download/
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A powerful text mode based programming IDE
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index bc7b88eddfc2..e2613a2a10cf 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gettext
 PORTVERSION=	1.01
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Locale
@@ -16,10 +16,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Message handling functions
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 PERL_CONFIGURE=	yes
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
+USE_GETTEXT=	yes
 
 MAN3=		Locale::gettext.3
 
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index e2a09e657ff3..ebc0432ac3fc 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	popt
 PORTVERSION=	1.6.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ \
 		ftp://ftp.mirror.ac.uk/sites/ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/
@@ -15,8 +15,7 @@ MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ \
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A getopt(3) like library with a number of enhancements, from Redhat
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/devel/ruby-gettext/Makefile b/devel/ruby-gettext/Makefile
index 499efd8a2546..bfc490c7effa 100644
--- a/devel/ruby-gettext/Makefile
+++ b/devel/ruby-gettext/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gettext
 PORTVERSION=	0.5.3
+PORTREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	contrib
@@ -17,9 +18,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Ruby implementation of the gettext library
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext-old \
-		racc:${PORTSDIR}/devel/ruby-racc
+BUILD_DEPENDS=	racc:${PORTSDIR}/devel/ruby-racc
 
+USE_GETTEXT=	yes
 USE_RUBY=	yes
 USE_RUBY_FEATURES=	racc-runtime
 USE_RUBY_SETUP=	yes
diff --git a/devel/ruby-intl/Makefile b/devel/ruby-intl/Makefile
index 1813db62317f..4cbb45a80d82 100644
--- a/devel/ruby-intl/Makefile
+++ b/devel/ruby-intl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	intl
 PORTVERSION=	0.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://www.page.sannet.ne.jp/hirata-naoto/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -17,8 +17,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A simple wrapper of GNU gettext for Ruby
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/devel/rubygem-gettext/Makefile b/devel/rubygem-gettext/Makefile
index 499efd8a2546..bfc490c7effa 100644
--- a/devel/rubygem-gettext/Makefile
+++ b/devel/rubygem-gettext/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gettext
 PORTVERSION=	0.5.3
+PORTREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	contrib
@@ -17,9 +18,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Ruby implementation of the gettext library
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext-old \
-		racc:${PORTSDIR}/devel/ruby-racc
+BUILD_DEPENDS=	racc:${PORTSDIR}/devel/ruby-racc
 
+USE_GETTEXT=	yes
 USE_RUBY=	yes
 USE_RUBY_FEATURES=	racc-runtime
 USE_RUBY_SETUP=	yes
diff --git a/devel/rubygem-locale/Makefile b/devel/rubygem-locale/Makefile
index 499efd8a2546..bfc490c7effa 100644
--- a/devel/rubygem-locale/Makefile
+++ b/devel/rubygem-locale/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gettext
 PORTVERSION=	0.5.3
+PORTREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	contrib
@@ -17,9 +18,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Ruby implementation of the gettext library
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext-old \
-		racc:${PORTSDIR}/devel/ruby-racc
+BUILD_DEPENDS=	racc:${PORTSDIR}/devel/ruby-racc
 
+USE_GETTEXT=	yes
 USE_RUBY=	yes
 USE_RUBY_FEATURES=	racc-runtime
 USE_RUBY_SETUP=	yes
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 0abaa2f97dcf..8af7f6b457d0 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	yasm
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	http://www.tortall.net/projects/yasm/releases/
 
@@ -15,9 +16,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A complete rewrite of the NASM assembler
 
 BUILD_DEPENDS=	re2c:${PORTSDIR}/devel/re2c
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_GETTEXT=	yes
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile
index ba2f9a02a526..d367cc9eee53 100644
--- a/dns/mydns-ng/Makefile
+++ b/dns/mydns-ng/Makefile
@@ -7,17 +7,18 @@
 
 PORTNAME=	mydns
 PORTVERSION=	0.10.1
+PORTREVISION=	1
 CATEGORIES=	dns databases
 MASTER_SITES=	http://mydns.bboy.net/download/
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	DNS server designed to utilize the MySQL database
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc
+USE_GETTEXT=	yes
 USE_LIBTOOL=	yes
 USE_BZIP2=	yes
 
diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile
index ba2f9a02a526..d367cc9eee53 100644
--- a/dns/mydns/Makefile
+++ b/dns/mydns/Makefile
@@ -7,17 +7,18 @@
 
 PORTNAME=	mydns
 PORTVERSION=	0.10.1
+PORTREVISION=	1
 CATEGORIES=	dns databases
 MASTER_SITES=	http://mydns.bboy.net/download/
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	DNS server designed to utilize the MySQL database
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc
+USE_GETTEXT=	yes
 USE_LIBTOOL=	yes
 USE_BZIP2=	yes
 
diff --git a/editors/calligra-l10n-da/Makefile b/editors/calligra-l10n-da/Makefile
index 7c012b50d52b..fd030abfdeb5 100644
--- a/editors/calligra-l10n-da/Makefile
+++ b/editors/calligra-l10n-da/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/calligra-l10n-el/Makefile b/editors/calligra-l10n-el/Makefile
index 572fa3fe4c29..402649f8027e 100644
--- a/editors/calligra-l10n-el/Makefile
+++ b/editors/calligra-l10n-el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/calligra-l10n-en_GB/Makefile b/editors/calligra-l10n-en_GB/Makefile
index b25ea03e1357..6f3462124b98 100644
--- a/editors/calligra-l10n-en_GB/Makefile
+++ b/editors/calligra-l10n-en_GB/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/calligra-l10n-es/Makefile b/editors/calligra-l10n-es/Makefile
index fb4046b9eaf0..d19fc40cf5fb 100644
--- a/editors/calligra-l10n-es/Makefile
+++ b/editors/calligra-l10n-es/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/calligra-l10n-et/Makefile b/editors/calligra-l10n-et/Makefile
index e5a4d6ee6651..e8b0a44eea2b 100644
--- a/editors/calligra-l10n-et/Makefile
+++ b/editors/calligra-l10n-et/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/calligra-l10n-it/Makefile b/editors/calligra-l10n-it/Makefile
index f5a594aa4f31..749eea9090d6 100644
--- a/editors/calligra-l10n-it/Makefile
+++ b/editors/calligra-l10n-it/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/calligra-l10n-nb/Makefile b/editors/calligra-l10n-nb/Makefile
index 7c28aca5d510..daa1f61cc82d 100644
--- a/editors/calligra-l10n-nb/Makefile
+++ b/editors/calligra-l10n-nb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/calligra-l10n-nl/Makefile b/editors/calligra-l10n-nl/Makefile
index 7e5debc700ea..148ef267ca4f 100644
--- a/editors/calligra-l10n-nl/Makefile
+++ b/editors/calligra-l10n-nl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/calligra-l10n-sv/Makefile b/editors/calligra-l10n-sv/Makefile
index 9281468820a2..f1d877e0c5d2 100644
--- a/editors/calligra-l10n-sv/Makefile
+++ b/editors/calligra-l10n-sv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 5522d893c358..466bad57a597 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -7,16 +7,16 @@
 
 PORTNAME=	cooledit
 PORTVERSION=	3.17.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://cooledit.sourceforge.net/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Suite of utilities, including a GUI editor
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		vga.1:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
 
+USE_GETTEXT=	yes
 USE_XPM=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
diff --git a/editors/koffice-i18n-af/Makefile b/editors/koffice-i18n-af/Makefile
index 219e1aa145eb..238e49e358d1 100644
--- a/editors/koffice-i18n-af/Makefile
+++ b/editors/koffice-i18n-af/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-bs/Makefile b/editors/koffice-i18n-bs/Makefile
index 19d8b773c81f..b59908a045df 100644
--- a/editors/koffice-i18n-bs/Makefile
+++ b/editors/koffice-i18n-bs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-cs/Makefile b/editors/koffice-i18n-cs/Makefile
index c2a00b38ed58..a8c1af1bac2e 100644
--- a/editors/koffice-i18n-cs/Makefile
+++ b/editors/koffice-i18n-cs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-da/Makefile b/editors/koffice-i18n-da/Makefile
index 7c012b50d52b..fd030abfdeb5 100644
--- a/editors/koffice-i18n-da/Makefile
+++ b/editors/koffice-i18n-da/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-el/Makefile b/editors/koffice-i18n-el/Makefile
index 572fa3fe4c29..402649f8027e 100644
--- a/editors/koffice-i18n-el/Makefile
+++ b/editors/koffice-i18n-el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-en_GB/Makefile b/editors/koffice-i18n-en_GB/Makefile
index b25ea03e1357..6f3462124b98 100644
--- a/editors/koffice-i18n-en_GB/Makefile
+++ b/editors/koffice-i18n-en_GB/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-eo/Makefile b/editors/koffice-i18n-eo/Makefile
index 2b7c66c37853..4a9104ab4f62 100644
--- a/editors/koffice-i18n-eo/Makefile
+++ b/editors/koffice-i18n-eo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-es/Makefile b/editors/koffice-i18n-es/Makefile
index fb4046b9eaf0..d19fc40cf5fb 100644
--- a/editors/koffice-i18n-es/Makefile
+++ b/editors/koffice-i18n-es/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-et/Makefile b/editors/koffice-i18n-et/Makefile
index e5a4d6ee6651..e8b0a44eea2b 100644
--- a/editors/koffice-i18n-et/Makefile
+++ b/editors/koffice-i18n-et/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-it/Makefile b/editors/koffice-i18n-it/Makefile
index f5a594aa4f31..749eea9090d6 100644
--- a/editors/koffice-i18n-it/Makefile
+++ b/editors/koffice-i18n-it/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-lt/Makefile b/editors/koffice-i18n-lt/Makefile
index 0a19c1abc594..9c1750e3a296 100644
--- a/editors/koffice-i18n-lt/Makefile
+++ b/editors/koffice-i18n-lt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-lv/Makefile b/editors/koffice-i18n-lv/Makefile
index 4bc1fd37bccc..87be2eb53dcb 100644
--- a/editors/koffice-i18n-lv/Makefile
+++ b/editors/koffice-i18n-lv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-mt/Makefile b/editors/koffice-i18n-mt/Makefile
index 4aa634005857..5cd537467e40 100644
--- a/editors/koffice-i18n-mt/Makefile
+++ b/editors/koffice-i18n-mt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-nb/Makefile b/editors/koffice-i18n-nb/Makefile
index 7c28aca5d510..daa1f61cc82d 100644
--- a/editors/koffice-i18n-nb/Makefile
+++ b/editors/koffice-i18n-nb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-nl/Makefile b/editors/koffice-i18n-nl/Makefile
index 7e5debc700ea..148ef267ca4f 100644
--- a/editors/koffice-i18n-nl/Makefile
+++ b/editors/koffice-i18n-nl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-nn/Makefile b/editors/koffice-i18n-nn/Makefile
index d95ddc22d5a2..dffd1478eadd 100644
--- a/editors/koffice-i18n-nn/Makefile
+++ b/editors/koffice-i18n-nn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-sk/Makefile b/editors/koffice-i18n-sk/Makefile
index 7978106b41b2..758c4064f10b 100644
--- a/editors/koffice-i18n-sk/Makefile
+++ b/editors/koffice-i18n-sk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-sl/Makefile b/editors/koffice-i18n-sl/Makefile
index 2db559739f03..cc20c96e5513 100644
--- a/editors/koffice-i18n-sl/Makefile
+++ b/editors/koffice-i18n-sl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-sv/Makefile b/editors/koffice-i18n-sv/Makefile
index 9281468820a2..f1d877e0c5d2 100644
--- a/editors/koffice-i18n-sv/Makefile
+++ b/editors/koffice-i18n-sv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-th/Makefile b/editors/koffice-i18n-th/Makefile
index 450a667497f4..df851b36b99f 100644
--- a/editors/koffice-i18n-th/Makefile
+++ b/editors/koffice-i18n-th/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-tr/Makefile b/editors/koffice-i18n-tr/Makefile
index f3f83e7d0015..63cd857ce165 100644
--- a/editors/koffice-i18n-tr/Makefile
+++ b/editors/koffice-i18n-tr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-ven/Makefile b/editors/koffice-i18n-ven/Makefile
index a9d34808add7..57d92ec1cccd 100644
--- a/editors/koffice-i18n-ven/Makefile
+++ b/editors/koffice-i18n-ven/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-xh/Makefile b/editors/koffice-i18n-xh/Makefile
index bb13b680a96b..acb548f15c40 100644
--- a/editors/koffice-i18n-xh/Makefile
+++ b/editors/koffice-i18n-xh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-i18n-zu/Makefile b/editors/koffice-i18n-zu/Makefile
index 65ed22eac628..b27e421021a7 100644
--- a/editors/koffice-i18n-zu/Makefile
+++ b/editors/koffice-i18n-zu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-kde4-l10n-da/Makefile b/editors/koffice-kde4-l10n-da/Makefile
index 7c012b50d52b..fd030abfdeb5 100644
--- a/editors/koffice-kde4-l10n-da/Makefile
+++ b/editors/koffice-kde4-l10n-da/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-kde4-l10n-el/Makefile b/editors/koffice-kde4-l10n-el/Makefile
index 572fa3fe4c29..402649f8027e 100644
--- a/editors/koffice-kde4-l10n-el/Makefile
+++ b/editors/koffice-kde4-l10n-el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-kde4-l10n-en_GB/Makefile b/editors/koffice-kde4-l10n-en_GB/Makefile
index b25ea03e1357..6f3462124b98 100644
--- a/editors/koffice-kde4-l10n-en_GB/Makefile
+++ b/editors/koffice-kde4-l10n-en_GB/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-kde4-l10n-es/Makefile b/editors/koffice-kde4-l10n-es/Makefile
index fb4046b9eaf0..d19fc40cf5fb 100644
--- a/editors/koffice-kde4-l10n-es/Makefile
+++ b/editors/koffice-kde4-l10n-es/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-kde4-l10n-et/Makefile b/editors/koffice-kde4-l10n-et/Makefile
index e5a4d6ee6651..e8b0a44eea2b 100644
--- a/editors/koffice-kde4-l10n-et/Makefile
+++ b/editors/koffice-kde4-l10n-et/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-kde4-l10n-it/Makefile b/editors/koffice-kde4-l10n-it/Makefile
index f5a594aa4f31..749eea9090d6 100644
--- a/editors/koffice-kde4-l10n-it/Makefile
+++ b/editors/koffice-kde4-l10n-it/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-kde4-l10n-nb/Makefile b/editors/koffice-kde4-l10n-nb/Makefile
index 7c28aca5d510..daa1f61cc82d 100644
--- a/editors/koffice-kde4-l10n-nb/Makefile
+++ b/editors/koffice-kde4-l10n-nb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-kde4-l10n-nl/Makefile b/editors/koffice-kde4-l10n-nl/Makefile
index 7e5debc700ea..148ef267ca4f 100644
--- a/editors/koffice-kde4-l10n-nl/Makefile
+++ b/editors/koffice-kde4-l10n-nl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-kde4-l10n-sv/Makefile b/editors/koffice-kde4-l10n-sv/Makefile
index 9281468820a2..f1d877e0c5d2 100644
--- a/editors/koffice-kde4-l10n-sv/Makefile
+++ b/editors/koffice-kde4-l10n-sv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/koffice-kde4-l10n-tr/Makefile b/editors/koffice-kde4-l10n-tr/Makefile
index f3f83e7d0015..63cd857ce165 100644
--- a/editors/koffice-kde4-l10n-tr/Makefile
+++ b/editors/koffice-kde4-l10n-tr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index 0ff38d9449a0..b8b19a3bdbfb 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lpe
 PORTVERSION=	1.2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.sasknow.com/pub/ \
 		ftp://ftp.twu.net/users/cdsmith/lpe/
@@ -16,9 +16,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ryan@sasknow.com
 COMMENT=	A "lightweight programmer's editor" with syntax highlighting
 
-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index da7b847f1ea6..c6aa391944ce 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -7,19 +7,18 @@
 
 PORTNAME=	nano
 PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	http://www.nano-editor.org/dist/v1.2/
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Nano's ANOther editor, an enhanced free Pico clone
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-all
+USE_GETTEXT=	yes
 
 INFO=		nano
 MAN1=		nano.1
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index ed053880e734..770eeb2c3dc2 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	poedit
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,9 +17,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gettext catalogs (.po files) editor
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
+LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/editors/ssed/Makefile b/editors/ssed/Makefile
index 1b9c4594c435..e1ec6be1d6ce 100644
--- a/editors/ssed/Makefile
+++ b/editors/ssed/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ssed
 PORTVERSION=	3.58
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors textproc
 MASTER_SITES=	http://queen.rett.polimi.it/~paolob/seders/ssed/
 DISTNAME=	sed-${PORTVERSION}
@@ -15,9 +15,9 @@ DISTNAME=	sed-${PORTVERSION}
 MAINTAINER=	verm@drunkmonk.net
 COMMENT=	Super-sed is a heavily enhanced version of sed
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} --program-prefix=s
 
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 0378fa74bfba..b7568eae1094 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xemacs-devel-mule
 PORTVERSION=	${XEMACS_VER:S/-/./}
+PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|kiri/xemacs|} \
 		${MASTER_SITE_XEMACS:S|%SUBDIR%|xemacs-${XEMACS_REL}|}
@@ -29,11 +30,11 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		compface.1:${PORTSDIR}/mail/faces
+USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_XPM=	yes
 .endif
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old \
-		${LIB_INPUT_METHOD}
+LIB_DEPENDS+=	${LIB_INPUT_METHOD}
 
 XEMACS_MAJOR_VER?=	21
 XEMACS_REL=		${XEMACS_MAJOR_VER}.5
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index cb38d163e570..54864abd6f5b 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xemacs-mule
 PORTVERSION=	${XEMACS_VER}
+PORTREVISION=	1
 .if defined(WNN6)
 .endif
 CATEGORIES+=	editors
@@ -32,7 +33,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		compface.1:${PORTSDIR}/mail/faces \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		${LIB_INPUT_METHOD}
 
 XEMACS_MAJOR_VER?=	21
@@ -40,6 +40,7 @@ XEMACS_REL=		${XEMACS_MAJOR_VER}.4
 XEMACS_VER=		${XEMACS_MAJOR_VER}.4.14
 XEMACS_ARCH=		${CONFIGURE_TARGET}
 
+USE_GETTEXT=	yes
 USE_XLIB=	yes
 STRIP=
 USE_AUTOCONF=	yes
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index ed7d51c8857c..11f5ff426ab9 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yudit
 PORTVERSION=	2.7.6
+PORTREVISION=	1
 CATEGORIES=	editors converters print
 MASTER_SITES=	http://yudit.org/download/ \
 		${MASTER_SITE_SUNSITE}
@@ -16,9 +17,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	jkoshy@freebsd.org
 COMMENT=	Multi-lingual unicode text editor with TTF support
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext-old
-
 USE_XLIB=	YES
+USE_GETTEXT=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib" \
 		LC_ALL=
diff --git a/editors/zoinks/Makefile b/editors/zoinks/Makefile
index 675a166e6d53..3491373ecbc2 100644
--- a/editors/zoinks/Makefile
+++ b/editors/zoinks/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zoinks
 PORTVERSION=	0.3.7
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://zoinks.mikelockwood.com/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -14,8 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	mike@mikelockwood.com
 COMMENT=	An X11 programmer's editor and development environment
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 .if defined(WITH_IMLIB)
 USE_GNOME=	imlib
 CONFIGURE_ARGS+=	--enable-imlib
diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index 3cb2d8d772c8..179923216d45 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gxmame
 PORTVERSION=	0.34b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,9 +16,9 @@ MAINTAINER=	tlp@liquidx.org
 COMMENT=	GXmame is a GTK frontend for xmame
 
 RUN_DEPENDS=	xmame:${PORTSDIR}/emulators/xmame
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_GETTEXT=	yes
 USE_GZIP=	yes
 USE_XLIB=	yes
 USE_GNOME=	gtk20
diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index b76cc04e9c6c..d63a418586d6 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hercules
 PORTVERSION=	2.17.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.conmicro.cx/hercules/
 
@@ -15,10 +15,9 @@ MAINTAINER=	phk@FreeBSD.org
 COMMENT=	The Hercules System/370, ESA/390, and z/Architecture Emulator
 
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 
-LIB_DEPENDS=   intl.5:${PORTSDIR}/devel/gettext-old
-
 post-patch:
 	@${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/configure
 
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index abaa53892d59..03afa89c3334 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xsystem35
 PORTVERSION=	1.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.aist-nara.ac.jp/~masaki-c/private/unitbase/xsys35/down/
 
@@ -16,6 +16,7 @@ COMMENT=	AliceSoft System 3.5 on X Window System
 
 USE_REINPLACE=	yes
 USE_AUTOCONF=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
@@ -40,8 +41,6 @@ PATCHES=	pastel.diff
 
 .include <bsd.port.pre.mk>
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 FREETYPE_CONFIG?=    ${LOCALBASE}/bin/freetype-config
 
diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index 542a26bbe9d9..20f102f78ebe 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	grisbi
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	http://grisbi.org/download/packages/${PORTVERSION}/sources/		\
 		http://cedricauger.free.fr/download/packages/${PORTVERSION}/sources/	\
@@ -15,9 +16,9 @@ MASTER_SITES=	http://grisbi.org/download/packages/${PORTVERSION}/sources/		\
 MAINTAINER=	thierry@pompo.net
 COMMENT=	A personnal accounting application
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old	\
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
diff --git a/french/calligra-l10n/Makefile b/french/calligra-l10n/Makefile
index 065b53a14715..ba62ca6fcfcd 100644
--- a/french/calligra-l10n/Makefile
+++ b/french/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	french kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/french/kde3-i18n/Makefile b/french/kde3-i18n/Makefile
index cea781cacf37..81f23fef7b62 100644
--- a/french/kde3-i18n/Makefile
+++ b/french/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	french kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/french/kde4-l10n/Makefile b/french/kde4-l10n/Makefile
index cea781cacf37..81f23fef7b62 100644
--- a/french/kde4-l10n/Makefile
+++ b/french/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	french kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/french/koffice-i18n/Makefile b/french/koffice-i18n/Makefile
index 065b53a14715..ba62ca6fcfcd 100644
--- a/french/koffice-i18n/Makefile
+++ b/french/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	french kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/french/koffice-kde4-l10n/Makefile b/french/koffice-kde4-l10n/Makefile
index 065b53a14715..ba62ca6fcfcd 100644
--- a/french/koffice-kde4-l10n/Makefile
+++ b/french/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	french kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/ftp/axel/Makefile b/ftp/axel/Makefile
index 2cb291fbfc29..81b26b85144a 100644
--- a/ftp/axel/Makefile
+++ b/ftp/axel/Makefile
@@ -8,15 +8,14 @@
 
 PORTNAME=	axel
 PORTVERSION=	1.0a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.lintux.cx/downloads/
 
 MAINTAINER=	lintux@debian.org
 COMMENT=	A download accelerator
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 USE_REINPLACE=	yes
diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index afc8f9d9a6d8..c5a48aa488ec 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lftp
 PORTVERSION=	2.6.11
+PORTREVISION=	1
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.phear.org/pub/linux/networking/ftp/client/lftp/ \
 		ftp://ftp.phear.org/pub/linux/networking/ftp/client/lftp/old/ \
@@ -34,9 +35,8 @@ MASTER_SITES=	ftp://ftp.phear.org/pub/linux/networking/ftp/client/lftp/ \
 MAINTAINER=	fm@code.org.ua
 COMMENT=	Shell-like command line ftp client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index 6b6cc2d2f7f1..996e7fbf3e4e 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pavuk
 PORTVERSION=	0.9.28
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	ftp www
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.idata.sk/~ondrej/sw/
@@ -18,8 +18,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTTP, FTP and Gopher mirroring tool
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_OPENSSL=	yes
 WANT_GNOME=	yes
 USE_REINPLACE=	yes
diff --git a/ftp/wget+ipv6/Makefile b/ftp/wget+ipv6/Makefile
index e9524bb92fee..ac0bc7da6016 100644
--- a/ftp/wget+ipv6/Makefile
+++ b/ftp/wget+ipv6/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	wget
 PORTVERSION=	1.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	ftp www ipv6
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/wget/pub/unix/util/wget/ \
@@ -27,13 +27,12 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	sf@FreeBSD.org
 COMMENT=	Retrieve files from the Net via HTTP and FTP with IPv6 capability
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE}
 .endif
 USE_PERL5_BUILD=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/ftp/wget-devel/Makefile b/ftp/wget-devel/Makefile
index 754d1e60e323..abf54386e20f 100644
--- a/ftp/wget-devel/Makefile
+++ b/ftp/wget-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wget-devel
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 CATEGORIES=	ftp www ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	wget
@@ -21,7 +22,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Retrieve files from the Net via HTTP and FTP
 
 .if !defined(WITHOUT_NLS)
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
+USE_GETTEXT=	yes
 .endif
 
 CONFLICTS=	wget-*
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 4c9abc796ac7..18f1bbec4475 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	wget
 PORTVERSION=	1.8.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	ftp www ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	wget
@@ -24,7 +24,7 @@ MAINTAINER=	sf@FreeBSD.org
 COMMENT=	Retrieve files from the Net via HTTP and FTP
 
 .if !defined(WITHOUT_NLS)
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
+USE_GETTEXT=	yes
 .endif
 
 CONFLICTS=	wget-devel-*
diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile
index bc692bbc2b9e..78675d75e1f6 100644
--- a/games/freeciv-gtk2/Makefile
+++ b/games/freeciv-gtk2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freeciv
 PORTVERSION=	1.14.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 		ftp://ftp.netc.pt/pub/freeciv/stable/ \
@@ -15,8 +16,7 @@ MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 MAINTAINER?=	adam-ports@blacktabby.org
 COMMENT?=	A civilisation clone for X11; multiplayer
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_XPM=	yes
 USE_BZIP2=	yes
 WANT_GNOME=	yes
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index bc692bbc2b9e..78675d75e1f6 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freeciv
 PORTVERSION=	1.14.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 		ftp://ftp.netc.pt/pub/freeciv/stable/ \
@@ -15,8 +16,7 @@ MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 MAINTAINER?=	adam-ports@blacktabby.org
 COMMENT?=	A civilisation clone for X11; multiplayer
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_XPM=	yes
 USE_BZIP2=	yes
 WANT_GNOME=	yes
diff --git a/games/ggz-txt-client/Makefile b/games/ggz-txt-client/Makefile
index 5003a2af629a..0c08cfc24969 100644
--- a/games/ggz-txt-client/Makefile
+++ b/games/ggz-txt-client/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ggz-txt-client
 PORTVERSION=	0.0.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ggz
@@ -15,11 +16,11 @@ MASTER_SITE_SUBDIR=	ggz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GGZ Gaming Zone - Console (Text) Frontend
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		ggz.1:${PORTSDIR}/games/libggz \
+LIB_DEPENDS=	ggz.1:${PORTSDIR}/games/libggz \
 		ggzcore.3:${PORTSDIR}/games/ggz-client-libs
 
 USE_GETOPT_LONG=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}
 CONFIGURE_ENV=	\
diff --git a/games/gnmm/Makefile b/games/gnmm/Makefile
index 40221636a286..08f1c55b319b 100644
--- a/games/gnmm/Makefile
+++ b/games/gnmm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnmm
 PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,9 +17,9 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	barner@gmx.de
 COMMENT=	A "nine mens' morris" implementation for the GNOME Desktop Environment
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf
diff --git a/games/gtypist/Makefile b/games/gtypist/Makefile
index 3f9153ae54d7..ebe0202a570a 100644
--- a/games/gtypist/Makefile
+++ b/games/gtypist/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gtypist
 PORTVERSION=	2.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -13,9 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Interactive typing tutor
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/games/lexter/Makefile b/games/lexter/Makefile
index 55853e66dbcf..ba93fcc0c901 100644
--- a/games/lexter/Makefile
+++ b/games/lexter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lexter
 PORTVERSION=	1.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
@@ -15,12 +15,11 @@ MASTER_SITE_SUBDIR=	games/arcade
 MAINTAINER=	markp@FreeBSD.org
 COMMENT=	A real-time word puzzle for text terminals
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include' \
 		LDFLAGS='-L${LOCALBASE}/lib'
 CONFIGURE_ARGS+=	--localstatedir=/var/games
+USE_GETTEXT=	yes
 
 MAN6=	lexter.6
 
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index abc830b4b98d..e1c26e6c7b3f 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lincity
 PORTVERSION=	1.12.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rich city simulation game for X
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index 7728f68ce4c4..fab7b89eefc2 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	macopix
 PORTVERSION=	0.8.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://kurumi.sakura.ne.jp/~chimari/macopix/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES}
@@ -15,8 +15,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES}
 MAINTAINER=	esu@yk.rim.or.jp
 COMMENT=	Window sitter for X11
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
@@ -32,6 +31,7 @@ RESTRICTED_FILES= \
 		macopix-mascot-tsukihime-ja-1.00.tar.gz \
 		macopix-mascot-marimite-ja-0.70.tar.gz
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12 gdkpixbuf
 
diff --git a/games/tornado/Makefile b/games/tornado/Makefile
index 2bef6040c83b..351b16c2029f 100644
--- a/games/tornado/Makefile
+++ b/games/tornado/Makefile
@@ -7,17 +7,17 @@
 
 PORTNAME=	tornado
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://home.kcore.de/~kiza/linux/tornado/download/
 
 MAINTAINER=	minter@lunenburg.org
 COMMENT=	A curses-based game of weather destruction
 
-LIB_DEPENDS=    intl:${PORTSDIR}/devel/gettext-old
-
 MAN6=		tornado.6
 MANLANG=	"" de fr it ru
 
+USE_GETTEXT=	yes
 USE_GMAKE=      yes
 
 .include <bsd.port.mk>
diff --git a/games/xfce4-toys/Makefile b/games/xfce4-toys/Makefile
index f0806c060fe5..3e463a3dbc68 100644
--- a/games/xfce4-toys/Makefile
+++ b/games/xfce4-toys/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-toys
 PORTVERSION=	4.0.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	games xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
                 ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/xfce-${PORTVERSION}/src/ \
@@ -19,12 +19,12 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Toys for the XFce 4 panel
 
 BUILD_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
+LIB_DEPENDS=	xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
+USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index b7e09deda8e6..921aba068165 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xinvaders
 PORTVERSION=	2.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade/invaders
@@ -15,12 +15,11 @@ MASTER_SITE_SUBDIR=	games/arcade/invaders
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shoot-em-up them nasty little bugs
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 ONLY_FOR_ARCHS=	i386
 
 NO_CDROM=	"don't sell for profit"
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_AUTOMAKE=	yes
 AUTOMAKE_ARGS=	--include-deps
diff --git a/german/calligra-l10n/Makefile b/german/calligra-l10n/Makefile
index 70089c4325a7..76dd9d9c7be9 100644
--- a/german/calligra-l10n/Makefile
+++ b/german/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	german kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/german/kde3-i18n/Makefile b/german/kde3-i18n/Makefile
index 2fdcdfab1397..024bc94b5662 100644
--- a/german/kde3-i18n/Makefile
+++ b/german/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	german kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/german/kde4-l10n/Makefile b/german/kde4-l10n/Makefile
index 2fdcdfab1397..024bc94b5662 100644
--- a/german/kde4-l10n/Makefile
+++ b/german/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	german kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/german/koffice-i18n/Makefile b/german/koffice-i18n/Makefile
index 70089c4325a7..76dd9d9c7be9 100644
--- a/german/koffice-i18n/Makefile
+++ b/german/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	german kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/german/koffice-kde4-l10n/Makefile b/german/koffice-kde4-l10n/Makefile
index 70089c4325a7..76dd9d9c7be9 100644
--- a/german/koffice-kde4-l10n/Makefile
+++ b/german/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	german kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index 929b714a5cb3..0a96aa4a54b3 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkgraph
 PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics math
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR= jedgar
@@ -15,9 +15,8 @@ MASTER_SITE_SUBDIR= jedgar
 MAINTAINER=	jedgar@FreeBSD.org
 COMMENT=	Graphing calculator using GTK+
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_X_PREFIX=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	imlib
 USE_PERL5_BUILD=yes
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index 876dcb74a3ff..eab7e4989300 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libexif
 PORTVERSION=	0.5.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 COMMENT=	Library to read digital camera file meta-data
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index 0b00a38e988a..6bce08a87326 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgphoto2
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gphoto
@@ -14,11 +15,11 @@ MASTER_SITE_SUBDIR=	gphoto
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A universal digital camera picture control tool
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		usb-0.1.7:${PORTSDIR}/devel/libusb \
+LIB_DEPENDS=	usb-0.1.7:${PORTSDIR}/devel/libusb \
 		exif.10:${PORTSDIR}/graphics/libexif
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
diff --git a/graphics/lodju/Makefile b/graphics/lodju/Makefile
index f94d2a422959..4eec110dcda9 100644
--- a/graphics/lodju/Makefile
+++ b/graphics/lodju/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lodju
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	graphics
 MASTER_SITES=	http://liw.iki.fi/liw/lodju/tarballs/
 
@@ -16,8 +16,7 @@ COMMENT?=	An image management tool for the X Window System
 
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
-		gtk12-config:${PORTSDIR}/x11-toolkits/gtk12 \
-		${LOCALBASE}/include/libintl.h:${PORTSDIR}/devel/gettext-old
+		gtk12-config:${PORTSDIR}/x11-toolkits/gtk12
 LIB_DEPENDS=	glade-gnome:${PORTSDIR}/x11-toolkits/rep-gtk \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
@@ -27,5 +26,6 @@ MANCOMPRESSED=	yes
 AUTOCONF=       autoconf
 GNU_AUTOCONF=   yes
 HAS_CONFIGURE=  yes
+USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/osgedit/Makefile b/graphics/osgedit/Makefile
index 00d0a3dda81d..2e195ea20b5b 100644
--- a/graphics/osgedit/Makefile
+++ b/graphics/osgedit/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	osgedit
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,6 +22,7 @@ RUN_DEPENDS=	${X11BASE}/lib/libosg.so:${PORTSDIR}/graphics/osg
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/ruby-tgif/Makefile b/graphics/ruby-tgif/Makefile
index 1758234d8a96..f94fde5d64a1 100644
--- a/graphics/ruby-tgif/Makefile
+++ b/graphics/ruby-tgif/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tgif
 PORTVERSION=	20010408
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www2s.biglobe.ne.jp/~Nori/ruby/dist/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -18,8 +18,8 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Ruby extension library to draw Tgif graphics
 
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/${TGIF_PORT}:build
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 
+USE_GETTEXT=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_XLIB=	yes
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 8a35a193567d..0ac2875e5d83 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sane-backends
 PORTVERSION=	1.0.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/%SUBDIR%/ \
 		ftp://ftp.de.mostang.com/pub/sane/%SUBDIR%/ \
@@ -18,11 +18,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION} \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		usb-0.1.7:${PORTSDIR}/devel/libusb \
+LIB_DEPENDS=	usb-0.1.7:${PORTSDIR}/devel/libusb \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_REINPLACE=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/graphics/tgif-nls/Makefile b/graphics/tgif-nls/Makefile
index 445c2367e690..53e77922212d 100644
--- a/graphics/tgif-nls/Makefile
+++ b/graphics/tgif-nls/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tgif
 PORTVERSION=	4.1.43
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://bourbon.usc.edu/pub/tgif/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -17,9 +18,9 @@ DISTNAME=	${PORTNAME}-QPL-${PORTVERSION}
 MAINTAINER=	one@netlab.is.tsukuba.ac.jp
 COMMENT=	A two-dimensional drawing tool with NLS message catalogs support
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm
 
+USE_GETTEXT=	yes
 USE_IMAKE=	yes
 USE_REINPLACE=	yes
 MAN1=		tgif.1
diff --git a/hebrew/kde3-i18n/Makefile b/hebrew/kde3-i18n/Makefile
index 5150996af697..eb8f3c1e27e6 100644
--- a/hebrew/kde3-i18n/Makefile
+++ b/hebrew/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	hebrew kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/hebrew/kde4-l10n/Makefile b/hebrew/kde4-l10n/Makefile
index 5150996af697..eb8f3c1e27e6 100644
--- a/hebrew/kde4-l10n/Makefile
+++ b/hebrew/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	hebrew kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/hebrew/koffice-i18n/Makefile b/hebrew/koffice-i18n/Makefile
index 66448e3c09ed..6bd27235ee83 100644
--- a/hebrew/koffice-i18n/Makefile
+++ b/hebrew/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	hebrew kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/hungarian/kde3-i18n/Makefile b/hungarian/kde3-i18n/Makefile
index a8381c947989..ffc3ccaed1e3 100644
--- a/hungarian/kde3-i18n/Makefile
+++ b/hungarian/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	hungarian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/hungarian/kde4-l10n/Makefile b/hungarian/kde4-l10n/Makefile
index a8381c947989..ffc3ccaed1e3 100644
--- a/hungarian/kde4-l10n/Makefile
+++ b/hungarian/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	hungarian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/hungarian/koffice-i18n/Makefile b/hungarian/koffice-i18n/Makefile
index c260ee1e1d31..f9517978d082 100644
--- a/hungarian/koffice-i18n/Makefile
+++ b/hungarian/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	hungarian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/irc/liece/Makefile b/irc/liece/Makefile
index 6d91ba07283e..1271c0416f4a 100644
--- a/irc/liece/Makefile
+++ b/irc/liece/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	liece
 PORTVERSION=	1.4.10
+PORTREVISION=	1
 CATEGORIES=	irc elisp
 MASTER_SITES=	http://www.unixuser.org/~ueno/liece/dist/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -14,12 +15,12 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 MAINTAINER=	yoichi@FreeBSD.org
 COMMENT=	Yet another IRC client which runs under Emacsen
 
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
-		msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
 RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
 		ldcc:${PORTSDIR}/irc/liece-dcc
 
 HAS_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 
 EMACS_PORT_NAME?=	emacs21
diff --git a/irc/lostirc/Makefile b/irc/lostirc/Makefile
index dda8f91f5a8f..1e30ac7d9d61 100644
--- a/irc/lostirc/Makefile
+++ b/irc/lostirc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lostirc
 PORTVERSION=	0.2.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	rael@vectorstar.net
 COMMENT=	LostIRC is a simple and minimal IRC client for X
 
-LIB_DEPENDS=	gtkmm-2:${PORTSDIR}/x11-toolkits/gtk--2 \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	gtkmm-2:${PORTSDIR}/x11-toolkits/gtk--2
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
diff --git a/irc/riece-emacs21/Makefile b/irc/riece-emacs21/Makefile
index 6d91ba07283e..1271c0416f4a 100644
--- a/irc/riece-emacs21/Makefile
+++ b/irc/riece-emacs21/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	liece
 PORTVERSION=	1.4.10
+PORTREVISION=	1
 CATEGORIES=	irc elisp
 MASTER_SITES=	http://www.unixuser.org/~ueno/liece/dist/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -14,12 +15,12 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 MAINTAINER=	yoichi@FreeBSD.org
 COMMENT=	Yet another IRC client which runs under Emacsen
 
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
-		msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
 RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
 		ldcc:${PORTSDIR}/irc/liece-dcc
 
 HAS_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 
 EMACS_PORT_NAME?=	emacs21
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index 6d91ba07283e..1271c0416f4a 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	liece
 PORTVERSION=	1.4.10
+PORTREVISION=	1
 CATEGORIES=	irc elisp
 MASTER_SITES=	http://www.unixuser.org/~ueno/liece/dist/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -14,12 +15,12 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 MAINTAINER=	yoichi@FreeBSD.org
 COMMENT=	Yet another IRC client which runs under Emacsen
 
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
-		msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
 RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
 		ldcc:${PORTSDIR}/irc/liece-dcc
 
 HAS_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 
 EMACS_PORT_NAME?=	emacs21
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index 475646c29f0a..bd81bffa840f 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eb
 PORTVERSION=	3.3.4
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/net/ndtp/eb/
@@ -21,8 +22,6 @@ PATCH_SITES=	${MASTER_SITES}
 MAINTAINER=	takamune2004@yahoo.co.jp
 COMMENT=	C library for accessing EB, EBG, EBXA and EPWING CD-ROM dictionaries
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 EBFILES=	${DISTNAME}${EXTRACT_SUFX}
 LISTFILES=	appendix/LIST \
 		appendix/LIST-ja
@@ -59,6 +58,7 @@ APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 
 DIST_SUBDIR=	eb
 
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/japanese/eb3/Makefile b/japanese/eb3/Makefile
index 475646c29f0a..bd81bffa840f 100644
--- a/japanese/eb3/Makefile
+++ b/japanese/eb3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eb
 PORTVERSION=	3.3.4
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/net/ndtp/eb/
@@ -21,8 +22,6 @@ PATCH_SITES=	${MASTER_SITES}
 MAINTAINER=	takamune2004@yahoo.co.jp
 COMMENT=	C library for accessing EB, EBG, EBXA and EPWING CD-ROM dictionaries
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 EBFILES=	${DISTNAME}${EXTRACT_SUFX}
 LISTFILES=	appendix/LIST \
 		appendix/LIST-ja
@@ -59,6 +58,7 @@ APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 
 DIST_SUBDIR=	eb
 
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/japanese/kde3-i18n/Makefile b/japanese/kde3-i18n/Makefile
index 66059ae620fb..a558b2476531 100644
--- a/japanese/kde3-i18n/Makefile
+++ b/japanese/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	japanese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/japanese/kde4-l10n/Makefile b/japanese/kde4-l10n/Makefile
index 66059ae620fb..a558b2476531 100644
--- a/japanese/kde4-l10n/Makefile
+++ b/japanese/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	japanese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/japanese/koffice-i18n/Makefile b/japanese/koffice-i18n/Makefile
index 87b98355a2dc..1be924edd748 100644
--- a/japanese/koffice-i18n/Makefile
+++ b/japanese/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	japanese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/japanese/koffice-kde4-l10n/Makefile b/japanese/koffice-kde4-l10n/Makefile
index 87b98355a2dc..1be924edd748 100644
--- a/japanese/koffice-kde4-l10n/Makefile
+++ b/japanese/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	japanese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 781f4be41b02..6fa93aa5ef02 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	${VERSION}.j${JP_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese mail
 MASTER_SITES=	http://www.emaillab.org/mutt/1.5/ \
 		http://my.reset.jp/~iwashita/mutt/distfiles/ \
@@ -27,9 +27,9 @@ COMMENT=	Text-based mail client (Japanised development version)
 LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang \
 		iconv.3:${PORTSDIR}/converters/libiconv
 .if !defined(WITH_GETTEXT)
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
+USE_GETTEXT=	yes
 .else
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 .endif
 .if defined(WITH_MUTT_CYRUS_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index d4c85c30a2b1..74b81c0f57af 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	${VERSION}.j${JP_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese mail
 MASTER_SITES=	http://www.emaillab.org/mutt/1.4/ \
 		http://my.reset.jp/~iwashita/mutt/distfiles/ \
@@ -27,9 +27,9 @@ COMMENT=	Text-based mail client (Japanised Version)
 LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang \
 		iconv.3:${PORTSDIR}/converters/libiconv
 .if !defined(WITH_GETTEXT)
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
+USE_GETTEXT=	yes
 .else
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext-old
+BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 .endif
 .if defined(WITH_MUTT_CYRUS_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index 777411a67d8c..d9a1575d1abb 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vflib
 PORTVERSION=	${VFLIB_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://gull.se.hiroshima-u.ac.jp/pub/TypeHack/
 DISTNAME=	VFlib2-${PORTVERSION}
@@ -17,13 +17,13 @@ MAINTAINER=	mita@FreeBSD.org
 COMMENT=	Japanese Vector font library
 
 BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake-4
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 
 VFLIB_VERSION=	2.25.6
 PLIST_SUB=	VFLIB_VERSION=${VFLIB_VERSION}
 
 USE_FREETYPE=	yes
+USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_AUTOCONF_VER=213
 INSTALLS_SHLIB=	yes
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index 6a023daa3d61..f26d144b254a 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@@ -22,7 +22,6 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		zip:${PORTSDIR}/archivers/zip \
 		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
 .if !defined(WITHOUT_PLUGIN)
-BUILD_DEPENDS+=	msgfmt:${PORTSDIR}/devel/gettext-old
 LIB_DEPENDS=	glib12.3:$(PORTSDIR)/devel/glib12 \
 		gtk12.2:$(PORTSDIR)/x11-toolkits/gtk12 \
 		nspr4.1:$(PORTSDIR)/devel/nspr
@@ -47,6 +46,7 @@ JDK_VERSION=	1.3.1
 JDK_PATCHSET_VERSION=	9
 
 ONLY_FOR_ARCHS=	i386
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
diff --git a/java/jmp/Makefile b/java/jmp/Makefile
index 621d648c7910..d9f87bcbf982 100644
--- a/java/jmp/Makefile
+++ b/java/jmp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jmp
 PORTVERSION=	0.38
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://www.khelekore.org/jmp/
 
@@ -14,10 +15,10 @@ MAINTAINER=	ronald@cs.vu.nl
 COMMENT=	Java Memory Profiler
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/bison:${PORTSDIR}/devel/bison
-LIB_DEPENDS=	intl:${PORTSDIR}/devel/gettext-old
 
 CONFIGURE_ARGS=	--with-includes="${JAVA_HOME}/include ${LOCALBASE}/include"
 
+USE_GETTEXT=	yes
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=--enable-noui
 .else
diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 6683a5fa6edb..9617d912af40 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ami
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	korean x11
 MASTER_SITES=	http://download.kldp.net/ami/ \
 		http://www.kr.freebsd.org/~hwang/ami/:hjdic \
@@ -17,9 +18,9 @@ EXTRACT_ONLY=	${DISTNAME}.tar.gz
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Well-known Korean X11 Input Method
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12 gdkpixbuf
diff --git a/korean/kde3-i18n/Makefile b/korean/kde3-i18n/Makefile
index e8f451780205..2fa0eff3379e 100644
--- a/korean/kde3-i18n/Makefile
+++ b/korean/kde3-i18n/Makefile
@@ -18,10 +18,9 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 IGNORE=		Needs update from vendor.
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/korean/kde4-l10n/Makefile b/korean/kde4-l10n/Makefile
index e8f451780205..2fa0eff3379e 100644
--- a/korean/kde4-l10n/Makefile
+++ b/korean/kde4-l10n/Makefile
@@ -18,10 +18,9 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 IGNORE=		Needs update from vendor.
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/korean/texinfo/Makefile b/korean/texinfo/Makefile
index 98aad63eac0f..932a1dc2bb97 100644
--- a/korean/texinfo/Makefile
+++ b/korean/texinfo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	texinfo
 PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean print
 MASTER_SITES=	ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
 DISTNAME=	${PORTNAME}-ko-${PORTVERSION}
@@ -15,10 +15,10 @@ DISTNAME=	${PORTNAME}-ko-${PORTVERSION}
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Korean enabled Texinfo formatter
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	${LOCALBASE}/share/texmf/doc/latex/hlatex/uhc.ks:${PORTSDIR}/korean/hlatex
 
 GNU_CONFIGURE=	YES
+USE_GETTEXT=	yes
 USE_GMAKE=	YES
 
 # local variables.
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 310aa75666f3..9cc2e6a930a3 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clisp
 PORTVERSION=	2.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://cvs2.cons.org/pub/lisp/clisp/source/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -16,12 +16,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	henrik.motakef@web.de
 COMMENT=	An ANSI Common Lisp
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GCC=	2.95
+USE_GETTEXT=	yes
 
 # In clisp-2.28, the build dies in the "regexp" module: the build target
 # invokes a configure script, which encounters a different CC variable than
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index cda276fc9054..b27d8f85dc81 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gawk
 PORTVERSION=	3.1.1
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gawk
@@ -13,8 +14,6 @@ MASTER_SITE_SUBDIR=	gawk
 MAINTAINER=	dd@FreeBSD.org
 COMMENT=	The GNU version of Awk
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libintl.a:${PORTSDIR}/devel/gettext-old
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500039
@@ -27,5 +26,6 @@ CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 MAN1=		gawk.1 igawk.1
 
 PLIST_SUB=	VERSION=${PORTVERSION}
+USE_GETTEXT=	yes
 
 .include <bsd.port.post.mk>
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 4c09487784d5..7d3bbcb05427 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	librep
 PORTVERSION=	0.16.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang elisp gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	librep
@@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR=	librep
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An Emacs Lisp like runtime library
 
-LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 PLIST_SUB=	GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} VERSION=${PORTVERSION}
 
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/lang/lush/Makefile b/lang/lush/Makefile
index 3d8f2214ae49..a003b08975ec 100644
--- a/lang/lush/Makefile
+++ b/lang/lush/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	lush
 PORTVERSION=	0.99
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lush
@@ -13,9 +14,9 @@ MASTER_SITE_SUBDIR=	lush
 MAINTAINER=	dyeske@yahoo.com
 COMMENT=	A high level object-oriented programming language
 
-LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_SDL=	yes
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index b74297a39293..4e2527f8f75d 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mdk
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang gnome
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		${MASTER_SITE_SOURCEFORGE}
@@ -18,9 +18,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MIX Development Kit offers an emulation of MIX and MIXAL
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		guile.15:${PORTSDIR}/lang/guile
 
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 USE_GETOPT_LONG=	yes
 USE_X_PREFIX=	yes
diff --git a/lang/open-cobol-devel/Makefile b/lang/open-cobol-devel/Makefile
index a66fac72b75f..eed96f2680bd 100644
--- a/lang/open-cobol-devel/Makefile
+++ b/lang/open-cobol-devel/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	open-cobol
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An open-source COBOL compiler
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		ltdl.4:${PORTSDIR}/devel/libltdl \
+LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl \
 		gmp.6:${PORTSDIR}/math/libgmp4
 
 GNU_CONFIGURE=	yes
@@ -27,5 +27,6 @@ CONFIGURE_ARGS=	--with-readline
 INSTALLS_SHLIB=	yes
 
 INFO=		open-cobol
+USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile
index a66fac72b75f..eed96f2680bd 100644
--- a/lang/open-cobol/Makefile
+++ b/lang/open-cobol/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	open-cobol
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An open-source COBOL compiler
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		ltdl.4:${PORTSDIR}/devel/libltdl \
+LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl \
 		gmp.6:${PORTSDIR}/math/libgmp4
 
 GNU_CONFIGURE=	yes
@@ -27,5 +27,6 @@ CONFIGURE_ARGS=	--with-readline
 INSTALLS_SHLIB=	yes
 
 INFO=		open-cobol
+USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index 705f40986962..4a057e506312 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -21,7 +21,7 @@
 
 PORTNAME=	php4
 PORTVERSION=	4.3.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/:release \
 		http://it.php.net/distributions/:release \
@@ -326,7 +326,7 @@ CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
 .endif
 
 .if defined(WITH_GETTEXT)
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
+USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--with-gettext=${LOCALBASE}
 .endif
 
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 43afe764eb32..ea309e5b0386 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -21,7 +21,7 @@
 
 PORTNAME=	php5
 PORTVERSION=	5.0.0.a4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/:release \
 		http://it.php.net/distributions/:release \
@@ -314,7 +314,7 @@ CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
 .endif
 
 .if defined(WITH_GETTEXT)
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
+USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--with-gettext=${LOCALBASE}
 .endif
 
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 43afe764eb32..ea309e5b0386 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -21,7 +21,7 @@
 
 PORTNAME=	php5
 PORTVERSION=	5.0.0.a4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/:release \
 		http://it.php.net/distributions/:release \
@@ -314,7 +314,7 @@ CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
 .endif
 
 .if defined(WITH_GETTEXT)
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
+USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--with-gettext=${LOCALBASE}
 .endif
 
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 5847e358dcb7..03cc9132f985 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed-claws
 PORTVERSION=	0.9.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -19,12 +19,11 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	A lightweight and very featureful GTK+ based e-mail and news client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 THEMEVERSION=	20031130
 THEMEFILE=	sylpheed-iconset-${THEMEVERSION}.tar.gz
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 23297a91d203..2571f89b562f 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	elm
 PORTVERSION=	2.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.virginia.edu/pub/elm/ \
 		http://www.dragondata.com/software/
@@ -16,11 +16,11 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	toasty@dragondata.com
 COMMENT=	A once-popular mail user agent, version 2.5.x
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 
 WRKSRC=			${WRKDIR}/elm${PORTVERSION}
 NO_LATEST_LINK=		yes
+USE_GETTEXT=		yes
 IS_INTERACTIVE=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index 27ccf7b216cf..31806f23d190 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	elmo
 PORTVERSION=	0.8.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
 		${MASTER_SITE_SAVANNAH:S/$/:sav/}
@@ -18,8 +18,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:sf,sav
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Receive, filter, read, compose and send mail at the text console
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
@@ -28,6 +27,7 @@ MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 MAN1=		elmo.1 elmoconf.pl.1
 PLIST=		${WRKDIR}/pkg-plist
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 
 pre-extract:
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 27ccf7b216cf..31806f23d190 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	elmo
 PORTVERSION=	0.8.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
 		${MASTER_SITE_SAVANNAH:S/$/:sav/}
@@ -18,8 +18,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:sf,sav
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Receive, filter, read, compose and send mail at the text console
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
@@ -28,6 +27,7 @@ MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 MAN1=		elmo.1 elmoconf.pl.1
 PLIST=		${WRKDIR}/pkg-plist
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 
 pre-extract:
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index b362b2b56c71..b6c6de4895f3 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -11,6 +11,7 @@
 
 PORTNAME=	fetchmail
 PORTVERSION=	6.2.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.catb.org/~esr/%SUBDIR%/ \
 		ftp://ftp.ayamura.org/pub/%SUBDIR%/ \
@@ -21,11 +22,11 @@ MASTER_SITE_SUBDIR=	fetchmail
 MAINTAINER=	eik@FreeBSD.org
 COMMENT=	Batch mail retrieval utility for IMAP/POP2/POP3/APOP/KPOP/ETRN/ODMR
 
-LIB_DEPENDS=	intl:${PORTSDIR}/devel/gettext-old
 .if defined(WITH_X11)
 RUN_DEPENDS=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 .endif
 
+USE_GETTEXT=	yes
 .if defined(WITH_X11)
 USE_PYTHON=	yes
 .endif
diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile
index 14f2a4318cb8..32097b8f2775 100644
--- a/mail/filtermail/Makefile
+++ b/mail/filtermail/Makefile
@@ -10,6 +10,7 @@
 
 PORTNAME=	filtermail
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://home.in.tum.de/baueran/%SUBDIR%/
@@ -19,8 +20,6 @@ DISTNAME=	mailfilter-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Filter mail on a pop3 server: saves downloading spam
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 # This port is filtermail, but the author called it mailfilter. To avoid a
 #  clash with another port called mailfilter, we change all files
 #  installed by this port from the form *mailfilter* to the form
@@ -31,6 +30,7 @@ EXTRACT_AFTER_ARGS=	| ${SED} 's/[mM][aA][iI][lL][fF][iI][lL][tT][eE][rR]/filterm
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_GETOPT_LONG=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 328fe371a3a7..154a349b601e 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -7,17 +7,16 @@
 
 PORTNAME=	kbiff
 PORTVERSION=	3.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail kde
 MASTER_SITES=	http://devel-home.kde.org/~granroth/kbiff/
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	"Mail notification utility for KDE with nice features"
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index d8dac1f1b0f1..2f2ea5f5bcd1 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -75,7 +75,7 @@
 
 PORTNAME=	mutt-devel
 PORTVERSION=	1.5.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	mail ipv6
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -177,7 +177,7 @@ SGML_USED=	no
 .endif
 
 .if !defined(WITHOUT_NLS)
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
+USE_GETTEXT=	yes
 .endif
 
 .if defined(NOPORTDOCS)
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 27165c40e184..0e5a202c085f 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	1.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -42,7 +42,7 @@ WITH_SGML_DOCS?=yes
 .endif
 
 .if !defined(WITHOUT_NLS)
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
+USE_GETTEXT=	yes
 .endif
 .if defined(WITH_SLANG)
 LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 27165c40e184..0e5a202c085f 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	1.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -42,7 +42,7 @@ WITH_SGML_DOCS?=yes
 .endif
 
 .if !defined(WITHOUT_NLS)
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
+USE_GETTEXT=	yes
 .endif
 .if defined(WITH_SLANG)
 LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index e816bda04cea..51258f35e3f1 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	perdition
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	mail net security
 MASTER_SITES=	http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/
 
 MAINTAINER=	clement@FreeBSD.org
 COMMENT=	A POP3 & IMAP4 proxy that can map users to multiple backend servers
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		popt.0:${PORTSDIR}/devel/popt \
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger \
 		vanessa_socket.0:${PORTSDIR}/devel/libvanessa_socket \
 		vanessa_adt.0:${PORTSDIR}/devel/libvanessa_adt
@@ -24,6 +24,7 @@ MAN8=		perdition.8
 
 MANCOMPRESSED=	no
 
+USE_GETTEXT=	yes
 USE_LIBTOOL=	YES
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" BDB_LIB=db3
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index feea8e5249c4..26a0f5dab440 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spruce
 PORTVERSION=	0.6.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	erich@tacni.net
 COMMENT=	A simple GTK based email client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 5847e358dcb7..03cc9132f985 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed-claws
 PORTVERSION=	0.9.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -19,12 +19,11 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	A lightweight and very featureful GTK+ based e-mail and news client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 THEMEVERSION=	20031130
 THEMEFILE=	sylpheed-iconset-${THEMEVERSION}.tar.gz
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
diff --git a/mail/sylpheed-gtk2/Makefile b/mail/sylpheed-gtk2/Makefile
index e8d36cc90c74..0ef624477482 100644
--- a/mail/sylpheed-gtk2/Makefile
+++ b/mail/sylpheed-gtk2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		sylpheed-gtk2
 PORTVERSION=		0.9.8a.20040109
+PORTREVISION=		1
 CATEGORIES=		mail ipv6
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +16,9 @@ DISTNAME=		sylpheed-${PORTVERSION:R}-gtk2-${PORTVERSION:E}
 MAINTAINER=		jylefort@brutele.be
 COMMENT=		The GTK+ 2.0 port of a lightweight, featureful and fast e-mail client
 
-LIB_DEPENDS=		intl.5:${PORTSDIR}/devel/gettext-old \
-			iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=		iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_GETTEXT=		yes
 USE_GMAKE=		yes
 USE_X_PREFIX=		yes
 USE_GNOME=		gtk20
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 85be3ec7348d..cca46179c230 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	0.9.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -16,10 +16,10 @@ MASTER_SITE_SUBDIR=	sylpheed-claws
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index 85be3ec7348d..cca46179c230 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	0.9.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -16,10 +16,10 @@ MASTER_SITE_SUBDIR=	sylpheed-claws
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index 85be3ec7348d..cca46179c230 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	0.9.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -16,10 +16,10 @@ MASTER_SITE_SUBDIR=	sylpheed-claws
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index 85be3ec7348d..cca46179c230 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	0.9.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -16,10 +16,10 @@ MASTER_SITE_SUBDIR=	sylpheed-claws
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index 16f19c035a0d..559e10ed012e 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oleo
 PORTVERSION=	1.99.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GNU spreadsheet for X11 and terminals
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=		yes
 USE_PERL5_BUILD=	yes
 USE_BISON=	yes
 USE_REINPLACE=	yes
diff --git a/misc/afbackup/Makefile b/misc/afbackup/Makefile
index f234f55782af..7a355114cf89 100644
--- a/misc/afbackup/Makefile
+++ b/misc/afbackup/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	afbackup
 PORTVERSION=	3.3.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	afbackup
@@ -20,8 +20,8 @@ COMMENT=	AF's backup system
 
 WRKSRC=		${WRKDIR}/afbackup-3.3.5
 PLIST=		${WRKSRC}/pkg-plist
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext-old
 
+USE_GETTEXT=	yes
 .if ! defined(NO_DES)
 USE_OPENSSL=	yes
 CONFIG_WITH_DES=	--with-des --with-des-header=openssl/des.h \
diff --git a/misc/dirtree/Makefile b/misc/dirtree/Makefile
index 3c95e29fbaeb..739c149cb4d7 100644
--- a/misc/dirtree/Makefile
+++ b/misc/dirtree/Makefile
@@ -8,19 +8,19 @@
 
 PORTNAME=	dirtree
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://home.pages.at/kingleo/development/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A command line tool for displaying directory trees
 
-LIB_DEPENDS=	LeoArg.2:${PORTSDIR}/devel/leoarg \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	LeoArg.2:${PORTSDIR}/devel/leoarg
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 
 MAN1=	dirtree.1
diff --git a/misc/getopt/Makefile b/misc/getopt/Makefile
index a33be411803d..26754b21d561 100644
--- a/misc/getopt/Makefile
+++ b/misc/getopt/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	getopt
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://huizen.dds.nl/~frodol/
 
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	A getopt(1) replacement that supports GNU-style long options
 
-LIB_DEPENDS=	intl:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=		yes
 USE_GMAKE=		yes
 USE_GETOPT_LONG=	yes
 
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index de9cfa33fccd..34908de79539 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomemimedata
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-mime-data/2.4
@@ -16,9 +17,8 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A MIME and Application database for GNOME
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomehier gnomeprefix gnometarget pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/misc/gnomemimedata/Makefile b/misc/gnomemimedata/Makefile
index de9cfa33fccd..34908de79539 100644
--- a/misc/gnomemimedata/Makefile
+++ b/misc/gnomemimedata/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomemimedata
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-mime-data/2.4
@@ -16,9 +17,8 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A MIME and Application database for GNOME
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomehier gnomeprefix gnometarget pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/misc/hello/Makefile b/misc/hello/Makefile
index d47fde67cd0d..707985db1482 100644
--- a/misc/hello/Makefile
+++ b/misc/hello/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hello
 PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	hello
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	hello
 MAINTAINER=	shipley@dis.org
 COMMENT=	A utility for saying hello to the world and reading email
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	YES
 USE_PERL5_BUILD=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/misc/kcd-devel/Makefile b/misc/kcd-devel/Makefile
index 8d25b092bf52..27601461053d 100644
--- a/misc/kcd-devel/Makefile
+++ b/misc/kcd-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kcd
 PORTVERSION=	7.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Change directory in full-screen visual mode
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/misc/kcd/Makefile b/misc/kcd/Makefile
index 8d25b092bf52..27601461053d 100644
--- a/misc/kcd/Makefile
+++ b/misc/kcd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kcd
 PORTVERSION=	7.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Change directory in full-screen visual mode
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/misc/kde3-i18n-af/Makefile b/misc/kde3-i18n-af/Makefile
index a029b18455aa..c2d0b49c6f32 100644
--- a/misc/kde3-i18n-af/Makefile
+++ b/misc/kde3-i18n-af/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-az/Makefile b/misc/kde3-i18n-az/Makefile
index c603acb7f3f5..6eff2544cb3a 100644
--- a/misc/kde3-i18n-az/Makefile
+++ b/misc/kde3-i18n-az/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	3.0.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}a/src/kde-i18n
@@ -17,10 +18,9 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 IGNORE=		Needs update from vendor.
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-bg/Makefile b/misc/kde3-i18n-bg/Makefile
index 3ca1f3b512dd..77a58f4bd8a3 100644
--- a/misc/kde3-i18n-bg/Makefile
+++ b/misc/kde3-i18n-bg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-bs/Makefile b/misc/kde3-i18n-bs/Makefile
index 1f4c6b3c7026..2b3edcecec02 100644
--- a/misc/kde3-i18n-bs/Makefile
+++ b/misc/kde3-i18n-bs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-ca/Makefile b/misc/kde3-i18n-ca/Makefile
index 217155ef3125..41c3e1ebe758 100644
--- a/misc/kde3-i18n-ca/Makefile
+++ b/misc/kde3-i18n-ca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-cs/Makefile b/misc/kde3-i18n-cs/Makefile
index 8ffe812d3a7b..a8782b2bad53 100644
--- a/misc/kde3-i18n-cs/Makefile
+++ b/misc/kde3-i18n-cs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-da/Makefile b/misc/kde3-i18n-da/Makefile
index 687aaa1e807d..f85383ff3b02 100644
--- a/misc/kde3-i18n-da/Makefile
+++ b/misc/kde3-i18n-da/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-el/Makefile b/misc/kde3-i18n-el/Makefile
index 45d386ceef20..74543d1c7164 100644
--- a/misc/kde3-i18n-el/Makefile
+++ b/misc/kde3-i18n-el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-en_GB/Makefile b/misc/kde3-i18n-en_GB/Makefile
index aefad90a430d..1f0cb68d0d9d 100644
--- a/misc/kde3-i18n-en_GB/Makefile
+++ b/misc/kde3-i18n-en_GB/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-eo/Makefile b/misc/kde3-i18n-eo/Makefile
index 40de7273b375..f59589d3c775 100644
--- a/misc/kde3-i18n-eo/Makefile
+++ b/misc/kde3-i18n-eo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-es/Makefile b/misc/kde3-i18n-es/Makefile
index 6a052b48d236..74ea564f9762 100644
--- a/misc/kde3-i18n-es/Makefile
+++ b/misc/kde3-i18n-es/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-et/Makefile b/misc/kde3-i18n-et/Makefile
index 7314d0fc3f7f..1f283b987047 100644
--- a/misc/kde3-i18n-et/Makefile
+++ b/misc/kde3-i18n-et/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-fa/Makefile b/misc/kde3-i18n-fa/Makefile
index e92af8904548..655d1de66465 100644
--- a/misc/kde3-i18n-fa/Makefile
+++ b/misc/kde3-i18n-fa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-fi/Makefile b/misc/kde3-i18n-fi/Makefile
index 4c4b38b384d2..1096db1a41fa 100644
--- a/misc/kde3-i18n-fi/Makefile
+++ b/misc/kde3-i18n-fi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-hr/Makefile b/misc/kde3-i18n-hr/Makefile
index 0cafbef5009d..d5056f57deb9 100644
--- a/misc/kde3-i18n-hr/Makefile
+++ b/misc/kde3-i18n-hr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-id/Makefile b/misc/kde3-i18n-id/Makefile
index 5c1f374be786..74acd5f1fa6e 100644
--- a/misc/kde3-i18n-id/Makefile
+++ b/misc/kde3-i18n-id/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	3.0.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}a/src/kde-i18n
@@ -17,10 +18,9 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 IGNORE=		Needs update from vendor.
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-is/Makefile b/misc/kde3-i18n-is/Makefile
index 11f4e3a4a0da..c067187cb60a 100644
--- a/misc/kde3-i18n-is/Makefile
+++ b/misc/kde3-i18n-is/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-it/Makefile b/misc/kde3-i18n-it/Makefile
index 9dbb09df5f16..5b90d0462e13 100644
--- a/misc/kde3-i18n-it/Makefile
+++ b/misc/kde3-i18n-it/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-lt/Makefile b/misc/kde3-i18n-lt/Makefile
index 6d7642eb7677..f342bd7ed862 100644
--- a/misc/kde3-i18n-lt/Makefile
+++ b/misc/kde3-i18n-lt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-lv/Makefile b/misc/kde3-i18n-lv/Makefile
index f41a43a34b2c..0eea41f22b7a 100644
--- a/misc/kde3-i18n-lv/Makefile
+++ b/misc/kde3-i18n-lv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	3.0.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}a/src/kde-i18n
@@ -17,10 +18,9 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 IGNORE=		Needs update from vendor.
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-mk/Makefile b/misc/kde3-i18n-mk/Makefile
index 7507922cfd66..8e8249b7c830 100644
--- a/misc/kde3-i18n-mk/Makefile
+++ b/misc/kde3-i18n-mk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-mt/Makefile b/misc/kde3-i18n-mt/Makefile
index d02fafbad9e0..21dfb3369585 100644
--- a/misc/kde3-i18n-mt/Makefile
+++ b/misc/kde3-i18n-mt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-nb/Makefile b/misc/kde3-i18n-nb/Makefile
index 0d2696ee9871..175a82fa901b 100644
--- a/misc/kde3-i18n-nb/Makefile
+++ b/misc/kde3-i18n-nb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-nl/Makefile b/misc/kde3-i18n-nl/Makefile
index 39759a588a7d..1a08133650dd 100644
--- a/misc/kde3-i18n-nl/Makefile
+++ b/misc/kde3-i18n-nl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-nn/Makefile b/misc/kde3-i18n-nn/Makefile
index 93bf8bc3a29d..e539a39a5fa9 100644
--- a/misc/kde3-i18n-nn/Makefile
+++ b/misc/kde3-i18n-nn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-nso/Makefile b/misc/kde3-i18n-nso/Makefile
index 228a32119213..c3d908b32fd8 100644
--- a/misc/kde3-i18n-nso/Makefile
+++ b/misc/kde3-i18n-nso/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-ro/Makefile b/misc/kde3-i18n-ro/Makefile
index 8245432d482a..e6539e4ca3e5 100644
--- a/misc/kde3-i18n-ro/Makefile
+++ b/misc/kde3-i18n-ro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-se/Makefile b/misc/kde3-i18n-se/Makefile
index e39894c02f3a..dbd9e8313106 100644
--- a/misc/kde3-i18n-se/Makefile
+++ b/misc/kde3-i18n-se/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-sk/Makefile b/misc/kde3-i18n-sk/Makefile
index 0b5ebf9fd219..3c43b7046772 100644
--- a/misc/kde3-i18n-sk/Makefile
+++ b/misc/kde3-i18n-sk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-sl/Makefile b/misc/kde3-i18n-sl/Makefile
index 88d37c52b059..ae38b4a98381 100644
--- a/misc/kde3-i18n-sl/Makefile
+++ b/misc/kde3-i18n-sl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-sr/Makefile b/misc/kde3-i18n-sr/Makefile
index 67fd9fcd6450..af00119176c2 100644
--- a/misc/kde3-i18n-sr/Makefile
+++ b/misc/kde3-i18n-sr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-ss/Makefile b/misc/kde3-i18n-ss/Makefile
index f569dcdb89f0..98620ecf75d1 100644
--- a/misc/kde3-i18n-ss/Makefile
+++ b/misc/kde3-i18n-ss/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-sv/Makefile b/misc/kde3-i18n-sv/Makefile
index 2b14870f3f3e..95b600ff2f80 100644
--- a/misc/kde3-i18n-sv/Makefile
+++ b/misc/kde3-i18n-sv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-ta/Makefile b/misc/kde3-i18n-ta/Makefile
index 83d65805b2b8..9064d9e71308 100644
--- a/misc/kde3-i18n-ta/Makefile
+++ b/misc/kde3-i18n-ta/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-th/Makefile b/misc/kde3-i18n-th/Makefile
index 2c85ec2a12f2..8a8151fba2e9 100644
--- a/misc/kde3-i18n-th/Makefile
+++ b/misc/kde3-i18n-th/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-tr/Makefile b/misc/kde3-i18n-tr/Makefile
index cf7bb1904699..3b82e5cc28ea 100644
--- a/misc/kde3-i18n-tr/Makefile
+++ b/misc/kde3-i18n-tr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-ven/Makefile b/misc/kde3-i18n-ven/Makefile
index 80f43bca2594..b6d3e67ced63 100644
--- a/misc/kde3-i18n-ven/Makefile
+++ b/misc/kde3-i18n-ven/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-xh/Makefile b/misc/kde3-i18n-xh/Makefile
index 48f611cd19f2..684c83cfd93d 100644
--- a/misc/kde3-i18n-xh/Makefile
+++ b/misc/kde3-i18n-xh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde3-i18n-zu/Makefile b/misc/kde3-i18n-zu/Makefile
index 904ecdbcbc6b..a5655cc41493 100644
--- a/misc/kde3-i18n-zu/Makefile
+++ b/misc/kde3-i18n-zu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-i18n-is/Makefile b/misc/kde4-i18n-is/Makefile
index 11f4e3a4a0da..c067187cb60a 100644
--- a/misc/kde4-i18n-is/Makefile
+++ b/misc/kde4-i18n-is/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-bg/Makefile b/misc/kde4-l10n-bg/Makefile
index 3ca1f3b512dd..77a58f4bd8a3 100644
--- a/misc/kde4-l10n-bg/Makefile
+++ b/misc/kde4-l10n-bg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-ca/Makefile b/misc/kde4-l10n-ca/Makefile
index 217155ef3125..41c3e1ebe758 100644
--- a/misc/kde4-l10n-ca/Makefile
+++ b/misc/kde4-l10n-ca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-cs/Makefile b/misc/kde4-l10n-cs/Makefile
index 8ffe812d3a7b..a8782b2bad53 100644
--- a/misc/kde4-l10n-cs/Makefile
+++ b/misc/kde4-l10n-cs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-da/Makefile b/misc/kde4-l10n-da/Makefile
index 687aaa1e807d..f85383ff3b02 100644
--- a/misc/kde4-l10n-da/Makefile
+++ b/misc/kde4-l10n-da/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-el/Makefile b/misc/kde4-l10n-el/Makefile
index 45d386ceef20..74543d1c7164 100644
--- a/misc/kde4-l10n-el/Makefile
+++ b/misc/kde4-l10n-el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-en_GB/Makefile b/misc/kde4-l10n-en_GB/Makefile
index aefad90a430d..1f0cb68d0d9d 100644
--- a/misc/kde4-l10n-en_GB/Makefile
+++ b/misc/kde4-l10n-en_GB/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-eo/Makefile b/misc/kde4-l10n-eo/Makefile
index 40de7273b375..f59589d3c775 100644
--- a/misc/kde4-l10n-eo/Makefile
+++ b/misc/kde4-l10n-eo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-es/Makefile b/misc/kde4-l10n-es/Makefile
index 6a052b48d236..74ea564f9762 100644
--- a/misc/kde4-l10n-es/Makefile
+++ b/misc/kde4-l10n-es/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-et/Makefile b/misc/kde4-l10n-et/Makefile
index 7314d0fc3f7f..1f283b987047 100644
--- a/misc/kde4-l10n-et/Makefile
+++ b/misc/kde4-l10n-et/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-fi/Makefile b/misc/kde4-l10n-fi/Makefile
index 4c4b38b384d2..1096db1a41fa 100644
--- a/misc/kde4-l10n-fi/Makefile
+++ b/misc/kde4-l10n-fi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-is/Makefile b/misc/kde4-l10n-is/Makefile
index 11f4e3a4a0da..c067187cb60a 100644
--- a/misc/kde4-l10n-is/Makefile
+++ b/misc/kde4-l10n-is/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-it/Makefile b/misc/kde4-l10n-it/Makefile
index 9dbb09df5f16..5b90d0462e13 100644
--- a/misc/kde4-l10n-it/Makefile
+++ b/misc/kde4-l10n-it/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-lt/Makefile b/misc/kde4-l10n-lt/Makefile
index 6d7642eb7677..f342bd7ed862 100644
--- a/misc/kde4-l10n-lt/Makefile
+++ b/misc/kde4-l10n-lt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-lv/Makefile b/misc/kde4-l10n-lv/Makefile
index f41a43a34b2c..0eea41f22b7a 100644
--- a/misc/kde4-l10n-lv/Makefile
+++ b/misc/kde4-l10n-lv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	3.0.5
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}a/src/kde-i18n
@@ -17,10 +18,9 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 IGNORE=		Needs update from vendor.
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-mk/Makefile b/misc/kde4-l10n-mk/Makefile
index 7507922cfd66..8e8249b7c830 100644
--- a/misc/kde4-l10n-mk/Makefile
+++ b/misc/kde4-l10n-mk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-nb/Makefile b/misc/kde4-l10n-nb/Makefile
index 0d2696ee9871..175a82fa901b 100644
--- a/misc/kde4-l10n-nb/Makefile
+++ b/misc/kde4-l10n-nb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-nl/Makefile b/misc/kde4-l10n-nl/Makefile
index 39759a588a7d..1a08133650dd 100644
--- a/misc/kde4-l10n-nl/Makefile
+++ b/misc/kde4-l10n-nl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-nn/Makefile b/misc/kde4-l10n-nn/Makefile
index 93bf8bc3a29d..e539a39a5fa9 100644
--- a/misc/kde4-l10n-nn/Makefile
+++ b/misc/kde4-l10n-nn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-ro/Makefile b/misc/kde4-l10n-ro/Makefile
index 8245432d482a..e6539e4ca3e5 100644
--- a/misc/kde4-l10n-ro/Makefile
+++ b/misc/kde4-l10n-ro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-sk/Makefile b/misc/kde4-l10n-sk/Makefile
index 0b5ebf9fd219..3c43b7046772 100644
--- a/misc/kde4-l10n-sk/Makefile
+++ b/misc/kde4-l10n-sk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-sl/Makefile b/misc/kde4-l10n-sl/Makefile
index 88d37c52b059..ae38b4a98381 100644
--- a/misc/kde4-l10n-sl/Makefile
+++ b/misc/kde4-l10n-sl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-sr/Makefile b/misc/kde4-l10n-sr/Makefile
index 67fd9fcd6450..af00119176c2 100644
--- a/misc/kde4-l10n-sr/Makefile
+++ b/misc/kde4-l10n-sr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-sv/Makefile b/misc/kde4-l10n-sv/Makefile
index 2b14870f3f3e..95b600ff2f80 100644
--- a/misc/kde4-l10n-sv/Makefile
+++ b/misc/kde4-l10n-sv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-ta/Makefile b/misc/kde4-l10n-ta/Makefile
index 83d65805b2b8..9064d9e71308 100644
--- a/misc/kde4-l10n-ta/Makefile
+++ b/misc/kde4-l10n-ta/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-th/Makefile b/misc/kde4-l10n-th/Makefile
index 2c85ec2a12f2..8a8151fba2e9 100644
--- a/misc/kde4-l10n-th/Makefile
+++ b/misc/kde4-l10n-th/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kde4-l10n-tr/Makefile b/misc/kde4-l10n-tr/Makefile
index cf7bb1904699..3b82e5cc28ea 100644
--- a/misc/kde4-l10n-tr/Makefile
+++ b/misc/kde4-l10n-tr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-af/Makefile b/misc/koffice-i18n-af/Makefile
index 219e1aa145eb..238e49e358d1 100644
--- a/misc/koffice-i18n-af/Makefile
+++ b/misc/koffice-i18n-af/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-bs/Makefile b/misc/koffice-i18n-bs/Makefile
index 19d8b773c81f..b59908a045df 100644
--- a/misc/koffice-i18n-bs/Makefile
+++ b/misc/koffice-i18n-bs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-cs/Makefile b/misc/koffice-i18n-cs/Makefile
index c2a00b38ed58..a8c1af1bac2e 100644
--- a/misc/koffice-i18n-cs/Makefile
+++ b/misc/koffice-i18n-cs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-da/Makefile b/misc/koffice-i18n-da/Makefile
index 7c012b50d52b..fd030abfdeb5 100644
--- a/misc/koffice-i18n-da/Makefile
+++ b/misc/koffice-i18n-da/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-el/Makefile b/misc/koffice-i18n-el/Makefile
index 572fa3fe4c29..402649f8027e 100644
--- a/misc/koffice-i18n-el/Makefile
+++ b/misc/koffice-i18n-el/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-en_GB/Makefile b/misc/koffice-i18n-en_GB/Makefile
index b25ea03e1357..6f3462124b98 100644
--- a/misc/koffice-i18n-en_GB/Makefile
+++ b/misc/koffice-i18n-en_GB/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-eo/Makefile b/misc/koffice-i18n-eo/Makefile
index 2b7c66c37853..4a9104ab4f62 100644
--- a/misc/koffice-i18n-eo/Makefile
+++ b/misc/koffice-i18n-eo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-es/Makefile b/misc/koffice-i18n-es/Makefile
index fb4046b9eaf0..d19fc40cf5fb 100644
--- a/misc/koffice-i18n-es/Makefile
+++ b/misc/koffice-i18n-es/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-et/Makefile b/misc/koffice-i18n-et/Makefile
index e5a4d6ee6651..e8b0a44eea2b 100644
--- a/misc/koffice-i18n-et/Makefile
+++ b/misc/koffice-i18n-et/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-it/Makefile b/misc/koffice-i18n-it/Makefile
index f5a594aa4f31..749eea9090d6 100644
--- a/misc/koffice-i18n-it/Makefile
+++ b/misc/koffice-i18n-it/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-lt/Makefile b/misc/koffice-i18n-lt/Makefile
index 0a19c1abc594..9c1750e3a296 100644
--- a/misc/koffice-i18n-lt/Makefile
+++ b/misc/koffice-i18n-lt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-lv/Makefile b/misc/koffice-i18n-lv/Makefile
index 4bc1fd37bccc..87be2eb53dcb 100644
--- a/misc/koffice-i18n-lv/Makefile
+++ b/misc/koffice-i18n-lv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-mt/Makefile b/misc/koffice-i18n-mt/Makefile
index 4aa634005857..5cd537467e40 100644
--- a/misc/koffice-i18n-mt/Makefile
+++ b/misc/koffice-i18n-mt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-nb/Makefile b/misc/koffice-i18n-nb/Makefile
index 7c28aca5d510..daa1f61cc82d 100644
--- a/misc/koffice-i18n-nb/Makefile
+++ b/misc/koffice-i18n-nb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-nl/Makefile b/misc/koffice-i18n-nl/Makefile
index 7e5debc700ea..148ef267ca4f 100644
--- a/misc/koffice-i18n-nl/Makefile
+++ b/misc/koffice-i18n-nl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-nn/Makefile b/misc/koffice-i18n-nn/Makefile
index d95ddc22d5a2..dffd1478eadd 100644
--- a/misc/koffice-i18n-nn/Makefile
+++ b/misc/koffice-i18n-nn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-sk/Makefile b/misc/koffice-i18n-sk/Makefile
index 7978106b41b2..758c4064f10b 100644
--- a/misc/koffice-i18n-sk/Makefile
+++ b/misc/koffice-i18n-sk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-sl/Makefile b/misc/koffice-i18n-sl/Makefile
index 2db559739f03..cc20c96e5513 100644
--- a/misc/koffice-i18n-sl/Makefile
+++ b/misc/koffice-i18n-sl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-sv/Makefile b/misc/koffice-i18n-sv/Makefile
index 9281468820a2..f1d877e0c5d2 100644
--- a/misc/koffice-i18n-sv/Makefile
+++ b/misc/koffice-i18n-sv/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-th/Makefile b/misc/koffice-i18n-th/Makefile
index 450a667497f4..df851b36b99f 100644
--- a/misc/koffice-i18n-th/Makefile
+++ b/misc/koffice-i18n-th/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-tr/Makefile b/misc/koffice-i18n-tr/Makefile
index f3f83e7d0015..63cd857ce165 100644
--- a/misc/koffice-i18n-tr/Makefile
+++ b/misc/koffice-i18n-tr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-ven/Makefile b/misc/koffice-i18n-ven/Makefile
index a9d34808add7..57d92ec1cccd 100644
--- a/misc/koffice-i18n-ven/Makefile
+++ b/misc/koffice-i18n-ven/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-xh/Makefile b/misc/koffice-i18n-xh/Makefile
index bb13b680a96b..acb548f15c40 100644
--- a/misc/koffice-i18n-xh/Makefile
+++ b/misc/koffice-i18n-xh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/koffice-i18n-zu/Makefile b/misc/koffice-i18n-zu/Makefile
index 65ed22eac628..b27e421021a7 100644
--- a/misc/koffice-i18n-zu/Makefile
+++ b/misc/koffice-i18n-zu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index 19de06e02c37..9e703d056cdc 100644
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kwatch
 PORTVERSION=	2.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc kde
 MASTER_SITES=	http://www.m-j-s.net/pub/kde/ \
 		${MASTER_SITE_KDE}
@@ -16,8 +16,7 @@ MASTER_SITE_SUBDIR=	stable/apps/KDE3.x/admin/
 MAINTAINER=	kde@freebsd.org
 COMMENT=	KDE/Qt log file viewer
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_KDELIBS_VER=	3
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 9cb03cdfcfe6..336c1d8b59ba 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mc
 PORTVERSION=	4.6.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	misc shells
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	utils/file/managers/mc/
@@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR=	utils/file/managers/mc/
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	Midnight Commander, a free Norton Commander Clone
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 .include <bsd.port.pre.mk>
 
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	glib20
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index 5baa00c8be75..b16381194efb 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -7,19 +7,19 @@
 
 PORTNAME=	pinfo
 PORTVERSION=	0.6.8
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://dione.ids.pl/~pborys/software/pinfo/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ncurses based, lynx style info documentation browser
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-readline \
 		--with-localedir=${PREFIX}/share/locale
+USE_GETTEXT=	yes
 
 MAN1=	pinfo.1
 INFO=	pinfo
diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile
index 1effb7910df6..406eccb4a59d 100644
--- a/misc/upclient/Makefile
+++ b/misc/upclient/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	upclient
 PORTVERSION=	5.0.b8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://uptimes.wonko.com/files/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
@@ -18,8 +18,7 @@ COMMENT=	The Uptimes project client
 # Global variables
 #
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 ALL_TARGET=	bsd
 BUILD_WRKSRC=	${WRKSRC}/src
diff --git a/misc/xfce4-iconbox/Makefile b/misc/xfce4-iconbox/Makefile
index 1e815ff62ca9..e8aaad394851 100644
--- a/misc/xfce4-iconbox/Makefile
+++ b/misc/xfce4-iconbox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-iconbox
 PORTVERSION=	4.0.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	misc xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
                 ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/xfce-${PORTVERSION}/src/ \
@@ -19,10 +19,10 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 icon box, an alternative taskbar
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
+LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 
+USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index a8084c36953a..ee62ad9f309e 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.0.r3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,11 +24,11 @@ LIB_DEPENDS=	FLAC.5:${PORTSDIR}/audio/flac \
 		mad.2:${PORTSDIR}/audio/libmad \
 		speex.2:${PORTSDIR}/audio/speex \
 		iconv.3:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		dvdread.3:${PORTSDIR}/multimedia/libdvdread
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index 3627536e370e..922c9774d8eb 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ogle
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 PKGNAMESUFFIX=	-gui
@@ -16,11 +17,11 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	An add-on graphical user interface for Ogle
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.11:${PORTSDIR}/multimedia/ogle
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		glade-2.0:${PORTSDIR}/devel/libglade2 \
+LIB_DEPENDS=	glade-2.0:${PORTSDIR}/devel/libglade2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 RUN_DEPENDS=	ogle:${PORTSDIR}/multimedia/ogle
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack \
 		gnomehier \
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 8c04e71075f5..787a8cb7c8a1 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vlc
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/
 
@@ -18,7 +19,6 @@ LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
 		mad.2:${PORTSDIR}/audio/mad \
 		avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
 		a52.0:${PORTSDIR}/audio/liba52 \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		FLAC.5:${PORTSDIR}/audio/flac \
@@ -33,6 +33,7 @@ LIB_DEPENDS+=	dvbpsi.3:${PORTSDIR}/multimedia/libdvbpsi
 #		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
 
 USE_GETOPT_LONG=yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 8c04e71075f5..787a8cb7c8a1 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vlc
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/
 
@@ -18,7 +19,6 @@ LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
 		mad.2:${PORTSDIR}/audio/mad \
 		avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
 		a52.0:${PORTSDIR}/audio/liba52 \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		FLAC.5:${PORTSDIR}/audio/flac \
@@ -33,6 +33,7 @@ LIB_DEPENDS+=	dvbpsi.3:${PORTSDIR}/multimedia/libdvbpsi
 #		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
 
 USE_GETOPT_LONG=yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 88faadb8e1aa..f7a1c88bac8f 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	0.9.23
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,9 +18,9 @@ COMMENT=	An X11 multimedia player
 
 LIB_DEPENDS=	xine.9:${PORTSDIR}/multimedia/libxine \
 		aa.1:${PORTSDIR}/graphics/aalib \
-		png.5:${PORTSDIR}/graphics/png \
-		intl.5:${PORTSDIR}/devel/gettext-old
+		png.5:${PORTSDIR}/graphics/png
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/multimedia/xmps-opendivx-plugin/Makefile b/multimedia/xmps-opendivx-plugin/Makefile
index db3df2fddf7c..fd40538b0049 100644
--- a/multimedia/xmps-opendivx-plugin/Makefile
+++ b/multimedia/xmps-opendivx-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmps-opendivx-plugin
 PORTVERSION=	0.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.projectmayo.com/dnload/divx4linux/xmps/
 
@@ -15,10 +15,10 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	xmps plugin using OpenDivX decoding engine from Project Mayo
 
 LIB_DEPENDS=	divxdecore.0:${PORTSDIR}/multimedia/libdivxdecore \
-		xmps.0:${PORTSDIR}/multimedia/xmps \
-		intl.5:${PORTSDIR}/devel/gettext-old
+		xmps.0:${PORTSDIR}/multimedia/xmps
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.0.2
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_GNOME=	gtk12
diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile
index 935316cf7cef..6bb8249364b3 100644
--- a/multimedia/xmps-win32-plugin/Makefile
+++ b/multimedia/xmps-win32-plugin/Makefile
@@ -7,17 +7,17 @@
 
 PORTNAME=	xmps-win32-plugin
 PORTVERSION=	0.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://xmps.sourceforge.net/sources/
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	xmps plugin for Win32 (TM) Codecs
 
-LIB_DEPENDS=	xmps.0:${PORTSDIR}/multimedia/xmps \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	xmps.0:${PORTSDIR}/multimedia/xmps
 RUN_DEPENDS=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_GNOME=	gtk12
diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index 813c8674062e..fb4235a08d4b 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -8,17 +8,17 @@
 
 PORTNAME=	centericq
 PORTVERSION=	4.9.10
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://centericq.de/archive/source/releases/
 
 MAINTAINER=	clsung@dragon2.net
 COMMENT=	A text mode menu- and window-driven IM interface
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_OPENSSL=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
diff --git a/net-mgmt/ap-utils/Makefile b/net-mgmt/ap-utils/Makefile
index 449d48af832f..797476c1e4f0 100644
--- a/net-mgmt/ap-utils/Makefile
+++ b/net-mgmt/ap-utils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ap-utils
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,10 +15,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	daniel+aputils@pelleg.org
 COMMENT=	A set of utilities to configure and monitor wireless access points
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	LDFLAGS="-lintl -L${LOCALBASE}/lib"
 MAN8=		ap-trapd.8 ap-mrtg.8 ap-config.8
diff --git a/net-mgmt/darkstat/Makefile b/net-mgmt/darkstat/Makefile
index c9ec2d5f2ebb..e8f20e6d5725 100644
--- a/net-mgmt/darkstat/Makefile
+++ b/net-mgmt/darkstat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	darkstat
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://members.optushome.com.au/emikulic/net/darkstat/ \
 		http://yallara.cs.rmit.edu.au/~emikulic/_/
@@ -14,6 +15,7 @@ MASTER_SITES=	http://members.optushome.com.au/emikulic/net/darkstat/ \
 MAINTAINER=	emikulic@optushome.com.au
 COMMENT=	Network statistics gatherer, similar to ntop
 
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
@@ -21,7 +23,6 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB=	NLS="@comment "
 .else
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
 PLIST_SUB=	NLS=""
 .endif
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index dcaad8b88488..f596ecf56fdc 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	etherape
 PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	samy@kerneled.com
 COMMENT=	A graphical network traffic visualization tool for gnome
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_GNOME=	libglade2 libgnomeui
 USE_LIBTOOL=	yes
 USE_X_PREFIX=	yes
diff --git a/net-mgmt/ipv6calc/Makefile b/net-mgmt/ipv6calc/Makefile
index b903a464c8c6..7e8e12fdad2f 100644
--- a/net-mgmt/ipv6calc/Makefile
+++ b/net-mgmt/ipv6calc/Makefile
@@ -7,15 +7,15 @@
 
 PORTNAME=	ipv6calc
 PORTVERSION=	0.46
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Convert, change and calculate with IPv6 addresses
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 
diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index ed6769a1b228..e42d0024e035 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dctc
 PORTVERSION=	0.66
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	http://unixpages.org/distfiles/ \
 		http://ac2i.tzo.com/dctc/
@@ -18,9 +18,9 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A GUI to DirectConnect (www.neo-modus.com) text client
 
 BUILD_DEPENDS=	dctc:${PORTSDIR}/net/dctc
-LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4 \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_XLIB=	yes
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 78b492e7d766..f1899589deb1 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnunet
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
 		${MASTER_SITE_GNU}
@@ -17,9 +18,9 @@ DISTNAME=	GNUnet-${PORTVERSION}
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	An anonymous, distributed, reputation-based network
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		ltdl.4:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
 
+USE_GETTEXT=	yes
 USE_SIZE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/net-p2p/gtkhx/Makefile b/net-p2p/gtkhx/Makefile
index 3860d88f9fe5..9c4686c0f551 100644
--- a/net-p2p/gtkhx/Makefile
+++ b/net-p2p/gtkhx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkhx
 PORTVERSION=	0.9.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkhx
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	gtkhx
 MAINTAINER=	jre@vineyard.net
 COMMENT=	A GTK+ version of Hx, a UNIX Hotline Client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_GNOME=	gdkpixbuf
 USE_GMAKE=	yes
diff --git a/net-p2p/lopster/Makefile b/net-p2p/lopster/Makefile
index d32b56287e09..3e7bea46780d 100644
--- a/net-p2p/lopster/Makefile
+++ b/net-p2p/lopster/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lopster
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +15,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	roman@xpert.com
 COMMENT=	GTK+ client for Napster
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile
index eeeaa1c09bbc..a7ab17dd36d4 100644
--- a/net-p2p/xmule/Makefile
+++ b/net-p2p/xmule/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmule
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmule
@@ -17,11 +18,11 @@ COMMENT=	Port of eMule eDonkey P2P client using wxWindows class library
 #FORBIDDEN=	Multiple vulnerabilities, see \
 #	   	http://security.e-matters.de/advisories/022003.html
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		expat.4:${PORTSDIR}/textproc/expat2 \
+LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2 \
 		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehier \
diff --git a/net/ap-utils/Makefile b/net/ap-utils/Makefile
index 449d48af832f..797476c1e4f0 100644
--- a/net/ap-utils/Makefile
+++ b/net/ap-utils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ap-utils
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,10 +15,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	daniel+aputils@pelleg.org
 COMMENT=	A set of utilities to configure and monitor wireless access points
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	LDFLAGS="-lintl -L${LOCALBASE}/lib"
 MAN8=		ap-trapd.8 ap-mrtg.8 ap-config.8
diff --git a/net/centericq/Makefile b/net/centericq/Makefile
index 813c8674062e..fb4235a08d4b 100644
--- a/net/centericq/Makefile
+++ b/net/centericq/Makefile
@@ -8,17 +8,17 @@
 
 PORTNAME=	centericq
 PORTVERSION=	4.9.10
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://centericq.de/archive/source/releases/
 
 MAINTAINER=	clsung@dragon2.net
 COMMENT=	A text mode menu- and window-driven IM interface
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_OPENSSL=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
diff --git a/net/darkstat/Makefile b/net/darkstat/Makefile
index c9ec2d5f2ebb..e8f20e6d5725 100644
--- a/net/darkstat/Makefile
+++ b/net/darkstat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	darkstat
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://members.optushome.com.au/emikulic/net/darkstat/ \
 		http://yallara.cs.rmit.edu.au/~emikulic/_/
@@ -14,6 +15,7 @@ MASTER_SITES=	http://members.optushome.com.au/emikulic/net/darkstat/ \
 MAINTAINER=	emikulic@optushome.com.au
 COMMENT=	Network statistics gatherer, similar to ntop
 
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
@@ -21,7 +23,6 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB=	NLS="@comment "
 .else
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
 PLIST_SUB=	NLS=""
 .endif
diff --git a/net/dctc-gui/Makefile b/net/dctc-gui/Makefile
index ed6769a1b228..e42d0024e035 100644
--- a/net/dctc-gui/Makefile
+++ b/net/dctc-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dctc
 PORTVERSION=	0.66
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	http://unixpages.org/distfiles/ \
 		http://ac2i.tzo.com/dctc/
@@ -18,9 +18,9 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A GUI to DirectConnect (www.neo-modus.com) text client
 
 BUILD_DEPENDS=	dctc:${PORTSDIR}/net/dctc
-LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4 \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_XLIB=	yes
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index dcaad8b88488..f596ecf56fdc 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	etherape
 PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	samy@kerneled.com
 COMMENT=	A graphical network traffic visualization tool for gnome
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_GNOME=	libglade2 libgnomeui
 USE_LIBTOOL=	yes
 USE_X_PREFIX=	yes
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 78b492e7d766..f1899589deb1 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnunet
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
 		${MASTER_SITE_GNU}
@@ -17,9 +18,9 @@ DISTNAME=	GNUnet-${PORTVERSION}
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	An anonymous, distributed, reputation-based network
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		ltdl.4:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
 
+USE_GETTEXT=	yes
 USE_SIZE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/net/gtkhx/Makefile b/net/gtkhx/Makefile
index 3860d88f9fe5..9c4686c0f551 100644
--- a/net/gtkhx/Makefile
+++ b/net/gtkhx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkhx
 PORTVERSION=	0.9.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkhx
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	gtkhx
 MAINTAINER=	jre@vineyard.net
 COMMENT=	A GTK+ version of Hx, a UNIX Hotline Client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_GNOME=	gdkpixbuf
 USE_GMAKE=	yes
diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile
index b903a464c8c6..7e8e12fdad2f 100644
--- a/net/ipv6calc/Makefile
+++ b/net/ipv6calc/Makefile
@@ -7,15 +7,15 @@
 
 PORTNAME=	ipv6calc
 PORTVERSION=	0.46
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Convert, change and calculate with IPv6 addresses
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index 6fee5534844c..200307815f72 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jwhois
 PORTVERSION=	3.2.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	jwhois
@@ -14,10 +15,9 @@ MASTER_SITE_SUBDIR=	jwhois
 MAINTAINER=	matusita@FreeBSD.org
 COMMENT=An improved WHOIS client capable of selecting server to query
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--localstatedir=${PREFIX}/var/jwhois
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
 
diff --git a/net/nc6/Makefile b/net/nc6/Makefile
index d51b82f60f72..d7faf9537711 100644
--- a/net/nc6/Makefile
+++ b/net/nc6/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nc6
 PORTVERSION=	0.5
-PORTREVISION=	2	
+PORTREVISION=	3
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/ \
 		http://ftp.deepspace6.net/pub/ds6/sources/nc6/
@@ -15,10 +15,10 @@ MASTER_SITES=	ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/ \
 MAINTAINER=	filippo@widestore.net
 COMMENT=	Netcat clone with IPv6 support
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 MAN1=	nc6.1
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index 6e7f3eb5d57d..540be173f035 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	netdude
 PORTVERSION=	0.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,10 +16,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NETwork DUmp data Displayer and Editor for tcpdump tracefiles
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv \
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
 		ltdl.4:${PORTSDIR}/devel/libltdl
 
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	glib12 gtk12
 USE_LIBTOOL=	yes
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index cf00c0b0cae9..b9f62808bfc7 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ntop
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -82,7 +82,7 @@ RUN_DEPENDS+=		lsof:${PORTSDIR}/sysutils/lsof
 .endif
 
 .if defined(WITH_LOCALE)
-LIB_DEPENDS+=		intl.5:${PORTSDIR}/devel/gettext-old
+USE_GETTEXT=		yes
 CONFIGURE_ARGS+=	--enable-i18n \
 			--with-localedir=${LOCALBASE}/share/locale
 .endif
diff --git a/net/tcpreen/Makefile b/net/tcpreen/Makefile
index 46c43cd1df73..964b891e3ece 100644
--- a/net/tcpreen/Makefile
+++ b/net/tcpreen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tcpreen
 PORTVERSION=	1.3.6
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,10 +15,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	Janos.Mohacsi@bsd.hu
 COMMENT=	A simple TCP session re-engineering tool
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_BZIP2=	yes
 USE_GETOPT_LONG=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 MAN1=		tcpreen.1
 
diff --git a/net/whois/Makefile b/net/whois/Makefile
index f88662c355a7..fc0025806770 100644
--- a/net/whois/Makefile
+++ b/net/whois/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	whois
 PORTVERSION=	4.6.9
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.linux.it/~md/software/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -14,11 +15,11 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	filippo@widestore.net
 COMMENT=	Marco d'Itri whois client
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 MAN1=	whois.1
 
+USE_GETTEXT=	yes
 USE_PERL5_BUILD=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/net/wol/Makefile b/net/wol/Makefile
index f02f24997e75..fe19153db497 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	wol
 PORTVERSION=	0.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ahh
@@ -16,11 +16,11 @@ MASTER_SITE_SUBDIR=	ahh
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Tool to wake up Wake-On-LAN compliant computers
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=		yes
 USE_GETOPT_LONG=	yes
+USE_GETTEXT=		yes
 CPPFLAGS=		-I${LOCALBASE}/include
 LDFLAGS=		-L${LOCALBASE}/lib
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/net/xmule/Makefile b/net/xmule/Makefile
index eeeaa1c09bbc..a7ab17dd36d4 100644
--- a/net/xmule/Makefile
+++ b/net/xmule/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmule
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmule
@@ -17,11 +18,11 @@ COMMENT=	Port of eMule eDonkey P2P client using wxWindows class library
 #FORBIDDEN=	Multiple vulnerabilities, see \
 #	   	http://security.e-matters.de/advisories/022003.html
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		expat.4:${PORTSDIR}/textproc/expat2 \
+LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2 \
 		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehier \
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 8001c77864c4..3791cb6d34d4 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	slrn
 PORTVERSION=	0.9.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.rge.com/pub/usenet/readers/unix/slrn/ \
@@ -22,10 +22,10 @@ MAINTAINER=	petef@FreeBSD.org
 COMMENT=	SLang-based newsreader
 
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 677edbc9209e..35097105afb4 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tin
 PORTVERSION=	1.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	news ipv6
 MASTER_SITES=	http://mirrors.rcn.net/pub/news/tin/v1.6/ \
 		ftp://mirrors.rcn.net/pub/news/tin/v1.6/ \
@@ -19,10 +19,10 @@ COMMENT=	Easy-to-use threaded newsreader with NOV/NNTP support
 
 LIB_DEPENDS=	uu.3:${PORTSDIR}/converters/uulib \
 		iconv.3:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		pcre.0:${PORTSDIR}/devel/pcre
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 TIN_EDITOR?=	/usr/bin/ee
diff --git a/news/yencode/Makefile b/news/yencode/Makefile
index f7912d26987a..7583d50bfde8 100644
--- a/news/yencode/Makefile
+++ b/news/yencode/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	yencode
 PORTVERSION=	0.46
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	news
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,9 +16,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free (GPL) encoder and decoder for the yEnc Usenet file format
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_GETOPT_LONG=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/palm/coldsync/Makefile b/palm/coldsync/Makefile
index 2660af0c7bed..f9ab749635f3 100644
--- a/palm/coldsync/Makefile
+++ b/palm/coldsync/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	coldsync
 PORTVERSION=	2.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	palm comms
 MASTER_SITES=	http://www.coldsync.org/download/
 
 MAINTAINER=	arensb+freebsd-ports@ooblick.com
 COMMENT=	Synchronize a PalmPilot with a Unix workstation
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i "" -E
 
diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index bf4e7928985b..e6b525580282 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -8,17 +8,17 @@
 
 PORTNAME=	jpilot
 PORTVERSION=	0.99.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	palm comms
 MASTER_SITES=	http://jpilot.org/
 
 MAINTAINER?=	varju@webct.com
 COMMENT=	Desktop Organizer Software for the Palm Pilot
 
-LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link
 
 CONFIGURE_ARGS+=	--with-pilot-prefix=${PREFIX}
+USE_GETTEXT=	yes
 .if defined(WITH_GTK2)
 USE_GNOME=	gtk20
 CONFIGURE_ARGS+=	--enable-gtk2=yes
diff --git a/polish/calligra-l10n/Makefile b/polish/calligra-l10n/Makefile
index d121329447df..6e7015244236 100644
--- a/polish/calligra-l10n/Makefile
+++ b/polish/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	polish kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -15,10 +16,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/polish/kde3-i18n/Makefile b/polish/kde3-i18n/Makefile
index 1c39b22ac9a7..3acbb00ad8a5 100644
--- a/polish/kde3-i18n/Makefile
+++ b/polish/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	polish kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -15,10 +16,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/polish/kde4-l10n/Makefile b/polish/kde4-l10n/Makefile
index 1c39b22ac9a7..3acbb00ad8a5 100644
--- a/polish/kde4-l10n/Makefile
+++ b/polish/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	polish kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -15,10 +16,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/polish/koffice-i18n/Makefile b/polish/koffice-i18n/Makefile
index d121329447df..6e7015244236 100644
--- a/polish/koffice-i18n/Makefile
+++ b/polish/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	polish kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -15,10 +16,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/polish/koffice-kde4-l10n/Makefile b/polish/koffice-kde4-l10n/Makefile
index d121329447df..6e7015244236 100644
--- a/polish/koffice-kde4-l10n/Makefile
+++ b/polish/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	polish kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -15,10 +16,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/portuguese/calligra-l10n-pt_BR/Makefile b/portuguese/calligra-l10n-pt_BR/Makefile
index 2403b1582b70..c9c0aaa1de11 100644
--- a/portuguese/calligra-l10n-pt_BR/Makefile
+++ b/portuguese/calligra-l10n-pt_BR/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/portuguese/calligra-l10n/Makefile b/portuguese/calligra-l10n/Makefile
index 5a85b81a6d29..b572c0bd1b7b 100644
--- a/portuguese/calligra-l10n/Makefile
+++ b/portuguese/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/portuguese/kde3-i18n-pt_BR/Makefile b/portuguese/kde3-i18n-pt_BR/Makefile
index 4011d13b47d2..50299183a50c 100644
--- a/portuguese/kde3-i18n-pt_BR/Makefile
+++ b/portuguese/kde3-i18n-pt_BR/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	portuguese misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/portuguese/kde3-i18n/Makefile b/portuguese/kde3-i18n/Makefile
index 6577c2fcfae6..663929ae66aa 100644
--- a/portuguese/kde3-i18n/Makefile
+++ b/portuguese/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	portuguese misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/portuguese/kde4-l10n-pt_BR/Makefile b/portuguese/kde4-l10n-pt_BR/Makefile
index 4011d13b47d2..50299183a50c 100644
--- a/portuguese/kde4-l10n-pt_BR/Makefile
+++ b/portuguese/kde4-l10n-pt_BR/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	portuguese misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/portuguese/kde4-l10n/Makefile b/portuguese/kde4-l10n/Makefile
index 6577c2fcfae6..663929ae66aa 100644
--- a/portuguese/kde4-l10n/Makefile
+++ b/portuguese/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	portuguese misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/portuguese/koffice-i18n-pt_BR/Makefile b/portuguese/koffice-i18n-pt_BR/Makefile
index 2403b1582b70..c9c0aaa1de11 100644
--- a/portuguese/koffice-i18n-pt_BR/Makefile
+++ b/portuguese/koffice-i18n-pt_BR/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/portuguese/koffice-i18n/Makefile b/portuguese/koffice-i18n/Makefile
index 5a85b81a6d29..b572c0bd1b7b 100644
--- a/portuguese/koffice-i18n/Makefile
+++ b/portuguese/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/portuguese/koffice-kde4-l10n-pt_BR/Makefile b/portuguese/koffice-kde4-l10n-pt_BR/Makefile
index 2403b1582b70..c9c0aaa1de11 100644
--- a/portuguese/koffice-kde4-l10n-pt_BR/Makefile
+++ b/portuguese/koffice-kde4-l10n-pt_BR/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/portuguese/koffice-kde4-l10n/Makefile b/portuguese/koffice-kde4-l10n/Makefile
index 5a85b81a6d29..b572c0bd1b7b 100644
--- a/portuguese/koffice-kde4-l10n/Makefile
+++ b/portuguese/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	portuguese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index fb2c8f3cf424..7377e488090d 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://stone.phys.pusan.ac.kr/pub/CJK-LyX/
 PKGNAMEPREFIX=	cjk-
@@ -18,13 +18,13 @@ COMMENT=	Document processor interfaced with LaTeX, with CJK support
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		forms.1:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
 
 WRKSRC=		${WRKDIR}/CJK-LyX-${PORTVERSION}
 
+USE_GETTEXT=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
 USE_PERL5=	yes
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index ba630cf8949a..c0e140b07c70 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gimp-print
 PORTVERSION=	4.2.6
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -13,8 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GIMP Print Printer Driver
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index ba630cf8949a..c0e140b07c70 100644
--- a/print/gutenprint-base/Makefile
+++ b/print/gutenprint-base/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gimp-print
 PORTVERSION=	4.2.6
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -13,8 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GIMP Print Printer Driver
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/print/gutenprint/Makefile b/print/gutenprint/Makefile
index ba630cf8949a..c0e140b07c70 100644
--- a/print/gutenprint/Makefile
+++ b/print/gutenprint/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gimp-print
 PORTVERSION=	4.2.6
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -13,8 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GIMP Print Printer Driver
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index b1d69d54bb02..08b6a199804f 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -17,11 +18,11 @@ COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG)
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index b1d69d54bb02..08b6a199804f 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -17,11 +18,11 @@ COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG)
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index b1d69d54bb02..08b6a199804f 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -17,11 +18,11 @@ COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG)
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index b1d69d54bb02..08b6a199804f 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -17,11 +18,11 @@ COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG)
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index b1d69d54bb02..08b6a199804f 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -17,11 +18,11 @@ COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG)
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 6bc445f0189b..99fb7ae35b87 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-print
 PORTVERSION=	4.0.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	print xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
                 ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/xfce-${PORTVERSION}/src/ \
@@ -19,10 +19,10 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 graphical frontend for printing
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
+LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 
+USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
diff --git a/russian/calligra-l10n/Makefile b/russian/calligra-l10n/Makefile
index 096cd891c398..d9959de8c34b 100644
--- a/russian/calligra-l10n/Makefile
+++ b/russian/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	russian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/russian/kde3-i18n/Makefile b/russian/kde3-i18n/Makefile
index adc9198838f0..5b8ccfc8dbd8 100644
--- a/russian/kde3-i18n/Makefile
+++ b/russian/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	russian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/russian/kde4-l10n/Makefile b/russian/kde4-l10n/Makefile
index adc9198838f0..5b8ccfc8dbd8 100644
--- a/russian/kde4-l10n/Makefile
+++ b/russian/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	russian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/russian/koffice-i18n/Makefile b/russian/koffice-i18n/Makefile
index 096cd891c398..d9959de8c34b 100644
--- a/russian/koffice-i18n/Makefile
+++ b/russian/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	russian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/russian/koffice-kde4-l10n/Makefile b/russian/koffice-kde4-l10n/Makefile
index 096cd891c398..d9959de8c34b 100644
--- a/russian/koffice-kde4-l10n/Makefile
+++ b/russian/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	russian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/security/authforce/Makefile b/security/authforce/Makefile
index 58b0e0419941..3c93cfe3662e 100644
--- a/security/authforce/Makefile
+++ b/security/authforce/Makefile
@@ -7,18 +7,18 @@
 
 PORTNAME=	authforce
 PORTVERSION=	0.9.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security www
 MASTER_SITES=	http://kapheine.hypa.net/authforce/
 
 MAINTAINER=	ache@FreeBSD.org
 COMMENT=	HTTP authentication brute forcer
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
 
 USE_BZIP2=	yes
 USE_GETOPT_LONG=yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/security/fwlogwatch/Makefile b/security/fwlogwatch/Makefile
index 83d9b1960e13..8b5df0d122fd 100644
--- a/security/fwlogwatch/Makefile
+++ b/security/fwlogwatch/Makefile
@@ -8,16 +8,15 @@
 
 PORTNAME=	fwlogwatch
 PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.kybs.de/boris/sw/
 
 MAINTAINER=	jim@corebsd.or.id
 COMMENT=	A packet filter and firewall log analyzer
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 MAKE_ENV=	MKDIR="${MKDIR}"
 INSTALL_TARGET=	install install-config install-i18n
diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index 668cfe30dff2..7343f49297ba 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	newpg
 PORTVERSION=	0.9.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	alpha/aegypten
@@ -17,7 +17,6 @@ COMMENT=	Prerelease package of GnuPG extensions for GnuPG 2.0
 
 LIB_DEPENDS=	gcrypt.6:${PORTSDIR}/security/libgcrypt \
 		iconv.3:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		ksba.7:${PORTSDIR}/security/libksba \
 		pth.20:${PORTSDIR}/devel/pth
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
@@ -26,6 +25,7 @@ RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
 		
 USE_AUTOCONF_VER=253
 USE_LIBTOOL=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 1b9962315121..e880c79c94d0 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
@@ -16,9 +17,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	The GNU Privacy Guard
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_BZIP2=	YES
+USE_GETTEXT=	yes
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_TARGET=	--build ${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 1b9962315121..e880c79c94d0 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
@@ -16,9 +17,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	The GNU Privacy Guard
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_BZIP2=	YES
+USE_GETTEXT=	yes
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_TARGET=	--build ${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 076fbf65b156..b5fe0f03a862 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gsasl
 PORTVERSION=	0.0.14
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://josefsson.org/${PORTNAME}/releases/ \
 		${MASTER_SITE_GNU_ALPHA}
@@ -16,11 +17,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU SASL Library
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		idn.12:${PORTSDIR}/devel/libidn \
+LIB_DEPENDS=	idn.12:${PORTSDIR}/devel/libidn \
 		gcrypt.6:${PORTSDIR}/security/libgcrypt \
-		ntlm.0:${PORTSDIR}/security/libntlm \
+		ntlm.0:${PORTSDIR}/security/libntlm
 
+USE_GETTEXT=	yes
 USE_PERL5_BUILD=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GETOPT_LONG=	yes
diff --git a/security/gss/Makefile b/security/gss/Makefile
index c71a91674feb..3318cedf77ee 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gss
 PORTVERSION=	0.0.10
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://josefsson.org/${PORTNAME}/releases/ \
 		${MASTER_SITE_GNU_ALPHA}
@@ -16,9 +17,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU Generic Security Service Library
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		shishi.0:${PORTSDIR}/security/shishi
+LIB_DEPENDS=	shishi.0:${PORTSDIR}/security/shishi
 
+USE_GETTEXT=		yes
 USE_PERL5_BUILD=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GETOPT_LONG=	yes
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 1e16ec0f7253..215c1da8b07d 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	mcrypt
 PORTVERSION=	2.6.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	ftp://argeas.cs-net.gr/pub/unix/mcrypt/attic/ \
 		ftp://ftp.ntua.gr/pub/security/mcrypt/attic/ \
@@ -23,9 +23,9 @@ COMMENT=	Replacement for crypt(1)
 
 BUILD_DEPENDS=	autoconf257:${PORTSDIR}/devel/autoconf257
 LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt/ \
-		mhash.2:${PORTSDIR}/security/mhash/ \
-		intl.5:${PORTSDIR}/devel/gettext-old
+		mhash.2:${PORTSDIR}/security/mhash/
 
+USE_GETTEXT=		yes
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+=	--enable-static --with-catgets
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/newpg/Makefile b/security/newpg/Makefile
index 668cfe30dff2..7343f49297ba 100644
--- a/security/newpg/Makefile
+++ b/security/newpg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	newpg
 PORTVERSION=	0.9.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	alpha/aegypten
@@ -17,7 +17,6 @@ COMMENT=	Prerelease package of GnuPG extensions for GnuPG 2.0
 
 LIB_DEPENDS=	gcrypt.6:${PORTSDIR}/security/libgcrypt \
 		iconv.3:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		ksba.7:${PORTSDIR}/security/libksba \
 		pth.20:${PORTSDIR}/devel/pth
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
@@ -26,6 +25,7 @@ RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
 		
 USE_AUTOCONF_VER=253
 USE_LIBTOOL=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
diff --git a/security/quintuple-agent/Makefile b/security/quintuple-agent/Makefile
index 04593da41a58..f361367393cc 100644
--- a/security/quintuple-agent/Makefile
+++ b/security/quintuple-agent/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	quintuple-agent
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.vibe.at/tools/q-agent/
 
 MAINTAINER=	stolz@i2.informatik.rwth-aachen.de
 COMMENT=	Quintuple Agent is a program that stores secrets for you
 
-LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_GNOME=	glib12
 .ifndef(WITHOUT_X11)
 USE_GNOME+=	gtk12
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index acb123d886c2..98a4667bd089 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -8,17 +8,18 @@
 
 PORTNAME=	shishi
 PORTVERSION=	0.0.14
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://josefsson.org/${PORTNAME}/releases/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free implementation of the Kerberos 5 network security system
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		idn.12:${PORTSDIR}/devel/libidn \
+LIB_DEPENDS=	idn.12:${PORTSDIR}/devel/libidn \
 		tasn1.2:${PORTSDIR}/security/libtasn1
 
 USE_PERL5_BUILD=	yes
+USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index 3980d776d9a7..357b8f8a2eb6 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	steghide
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	steghide
@@ -16,9 +17,9 @@ MAINTAINER=	arved@FreeBSD.org
 COMMENT=	"Steganography tool to hide data in binary files"
 
 LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt \
-		mhash.2:${PORTSDIR}/security/mhash \
-		intl.5:${PORTSDIR}/devel/gettext-old
+		mhash.2:${PORTSDIR}/security/mhash
 
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
diff --git a/security/tinc/Makefile b/security/tinc/Makefile
index 55585a1c2986..f56ef7683828 100644
--- a/security/tinc/Makefile
+++ b/security/tinc/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	tinc
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://tinc.nl.linux.org/packages/ \
 		ftp://ftp.wiretapped.net/pub/security/network-security/tinc/ \
@@ -16,9 +17,9 @@ MASTER_SITES=	http://tinc.nl.linux.org/packages/ \
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	A Virtual Private Network (VPN) daemon
 
-LIB_DEPENDS=	intl:${PORTSDIR}/devel/gettext-old \
-		lzo.1:${PORTSDIR}/archivers/lzo
+LIB_DEPENDS=	lzo.1:${PORTSDIR}/archivers/lzo
 
+USE_GETTEXT=	yes
 USE_SIZE=	yes
 USE_OPENSSL=	yes
 USE_REINPLACE=	yes
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 04edfa0190e8..10a72fef002e 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apcupsd
 PORTVERSION=	3.10.11
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.de
 COMMENT=	A daemon for controlling APC UPS
 
-LIB_DEPENDS=	intl.6:${PORTSDIR}/devel/gettext
-
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 
 STARTUP_SCRIPT=	apcupsd.sh.sample
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 578a82d50855..39b924f38511 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	coreutils
 PORTVERSION=	5.0
+PORTREVISION=	1
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,14 +17,13 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	The Free Software Foundation's core utilities
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 CONFLICTS=	sh-utils-* fileutils-* textutils-* id-utils-*
 
 # Global variables
 #
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--program-prefix=g
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index ba7b297723a8..395f31a49922 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -7,18 +7,18 @@
 
 PORTNAME=	gcombust
 PORTVERSION=	0.1.53
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.abo.fi/~jmunsin/gcombust/
 
 MAINTAINER=	mcdouga9@msu.edu
 COMMENT=	A GTK+ frontend for mkisofs and cdrecord
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
 		mkisofs:${PORTSDIR}/sysutils/mkisofs \
 		cdlabelgen:${PORTSDIR}/print/cdlabelgen
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_PERL5_BUILD=yes
 USE_GNOME=	gtk12 gnomehier
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index d2fd06bbc3c6..df98af7ef037 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -7,19 +7,20 @@
 
 PORTNAME=	gtk-imonc
 PORTVERSION=	0.4.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://userpage.fu-berlin.de/~zeank/gtk-imonc/download/
 
 MAINTAINER=	steffen@vogelreuter.de
 COMMENT=	A gtk based client to control an one disc fli4l router
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE}
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
diff --git a/sysutils/mount.app/Makefile b/sysutils/mount.app/Makefile
index ad8fbac3e01c..92a3de172eb9 100644
--- a/sysutils/mount.app/Makefile
+++ b/sysutils/mount.app/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mountapp
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mountapp
@@ -14,9 +15,9 @@ MASTER_SITE_SUBDIR=	mountapp
 MAINTAINER=	nm@web.am
 COMMENT=	Windowmaker application, Resembles wmmount with extra functionality
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 BUILD_DEPENDS+=	${X11BASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker
 
+USE_GETTEXT=	yes
 USE_GNOME=	gtk12 glib12
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/xfce4-mcs-manager/Makefile b/sysutils/xfce4-mcs-manager/Makefile
index 45d5beb12dae..39cbb5392b71 100644
--- a/sysutils/xfce4-mcs-manager/Makefile
+++ b/sysutils/xfce4-mcs-manager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-mcs-manager
 PORTVERSION=	4.0.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
                 ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/xfce-${PORTVERSION}/src/ \
@@ -19,11 +19,11 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 settings manager
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
+LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		xfce4mcs-manager.1:${PORTSDIR}/x11/libxfce4mcs
 
+USE_GETTEXT=	yes
 USE_GNOME=	glib20
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index c6648d78622b..b2f89957942d 100644
--- a/sysutils/xfce4-mcs-plugins/Makefile
+++ b/sysutils/xfce4-mcs-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-mcs-plugins
 PORTVERSION=	4.0.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
                 ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/xfce-${PORTVERSION}/src/ \
@@ -20,10 +20,10 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 settings manager plugins
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
+LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 
+USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index 02c23d5c9615..40bc5f24a30c 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-utils
 PORTVERSION=	4.0.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
                 ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/xfce-${PORTVERSION}/src/ \
@@ -19,11 +19,11 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 essential utilities and scripts
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
+LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui \
 		xfce4mcs-manager.1:${PORTSDIR}/sysutils/xfce4-mcs-manager
 
+USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile
index 5b6fe1db048c..99483d40a9a5 100644
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@@ -16,9 +16,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An xmlviewer with a netscape plugin, and now a bonobo control as well
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomelibs bonobo gnomeprefix
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index 8f74109d892a..e7575708c4fc 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libtre
 PORTVERSION=	0.6.4
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://laurikari.net/tre/
 DISTNAME=	tre-${PORTVERSION}
@@ -15,8 +16,7 @@ DISTNAME=	tre-${PORTVERSION}
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	A lightweight fully POSIX compliant regexp matching library
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_SIZE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index 0b5a2bdd5ec7..0a291116b85c 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	modlogan
 PORTVERSION=	0.8.10
+PORTREVISION=	1
 CATEGORIES=	textproc www
 MASTER_SITES=	http://jan.kneschke.de/projects/modlogan/download/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -17,10 +18,10 @@ COMMENT=	A modular log file analysis program
 
 LIB_DEPENDS=	adns.1:${PORTSDIR}/dns/adns \
 		gd.4:${PORTSDIR}/graphics/gd \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		expat.4:${PORTSDIR}/textproc/expat2
 
+USE_GETTEXT=	yes
 .if defined(WITH_MYSQL)
 # To quote the author:
 #  It is used by src/processor/telecom/... for a commercial project. The
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 18c4024b096b..54ce978a95a9 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	OpenSP
 PORTVERSION=	1.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openjade
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR=	openjade
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	This package is a collection of SGML/XML tools called OpenSP
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_GETTEXT=	yes
 USE_GMAKE=	YES
 USE_REINPLACE=	YES
 USE_LIBTOOL=	YES
diff --git a/textproc/rotix/Makefile b/textproc/rotix/Makefile
index fa3e3928aad2..5daf1e97c0bd 100644
--- a/textproc/rotix/Makefile
+++ b/textproc/rotix/Makefile
@@ -8,15 +8,14 @@
 
 PORTNAME=	rotix
 PORTVERSION=	0.82
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/${DISTNAME}/
 
 MAINTAINER=	lintux@debian.org
 COMMENT=	A program to generate rotational obfuscations
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 USE_REINPLACE=	yes
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index e7f4ea6f4a96..0831f8f03616 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scrollkeeper
 PORTVERSION=	0.3.14
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -16,7 +17,6 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An Open Document Cataloging Project
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 BUILD_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
 		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
@@ -33,6 +33,7 @@ PREFIX?=	${X11BASE}
 DOCBOOK_VERSION=	4.1.2
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_BISON=	yes
diff --git a/textproc/spellutils/Makefile b/textproc/spellutils/Makefile
index fb5178144109..4125115e9b2e 100644
--- a/textproc/spellutils/Makefile
+++ b/textproc/spellutils/Makefile
@@ -14,10 +14,10 @@ MASTER_SITES=	http://home.worldonline.dk/byrial/spellutils/
 MAINTAINER=	thierry@pompo.net
 COMMENT=	Programs used to isolate some parts or texts before spell-checking
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"	\
 		LIBS='-L${LOCALBASE}/lib'		\
 		LDFLAGS=-lintl
diff --git a/ukrainian/calligra-l10n/Makefile b/ukrainian/calligra-l10n/Makefile
index 4a2ad2d90f7f..0bc1c9ac8090 100644
--- a/ukrainian/calligra-l10n/Makefile
+++ b/ukrainian/calligra-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/ukrainian/kde3-i18n/Makefile b/ukrainian/kde3-i18n/Makefile
index 5493c739fb5b..a4f1ac8ab384 100644
--- a/ukrainian/kde3-i18n/Makefile
+++ b/ukrainian/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/ukrainian/kde4-l10n/Makefile b/ukrainian/kde4-l10n/Makefile
index 5493c739fb5b..a4f1ac8ab384 100644
--- a/ukrainian/kde4-l10n/Makefile
+++ b/ukrainian/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/ukrainian/koffice-i18n/Makefile b/ukrainian/koffice-i18n/Makefile
index 4a2ad2d90f7f..0bc1c9ac8090 100644
--- a/ukrainian/koffice-i18n/Makefile
+++ b/ukrainian/koffice-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/ukrainian/koffice-kde4-l10n/Makefile b/ukrainian/koffice-kde4-l10n/Makefile
index 4a2ad2d90f7f..0bc1c9ac8090 100644
--- a/ukrainian/koffice-kde4-l10n/Makefile
+++ b/ukrainian/koffice-kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/vietnamese/kde3-i18n/Makefile b/vietnamese/kde3-i18n/Makefile
index 9112a97951c8..ba519016a8cb 100644
--- a/vietnamese/kde3-i18n/Makefile
+++ b/vietnamese/kde3-i18n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	vietnamese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src/kde-i18n
@@ -16,10 +17,9 @@ DIST_SUBDIR=	KDE
 MAINTAINER?=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
diff --git a/www/amyc/Makefile b/www/amyc/Makefile
index e7db13dfe297..24836f6764b4 100644
--- a/www/amyc/Makefile
+++ b/www/amyc/Makefile
@@ -7,16 +7,15 @@
 
 PORTNAME=	amyc
 PORTVERSION=	0.9.159
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://www.crevola.com/about/current/
 
 MAINTAINER=	petef@FreeBSD.org
 COMMENT=	Display the contents of your Netscape cache
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_AUTOCONF=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile
index e140cdd2beb9..dfb8938f968f 100644
--- a/www/kdewebdev/Makefile
+++ b/www/kdewebdev/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quanta
 PORTVERSION= 	${KDE_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	www kde
 MASTER_SITES=	${MASTER_SITE_KDE}
@@ -17,12 +17,11 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@freebsd.org
 COMMENT=	Comprehensive html/website development environment
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index e140cdd2beb9..dfb8938f968f 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quanta
 PORTVERSION= 	${KDE_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	www kde
 MASTER_SITES=	${MASTER_SITE_KDE}
@@ -17,12 +17,11 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@freebsd.org
 COMMENT=	Comprehensive html/website development environment
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index fc67113636da..976e424b3bd3 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lynx
 PORTVERSION=    2.8.5d17
+PORTREVISION=	1
 CATEGORIES=     www ipv6
 MASTER_SITES=	http://lynx.isc.org/current/
 DISTNAME=       ${PORTNAME}2.8.5dev.17
@@ -14,10 +15,9 @@ DISTNAME=       ${PORTNAME}2.8.5dev.17
 MAINTAINER=	ache@FreeBSD.org
 COMMENT=	A non-graphical, text-based World-Wide Web client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 WRKSRC=		${WRKDIR}/${PORTNAME}2-8-5
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 NO_LATEST_LINK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
diff --git a/www/quanta/Makefile b/www/quanta/Makefile
index e140cdd2beb9..dfb8938f968f 100644
--- a/www/quanta/Makefile
+++ b/www/quanta/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quanta
 PORTVERSION= 	${KDE_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	www kde
 MASTER_SITES=	${MASTER_SITE_KDE}
@@ -17,12 +17,11 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@freebsd.org
 COMMENT=	Comprehensive html/website development environment
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index ea0f3f20c196..034f869f33de 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	retawq
 PORTVERSION=	0.1.7
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An interactive, multi-threaded web browser for text terminals
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index 36c23b0e5864..60a45e976cdb 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -14,13 +14,12 @@ MASTER_SITES=	http://www.lyra.org/sitecopy/
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Maintains remote websites, uses FTP or WebDAV to sync up with local copy
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
 CONFIGURE_ARGS=	--with-included-neon --with-libxml2
 USE_REINPLACE=	yes
+USE_GETTEXT=	yes
 USE_GNOME=	libxml2
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index 6a7b3d1b2a54..9b9b134c7d4e 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	snownews
 PORTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://home.kcore.de/~kiza/software/snownews/download/
 
@@ -15,9 +16,9 @@ MAINTAINER=	clsung@dragon2.net
 COMMENT=	A text mode RSS newsreader
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/xml2-config:${PORTSDIR}/textproc/libxml2
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 
 MAN1=		snownews.1
diff --git a/x11-fm/xfce4-fm/Makefile b/x11-fm/xfce4-fm/Makefile
index b289b203cbe7..ff15d1bf6a45 100644
--- a/x11-fm/xfce4-fm/Makefile
+++ b/x11-fm/xfce4-fm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-fm
 PORTVERSION=	4.0.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-fm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
                 ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/xfce-${PORTVERSION}/src/ \
@@ -20,12 +20,12 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 file manager
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		dbh.1:${PORTSDIR}/databases/dbh \
+LIB_DEPENDS=	dbh.1:${PORTSDIR}/databases/dbh \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 
+USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile
index eb746f522db5..ac002aa4e59b 100644
--- a/x11-fm/xfe/Makefile
+++ b/x11-fm/xfe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfe
 PORTVERSION=	0.54.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,6 @@ MAINTAINER=	ptiJo@noos.fr
 COMMENT=	Fast MS-Explorer like filemanager for X
 
 LIB_DEPENDS=	FOX:${PORTSDIR}/x11-toolkits/fox \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		png.5:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
@@ -26,6 +25,7 @@ CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 CONFIGURE_ARGS+=--x-includes=${X11BASE}/include \
 		--x-libraries=${X11BASE}/lib \
 		--with-x
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index dec49057ad43..00992c352d38 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xnc
 PORTVERSION=	5.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.xnc.dubna.su/src-5/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -24,10 +24,10 @@ COMMENT=	File manager for X Window
 #		lha:${PORTSDIR}/archivers/lha
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		intl.5:${PORTSDIR}/devel/gettext-old
+		tiff.4:${PORTSDIR}/graphics/tiff
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_GETTEXT=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-pty=BSD --with-libintl-prefix=${LOCALBASE}
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index ecbfbfdb090a..82835facb5ed 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	1.2.10
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtk+/1.2
@@ -16,8 +16,7 @@ DISTNAME=	gtk+-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gimp Toolkit for X11 GUI (previous stable version)
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GNOME=	glib12
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 9bb29c6cecf2..36179e0f8a04 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.2,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.2/
@@ -16,12 +17,12 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An open-source framework for the layout and rendering of i18n text
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 RUN_DEPENDS=	${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
 		${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index e773a8d7a499..5ef8ce6a526a 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icewm
 PORTVERSION=	1.2.13
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window Manager designed for speed, usability and consistency
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget
diff --git a/x11-wm/kappdock/Makefile b/x11-wm/kappdock/Makefile
index 220d91feacce..face1979561b 100644
--- a/x11-wm/kappdock/Makefile
+++ b/x11-wm/kappdock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kappdock
 PORTVERSION=	0.46.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm kde
 MASTER_SITES=	http://www.Informatik.Uni-Oldenburg.DE/~bigboss/kappdock/
 DISTNAME=	${PORTNAME}-0.46-1
@@ -16,8 +16,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-0.46
 MAINTAINER=	jeremy@external.org
 COMMENT=	A dock-like applet for KDE3
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=
diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile
index ba88e8d69a9a..1d4e11cfef61 100644
--- a/x11-wm/ude/Makefile
+++ b/x11-wm/ude/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ude
 PORTVERSION=	0.2.9
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	udeproject
@@ -14,9 +15,9 @@ MASTER_SITE_SUBDIR=	udeproject
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small, fast, compact windowmanager
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index c524a29dd8c3..010b94eb2628 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	windowmaker
 PORTVERSION=	0.80.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER}
 MASTER_SITE_SUBDIR=	source/release
@@ -18,8 +18,7 @@ COMMENT=	GNUStep-compliant NeXTStep window manager clone
 
 LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		intl.5:${PORTSDIR}/devel/gettext-old
+		tiff.4:${PORTSDIR}/graphics/tiff
 .if !defined(WITHOUT_HERMES)
 LIB_DEPENDS+=	Hermes.1:${PORTSDIR}/graphics/Hermes
 .endif
@@ -27,6 +26,7 @@ LIB_DEPENDS+=	Hermes.1:${PORTSDIR}/graphics/Hermes
 RUN_DEPENDS=	${X11BASE}/share/WindowMaker/Themes/Checker.themed/style:${PORTSDIR}/graphics/wmicons
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index fc12a7f877f7..752ea13e6ac8 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-desktop
 PORTVERSION=	4.0.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
                 ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/xfce-${PORTVERSION}/src/ \
@@ -20,12 +20,12 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 desktop background manager and root menu
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
+LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 
+USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index cb5a09f8312b..d0d9316428a6 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-panel
 PORTVERSION=	4.0.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
                 ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/xfce-${PORTVERSION}/src/ \
@@ -19,12 +19,12 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 panel module
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
+LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 
+USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index df816d758653..e99dc166f304 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-wm
 PORTVERSION=	4.0.3.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
                 ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/xfce-${PORTVERSION}/src/ \
@@ -20,12 +20,12 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 window manager
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
+LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 
+USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index f3f19de1ae16..4e63a02fced2 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
@@ -24,12 +24,12 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xslt.2:${PORTSDIR}/textproc/libxslt \
 		pcre.0:${PORTSDIR}/devel/pcre \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		cups.2:${PORTSDIR}/print/cups-base
 RUN_DEPENDS=	${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
 		${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
 
+USE_GETTEXT=	yes
 USE_QT_VER=	3
 PREFIX=		${KDE_PREFIX}
 USE_OPENSSL=	yes
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index f3f19de1ae16..4e63a02fced2 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
@@ -24,12 +24,12 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xslt.2:${PORTSDIR}/textproc/libxslt \
 		pcre.0:${PORTSDIR}/devel/pcre \
-		intl.5:${PORTSDIR}/devel/gettext-old \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		cups.2:${PORTSDIR}/print/cups-base
 RUN_DEPENDS=	${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
 		${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
 
+USE_GETTEXT=	yes
 USE_QT_VER=	3
 PREFIX=		${KDE_PREFIX}
 USE_OPENSSL=	yes
diff --git a/x11/kgamma/Makefile b/x11/kgamma/Makefile
index cbbbda5d9b5e..91d26cb7389d 100644
--- a/x11/kgamma/Makefile
+++ b/x11/kgamma/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		kgamma
 PORTVERSION=		1.0.1
-PORTREVISION=	1
+PORTREVISION=		2
 CATEGORIES=		x11 kde
 MASTER_SITES=		http://download.berlios.de/kgamma/
 DISTNAME=		${PORTNAME}-${PORTVERSION:S/.p./_pre/}
@@ -15,9 +15,8 @@ DISTNAME=		${PORTNAME}-${PORTVERSION:S/.p./_pre/}
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	"KDE Control Center module for gamma calibration/correction of XFree86"
 
-LIB_DEPENDS= 		intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_BZIP2=		yes
+USE_GETTEXT=		yes
 USE_KDELIBS_VER=	3
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index 79ea7b3e2ac1..69e509621c5b 100644
--- a/x11/xfree86_xkb_xml/Makefile
+++ b/x11/xfree86_xkb_xml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfree86_xkb_xml
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gswitchit
@@ -14,9 +15,9 @@ MASTER_SITE_SUBDIR=	gswitchit
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A little set of XML files useful for dealing with XKB rules
 
-LIB_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes