Recursive revision bump / recommended bump for gettext ABI change.

80 files changed, 162 insertions, 120 deletions

diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index b605f062587..84e6115be2c 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2006/01/18 18:19:54 ghen Exp $
+# $NetBSD: Makefile,v 1.53 2006/02/05 23:08:54 joerg Exp $
 
 DISTNAME=	TeXmacs-1.0.5.12-src
 PKGNAME=	${DISTNAME:S/-src//}
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.texmacs.org/pub/TeXmacs/targz/
 MASTER_SITES+=	http://www.texmacs.org/Download/ftp/targz/
diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 3c8a4bce445..24bba1f53f5 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2006/01/26 23:23:30 adam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:55 joerg Exp $
 
 .include "../../editors/abiword/Makefile.common"
 
 PKGNAME=	abiword-plugins-${ABIWORD_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Plugins enhancing Abiword's capabilities
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/abiword-plugins
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index e044d1ffbcd..e4e90c53586 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.96 2006/01/26 23:23:08 adam Exp $
+# $NetBSD: Makefile,v 1.97 2006/02/05 23:08:54 joerg Exp $
 
 .include "Makefile.common"
 COMMENT=	Open Source cross-platform word processor
-PKGREVISION=	2
+PKGREVISION=	3
 
 # GTK1 version and previous name of the GTK2 version
 CONFLICTS=	abiword-personal-[0-9]* abiword2-[0-9]*
diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
index 9c4e668a81c..13bfd73ef7e 100644
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:45 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:55 joerg Exp $
 #
 
 DISTNAME=	beaver-0.2.6
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	http://savannah.nongnu.org/download/beaver/
 
diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index 9bfdf1b4f5a..5103ac103a1 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2005/06/16 06:57:49 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/05 23:08:55 joerg Exp $
 #
 
 DISTNAME=	biew562
 PKGNAME=	biew-5.6.2
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=biew/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/editors/ce-x11/Makefile b/editors/ce-x11/Makefile
index be36b9497b7..09e47a00775 100644
--- a/editors/ce-x11/Makefile
+++ b/editors/ce-x11/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:09 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:55 joerg Exp $
 #
 
 .include "../../editors/ce/Makefile.common"
 
 PKGNAME=		ce-x11-${VERSION}
+PKGREVISION=		1
 COMMENT+=		, X11 version
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 63c11dfcbd9..c7a3441919a 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2006/01/24 07:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2006/02/05 23:08:55 joerg Exp $
 #
 
 DISTNAME=	conglomerate-0.9.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=conglomerate/}
 
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 4b0dab87f84..25f856cc643 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/10/19 10:53:43 adam Exp $
+# $NetBSD: Makefile,v 1.20 2006/02/05 23:08:55 joerg Exp $
 
 DISTNAME=	cooledit-3.17.17
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/
 
diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index 44ce5fb42ce..cb89ee51a88 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2006/01/24 07:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2006/02/05 23:08:55 joerg Exp $
 #
 
 DISTNAME=	dasher-3.2.18
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/3.2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/editors/elvis-x11/Makefile b/editors/elvis-x11/Makefile
index 0933257bfc4..777f3cfc3fd 100644
--- a/editors/elvis-x11/Makefile
+++ b/editors/elvis-x11/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:55 joerg Exp $
 #
 
 .include "../../editors/elvis/Makefile.common"
 
 PKGNAME=        elvis-x11-2.2.0
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT=	GUI for elvis, includes console elvis
 
 CONFLICTS+=	elvis-[0-9]*
diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile
index 4213cd5f6fd..9a72e88bef5 100644
--- a/editors/emacs-nox11/Makefile
+++ b/editors/emacs-nox11/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/06/08 14:39:40 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/02/05 23:08:55 joerg Exp $
 
 DISTNAME=	emacs-${EMACSVERSION}a
 PKGNAME=	emacs-nox11-${EMACSVERSION}a
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 COMMENT=	GNU editing macros (editor) - non X11 version
 
diff --git a/editors/emacs-packages/Makefile b/editors/emacs-packages/Makefile
index a35f8aa4544..b03969b0c71 100644
--- a/editors/emacs-packages/Makefile
+++ b/editors/emacs-packages/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2005/08/28 04:25:29 uebayasi Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:55 joerg Exp $
 
 DISTNAME=	emacs-packages-0.6
+PKGREVISION=	1
 CATEGORIES=	meta-pkgs editors
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 6d258c07c21..f6dd8008113 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2005/12/05 23:55:06 rillig Exp $
+# $NetBSD: Makefile,v 1.90 2006/02/05 23:08:55 joerg Exp $
 
 DISTNAME=	emacs-${EMACSVERSION}a
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 COMMENT=	GNU editing macros (editor)
 
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index c5167f78775..97cbdffb871 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2006/01/04 17:00:32 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/02/05 23:08:55 joerg Exp $
 
 DISTNAME=	emacs-20.7
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/} \
 		${MASTER_SITE_LOCAL}
