Autotools update. Read ports/UPDATING 20100915 for details.

Approved by:	portmgr (for Mk/bsd.port.mk part)
Tested by:	Multiple -exp runs

54 files changed, 93 insertions, 110 deletions

diff --git a/editors/cle/Makefile b/editors/cle/Makefile
index 3f96aeec4add..07ab72ad7009 100644
--- a/editors/cle/Makefile
+++ b/editors/cle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cle
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://kaolin.unice.fr/pub/Cle/
 
diff --git a/editors/koffice-i18n-af/Makefile b/editors/koffice-i18n-af/Makefile
index 8f00778973e8..ac279447ed27 100644
--- a/editors/koffice-i18n-af/Makefile
+++ b/editors/koffice-i18n-af/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Afrikaans messages and documentation for koffice
 
-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/editors/koffice-i18n-bg/Makefile b/editors/koffice-i18n-bg/Makefile
index d30255486282..1b994e7d748f 100644
--- a/editors/koffice-i18n-bg/Makefile
+++ b/editors/koffice-i18n-bg/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Bulgarian messages and documentation for koffice
 
-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/editors/koffice-i18n-br/Makefile b/editors/koffice-i18n-br/Makefile
index 948421e1c2fa..8277d17c721a 100644
--- a/editors/koffice-i18n-br/Makefile
+++ b/editors/koffice-i18n-br/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Breton messages and documentation for koffice
 
-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/editors/koffice-i18n-bs/Makefile b/editors/koffice-i18n-bs/Makefile
index 510f6c6e1f88..1cb80581e494 100644
--- a/editors/koffice-i18n-bs/Makefile
+++ b/editors/koffice-i18n-bs/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Bosnian messages and documentation for koffice
 
-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/editors/koffice-i18n-ca/Makefile b/editors/koffice-i18n-ca/Makefile
index df904dbbaa12..884d9a6ff3d9 100644
--- a/editors/koffice-i18n-ca/Makefile
+++ b/editors/koffice-i18n-ca/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Catalan messages and documentation for koffice
 
-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/editors/koffice-i18n-cs/Makefile b/editors/koffice-i18n-cs/Makefile
index 0fc493653cfe..d460ff4471a6 100644
--- a/editors/koffice-i18n-cs/Makefile
+++ b/editors/koffice-i18n-cs/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Czech messages and documentation for koffice
 
-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/editors/koffice-i18n-cy/Makefile b/editors/koffice-i18n-cy/Makefile
index 57faa826e638..7ee399dfe797 100644
--- a/editors/koffice-i18n-cy/Makefile
+++ b/editors/koffice-i18n-cy/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Welsh messages and documentation for koffice
 
-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/editors/koffice-i18n-da/Makefile b/editors/koffice-i18n-da/Makefile
index d26dfc15a716..f628990e2812 100644
--- a/editors/koffice-i18n-da/Makefile
+++ b/editors/koffice-i18n-da/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Danish messages and documentation for koffice
 
-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/editors/koffice-i18n-el/Makefile b/editors/koffice-i18n-el/Makefile
index 05fccb4d09dd..086dd0ed2929 100644
--- a/editors/koffice-i18n-el/Makefile
+++ b/editors/koffice-i18n-el/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	(Modern) greek messages and documentation for koffice
 
-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/editors/koffice-i18n-en_GB/Makefile b/editors/koffice-i18n-en_GB/Makefile
index 907623e2a215..e36b43db870a 100644
--- a/editors/koffice-i18n-en_GB/Makefile
+++ b/editors/koffice-i18n-en_GB/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	British messages and documentation for koffice
 
-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/editors/koffice-i18n-eo/Makefile b/editors/koffice-i18n-eo/Makefile
index 91de78802438..d969f66fa6c8 100644
--- a/editors/koffice-i18n-eo/Makefile
+++ b/editors/koffice-i18n-eo/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Esperanto messages and documentation for koffice
 
-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/editors/koffice-i18n-es/Makefile b/editors/koffice-i18n-es/Makefile
index a2bf0f3434b0..db8348427003 100644
--- a/editors/koffice-i18n-es/Makefile
+++ b/editors/koffice-i18n-es/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Spanish messages and documentation for koffice
 
