52 files changed, 109 insertions, 107 deletions

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