diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 55b61b51ead..2b2ff3630b0 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,8 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2001/02/18 23:58:37 dugsong Exp $
+# $OpenBSD: Makefile,v 1.18 2001/05/06 00:28:54 lebel Exp $
+
+COMMENT=	"open-source, cross-platform WYSIWYG word processor"
 
 VERSION=	0.7.12
 PKGNAME=	abiword-${VERSION}
 CATEGORIES=	editors
+NEED_VERSION=	1.402
 
 MASTER_SITES=	http://www.abisource.com/downloads/Version-${VERSION}/lf/
 DISTFILES=	abi-${VERSION}.tar.gz abidistfiles.tar.gz expat.tar.gz \
diff --git a/editors/abiword/pkg/COMMENT b/editors/abiword/pkg/COMMENT
deleted file mode 100644
index 3bfdd6b75cd..00000000000
--- a/editors/abiword/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-open-source, cross-platform WYSIWYG word processor
diff --git a/editors/axe/Makefile b/editors/axe/Makefile
index 66ad979b0f0..489f4e3452e 100644
--- a/editors/axe/Makefile
+++ b/editors/axe/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2001/01/05 16:35:58 brad Exp $
+# $OpenBSD: Makefile,v 1.12 2001/05/06 00:28:57 lebel Exp $
+
+COMMENT=		"simple to use text editor for X11"
 
 DISTNAME=		aXe-6.1.2
 PKGNAME=		axe-6.1.2
 CATEGORIES=		editors