-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/editors/koffice-i18n-et/Makefile b/editors/koffice-i18n-et/Makefile
index fc86bc0f37d4..2a974debf8f9 100644
--- a/editors/koffice-i18n-et/Makefile
+++ b/editors/koffice-i18n-et/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Estonian messages and documentation for koffice
 
-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/editors/koffice-i18n-eu/Makefile b/editors/koffice-i18n-eu/Makefile
index 2c40f28c1de3..05714aefa4bc 100644
--- a/editors/koffice-i18n-eu/Makefile
+++ b/editors/koffice-i18n-eu/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basque messages and documentation for koffice
 
-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/editors/koffice-i18n-fa/Makefile b/editors/koffice-i18n-fa/Makefile
index 7a2262b331f5..17ada96841e2 100644
--- a/editors/koffice-i18n-fa/Makefile
+++ b/editors/koffice-i18n-fa/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Persian messages and documentation for koffice
 
-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/editors/koffice-i18n-fi/Makefile b/editors/koffice-i18n-fi/Makefile
index 25e5cce013aa..395e5a48e463 100644
--- a/editors/koffice-i18n-fi/Makefile
+++ b/editors/koffice-i18n-fi/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Finnish messages and documentation for koffice
 
-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/editors/koffice-i18n-ga/Makefile b/editors/koffice-i18n-ga/Makefile
index 38bb637addef..fb0889a6eb54 100644
--- a/editors/koffice-i18n-ga/Makefile
+++ b/editors/koffice-i18n-ga/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Irish messages and documentation for koffice
 
-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/editors/koffice-i18n-gl/Makefile b/editors/koffice-i18n-gl/Makefile
index 7477929a0d04..f1dab7ef95fa 100644
--- a/editors/koffice-i18n-gl/Makefile
+++ b/editors/koffice-i18n-gl/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Gallegan messages and documentation for koffice
 
-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/editors/koffice-i18n-hi/Makefile b/editors/koffice-i18n-hi/Makefile
index 16d46eec58ca..35156afbeb4c 100644
--- a/editors/koffice-i18n-hi/Makefile
+++ b/editors/koffice-i18n-hi/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Hindi messages and documentation for koffice
 
-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/editors/koffice-i18n-hsb/Makefile b/editors/koffice-i18n-hsb/Makefile
index 2a5d4a028755..765e61052de0 100644
--- a/editors/koffice-i18n-hsb/Makefile
+++ b/editors/koffice-i18n-hsb/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Upper Sorbian messages and documentation for koffice
 
-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/editors/koffice-i18n-is/Makefile b/editors/koffice-i18n-is/Makefile
index 151216f6aa73..7bea55dc96fe 100644
--- a/editors/koffice-i18n-is/Makefile
+++ b/editors/koffice-i18n-is/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Icelandic messages and documentation for koffice
 
-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/editors/koffice-i18n-it/Makefile b/editors/koffice-i18n-it/Makefile
index d420a5bd2b9a..40b9cb715b53 100644
--- a/editors/koffice-i18n-it/Makefile
+++ b/editors/koffice-i18n-it/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Italian messages and documentation for koffice
 
-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/editors/koffice-i18n-km/Makefile b/editors/koffice-i18n-km/Makefile
index d30ebcedf4d3..a842143f8c3f 100644
--- a/editors/koffice-i18n-km/Makefile
+++ b/editors/koffice-i18n-km/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Khmer messages and documentation for koffice
 
-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/editors/koffice-i18n-lo/Makefile b/editors/koffice-i18n-lo/Makefile
index 9a3a6a9d2db6..0b71d6f4afbb 100644
--- a/editors/koffice-i18n-lo/Makefile
+++ b/editors/koffice-i18n-lo/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Lao messages and documentation for koffice
 
-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/editors/koffice-i18n-lt/Makefile b/editors/koffice-i18n-lt/Makefile
index 2fff9d41d0d1..347fc8060df7 100644
--- a/editors/koffice-i18n-lt/Makefile
+++ b/editors/koffice-i18n-lt/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Lithuanian messages and documentation for koffice
 
-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/editors/koffice-i18n-lv/Makefile b/editors/koffice-i18n-lv/Makefile
index dcec397b6e53..c3002f5661d4 100644
--- a/editors/koffice-i18n-lv/Makefile
+++ b/editors/koffice-i18n-lv/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Latvian messages and documentation for koffice
 