diff --git a/editors/fe/Makefile b/editors/fe/Makefile
index 02ddd17f9cc..0060ee78d02 100644
--- a/editors/fe/Makefile
+++ b/editors/fe/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2005/12/09 14:17:44 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:55 joerg Exp $
 
 DISTNAME=	fe-1.6
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.moria.de/~michael/fe/
 
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index ff15a378954..1bfda90f3ca 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2006/01/24 07:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2006/02/05 23:08:55 joerg Exp $
 #
 
 DISTNAME=		gconf-editor-2.12.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gconf-editor/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 1ab98717158..7b06912fc07 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2006/01/24 07:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2006/02/05 23:08:56 joerg Exp $
 #
 
 DISTNAME=		gedit-2.12.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/gice/Makefile b/editors/gice/Makefile
index e69b462576d..a6cba6303bc 100644
--- a/editors/gice/Makefile
+++ b/editors/gice/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2006/01/24 07:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2006/02/05 23:08:56 joerg Exp $
 #
 
 DISTNAME=		gice-0.6.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gice/}
 EXTRACT_SUFX=		.tgz
diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile
index 3996baf35a1..f9038e1b4fe 100644
--- a/editors/gnuserv/Makefile
+++ b/editors/gnuserv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/08/28 04:25:29 uebayasi Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:56 joerg Exp $
 
 DISTNAME=	gnuserv-3.12.7
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${HOMEPAGE}/src/
 
diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile
index 918ab61d6a6..a7cf0dfed01 100644
--- a/editors/gtranslator/Makefile
+++ b/editors/gtranslator/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/01/24 07:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:56 joerg Exp $
 
 DISTNAME=	gtranslator-1.0.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtranslator/}
 
diff --git a/editors/heme/Makefile b/editors/heme/Makefile
index 8d7bbabd9bb..296d304f1c0 100644
--- a/editors/heme/Makefile
+++ b/editors/heme/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/11/03 13:25:16 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:56 joerg Exp $
 #
 
 DISTNAME=		heme-0.4
+PKGREVISION=		1
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=heme/}
 
diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile
index 0427e8c7612..d3d026abad1 100644
--- a/editors/hnb/Makefile
+++ b/editors/hnb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:09 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:56 joerg Exp $
 #
 
 DISTNAME=	hnb-1.9.17
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hnb/}
 
diff --git a/editors/jave/Makefile b/editors/jave/Makefile
index 3a8704c8ef9..21f62352ae1 100644
--- a/editors/jave/Makefile
+++ b/editors/jave/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/12/30 10:51:48 martti Exp $
+# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:56 joerg Exp $
 
 DISTNAME=		jave_6.0_M7
 PKGNAME=		jave-6.0m7
+PKGREVISION=		1
 CATEGORIES=		editors
 MASTER_SITES=		http://www.jave.de/developer/ http://www.jave.de/figlet/
 DISTFILES=		jave_6.0_M7${EXTRACT_SUFX} figletfonts37${EXTRACT_SUFX}
