22 files changed, 49 insertions, 47 deletions

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