32 files changed, 73 insertions, 75 deletions

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