diff --git a/editors/jde/Makefile b/editors/jde/Makefile
index 1a4d2f99d54..910b726dd31 100644
--- a/editors/jde/Makefile
+++ b/editors/jde/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:09 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:56 joerg Exp $
 #
 
 DISTNAME=	jde-2.3.2
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel editors java
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 # The "real" site has silly naming conventions:
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 05b27dfff88..2ce57778125 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:09 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2006/02/05 23:08:56 joerg Exp $
 #
 PKGNAME=		jed-0.99.16
-PKGREVISION=		1
+PKGREVISION=		2
 .include "../../editors/jed/Makefile.common"
 COMMENT=		Extensible folding editor with Emacs/WordStar/EDT emulations
 
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 93f4e8284df..cdee0980fcf 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2005/12/29 06:21:38 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/02/05 23:08:56 joerg Exp $
 
 DISTNAME=	joe-3.3
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
diff --git a/editors/kdissert/Makefile b/editors/kdissert/Makefile
index f34a21a5b3e..caa3828ad1c 100644
--- a/editors/kdissert/Makefile
+++ b/editors/kdissert/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2006/01/24 07:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:56 joerg Exp $
 #
 
 DISTNAME=		kdissert-1.0.5
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		editors
 MASTER_SITES=		http://freehackers.org/~tnagy/kdissert/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 39f20c52255..72a08e17a83 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2006/01/24 07:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2006/02/05 23:08:56 joerg Exp $
 
 DISTNAME=		kile-1.8.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		editors kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kile/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 0ce855b663f..43727fe51db 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2006/01/24 07:32:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:56 joerg Exp $
 #
 
 DISTNAME=	leafpad-0.8.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors gnome
 MASTER_SITES=	http://savannah.nongnu.org/download/leafpad/
 
diff --git a/editors/leim/Makefile b/editors/leim/Makefile
index 0024491fc1c..9364cac3621 100644
--- a/editors/leim/Makefile
+++ b/editors/leim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2006/01/04 17:05:02 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:57 joerg Exp $
 
 DISTNAME=	leim-${VERSION}
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 DISTFILES=	emacs-${VERSION}a${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}
diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile
index 0cd83d45d5d..f17a0e44b5a 100644
--- a/editors/leim20/Makefile
+++ b/editors/leim20/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/01/04 16:58:58 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/05 23:08:57 joerg Exp $
 
 DISTNAME=	leim-${VERSION}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 DISTFILES=	emacs-${VERSION}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index afe7dbc762a..dc4cb649665 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/01/04 17:11:03 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/05 23:08:57 joerg Exp $
 #
 
 DISTNAME=	lpe-1.2.6
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.sasknow.com/pub/ \
 		ftp://ftp.twu.net/users/cdsmith/lpe/