-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/editors/koffice-i18n-mk/Makefile b/editors/koffice-i18n-mk/Makefile
index 21ce10757735..b7cb348db84d 100644
--- a/editors/koffice-i18n-mk/Makefile
+++ b/editors/koffice-i18n-mk/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Macedonian messages and documentation for koffice
 
-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/editors/koffice-i18n-ms/Makefile b/editors/koffice-i18n-ms/Makefile
index b529d38a4b47..805e9ad483d0 100644
--- a/editors/koffice-i18n-ms/Makefile
+++ b/editors/koffice-i18n-ms/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Malay messages and documentation for koffice
 
-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/editors/koffice-i18n-mt/Makefile b/editors/koffice-i18n-mt/Makefile
index a03195d76a63..45074f725b4e 100644
--- a/editors/koffice-i18n-mt/Makefile
+++ b/editors/koffice-i18n-mt/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Maltese messages and documentation for koffice
 
-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/editors/koffice-i18n-nb/Makefile b/editors/koffice-i18n-nb/Makefile
index 39df9c7ff96f..5e6fca7f6040 100644
--- a/editors/koffice-i18n-nb/Makefile
+++ b/editors/koffice-i18n-nb/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Norwegian Bokmaal messages and documentation for koffice
 
-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/editors/koffice-i18n-nl/Makefile b/editors/koffice-i18n-nl/Makefile
index 89415c4629f0..e34dae7d09ac 100644
--- a/editors/koffice-i18n-nl/Makefile
+++ b/editors/koffice-i18n-nl/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Dutch messages and documentation for koffice
 
-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/editors/koffice-i18n-nn/Makefile b/editors/koffice-i18n-nn/Makefile
index aeab4d097026..62d439176d6d 100644
--- a/editors/koffice-i18n-nn/Makefile
+++ b/editors/koffice-i18n-nn/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Norwegian Nynorsk messages and documentation for koffice
 
-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/editors/koffice-i18n-ro/Makefile b/editors/koffice-i18n-ro/Makefile
index d1d3b6676c6a..87fde2308e9d 100644
--- a/editors/koffice-i18n-ro/Makefile
+++ b/editors/koffice-i18n-ro/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Romanian messages and documentation for koffice
 
-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/editors/koffice-i18n-se/Makefile b/editors/koffice-i18n-se/Makefile
index b99ce50250e1..0fd3175e13c0 100644
--- a/editors/koffice-i18n-se/Makefile
+++ b/editors/koffice-i18n-se/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Northern Sami messages and documentation for koffice
 
-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/editors/koffice-i18n-sk/Makefile b/editors/koffice-i18n-sk/Makefile
index 266c6c97e023..39041a67f378 100644
--- a/editors/koffice-i18n-sk/Makefile
+++ b/editors/koffice-i18n-sk/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Slovak messages and documentation for koffice
 
-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/editors/koffice-i18n-sl/Makefile b/editors/koffice-i18n-sl/Makefile
index 2b0da3f69f7a..5f3f9369cfc1 100644
--- a/editors/koffice-i18n-sl/Makefile
+++ b/editors/koffice-i18n-sl/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Slovenian messages and documentation for koffice
 
-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/editors/koffice-i18n-sr/Makefile b/editors/koffice-i18n-sr/Makefile
index d7f30a6c4fa8..70c1a02eb8c2 100644
--- a/editors/koffice-i18n-sr/Makefile
+++ b/editors/koffice-i18n-sr/Makefile
@@ -18,11 +18,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Serbian messages and documentation for koffice
 
-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/editors/koffice-i18n-sr_Latn/Makefile b/editors/koffice-i18n-sr_Latn/Makefile
index adabc5bc94c3..0a361db06604 100644
--- a/editors/koffice-i18n-sr_Latn/Makefile
+++ b/editors/koffice-i18n-sr_Latn/Makefile
@@ -18,12 +18,11 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Serbian (latin alphabet) messages and documentation for koffice
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 DISTNAME_OVERRIDE=yes
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	build
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
diff --git a/editors/koffice-i18n-sv/Makefile b/editors/koffice-i18n-sv/Makefile
index 4f2cf1fe0b9e..c32de04b4988 100644
--- a/editors/koffice-i18n-sv/Makefile
+++ b/editors/koffice-i18n-sv/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Swedish messages and documentation for koffice
 