-NEED_VERSION=		1.336
+NEED_VERSION=		1.402
 MASTER_SITES=           ${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=     editors
 EXTRACT_SUFX=		.tar.Z
diff --git a/editors/axe/pkg/COMMENT b/editors/axe/pkg/COMMENT
deleted file mode 100644
index df9226f5b77..00000000000
--- a/editors/axe/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-simple to use text editor for X11
diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index 863438a6e7e..a074db70dd9 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2001/04/14 22:54:35 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2001/05/06 00:28:59 lebel Exp $
+
+COMMENT=	"binary editor and viewer"
 
 DISTNAME=	beav_1.40-13
 PKGNAME=	beav-1.40.13
 CATEGORIES=	editors
-NEED_VERSION=	1.319
+NEED_VERSION=	1.402
 
 MASTER_SITES=   ftp://ftp.debian.org/debian/dists/stable/main/source/editors/
 
diff --git a/editors/beav/pkg/COMMENT b/editors/beav/pkg/COMMENT
deleted file mode 100644
index bcc8aa04d04..00000000000
--- a/editors/beav/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-binary editor and viewer
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index e6720d13015..ce3286a7cf5 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,9 +1,12 @@
-# $OpenBSD: Makefile,v 1.4 2001/04/24 21:55:53 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2001/05/06 00:29:01 lebel Exp $
 
-CATEGORIES=		editors
-MASTER_SITES=		${HOMEPAGE}
+COMMENT=	"easy to use, graphical editor"
+
+CATEGORIES=	editors
+MASTER_SITES=	${HOMEPAGE}
 HOMEPAGE= 	http://cooledit.sourceforge.net/ 
 DISTNAME=	cooledit-3.17.2
+NEED_VERSION=	1.402
 
 MAINTAINER=	Marc Espie <espie@openbsd.org>
 
diff --git a/editors/cooledit/pkg/COMMENT b/editors/cooledit/pkg/COMMENT
deleted file mode 100644
index b5c5eb206ec..00000000000
--- a/editors/cooledit/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-easy to use, graphical editor
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 6559fe56d86..b285e73a69f 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2001/02/09 02:06:23 brad Exp $
+# $OpenBSD: Makefile,v 1.24 2001/05/06 00:29:03 lebel Exp $
+
+COMMENT=	"GNU editor"
 
 VER=		20.7
 DISTNAME=	emacs-${VER}
 CATEGORIES=	editors
-NEED_VERSION=	1.336
+NEED_VERSION=	1.402
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= emacs
 
diff --git a/editors/emacs/pkg/COMMENT b/editors/emacs/pkg/COMMENT
deleted file mode 100644
index f09d22ebb9d..00000000000
--- a/editors/emacs/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-GNU editor
diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index 164afc8fd9c..f18c2444a35 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2000/10/22 15:41:50 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2001/05/06 00:29:06 lebel Exp $
 # $FreeBSD: Makefile,v 1.1.1.1 1998/08/10 00:31:40 steve Exp $
 
+COMMENT=	"view and edit files in hexadecimal or ASCII"
+
 DISTNAME=	hexedit-1.1.0
 CATEGORIES=	editors
-NEED_VERSION=	1.330
+NEED_VERSION=	1.402
 MASTER_SITES=	http://pixel.linuxave.net/
 EXTRACT_SUFX=	.src.tgz
 
diff --git a/editors/hexedit/pkg/COMMENT b/editors/hexedit/pkg/COMMENT
deleted file mode 100644
index 750f2c7d608..00000000000
--- a/editors/hexedit/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-view and edit files in hexadecimal or ASCII
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 9848ecfe0fd..ec36a100903 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2001/02/22 02:45:16 brad Exp $
+# $OpenBSD: Makefile,v 1.20 2001/05/06 00:29:08 lebel Exp $
+
+COMMENT=	"text editor"
 
 DISTNAME=	jed-B0.99-13
 PKGNAME=	jed-0.99.13
 CATEGORIES=	editors
-NEED_VERSION=	1.336
+NEED_VERSION=	1.402
 MASTER_SITES=   ftp://space.mit.edu/pub/davis/jed/v0.99/ \
 		ftp://ftp.ntua.gr/pub/pub/lang/slang/jed/v0.99 \
 		ftp://ftp.gigabell.net/pub/Jed/v0.99/ \
diff --git a/editors/jed/pkg/COMMENT b/editors/jed/pkg/COMMENT
deleted file mode 100644
index 2cefdf951f9..00000000000
--- a/editors/jed/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-text editor
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 89f0b0c6a61..e20509c89ec 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2001/02/28 18:46:32 brad Exp $
+# $OpenBSD: Makefile,v 1.24 2001/05/06 00:29:10 lebel Exp $
+
+COMMENT=	"joe's own editor"
 
 DISTNAME=	joe2.8
 PKGNAME=	joe-2.8p1
 CATEGORIES=	editors
-NEED_VERSION=	1.336
+NEED_VERSION=	1.402
 MASTER_SITES=	ftp://ftp.std.com/src/editors/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/editors/joe/pkg/COMMENT b/editors/joe/pkg/COMMENT
deleted file mode 100644
index 0619ece6ecc..00000000000
--- a/editors/joe/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-joe's own editor
diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index 81e71b98762..80c1d80d0b0 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2000/10/22 15:41:51 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2001/05/06 00:29:12 lebel Exp $
 #
 
+COMMENT=	"Jonathan's Own Version of Emacs"
+
 DISTNAME=	jove-4.16
 CATEGORIES=	editors
-NEED_VERSION=	1.191
+NEED_VERSION=	1.402
 
 MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/moraes/jove/
 
diff --git a/editors/jove/pkg/COMMENT b/editors/jove/pkg/COMMENT
deleted file mode 100644
index 81ed1cc4fca..00000000000
--- a/editors/jove/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Jonathan's Own Version of Emacs
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index b91c2ff3e4a..84062cd82f1 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,11 +1,13 @@
-# $OpenBSD: Makefile,v 1.11 2001/02/21 17:25:55 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2001/05/06 00:29:15 lebel Exp $
 # NetBSD: Makefile,v 1.6 2000/01/19 12:28:44 hubertf Exp
 # FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp
 
+COMMENT=	"multilingual clone of vi/ex"
+
 DISTNAME=	nvi-1.79
 PKGNAME=	nvi-m17n-1.79.19991117
 CATEGORIES=	editors
-NEED_VERSION=	1.305
+NEED_VERSION=	1.402
 MASTER_SITES0=	ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
 
 MASTER_SITES=	ftp://sleepy.vwh.net/pub/ \
diff --git a/editors/nvi-m17n/pkg/COMMENT b/editors/nvi-m17n/pkg/COMMENT
deleted file mode 100644
index 51ce79fd4d9..00000000000
--- a/editors/nvi-m17n/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-multilingual clone of vi/ex
diff --git a/editors/textedit/Makefile b/editors/textedit/Makefile
index 393006eecad..9452b3ddc81 100644
--- a/editors/textedit/Makefile
+++ b/editors/textedit/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2001/04/07 15:31:42 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2001/05/06 00:29:17 lebel Exp $
+
+COMMENT=	"standard OpenLook text editor for X11"
 
 DISTNAME=	textedit
 PKGNAME=	textedit-1.0
 CATEGORIES=	editors
-NEED_VERSION=	1.305
+NEED_VERSION=	1.402
 
 MAINTAINER=	Ian Darwin <ian@openbsd.org>
 
diff --git a/editors/textedit/pkg/COMMENT b/editors/textedit/pkg/COMMENT
deleted file mode 100644
index 7157db5c30b..00000000000
--- a/editors/textedit/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-standard OpenLook text editor for X11
diff --git a/editors/uemacs/Makefile b/editors/uemacs/Makefile
index 6b5ee892ad1..a01444866b1 100644
--- a/editors/uemacs/Makefile
+++ b/editors/uemacs/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2000/09/12 15:37:34 brad Exp $
+# $OpenBSD: Makefile,v 1.13 2001/05/06 00:29:19 lebel Exp $
+
+COMMENT=	"full screen simple editor"
 
 DISTNAME=	uemacs
 PKGNAME=	uemacs-4.0
 CATEGORIES=	editors
-NEED_VERSION=	1.328
+NEED_VERSION=	1.402
 MASTER_SITES=	ftp://aquest.com/pub/uemacs400/disk2/
 DISTFILES=	ue400dev.zip
 EXTRACT_SUFX=	.zip
diff --git a/editors/uemacs/pkg/COMMENT b/editors/uemacs/pkg/COMMENT
deleted file mode 100644
index f0d23b78253..00000000000
--- a/editors/uemacs/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-full screen simple editor
diff --git a/editors/wordperfect/Makefile b/editors/wordperfect/Makefile
index 0d630aeff00..de3c6bb7a46 100644
--- a/editors/wordperfect/Makefile
+++ b/editors/wordperfect/Makefile
@@ -1,4 +1,6 @@
-# $OpenBSD: Makefile,v 1.15 2001/03/14 03:59:20 todd Exp $
+# $OpenBSD: Makefile,v 1.16 2001/05/06 00:29:21 lebel Exp $
+
+COMMENT=	"graphical word processor ported from Windows"
 
 ONLY_FOR_ARCHS=	i386
 
@@ -6,7 +8,7 @@ FAKE=		No
 
 PKGNAME=	wordperfect-8.0
 CATEGORIES=     editors
-NEED_VERSION=	1.336
+NEED_VERSION=	1.402
 
 MAINTAINER=	Dug Song <dugsong@monkey.org>
 
diff --git a/editors/wordperfect/pkg/COMMENT b/editors/wordperfect/pkg/COMMENT
deleted file mode 100644
index c2702ea05fd..00000000000
--- a/editors/wordperfect/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-graphical word processor ported from Windows
diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile
index 38ca31cca3c..c7fc1dad54e 100644
--- a/editors/xemacs20/Makefile
+++ b/editors/xemacs20/Makefile
@@ -1,11 +1,13 @@
-# $OpenBSD: Makefile,v 1.20 2000/10/23 21:45:30 naddy Exp $
+# $OpenBSD: Makefile,v 1.21 2001/05/06 00:29:24 lebel Exp $
+
+COMMENT=	"extensible, customizable real-time display editor"
 
 # use flavors for mule and compface support
 # e.g., make FLAVOR=mule
 
 DISTNAME=	xemacs-20.4
 CATEGORIES=	editors
-NEED_VERSION=	1.305
+NEED_VERSION=	1.402
 FAKE=		No
 MASTER_SITES=	ftp://ftp.xemacs.org/pub/xemacs/${DISTNAME}/ \
 		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/${DISTNAME}/ \
diff --git a/editors/xemacs20/pkg/COMMENT b/editors/xemacs20/pkg/COMMENT
deleted file mode 100644
index 6832c6effbb..00000000000
--- a/editors/xemacs20/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-extensible, customizable real-time display editor
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index 388583a182a..a9ab259b6ee 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -1,13 +1,15 @@
-# $OpenBSD: Makefile,v 1.7 2001/03/01 21:20:15 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2001/05/06 00:29:26 lebel Exp $
 
 # 
 # Description
 #
 
+COMMENT=		"heavily customizable and extensible editor"
+
 VERSION=		21.1.14
 DISTNAME=		xemacs-${VERSION}
 CATEGORIES=     	editors
-NEED_VERSION=		1.353
+NEED_VERSION=		1.402
 
 HOMEPAGE=		http://www.xemacs.org/
 
diff --git a/editors/xemacs21/pkg/COMMENT b/editors/xemacs21/pkg/COMMENT
deleted file mode 100644
index 4fecd593fc2..00000000000
--- a/editors/xemacs21/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-heavily customizable and extensible editor
diff --git a/editors/xwpe/Makefile b/editors/xwpe/Makefile
index ff605ff0251..44085b5edbd 100644
--- a/editors/xwpe/Makefile
+++ b/editors/xwpe/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2001/02/26 00:25:42 danh Exp $
+# $OpenBSD: Makefile,v 1.15 2001/05/06 00:29:28 lebel Exp $
+
+COMMENT=	"powerful programming editor"
 
 DISTNAME=	xwpe-1.5.22a
 CATEGORIES=	editors
-NEED_VERSION=	1.305
+NEED_VERSION=	1.402
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.identicalsoftware.com/xwpe/ 
 MASTER_SITE_SUBDIR= apps/editors/X
diff --git a/editors/xwpe/pkg/COMMENT b/editors/xwpe/pkg/COMMENT
deleted file mode 100644
index 2675b24c8ac..00000000000
--- a/editors/xwpe/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-powerful programming editor