diff --git a/editors/lyx-qt/Makefile b/editors/lyx-qt/Makefile
index a8840b7e52a..92144aa211d 100644
--- a/editors/lyx-qt/Makefile
+++ b/editors/lyx-qt/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2006/01/24 07:32:06 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2006/02/05 23:08:57 joerg Exp $
 #
 
 .include "./Makefile.common"
 
 PKGNAME=	${DISTNAME:S/lyx-/lyx-qt-/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT+=	(QT version)
 
diff --git a/editors/lyx-xforms/Makefile b/editors/lyx-xforms/Makefile
index fb5d8b4f055..93d55d47ee0 100644
--- a/editors/lyx-xforms/Makefile
+++ b/editors/lyx-xforms/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2006/01/18 21:00:45 reed Exp $
+# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:57 joerg Exp $
 #
 
 .include "../../editors/lyx-qt/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/lyx-/lyx-xforms-/}
+PKGREVISION=	1
 
 COMMENT+=	(xforms version)
 
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index 9c517981de5..97d89f3afdc 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:10 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:57 joerg Exp $
 #
 
 DISTNAME=	manedit-0.5.6
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	ftp://wolfpack.twu.net/users/wolfpack/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/editors/matlab-mode/Makefile b/editors/matlab-mode/Makefile
index c0d7f9ba208..de6e884dd86 100644
--- a/editors/matlab-mode/Makefile
+++ b/editors/matlab-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/01/21 18:57:40 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:57 joerg Exp $
 #
 
 DISTNAME=		matlab.el
@@ -6,6 +6,7 @@ DISTNAME=		matlab.el
 # emacs vs xemacs
 BASEPKGNAME=		matlab-mode-2.3.1
 PKGNAME=		${EMACS_PKGNAME_PREFIX}${BASEPKGNAME}
+PKGREVISION=		1
 CATEGORIES=		editors math
 MASTER_SITES=		http://www.mathworks.com/matlabcentral/files/104/
 EXTRACT_SUFX=
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index e801b1ff308..c8cf14cbd04 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/01/24 07:32:06 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/05 23:08:57 joerg Exp $
 #
 
 DISTNAME=	mlview-0.7.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/mlview/0.7/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/editors/mule-ucs/Makefile b/editors/mule-ucs/Makefile
index 36f5d3120f7..8c78c9405ea 100644
--- a/editors/mule-ucs/Makefile
+++ b/editors/mule-ucs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:10 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/05 23:08:57 joerg Exp $
 
 DISTNAME=	Mule-UCS-0.84
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/Mule-UCS/
 
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index ba422cdb652..80ab92906ad 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2006/01/04 20:35:08 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2006/02/05 23:08:57 joerg Exp $
 
 DISTNAME=	mule-2.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/
 
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index beeacbfe801..75fd58d221f 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:41 tv Exp $
+# $NetBSD: Makefile,v 1.24 2006/02/05 23:08:57 joerg Exp $
 
 DISTNAME=	nano-1.2.4
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.nano-editor.org/dist/v1.2/
 
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index ca2a1d663f8..20d5bb0a205 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2005/12/12 21:36:54 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2006/02/05 23:08:57 joerg Exp $
 
 DISTNAME=	nedit-${VERS}-src
 PKGNAME=	nedit-${VERS}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://www.nedit.org/ftp/v${VERS:S/./_/g}/ \
 		${MASTER_SITE_SOURCEFORGE:=nedit/} \
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 5e9fdc9051c..9b893eda1d7 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2006/01/24 07:32:06 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:57 joerg Exp $
 #
 
 DISTNAME=	poedit-1.3.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=poedit/}
 
diff --git a/editors/rox-edit/Makefile b/editors/rox-edit/Makefile
index 8789b1ea2ec..17fb064fe95 100644
--- a/editors/rox-edit/Makefile
+++ b/editors/rox-edit/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/01/29 17:39:33 rxg Exp $
+# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:57 joerg Exp $
 #
 
 DISTNAME=	edit-2.0
 PKGNAME=	rox-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 643628354dc..1094a2883de 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:10 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2006/02/05 23:08:57 joerg Exp $
 
 DISTNAME=		sam
 PKGNAME=		sam-4.3
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		editors plan9
 MASTER_SITES=		ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 EXTRACT_SUFX=		.msg.gz
@@ -10,7 +10,7 @@ EXTRACT_SUFX=		.msg.gz
 MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		Unix version of Rob Pike's editor for plan9
 