-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/editors/koffice-i18n-ta/Makefile b/editors/koffice-i18n-ta/Makefile
index 80c3a4037281..cf55cd71fef9 100644
--- a/editors/koffice-i18n-ta/Makefile
+++ b/editors/koffice-i18n-ta/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Tamil messages and documentation for koffice
 
-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/editors/koffice-i18n-tg/Makefile b/editors/koffice-i18n-tg/Makefile
index d0625382f1ee..99da942a4c55 100644
--- a/editors/koffice-i18n-tg/Makefile
+++ b/editors/koffice-i18n-tg/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Tajik messages and documentation for koffice
 
-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/editors/koffice-i18n-th/Makefile b/editors/koffice-i18n-th/Makefile
index 478a712d2d47..5aacbbe6098e 100644
--- a/editors/koffice-i18n-th/Makefile
+++ b/editors/koffice-i18n-th/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Thai messages and documentation for koffice
 
-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/editors/koffice-i18n-tr/Makefile b/editors/koffice-i18n-tr/Makefile
index c37cc74b4001..2c7853f2b0f0 100644
--- a/editors/koffice-i18n-tr/Makefile
+++ b/editors/koffice-i18n-tr/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Turkish messages and documentation for koffice
 
-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/editors/koffice-i18n-uz/Makefile b/editors/koffice-i18n-uz/Makefile
index 6cc85224e8bb..5fdfca81af46 100644
--- a/editors/koffice-i18n-uz/Makefile
+++ b/editors/koffice-i18n-uz/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Uzbek messages and documentation for koffice
 
-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/editors/koffice-i18n-ven/Makefile b/editors/koffice-i18n-ven/Makefile
index 029c7963c243..90a17ae88221 100644
--- a/editors/koffice-i18n-ven/Makefile
+++ b/editors/koffice-i18n-ven/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Venda messages and documentation for koffice
 
-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/editors/koffice-i18n-xh/Makefile b/editors/koffice-i18n-xh/Makefile
index 835c6dd96be2..595c37737b4a 100644
--- a/editors/koffice-i18n-xh/Makefile
+++ b/editors/koffice-i18n-xh/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Xhosa messages and documentation for koffice
 
-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/editors/koffice-i18n-zu/Makefile b/editors/koffice-i18n-zu/Makefile
index da1c66b8a77a..284c9b5270ff 100644
--- a/editors/koffice-i18n-zu/Makefile
+++ b/editors/koffice-i18n-zu/Makefile
@@ -17,11 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Zulu messages and documentation for koffice
 
-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/editors/mlview/Makefile b/editors/mlview/Makefile
index b3a57583f17a..1a1ceaf0a0e1 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mlview
 PORTVERSION=	0.8
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tree oriented XML editor for Gnome
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	autoconf:262 libtool:22
+USE_AUTOTOOLS=	autoconf:267 libtool:22
 USE_GNOME=	eel2 gnomehack gnomeprefix gtksourceview libgnomeui
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 75e6d37250a0..d6233bf719f5 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs-devel-mule
 PORTVERSION=	${XEMACS_VER:S/-/./}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
@@ -53,7 +53,7 @@ XEMACS_ARCH=	${MACHINE_ARCH}--freebsd
 
 WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
 STRIP=
-USE_AUTOTOOLS=	autoconf:262
+USE_AUTOTOOLS=	autoconf:267
 CONFIGURE_TARGET=${XEMACS_ARCH}
 
 CONFIGURE_ARGS+=	--enable-mule \
@@ -110,6 +110,9 @@ CONFIGURE_ARGS+=--disable-kkcc --disable-mc-alloc --disable-newgc
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 USE_XORG+=	x11 xft xpm
 CONFIGURE_ARGS+=--with-xft=all
+# XXX: needed until port updated to work nicely with autoconf >= 2.64
+#      see files/patch-configure.ac for more details
+CFLAGS+=	-I${LOCALBASE}/include/freetype2
 .elif defined(WITH_GTK)
 CONFIGURE_ARGS+=--with-gtk
 WITH_XIM=
diff --git a/editors/xemacs-devel-mule/files/patch-configure.ac b/editors/xemacs-devel-mule/files/patch-configure.ac
index c61834620e46..a20f0c608c91 100644
--- a/editors/xemacs-devel-mule/files/patch-configure.ac
+++ b/editors/xemacs-devel-mule/files/patch-configure.ac
@@ -1,5 +1,5 @@
 --- configure.ac.orig	2007-05-21 03:50:13.000000000 +0000
