66 files changed, 70 insertions, 132 deletions

diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index aac49e02ed5a..ff8543765fe4 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	amanda
 PORTVERSION=	2.5.1p3
-PORTREVISION?=	5
+PORTREVISION?=	6
 PKGNAMESUFFIX?=	-server
 PORTEPOCH=	1
 CATEGORIES=	misc
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
 SLAVEDIRS=	misc/amanda25-client
 
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
-USE_AUTOTOOLS=	autoconf:262
+USE_AUTOTOOLS=	autoconf:267
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 PATCH_STRIP=
diff --git a/misc/gwenview-i18n/Makefile b/misc/gwenview-i18n/Makefile
index 7567f99069c9..e717cc8483f1 100644
--- a/misc/gwenview-i18n/Makefile
+++ b/misc/gwenview-i18n/Makefile
@@ -14,13 +14,12 @@ MASTER_SITES=	SF/gwenview/gwenview/${PORTVERSION}
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	Localized messages and documentation for Gwenview
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 CONFLICTS=	gwenview-0.[0-9]* gwenview-1.[0-3]*
 
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/k3b-i18n/Makefile b/misc/k3b-i18n/Makefile
index d19e426af2c1..9302007bd0b3 100644
--- a/misc/k3b-i18n/Makefile
+++ b/misc/k3b-i18n/Makefile
@@ -14,11 +14,10 @@ MASTER_SITES=	SF/k3b/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	Localized messages and documentation for K3b
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/kde3-i18n-af/Makefile b/misc/kde3-i18n-af/Makefile
index 8906be8e2d13..0ea9c209a4f8 100644
--- a/misc/kde3-i18n-af/Makefile
+++ b/misc/kde3-i18n-af/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Afrikaans localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-az/Makefile b/misc/kde3-i18n-az/Makefile
index c46efa2d10ff..503b30df8110 100644
--- a/misc/kde3-i18n-az/Makefile
+++ b/misc/kde3-i18n-az/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Azerbaijani messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-be/Makefile b/misc/kde3-i18n-be/Makefile
index 08251925d199..41c19a3af01e 100644
--- a/misc/kde3-i18n-be/Makefile
+++ b/misc/kde3-i18n-be/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Belarusian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-bg/Makefile b/misc/kde3-i18n-bg/Makefile
index 8cf1f4ea0f0f..ce887ddb5038 100644
--- a/misc/kde3-i18n-bg/Makefile
+++ b/misc/kde3-i18n-bg/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Bulgarian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-bn/Makefile b/misc/kde3-i18n-bn/Makefile
index cfe0c56958f8..498875da87de 100644
--- a/misc/kde3-i18n-bn/Makefile
+++ b/misc/kde3-i18n-bn/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Bengali messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-br/Makefile b/misc/kde3-i18n-br/Makefile
index 7cdd91d0560d..970108522919 100644
--- a/misc/kde3-i18n-br/Makefile
+++ b/misc/kde3-i18n-br/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Breton messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-bs/Makefile b/misc/kde3-i18n-bs/Makefile
index 3f873a2d6daf..f310a53ec257 100644
--- a/misc/kde3-i18n-bs/Makefile
+++ b/misc/kde3-i18n-bs/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Bosnian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-ca/Makefile b/misc/kde3-i18n-ca/Makefile
index 07f3b7e49d74..cb216d21ee92 100644
--- a/misc/kde3-i18n-ca/Makefile
+++ b/misc/kde3-i18n-ca/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Catalan messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-cs/Makefile b/misc/kde3-i18n-cs/Makefile
index 4a1dbbc28332..799283fdb3a0 100644
--- a/misc/kde3-i18n-cs/Makefile
+++ b/misc/kde3-i18n-cs/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Czech messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-csb/Makefile b/misc/kde3-i18n-csb/Makefile
index a7ca3e7da25b..bd9fdefef8ec 100644
--- a/misc/kde3-i18n-csb/Makefile
+++ b/misc/kde3-i18n-csb/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Cassubian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-cy/Makefile b/misc/kde3-i18n-cy/Makefile
index 8c41ac89f380..cd9a90eedd15 100644
--- a/misc/kde3-i18n-cy/Makefile
+++ b/misc/kde3-i18n-cy/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Welsh messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-da/Makefile b/misc/kde3-i18n-da/Makefile
index 851cacb831aa..c0069811aeb7 100644
--- a/misc/kde3-i18n-da/Makefile
+++ b/misc/kde3-i18n-da/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Danish messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-el/Makefile b/misc/kde3-i18n-el/Makefile
index e3331d1a42dc..363ad4a6a75c 100644
--- a/misc/kde3-i18n-el/Makefile
+++ b/misc/kde3-i18n-el/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Modern Greek messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-en_GB/Makefile b/misc/kde3-i18n-en_GB/Makefile
index 01183e7216cb..e95432d2f7d4 100644
--- a/misc/kde3-i18n-en_GB/Makefile
+++ b/misc/kde3-i18n-en_GB/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	British messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-eo/Makefile b/misc/kde3-i18n-eo/Makefile
index 0ea186fee5f9..0212f67e2bce 100644
--- a/misc/kde3-i18n-eo/Makefile
+++ b/misc/kde3-i18n-eo/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Esperanto messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-es/Makefile b/misc/kde3-i18n-es/Makefile
index d66ffde2786f..7012a691b061 100644
--- a/misc/kde3-i18n-es/Makefile
+++ b/misc/kde3-i18n-es/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Spanish messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-et/Makefile b/misc/kde3-i18n-et/Makefile
index a96f3ed4e4f6..65b87a168589 100644
--- a/misc/kde3-i18n-et/Makefile
+++ b/misc/kde3-i18n-et/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Estonian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-eu/Makefile b/misc/kde3-i18n-eu/Makefile
index 24ba7677995e..071bed3f5ede 100644
--- a/misc/kde3-i18n-eu/Makefile
+++ b/misc/kde3-i18n-eu/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basque messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-fa/Makefile b/misc/kde3-i18n-fa/Makefile
index f87c4c29172a..eab447f4ab5b 100644
--- a/misc/kde3-i18n-fa/Makefile
+++ b/misc/kde3-i18n-fa/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Persian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-fi/Makefile b/misc/kde3-i18n-fi/Makefile
index 47f1729af82a..89e96e7c58d1 100644
--- a/misc/kde3-i18n-fi/Makefile
+++ b/misc/kde3-i18n-fi/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Finnish messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-fy/Makefile b/misc/kde3-i18n-fy/Makefile
index 0f2e051a6c9d..3463ff6aebf4 100644
--- a/misc/kde3-i18n-fy/Makefile
+++ b/misc/kde3-i18n-fy/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Frisian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-ga/Makefile b/misc/kde3-i18n-ga/Makefile
index 52fc82e7e689..135f71266ccb 100644
--- a/misc/kde3-i18n-ga/Makefile
+++ b/misc/kde3-i18n-ga/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Irish messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-gl/Makefile b/misc/kde3-i18n-gl/Makefile
index 1c6f9b63e88e..bea4c11a722f 100644
--- a/misc/kde3-i18n-gl/Makefile
+++ b/misc/kde3-i18n-gl/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Gallegan messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-hi/Makefile b/misc/kde3-i18n-hi/Makefile
index 1ae77ffb54d0..a0449d8736ee 100644
--- a/misc/kde3-i18n-hi/Makefile
+++ b/misc/kde3-i18n-hi/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Hindi messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-hr/Makefile b/misc/kde3-i18n-hr/Makefile
index 77f6e75341be..f32232d009a4 100644
--- a/misc/kde3-i18n-hr/Makefile
+++ b/misc/kde3-i18n-hr/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Croatian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-hsb/Makefile b/misc/kde3-i18n-hsb/Makefile
index 077551e799b5..5ccc6d6a2153 100644
--- a/misc/kde3-i18n-hsb/Makefile
+++ b/misc/kde3-i18n-hsb/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Upper Sorbian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-is/Makefile b/misc/kde3-i18n-is/Makefile
index 95b9953efa96..f7b4617b1355 100644
--- a/misc/kde3-i18n-is/Makefile
+++ b/misc/kde3-i18n-is/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Icelandic messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-it/Makefile b/misc/kde3-i18n-it/Makefile
index 4fb81010ec75..07fafad94126 100644
--- a/misc/kde3-i18n-it/Makefile
+++ b/misc/kde3-i18n-it/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Italian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-kk/Makefile b/misc/kde3-i18n-kk/Makefile
index 347899c6dc96..e233b8c5752e 100644
--- a/misc/kde3-i18n-kk/Makefile
+++ b/misc/kde3-i18n-kk/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Kazakh messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-km/Makefile b/misc/kde3-i18n-km/Makefile
index f2e4524ef154..d34c63c35b34 100644
--- a/misc/kde3-i18n-km/Makefile
+++ b/misc/kde3-i18n-km/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Khmer messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-lt/Makefile b/misc/kde3-i18n-lt/Makefile
index 8a5d18f703c8..74353ef1f812 100644
--- a/misc/kde3-i18n-lt/Makefile
+++ b/misc/kde3-i18n-lt/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Lithuanian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-lv/Makefile b/misc/kde3-i18n-lv/Makefile
index b6881e679a69..982984121748 100644
--- a/misc/kde3-i18n-lv/Makefile
+++ b/misc/kde3-i18n-lv/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Latvian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-mk/Makefile b/misc/kde3-i18n-mk/Makefile
index caafcb035591..544656fba435 100644
--- a/misc/kde3-i18n-mk/Makefile
+++ b/misc/kde3-i18n-mk/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Macedonian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-mn/Makefile b/misc/kde3-i18n-mn/Makefile
index cb9496522ae6..708f926687df 100644
--- a/misc/kde3-i18n-mn/Makefile
+++ b/misc/kde3-i18n-mn/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Mongolian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-ms/Makefile b/misc/kde3-i18n-ms/Makefile
index 13999b34938e..7b26bb54312e 100644
--- a/misc/kde3-i18n-ms/Makefile
+++ b/misc/kde3-i18n-ms/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Malay messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-mt/Makefile b/misc/kde3-i18n-mt/Makefile
index 4ece876edc8f..656d20851aad 100644
--- a/misc/kde3-i18n-mt/Makefile
+++ b/misc/kde3-i18n-mt/Makefile
@@ -18,11 +18,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Maltese messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-nb/Makefile b/misc/kde3-i18n-nb/Makefile
index 8151ae37cad3..c335e2f3fd70 100644
--- a/misc/kde3-i18n-nb/Makefile
+++ b/misc/kde3-i18n-nb/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Norwegian Bokmaal messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-nds/Makefile b/misc/kde3-i18n-nds/Makefile
index 5527d01bac4b..8c1e67626830 100644
--- a/misc/kde3-i18n-nds/Makefile
+++ b/misc/kde3-i18n-nds/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Low German localized messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-nl/Makefile b/misc/kde3-i18n-nl/Makefile
index 89c1b215d532..ff97516dac9e 100644
--- a/misc/kde3-i18n-nl/Makefile
+++ b/misc/kde3-i18n-nl/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Dutch messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-nn/Makefile b/misc/kde3-i18n-nn/Makefile
index 7e23b84716be..a7273bbb97a8 100644
--- a/misc/kde3-i18n-nn/Makefile
+++ b/misc/kde3-i18n-nn/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Norwegian Nynorsk messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-nso/Makefile b/misc/kde3-i18n-nso/Makefile
index 13f5a27593ce..7d4d30743cf8 100644
--- a/misc/kde3-i18n-nso/Makefile
+++ b/misc/kde3-i18n-nso/Makefile
@@ -18,11 +18,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Northern Sotho messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-pa/Makefile b/misc/kde3-i18n-pa/Makefile
index 1dab6f7e108d..65a4006ebfe2 100644
--- a/misc/kde3-i18n-pa/Makefile
+++ b/misc/kde3-i18n-pa/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Panjabi messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-ro/Makefile b/misc/kde3-i18n-ro/Makefile
index 854ff2a2597c..36c2ca6077f1 100644
--- a/misc/kde3-i18n-ro/Makefile
+++ b/misc/kde3-i18n-ro/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Romanian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-rw/Makefile b/misc/kde3-i18n-rw/Makefile
index 32a77a2cf65a..06f4759fd425 100644
--- a/misc/kde3-i18n-rw/Makefile
+++ b/misc/kde3-i18n-rw/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Kinyarwanda messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-se/Makefile b/misc/kde3-i18n-se/Makefile
index ce2fe5f6b139..0800a1707e17 100644
--- a/misc/kde3-i18n-se/Makefile
+++ b/misc/kde3-i18n-se/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Northern Sami messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-sk/Makefile b/misc/kde3-i18n-sk/Makefile
index 107babdec390..7eb228961713 100644
--- a/misc/kde3-i18n-sk/Makefile
+++ b/misc/kde3-i18n-sk/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Slovak messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-sl/Makefile b/misc/kde3-i18n-sl/Makefile
index 6dbbf1c6fe78..6b76173ffa99 100644
--- a/misc/kde3-i18n-sl/Makefile
+++ b/misc/kde3-i18n-sl/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Slovenian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-sr/Makefile b/misc/kde3-i18n-sr/Makefile
index 3b10f3e1ab2f..ca0cc74e2a25 100644
--- a/misc/kde3-i18n-sr/Makefile
+++ b/misc/kde3-i18n-sr/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Serbian messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-sr_Latn/Makefile b/misc/kde3-i18n-sr_Latn/Makefile
index 9abb8203ebd7..6ca6716fe4a0 100644
--- a/misc/kde3-i18n-sr_Latn/Makefile
+++ b/misc/kde3-i18n-sr_Latn/Makefile
@@ -18,11 +18,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Serbian (latin alphabet) messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-ss/Makefile b/misc/kde3-i18n-ss/Makefile
index 0242cc3725cc..756802ea1012 100644
--- a/misc/kde3-i18n-ss/Makefile
+++ b/misc/kde3-i18n-ss/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Swati messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-sv/Makefile b/misc/kde3-i18n-sv/Makefile
index f5fec947e80b..6d376b1257bc 100644
--- a/misc/kde3-i18n-sv/Makefile
+++ b/misc/kde3-i18n-sv/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Swedish messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-ta/Makefile b/misc/kde3-i18n-ta/Makefile
index 6735fcb50e28..af14f9dab4cd 100644
--- a/misc/kde3-i18n-ta/Makefile
+++ b/misc/kde3-i18n-ta/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Tamil messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-te/Makefile b/misc/kde3-i18n-te/Makefile
index 888fec742a81..68d396789f72 100644
--- a/misc/kde3-i18n-te/Makefile
+++ b/misc/kde3-i18n-te/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Telugu messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-tg/Makefile b/misc/kde3-i18n-tg/Makefile
index 82b4cf56fae6..7e8bf30f8085 100644
--- a/misc/kde3-i18n-tg/Makefile
+++ b/misc/kde3-i18n-tg/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Tajik messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-th/Makefile b/misc/kde3-i18n-th/Makefile
index dbe15441b3ec..43ffcac71d99 100644
--- a/misc/kde3-i18n-th/Makefile
+++ b/misc/kde3-i18n-th/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Thai messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-tr/Makefile b/misc/kde3-i18n-tr/Makefile
index 9ddb71d6e71e..be6ccc0178c8 100644
--- a/misc/kde3-i18n-tr/Makefile
+++ b/misc/kde3-i18n-tr/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Turkish messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-uz/Makefile b/misc/kde3-i18n-uz/Makefile
index 0ab8cd9c8002..face96002318 100644
--- a/misc/kde3-i18n-uz/Makefile
+++ b/misc/kde3-i18n-uz/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Uzbek messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-ven/Makefile b/misc/kde3-i18n-ven/Makefile
index 10b6491b7cde..4754d8a81452 100644
--- a/misc/kde3-i18n-ven/Makefile
+++ b/misc/kde3-i18n-ven/Makefile
@@ -18,11 +18,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Venda messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-wa/Makefile b/misc/kde3-i18n-wa/Makefile
index cd2d3b1d212d..4ebf66ac3edc 100644
--- a/misc/kde3-i18n-wa/Makefile
+++ b/misc/kde3-i18n-wa/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Walloon messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-xh/Makefile b/misc/kde3-i18n-xh/Makefile
index c7dd4029654e..98ca048a2006 100644
--- a/misc/kde3-i18n-xh/Makefile
+++ b/misc/kde3-i18n-xh/Makefile
@@ -18,11 +18,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Xhosa messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/kde3-i18n-zu/Makefile b/misc/kde3-i18n-zu/Makefile
index 91c0c3417568..e3015c47bbc1 100644
--- a/misc/kde3-i18n-zu/Makefile
+++ b/misc/kde3-i18n-zu/Makefile
@@ -18,11 +18,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Zulu messages and documentation for KDE3
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/misc/skyutils/Makefile b/misc/skyutils/Makefile
index f4e0b6f37a2a..d78ce9bca508 100644
--- a/misc/skyutils/Makefile
+++ b/misc/skyutils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	skyutils
 PORTVERSION=	2.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	laszlof
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library required by smssend (same author)
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262 libtool:22
+USE_AUTOTOOLS=	autoconf:267 libtool:22
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index e55e8ca275cf..0755e1af891a 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sword
 PORTVERSION=	1.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.6/ \
 		http://crosswire.org/ftpmirror/pub/sword/source/v1.6/ \
@@ -24,7 +24,7 @@ MAKE_JOBS_SAFE=	yes
 USE_GNOME=	pkgconfig
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:110 autoconf:262
+USE_AUTOTOOLS=	automake:110 autoconf:267
 CONFIGURE_ARGS+=	--without-conf --without-clucene --with-zlib --without-icu
 USE_LDCONFIG=	yes
 SUB_FILES=	pkg-message
@@ -43,6 +43,7 @@ pre-everything::
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|2.63|2.67|g' ${WRKSRC}/aclocal.m4
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|:=|=|' ${WRKSRC}/Makefile.am \