-DEPENDS+=		libXgFonts-1.0:../../fonts/Xg
+DEPENDS+=		libXgFonts-1.0nb1:../../fonts/Xg
 
 WRKSRC=			${WRKDIR}
 EXTRACT_CMD=		${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
diff --git a/editors/sam/buildlink3.mk b/editors/sam/buildlink3.mk
index 506560858f2..685cf4aba9b 100644
--- a/editors/sam/buildlink3.mk
+++ b/editors/sam/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/18 04:19:49 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:57 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SAM_BUILDLINK3_MK:=	${SAM_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	sam
 
 .if !empty(SAM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.sam+=	sam>=4.3nb1
+BUILDLINK_RECOMMENDED.sam?=	sam>=4.3nb3
 BUILDLINK_PKGSRCDIR.sam?=	../../editors/sam
 BUILDLINK_DEPMETHOD.sam?=	build
 .endif	# SAM_BUILDLINK3_MK
diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index 865e32eb4fc..aa01a1e3ef2 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:10 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:57 joerg Exp $
 #
 
 DISTNAME=	speedbar-0.14beta4
 PKGNAME=	${EMACS_PKGNAME_PREFIX}speedbar-0.14rc4
+PKGREVISION=	1
 CATEGORIES=	editors devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cedet/}
 
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index ffc631c51e3..260bf0e67e1 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:29 uebayasi Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:57 joerg Exp $
 
 DISTNAME=	tamago-4.0.6
 PKGNAME=	${EMACS_PKGNAME_PREFIX}tamago-20020909
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://www.m17n.org/pub/tamago/
 
diff --git a/editors/ted-cs/Makefile b/editors/ted-cs/Makefile
index ed4729b18d1..176d9589b4b 100644
--- a/editors/ted-cs/Makefile
+++ b/editors/ted-cs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:49 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	Ted_cs_CZ
 PKGNAME=	ted-cs-2.16
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
diff --git a/editors/ted-da/Makefile b/editors/ted-da/Makefile
index 4e14a21d0c3..ce391db19f8 100644
--- a/editors/ted-da/Makefile
+++ b/editors/ted-da/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:49 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	Ted_da_DK
 PKGNAME=	ted-da-2.16
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
diff --git a/editors/ted-de/Makefile b/editors/ted-de/Makefile
index 6f4029cd382..98c953dd531 100644
--- a/editors/ted-de/Makefile
+++ b/editors/ted-de/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:49 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	Ted_de_DE
 PKGNAME=	ted-de-2.16
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
diff --git a/editors/ted-en-gb/Makefile b/editors/ted-en-gb/Makefile
index 973ee7737a7..3989f2d6334 100644
--- a/editors/ted-en-gb/Makefile
+++ b/editors/ted-en-gb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:49 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	Ted_en_GB
 PKGNAME=	ted-en-gb-2.16
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
diff --git a/editors/ted-en-us/Makefile b/editors/ted-en-us/Makefile
index 2e6a5ff2650..c19494d0ce6 100644
--- a/editors/ted-en-us/Makefile
+++ b/editors/ted-en-us/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:49 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	ted-2.16.src
 PKGNAME=	ted-en-us-2.16
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
diff --git a/editors/ted-es/Makefile b/editors/ted-es/Makefile
index b39cf9bcee4..364877972b9 100644
--- a/editors/ted-es/Makefile
+++ b/editors/ted-es/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:49 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	Ted_es_ES
 PKGNAME=	ted-es-2.16
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
diff --git a/editors/ted-fr/Makefile b/editors/ted-fr/Makefile
index 68f6dd77e0e..600ff58b964 100644
--- a/editors/ted-fr/Makefile
+++ b/editors/ted-fr/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:49 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	Ted_fr_FR
 PKGNAME=	ted-fr-2.16
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
diff --git a/editors/ted-it/Makefile b/editors/ted-it/Makefile
index f2d12ed6978..3b216a7f12d 100644
--- a/editors/ted-it/Makefile
+++ b/editors/ted-it/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:49 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	Ted_it_IT
 PKGNAME=	ted-it-2.16
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
diff --git a/editors/ted-nl/Makefile b/editors/ted-nl/Makefile
index a2fe66e9c70..beec6fc30da 100644
--- a/editors/ted-nl/Makefile
+++ b/editors/ted-nl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:49 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	Ted_nl_NL
 PKGNAME=	ted-nl-2.16
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
diff --git a/editors/ted-no/Makefile b/editors/ted-no/Makefile
index 6edee9a03b9..966cf8e7fa4 100644
--- a/editors/ted-no/Makefile
+++ b/editors/ted-no/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:50 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	Ted_no_NO
 PKGNAME=	ted-no-2.16
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
diff --git a/editors/ted-pl/Makefile b/editors/ted-pl/Makefile
index 7ac3e6ebba1..805bd1e6d02 100644
--- a/editors/ted-pl/Makefile
+++ b/editors/ted-pl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:50 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	Ted_pl_PL
 PKGNAME=	ted-pl-2.16
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
diff --git a/editors/ted-pt/Makefile b/editors/ted-pt/Makefile
index c69389f212c..d4e9dcc4478 100644
--- a/editors/ted-pt/Makefile
+++ b/editors/ted-pt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:50 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	Ted_pt_PT
 PKGNAME=	ted-pt-2.16
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
diff --git a/editors/ted-sv/Makefile b/editors/ted-sv/Makefile
index 1cbc1586560..bb486535e19 100644
--- a/editors/ted-sv/Makefile
+++ b/editors/ted-sv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:50 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	Ted_sv_SE
 PKGNAME=	ted-sv-2.16
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index eb250cb3f3b..768e582e973 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2005/12/12 21:36:54 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2006/02/05 23:08:57 joerg Exp $
 
 DISTNAME=	ted-2.16.src
 PKGNAME=	ted-2.16
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/	\
 		ftp://metalab.unc.edu/pub/packages/editors/ted/
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index b9aeaca939e..5fc85cde947 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/01/24 07:32:06 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	texmaker-1.12
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://www.xm1math.net/texmaker/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/editors/uemacs/Makefile b/editors/uemacs/Makefile
index cdc5f0e420a..34c505ae7ea 100644
--- a/editors/uemacs/Makefile
+++ b/editors/uemacs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/03/24 21:12:54 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	ue400dev
 PKGNAME=	uemacs-4.0
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://aquest.com/pub/uemacs400/disk2/
 EXTRACT_SUFX=	.zip
diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index 0884e964b7d..04125ed313c 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2006/01/04 04:29:06 schmonz Exp $
+# $NetBSD: Makefile,v 1.24 2006/02/05 23:08:58 joerg Exp $
 #
 
 DISTNAME=	vigor-0.016
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vigor/}
 
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index 96ec56c012a..e6e109c68e9 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2005/12/05 20:50:10 rillig Exp $
+# $NetBSD: Makefile,v 1.52 2006/02/05 23:08:58 joerg Exp $
 
 PKGNAME=		vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
-#PKGREVISION=		1
+PKGREVISION=		1
 
 COMMENT=		Vim editor (vi clone) with X11 GTK+ GUI
 
diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index ddb08b8d475..2c39e6bd35d 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2006/01/24 07:32:06 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2006/02/05 23:08:58 joerg Exp $
 
 PKGNAME=		vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=		1
+PKGREVISION=		2
 
 COMMENT=		Vim editor (vi clone) with X11 GTK2 GUI
 
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index 0e7623be00c..e0286875369 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2006/01/24 07:32:06 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2006/02/05 23:08:58 joerg Exp $
 
 DISTNAME=	kvim-${KVIM_VERSION}
 PKGNAME=	vim-kde-${KVIM_VERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	editors kde
 MASTER_SITES=	ftp://ftp.rutgers.edu/pub/kde/stable/apps/KDE3.x/utils/ \
 		ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/utils/ \
diff --git a/editors/vim-lang/Makefile b/editors/vim-lang/Makefile
index d049b4f4db1..335cde013eb 100644
--- a/editors/vim-lang/Makefile
+++ b/editors/vim-lang/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/12/09 16:39:16 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:58 joerg Exp $
 
 PKGNAME=	vim-lang-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION=	1
 
 .include "../../editors/vim-share/Makefile.common"
 
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index bd9d76ae81c..ddb9bc173f2 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2005/12/12 21:36:54 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:59 joerg Exp $
 
 PKGNAME=		vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=		1
+PKGREVISION=		2
 
 COMMENT=		Vim editor (vi clone) with X11 Motif GUI
 
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index d59f42f0d51..8ddc53c1484 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:10 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2006/02/05 23:08:59 joerg Exp $
 
 PKGNAME=		vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION=		1
 
 .include "../../editors/vim-share/Makefile.common"
 
diff --git a/editors/wily/Makefile b/editors/wily/Makefile
index 729dc6d6a0f..36e6ef017cf 100644
--- a/editors/wily/Makefile
+++ b/editors/wily/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/10/12 12:13:38 tonio Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:59 joerg Exp $
 #
 
 DISTNAME=	wily-0.13.41
+PKGREVISION=	1
 CATEGORIES=	editors plan9
 MASTER_SITES=	ftp://ftp.cs.yorku.ca/pub/wily/src/old/
 EXTRACT_SUFX=	.tgz
@@ -13,7 +14,7 @@ COMMENT=	Unix/X11 clone of the Plan9 acme editor/environment
 GNU_CONFIGURE=	yes
 CONFIGURE_HAS_MANDIR=	no
 
-DEPENDS+=	libXgFonts-1.0:../../fonts/Xg
+DEPENDS+=	libXgFonts-1.0nb1:../../fonts/Xg
 
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile
index b32f5f0808e..b421df47e20 100644
--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:50 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:59 joerg Exp $
 
 DISTNAME=		xcoral-3.2
+PKGREVISION=		1
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:=editors/}
 
diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index c07218d1412..98be6435d79 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2005/12/12 21:36:54 joerg Exp $
+# $NetBSD: Makefile,v 1.51 2006/02/05 23:08:59 joerg Exp $
 
 DISTNAME=	xemacs-21.5.19
-PKGREVISION=	1
+PKGREVISION=	2
 
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=xemacs-21.5/}
diff --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile
index 5543c4acb0d..d98342260e6 100644
--- a/editors/xemacs-nox11/Makefile
+++ b/editors/xemacs-nox11/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/04/25 17:23:50 magick Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:59 joerg Exp $
 
 .include "../../editors/xemacs/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/xemacs/xemacs-nox11/}