-+++ configure.ac	2008-08-04 13:51:25.000000000 +0000
++++ configure.ac	2010-06-14 13:42:26.000000000 +0000
 @@ -389,5 +389,7 @@
  dnl
 +dnl m4_fst disappeared without a trace in autoconf 2.62
@@ -13,12 +13,38 @@
    *-*-linux*    ) opsys=linux ;;
 +  *-*-freebsd*	) opsys=freebsd ;;
    *-*-netbsd*   ) opsys=netbsd ;;
-@@ -3496,3 +3499,3 @@
-       for freetype_include_top in "/usr/X11R6/include/freetype2" \
+@@ -3487,26 +3490,7 @@
+ 
++  dnl XXX: autoconf > 2.64 AC_CHECK_HEADERS requires the headers to actually
++  dnl XXX: preprocess, and not just exist, so for now, we say 'yes'
++  dnl XXX: unconditionally if asked, and let it fall over elsewhere
+   if test "$with_xft_emacs" = "yes"; then
+-    AC_MSG_CHECKING([for Xrender, fontconfig, and Xft])
+-    xft_includes_found=no
+-    AC_CHECK_HEADERS([freetype/config/ftheader.h],
+-		     [xft_includes_found=yes],
+-		     [
+-      dnl #### How about /sw/include, and /opt/local/include?
+-      dnl these directories need to be the parent of the freetype directory
+-      for freetype_include_top in "/usr/X11R6/include/freetype2" \
 -				  "/usr/include/freetype2"
-+				  "$with_site_includes/freetype2"
-       do
-@@ -5420,3 +5423,3 @@
+-      do
+-	if test -d $freetype_include_top; then
+-	  AC_MSG_CHECKING([in ${freetype_include_top}/freetype2])
+-	  dnl disable autoconf's fucking cache; why these fuckheads think it
+-	  dnl is better to be broken than to be slow, I don't know!
+-	  dnl #### there's gotta be a better-looking way to do this!!
+-	  unset "$as_ac_Header"
+-          save_c_switch_site="$c_switch_site"
+-          c_switch_site="$c_switch_site -I${freetype_include_top}"
+-          AC_CHECK_HEADERS([freetype/config/ftheader.h],
+-			   [xft_includes_found=yes],
+-			   [c_switch_site=$save_c_switch_site])
+-	fi
+-      done])
++    xft_includes_found=yes
+     if test "$xft_includes_found" != "yes"; then
+@@ -5420,3 +5404,3 @@
    AC_MSG_CHECKING(for Berkeley db.h)
 -  for header in "db/db.h" "db.h"; do
 +  for header in "/usr/include/db.h" "db/db.h" "db.h"; do
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 4e49c9e5c3db..031114cd5dcb 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs-devel
 PORTVERSION=	${XEMACS_VER:S/-/./}
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
@@ -39,7 +39,7 @@ XEMACS_ARCH=		${CONFIGURE_TARGET}
 
 WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
 STRIP=
-USE_AUTOTOOLS=	autoconf:262
+USE_AUTOTOOLS=	autoconf:267
 CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
 
 CONFIGURE_ARGS?=--enable-clash-detection \
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index 64de56e03972..0df3b13361e2 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmlcopyeditor
 PORTVERSION=	1.2.0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	SF/xml-copy-editor/${PORTNAME}-linux/${PORTVERSION}
 
@@ -45,7 +45,7 @@ post-extract:
 
 # iconv.m4 is located in ${LOCALBASE}/share/aclocal
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
-USE_AUTOTOOLS=	aclocal:110 autoconf:262 automake:110 libtool:22
+USE_AUTOTOOLS=	aclocal:110 autoconf:267 automake:110 libtool:22
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \
diff --git a/editors/yui/Makefile b/editors/yui/Makefile
index 0281fb67e1ab..9a8bb07c8e5c 100644
--- a/editors/yui/Makefile
+++ b/editors/yui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yui
 PORTVERSION=	3.2.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://openoffice.mirahost.ru/fileZ/software/ \
 		http://citycat4.land.ru/ \
@@ -17,7 +17,7 @@ MAINTAINER=	citycat4@ngs.ru
 COMMENT=	Rich-featured multi-windows console text editor
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	autoconf:262
+USE_AUTOTOOLS=	autoconf:267
 
 MAN1=		y.1