+PKGREVISION=	1
 
 MAINTAINER=	magick@NetBSD.org
 
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 7f8df513e8f..e94d3bab5b6 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2005/07/15 18:27:49 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2006/02/05 23:08:59 joerg Exp $
 
 DISTNAME=	xemacs-packages
 PKGNAME=	xemacs-packages-1.15
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=packages/}
 DISTFILES=	\
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index b9b66b208a1..6d61ff15f19 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.78 2005/06/01 18:02:46 jlam Exp $
+# $NetBSD: Makefile,v 1.79 2006/02/05 23:08:59 joerg Exp $
 
 .include "../../editors/xemacs/Makefile.common"
 
 MAINTAINER=	uebayasi@NetBSD.org
+PKGREVISION=	1
 
 
 CONFIGURE_ARGS+=	--site-includes=${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/include
diff --git a/editors/xjed/Makefile b/editors/xjed/Makefile
index 64a490e2e91..b6cb9e9e64b 100644
--- a/editors/xjed/Makefile
+++ b/editors/xjed/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:10 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:59 joerg Exp $
 #
 PKGNAME=		xjed-0.99.16
+PKGREVISION=		1
 .include "../../editors/jed/Makefile.common"
 COMMENT=		Extensible folding editor with Emacs/WordStar/EDT emulations, X11 version
 
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 8b5f5e851bd..905467ab7aa 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2005/12/05 23:55:07 rillig Exp $
+# $NetBSD: Makefile,v 1.50 2006/02/05 23:08:59 joerg Exp $
 
 DISTNAME=		vile-9.5
 PKGNAME=		xvile-9.5
+PKGREVISION=		1
 CATEGORIES=		editors
 MASTER_SITES=		ftp://dickey.his.com/vile/ \
 			ftp://invisible-island.net/vile/
diff --git a/editors/xwpe/Makefile b/editors/xwpe/Makefile
index 0913be44653..e2c6bfba0d6 100644
--- a/editors/xwpe/Makefile
+++ b/editors/xwpe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:46 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:59 joerg Exp $
 #
 
 DISTNAME=	xwpe-1.5.29a
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://www.identicalsoftware.com/xwpe/
 
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index 468d2344e59..96f767200e0 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2005/08/12 13:47:31 adam Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:59 joerg Exp $
 
 DISTNAME=	yudit-2.7.8
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://yudit.org/download/
 EXTRACT_SUFX=	.tar.bz2