116 files changed, 61 insertions, 55 deletions

diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile
index 3eca7f48bac2..99352424f313 100644
--- a/editors/AbiWord/Makefile
+++ b/editors/AbiWord/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	abiword
 DISTNAME=	abiword-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	An open-source, cross-platform WYSIWYG word processor
 
 # unzip is needed during the installation process
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
diff --git a/editors/AbiWord/pkg-comment b/editors/AbiWord/pkg-comment
deleted file mode 100644
index 9156838a8ebf..000000000000
--- a/editors/AbiWord/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An open-source, cross-platform WYSIWYG word processor
diff --git a/editors/aee/Makefile b/editors/aee/Makefile
index cda40479ca2d..1631af488eab 100644
--- a/editors/aee/Makefile
+++ b/editors/aee/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	editors
 MASTER_SITES=	http://mahon.cwx.net/sources/
 
 MAINTAINER=	kbyanc@posi.net
+COMMENT=	An easy editor with both curses and X11 interfaces
 
 .if !defined(BUILD_XAE)
 ALL_TARGET=	main
diff --git a/editors/aee/pkg-comment b/editors/aee/pkg-comment
deleted file mode 100644
index 50128e5e13df..000000000000
--- a/editors/aee/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An easy editor with both curses and X11 interfaces
diff --git a/editors/boiling-egg/Makefile b/editors/boiling-egg/Makefile
index 6d45b3375b0e..dc8b1fcbc1f6 100644
--- a/editors/boiling-egg/Makefile
+++ b/editors/boiling-egg/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX=	# empty
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	yoichi@FreeBSD.org
+COMMENT=	A front-end of Egg V4
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/editors/boiling-egg/pkg-comment b/editors/boiling-egg/pkg-comment
deleted file mode 100644
index b5cd3f43e212..000000000000
--- a/editors/boiling-egg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A front-end of Egg V4
diff --git a/editors/bpatch/Makefile b/editors/bpatch/Makefile
index 404212205687..91990a735a1f 100644
--- a/editors/bpatch/Makefile
+++ b/editors/bpatch/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.interface-business.de/pub/outgoing/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	joerg@FreeBSD.org
+COMMENT=	A hex editor that doesn't load the whole file at once
 
 MAN1=		bpatch.1
 NO_WRKSUBDIR=   yes
diff --git a/editors/bpatch/pkg-comment b/editors/bpatch/pkg-comment
deleted file mode 100644
index 28258c418b05..000000000000
--- a/editors/bpatch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A hex editor that doesn't load the whole file at once
diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index dd52e5abef97..523c4e19a51f 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= bvi
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	jedgar@FreeBSD.org
+COMMENT=	A vi-like binary file (hex)editor
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/bvi
diff --git a/editors/bvi/pkg-comment b/editors/bvi/pkg-comment
deleted file mode 100644
index e26acd66c6fe..000000000000
--- a/editors/bvi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A vi-like binary file (hex)editor
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 246b244eacbd..6916eea1ffeb 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION}/src
 DIST_SUBDIR=	KDE/koffice
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Office Suite for KDE3
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
diff --git a/editors/calligra/pkg-comment b/editors/calligra/pkg-comment
deleted file mode 100644
index b4d60bc56d7e..000000000000
--- a/editors/calligra/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Office Suite for KDE3
diff --git a/editors/color-mate/Makefile b/editors/color-mate/Makefile
index f8e9604875f2..72f4a8c57414 100644
--- a/editors/color-mate/Makefile
+++ b/editors/color-mate/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	editors elisp
 MASTER_SITES=	http://www.netlab.is.tsukuba.ac.jp/~yokota/archive/
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	Color customizing module for Emacsen
 
 BUILD_DEPENDS=	lndir:${PORTSDIR}/x11/XFree86 \
 		showrgb:${PORTSDIR}/x11/XFree86
diff --git a/editors/color-mate/pkg-comment b/editors/color-mate/pkg-comment
deleted file mode 100644
index 5177f70a34a9..000000000000
--- a/editors/color-mate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Color customizing module for Emacsen
diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile
index 8ad33aad4e8f..8bfc53274942 100644
--- a/editors/dedit/Makefile
+++ b/editors/dedit/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	pool/main/d/dedit
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
+COMMENT=	A simple GNOME i18n editor
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
diff --git a/editors/dedit/pkg-comment b/editors/dedit/pkg-comment
deleted file mode 100644
index f7fec9045849..000000000000
--- a/editors/dedit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple GNOME i18n editor
diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile
index b40c5c0b845a..8346faf3bae8 100644
--- a/editors/emacs20-dl/Makefile
+++ b/editors/emacs20-dl/Makefile
@@ -24,6 +24,7 @@ PATCHFILES=		emacs-20.4-dl3.diff.gz emacs-20.7-linespace-patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	shige@FreeBSD.org
+COMMENT=	GNU editing macros with dynamic loading module function (binary only)
 
 RUN_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
 
diff --git a/editors/emacs20-dl/pkg-comment b/editors/emacs20-dl/pkg-comment
deleted file mode 100644
index 8e47b5ea4abf..000000000000
--- a/editors/emacs20-dl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU editing macros with dynamic loading module function (binary only)
diff --git a/editors/emacs20-mule-devel/Makefile b/editors/emacs20-mule-devel/Makefile
index 96982729e33d..0e8d0fcd1fc8 100644
--- a/editors/emacs20-mule-devel/Makefile
+++ b/editors/emacs20-mule-devel/Makefile
@@ -24,6 +24,7 @@ PATCHFILES=	emacs-${EMACS_VER}-mule-${MULE_VER}.patch \
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	shige@FreeBSD.org
+COMMENT=	GNU editing macros with dl module function and mule 4.1(binary only)
 
 BUILD_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
 RUN_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
diff --git a/editors/emacs20-mule-devel/pkg-comment b/editors/emacs20-mule-devel/pkg-comment
deleted file mode 100644
index 5550c8c2287f..000000000000
--- a/editors/emacs20-mule-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU editing macros with dl module function and mule 4.1(binary only)
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 8dc427bee1a3..dcb54d9b6e5c 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nobutaka@FreeBSD.org
+COMMENT=	GNU editing macros
 
 .if !defined(WITHOUT_X11)
 LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
diff --git a/editors/emacs21/pkg-comment b/editors/emacs21/pkg-comment
deleted file mode 100644
index 5f2e16cd82ff..000000000000
--- a/editors/emacs21/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU editing macros
diff --git a/editors/eshell-emacs20/Makefile b/editors/eshell-emacs20/Makefile
index 9fea81ac34a2..c7217cbe39bf 100644
--- a/editors/eshell-emacs20/Makefile
+++ b/editors/eshell-emacs20/Makefile
@@ -13,6 +13,7 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	yoichi@FreeBSD.org
+COMMENT=	Command shell implemented in emacs lisp
 
 EMACS_PORT_NAME=	emacs20
 
diff --git a/editors/eshell-emacs20/pkg-comment b/editors/eshell-emacs20/pkg-comment
deleted file mode 100644
index 90645a84e940..000000000000
--- a/editors/eshell-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Command shell implemented in emacs lisp
diff --git a/editors/fb/Makefile b/editors/fb/Makefile
index ca3631f4caca..f6face632c11 100644
--- a/editors/fb/Makefile
+++ b/editors/fb/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	_tar.gz
 
 MAINTAINER=	mi@aldan.algebra.com
+COMMENT=	Binary File Viewer, Editor, & Manipulator (and a lot more)
 
 NO_WRKSUBDIR=	Yes
 
diff --git a/editors/fb/pkg-comment b/editors/fb/pkg-comment
deleted file mode 100644
index e770301bf277..000000000000
--- a/editors/fb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Binary File Viewer, Editor, & Manipulator (and a lot more)
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 9141098b6868..0d4d6b0952fb 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gedit/0.9
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A small but powerful text editor for Gnome Desktop Environment
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/editors/gedit/pkg-comment b/editors/gedit/pkg-comment
deleted file mode 100644
index 27ffa7128246..000000000000
--- a/editors/gedit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small but powerful text editor for Gnome Desktop Environment
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 0b2d61edb2b2..ce9b80e586b3 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	gedit-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A small but powerful text editor for Gnome 2.0 Desktop Environment
 
 LIB_DEPENDS=	gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
 		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
diff --git a/editors/gedit2/pkg-comment b/editors/gedit2/pkg-comment
deleted file mode 100644
index 331894a2cae5..000000000000
--- a/editors/gedit2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small but powerful text editor for Gnome 2.0 Desktop Environment
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 7c21e182e072..02d569c5b6bf 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/ghex/1.2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GNOME hex editor
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/editors/ghex/pkg-comment b/editors/ghex/pkg-comment
deleted file mode 100644
index f55f49eb31e1..000000000000
--- a/editors/ghex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME hex editor
diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile
index 83cb72cfa88d..cbd72344c63c 100644
--- a/editors/ghex2/Makefile
+++ b/editors/ghex2/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GNOME 2 hex editor
 
 LIB_DEPENDS=	gailutil.17:${PORTSDIR}/x11-toolkits/gail \
 		gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
diff --git a/editors/ghex2/pkg-comment b/editors/ghex2/pkg-comment
deleted file mode 100644
index ea010c6d3019..000000000000
--- a/editors/ghex2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2 hex editor
diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile
index 4df39927a3f9..07f760bd1038 100644
--- a/editors/glimmer/Makefile
+++ b/editors/glimmer/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A full featured code editor for GNOME desktop with many advanced features
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
diff --git a/editors/glimmer/pkg-comment b/editors/glimmer/pkg-comment
deleted file mode 100644
index b01f25303985..000000000000
--- a/editors/glimmer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A full featured code editor for GNOME desktop with many advanced features
diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index 732502373f3d..67e13693ab3a 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	utils/file/hex
 EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	obrien@FreeBSD.org
+COMMENT=	View and edit files in hexadecimal or ASCII
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-${PORTVERSION}//}
 GNU_CONFIGURE=	yes
diff --git a/editors/hexedit/pkg-comment b/editors/hexedit/pkg-comment
deleted file mode 100644
index b14a078e3b14..000000000000
--- a/editors/hexedit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-View and edit files in hexadecimal or ASCII
diff --git a/editors/hexpert/Makefile b/editors/hexpert/Makefile
index 9c442926a76a..46faae75ad58 100644
--- a/editors/hexpert/Makefile
+++ b/editors/hexpert/Makefile
@@ -12,5 +12,6 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	peter
 
 MAINTAINER=	peter@FreeBSD.org
+COMMENT=	Hexpert - a simple but flexible binary file editor
 
 .include <bsd.port.mk>
diff --git a/editors/hexpert/pkg-comment b/editors/hexpert/pkg-comment
deleted file mode 100644
index fa672f22a14f..000000000000
--- a/editors/hexpert/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hexpert - a simple but flexible binary file editor
diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile
index ac7cbdfb7618..31a82dad101a 100644
--- a/editors/hnb/Makefile
+++ b/editors/hnb/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	pat@FreeBSD.org
+COMMENT=	Hierarchical NoteBook a data organizer
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 USE_GMAKE=	yes
diff --git a/editors/hnb/pkg-comment b/editors/hnb/pkg-comment
deleted file mode 100644
index 5ee92dafd4e4..000000000000
--- a/editors/hnb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hierarchical NoteBook a data organizer
diff --git a/editors/jedit/Makefile b/editors/jedit/Makefile
index 2b75adb4702d..4e3b0c22e763 100644
--- a/editors/jedit/Makefile
+++ b/editors/jedit/Makefile
@@ -16,6 +16,7 @@ EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=	
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	Powerful programmer's text editor written in Java
 
 BUILD_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 		${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jdk13
diff --git a/editors/jedit/pkg-comment b/editors/jedit/pkg-comment
deleted file mode 100644
index 9768e76e8b18..000000000000
--- a/editors/jedit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Powerful programmer's text editor written in Java
diff --git a/editors/jext/Makefile b/editors/jext/Makefile
index 0b03c485d92a..70e8e6025852 100644
--- a/editors/jext/Makefile
+++ b/editors/jext/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jext
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	Powerful 100% pure Java text editor
 
 RUN_DEPENDS=	${JAVAVM}:${PORTSDIR}/java/javavmwrapper \
 		${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jdk13
diff --git a/editors/jext/pkg-comment b/editors/jext/pkg-comment
deleted file mode 100644
index 70be8a6a72c3..000000000000
--- a/editors/jext/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Powerful 100% pure Java text editor
diff --git a/editors/joe-devel/Makefile b/editors/joe-devel/Makefile
index 5f05e397fea1..3f16bc09a5ef 100644
--- a/editors/joe-devel/Makefile
+++ b/editors/joe-devel/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	joe-${PORTVERSION:S/p/-pre/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	petef@FreeBSD.org
+COMMENT=	Development version of Joe's own editor
 
 MAN1=		joe.1
 
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index 246b244eacbd..6916eea1ffeb 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION}/src
 DIST_SUBDIR=	KDE/koffice
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Office Suite for KDE3
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
diff --git a/editors/koffice-kde3/pkg-comment b/editors/koffice-kde3/pkg-comment
deleted file mode 100644
index b4d60bc56d7e..000000000000
--- a/editors/koffice-kde3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Office Suite for KDE3
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index 246b244eacbd..6916eea1ffeb 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION}/src
 DIST_SUBDIR=	KDE/koffice
 
 MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Office Suite for KDE3
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
diff --git a/editors/koffice-kde4/pkg-comment b/editors/koffice-kde4/pkg-comment
deleted file mode 100644
index b4d60bc56d7e..000000000000
--- a/editors/koffice-kde4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Office Suite for KDE3
diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile
index a1ed40e3e28f..f62b1b8abb15 100644
--- a/editors/kxmleditor/Makefile
+++ b/editors/kxmleditor/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kevlo@FreeBSD.org
+COMMENT=	XML editor for KDE
 
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile
index c0f8108c4cd6..8fc8119bc688 100644
--- a/editors/leim20/Makefile
+++ b/editors/leim20/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
 
 MAINTAINER=	shige@FreeBSD.org
+COMMENT=	Libraries of (GNU) Emacs Input Method
 
 LATEST_LINK=	leim20
 
diff --git a/editors/leim21/Makefile b/editors/leim21/Makefile
index 251c8e04c3f1..810294251e41 100644
--- a/editors/leim21/Makefile
+++ b/editors/leim21/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
 
 MAINTAINER=	shige@FreeBSD.org
+COMMENT=	Libraries of (GNU) Emacs Input Method
 
 LATEST_LINK=	leim21
 
diff --git a/editors/leo/Makefile b/editors/leo/Makefile
index 33a2d7b30d9a..5f9ecdc3caa2 100644
--- a/editors/leo/Makefile
+++ b/editors/leo/Makefile
@@ -18,6 +18,7 @@ DISTFILES=	${DISTNAME}.zip ${SBOOKFILE} ${EXAMPLESFILES} ${WEBDOCSFILE}
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 
 MAINTAINER=	alane@freebsd.org
+COMMENT=	An advanced outline editor
 
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index 163bac42f2f7..655086f2ce9f 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	editors
 MASTER_SITES=	ftp://wolfpack.twu.net/users/wolfpack/
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	A UNIX manual page editor and viewer
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
diff --git a/editors/mg/Makefile b/editors/mg/Makefile
index d7efbb38baed..c52aa1a6d92b 100644
--- a/editors/mg/Makefile
+++ b/editors/mg/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL} \
 MASTER_SITE_SUBDIR=	dd
 
 MAINTAINER=	dd@FreeBSD.org
+COMMENT=	A small, fast Emacs-like editor
 
 MANSECTS=	1
 MAN1=		mg.1
diff --git a/editors/mg/pkg-comment b/editors/mg/pkg-comment
deleted file mode 100644
index 9448a84e3dc9..000000000000
--- a/editors/mg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small, fast Emacs-like editor
diff --git a/editors/mode-info/Makefile b/editors/mode-info/Makefile
index 4c28abb666e4..3af3352bc7bc 100644
--- a/editors/mode-info/Makefile
+++ b/editors/mode-info/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	elisp
 MASTER_SITES=	http://namazu.org/~tsuchiya/elisp/
 
 MAINTAINER=	yoichi@FreeBSD.org
+COMMENT=	Functions to refer Manuals on Emacsen with describe-* like interface
 
 MI_INDEX+=	mi-emacs.idx
 MI_WITH_ELISP?=	yes
diff --git a/editors/mode-info/pkg-comment b/editors/mode-info/pkg-comment
deleted file mode 100644
index 450565e31a51..000000000000
--- a/editors/mode-info/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Functions to refer Manuals on Emacsen with describe-* like interface
diff --git a/editors/moleskine/Makefile b/editors/moleskine/Makefile
index 0deb93184f47..974ce78bdca9 100644
--- a/editors/moleskine/Makefile
+++ b/editors/moleskine/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME:S/^m/M/}-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	A generic source code editor for the GNOME desktop
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome \
 		${PYTHON_SITELIBDIR}/_gtkscintillamodule.so:${PORTSDIR}/x11-toolkits/py-gtkscintilla
diff --git a/editors/moleskine/pkg-comment b/editors/moleskine/pkg-comment
deleted file mode 100644
index e31422bc2bb0..000000000000
--- a/editors/moleskine/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A generic source code editor for the GNOME desktop
diff --git a/editors/muggy/Makefile b/editors/muggy/Makefile
index 37a3ab91449b..73c59540a4c3 100644
--- a/editors/muggy/Makefile
+++ b/editors/muggy/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.aaa-int.or.jp/~jfactory/Factory/JDE/dist/
 DISTNAME=	Muggy-${PORTVERSION}
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
+COMMENT=	A simple text editor for the X on TkStep
 
 RUN_DEPENDS=	${RUN_DEP_LIST}
 LIB_DEPENDS=	${LIB_DEP_LIST}
diff --git a/editors/muggy/pkg-comment b/editors/muggy/pkg-comment
deleted file mode 100644
index 91f56a54b962..000000000000
--- a/editors/muggy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple text editor for the X on TkStep
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index e97a80f5ce36..07c253e4a906 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -16,6 +16,7 @@ DISTFILES=	mule-${MULE_VERSION}-${EMACS_VERSION}.tar.gz \
 		mule-${MULE_VERSION}-${EMACS_VERSION}.patch-981002.tar.gz
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	For a multilingual emacs, emacs lisp files, info pages, etc (except executables)
 
 MULE_VERSION=	2.3
 EMACS_VERSION=	19.34
diff --git a/editors/mule-common/pkg-comment b/editors/mule-common/pkg-comment
deleted file mode 100644
index 352793a7a6f6..000000000000
--- a/editors/mule-common/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-For a multilingual emacs, emacs lisp files, info pages, etc (except executables)
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index a563650d4326..b6502dc23cd2 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -16,6 +16,7 @@ DISTFILES=	nedit-5.3-source.tar.bz2 nedit.app-defaults
 EXTRACT_ONLY=	nedit-5.3-source.tar.bz2
 
 MAINTAINER=	deischen@freebsd.org
+COMMENT=	An X11/Motif GUI text editor for programs and plain text files
 
 USE_BZIP2=	yes
 USE_MOTIF=	yes
diff --git a/editors/nedit/pkg-comment b/editors/nedit/pkg-comment
deleted file mode 100644
index ecd7dd966d0d..000000000000
--- a/editors/nedit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11/Motif GUI text editor for programs and plain text files
diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile
index ade2f73a6182..d0f1736dc8ca 100644
--- a/editors/nvi-devel/Makefile
+++ b/editors/nvi-devel/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.kotnet.org/~skimo/nvi/devel/ \
 MASTER_SITE_SUBDIR=	dd
 
 MAINTAINER=	dd@FreeBSD.org
+COMMENT=	Development snapshot of the world-renown nvi editor
 
 BUILD_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
diff --git a/editors/nvi-devel/pkg-comment b/editors/nvi-devel/pkg-comment
deleted file mode 100644
index 82a97cb574b3..000000000000
--- a/editors/nvi-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Development snapshot of the world-renown nvi editor
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 6c1d6dd0f61e..8b18532704c4 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sobomax@FreeBSD.org
+COMMENT=	A full-featured SCIntilla based Text Editor for GTK/GNOME
 
 LIB_DEPENDS=	scintilla.1:${PORTSDIR}/x11-toolkits/scintilla
 
diff --git a/editors/scite/pkg-comment b/editors/scite/pkg-comment
deleted file mode 100644
index 3ad1e2da60b6..000000000000
--- a/editors/scite/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A full-featured SCIntilla based Text Editor for GTK/GNOME
diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile
index 5593cefcdb20..3d96142f233e 100644
--- a/editors/staroffice52/Makefile
+++ b/editors/staroffice52/Makefile
@@ -30,6 +30,7 @@ DISTFILES+=	soa-5_2-ga-bin-linux-en.bin
 EXTRACT_ONLY=	109939-03.tar.Z
 
 MAINTAINER=	mbr@FreeBSD.org
+COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 
 FETCH_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
diff --git a/editors/staroffice52/pkg-comment b/editors/staroffice52/pkg-comment
deleted file mode 100644
index 7c6d1b73d17a..000000000000
--- a/editors/staroffice52/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index 5c4a1388b990..9c71de2359bf 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -24,6 +24,7 @@ DISTFILES+=	soa-6_0-ga-bin-linux-en.bin
 EXTRACT_ONLY=	112887-03.tar
 
 MAINTAINER=	mbr@FreeBSD.org
+COMMENT=	Wordprocessor/dbase/spreadheet/drawing/chart
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be bought and downloaded direct from Sun via www interface'
diff --git a/editors/staroffice60/pkg-comment b/editors/staroffice60/pkg-comment
deleted file mode 100644
index cda7c195775d..000000000000
--- a/editors/staroffice60/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Wordprocessor/dbase/spreadheet/drawing/chart
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index 5c4a1388b990..9c71de2359bf 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -24,6 +24,7 @@ DISTFILES+=	soa-6_0-ga-bin-linux-en.bin
 EXTRACT_ONLY=	112887-03.tar
 
 MAINTAINER=	mbr@FreeBSD.org
+COMMENT=	Wordprocessor/dbase/spreadheet/drawing/chart
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be bought and downloaded direct from Sun via www interface'
diff --git a/editors/staroffice70/pkg-comment b/editors/staroffice70/pkg-comment
deleted file mode 100644
index cda7c195775d..000000000000
--- a/editors/staroffice70/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Wordprocessor/dbase/spreadheet/drawing/chart
diff --git a/editors/thoteditor/Makefile b/editors/thoteditor/Makefile
index a5e23704340c..36ee7224fef6 100644
--- a/editors/thoteditor/Makefile
+++ b/editors/thoteditor/Makefile
@@ -18,6 +18,7 @@ MASTER_SITE_SUBDIR=	apps/editors/X/thot
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	chuckr@FreeBSD.org
+COMMENT=	An structured document editor, offering a graphical WYSIWYG interface
 
 THOT_SUBDIR=	Target
 USE_MOTIF=	yes
diff --git a/editors/thoteditor/pkg-comment b/editors/thoteditor/pkg-comment
deleted file mode 100644
index 2efa373b9e3f..000000000000
--- a/editors/thoteditor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An structured document editor, offering a graphical WYSIWYG interface
diff --git a/editors/uzap/Makefile b/editors/uzap/Makefile
index fbe0a4b75c7e..7c1dfc8ddd2a 100644
--- a/editors/uzap/Makefile
+++ b/editors/uzap/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.interface-business.de/pub/outgoing/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	joerg@FreeBSD.org
+COMMENT=	Visual binary file editor
 
 # restrictive Copyright; the author is no longer reachable, however :-(
 RESTRICTED=	"Restrictive copyright"
diff --git a/editors/uzap/pkg-comment b/editors/uzap/pkg-comment
deleted file mode 100644
index 548a9baa588f..000000000000
--- a/editors/uzap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Visual binary file editor
diff --git a/editors/ved/Makefile b/editors/ved/Makefile
index 886c97505c3f..0b2b308220f1 100644
--- a/editors/ved/Makefile
+++ b/editors/ved/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/ved/
 
 MAINTAINER=	greid@ukug.uk.freebsd.org
+COMMENT=	A small and fast screen-oriented editor.
 
 USE_GMAKE=	yes
 
diff --git a/editors/ved/pkg-comment b/editors/ved/pkg-comment
deleted file mode 100644
index df47f257b040..000000000000
--- a/editors/ved/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small and fast screen-oriented editor.
diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index 102e12f66e3c..61a5b262864f 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= ${PORTNAME}
 
 MAINTAINER=	billf@FreeBSD.org
+COMMENT=	A vi clone inspired by the userfriendly comic strip
 
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
 		tcl82.1:${PORTSDIR}/lang/tcl82
diff --git a/editors/vigor/pkg-comment b/editors/vigor/pkg-comment
deleted file mode 100644
index 021a8c0ccf32..000000000000
--- a/editors/vigor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A vi clone inspired by the userfriendly comic strip
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index 127e76c8969d..05efd179eac1 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -25,6 +25,7 @@ PATCHFILES+=	5.8.0${p}
 .endfor
 
 MAINTAINER?=	obrien@FreeBSD.org
+COMMENT=	Vi "workalike", with many additional features
 
 .if defined(PACKAGE_BUILDING) && !defined(LITE)
 BUILD_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80
diff --git a/editors/vim5/pkg-comment b/editors/vim5/pkg-comment
deleted file mode 100644
index 06543ff852c3..000000000000
--- a/editors/vim5/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Vi "workalike", with many additional features
diff --git a/editors/wordperfect/Makefile b/editors/wordperfect/Makefile
index 479d9c766503..59017160a03f 100644
--- a/editors/wordperfect/Makefile
+++ b/editors/wordperfect/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	GUILG00
 EXTRACT_SUFX=	.GZ
 
 MAINTAINER=	msmith@freebsd.org
+COMMENT=	Graphical word processor ported from Windows
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	"LIC: redistribution not allowed"
diff --git a/editors/wordperfect/pkg-comment b/editors/wordperfect/pkg-comment
deleted file mode 100644
index 8d04b793cb77..000000000000
--- a/editors/wordperfect/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphical word processor ported from Windows
diff --git a/editors/xemacs-additional-packages/Makefile b/editors/xemacs-additional-packages/Makefile
index 354532158116..3bc71f311193 100644
--- a/editors/xemacs-additional-packages/Makefile
+++ b/editors/xemacs-additional-packages/Makefile
@@ -13,6 +13,7 @@ DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
+COMMENT=	Additional XEmacs elisp packages
 
 RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.zenirc:${PORTSDIR}/editors/xemacs-comm-packages \
 		${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.misc-games:${PORTSDIR}/editors/xemacs-games-packages \
diff --git a/editors/xemacs-additional-packages/pkg-comment b/editors/xemacs-additional-packages/pkg-comment
deleted file mode 100644
index c70f9cc5da78..000000000000
--- a/editors/xemacs-additional-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Additional XEmacs elisp packages
diff --git a/editors/xemacs-basic-mule-packages/Makefile b/editors/xemacs-basic-mule-packages/Makefile
index 1535d62f7dea..3e7d6349f155 100644
--- a/editors/xemacs-basic-mule-packages/Makefile
+++ b/editors/xemacs-basic-mule-packages/Makefile
@@ -20,6 +20,7 @@ DISTFILES=	\
 DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@FreeBSD.org
+COMMENT=	Basic XEmacs elisp packages with Mule(basic-mule)
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-basic-mule-packages/pkg-comment b/editors/xemacs-basic-mule-packages/pkg-comment
deleted file mode 100644
index 31f0c4e9cb05..000000000000
--- a/editors/xemacs-basic-mule-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Basic XEmacs elisp packages with Mule(basic-mule)
diff --git a/editors/xemacs-comm-packages/Makefile b/editors/xemacs-comm-packages/Makefile
index 7f31674d0848..2ef0fa031b66 100644
--- a/editors/xemacs-comm-packages/Makefile
+++ b/editors/xemacs-comm-packages/Makefile
@@ -28,6 +28,7 @@ DISTFILES=	\
 DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@FreeBSD.org
+COMMENT=	XEmacs elisp packages for Communication(comm)
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-comm-packages/pkg-comment b/editors/xemacs-comm-packages/pkg-comment
deleted file mode 100644
index 535a01a5d21d..000000000000
--- a/editors/xemacs-comm-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs elisp packages for Communication(comm)
diff --git a/editors/xemacs-games-packages/Makefile b/editors/xemacs-games-packages/Makefile
index 293ae05b1bf4..60e6b2d4aef6 100644
--- a/editors/xemacs-games-packages/Makefile
+++ b/editors/xemacs-games-packages/Makefile
@@ -19,6 +19,7 @@ DISTFILES=	\
 DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@FreeBSD.org
+COMMENT=	XEmacs elisp packages for Games(games)
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-games-packages/pkg-comment b/editors/xemacs-games-packages/pkg-comment
deleted file mode 100644
index aef5c0488665..000000000000
--- a/editors/xemacs-games-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs elisp packages for Games(games)
diff --git a/editors/xemacs-libs-packages/Makefile b/editors/xemacs-libs-packages/Makefile
index 28a41972ec9f..6b38b422a316 100644
--- a/editors/xemacs-libs-packages/Makefile
+++ b/editors/xemacs-libs-packages/Makefile
@@ -21,6 +21,7 @@ DISTFILES=	\
 DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@FreeBSD.org
+COMMENT=	XEmacs elisp packages for Libraries(libs)
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-libs-packages/pkg-comment b/editors/xemacs-libs-packages/pkg-comment
deleted file mode 100644
index 8a4e79dc54fc..000000000000
--- a/editors/xemacs-libs-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs elisp packages for Libraries(libs)
diff --git a/editors/xemacs-mule-packages/Makefile b/editors/xemacs-mule-packages/Makefile
index 96977d230c36..07517ca893bd 100644
--- a/editors/xemacs-mule-packages/Makefile
+++ b/editors/xemacs-mule-packages/Makefile
@@ -24,6 +24,7 @@ DISTFILES=	\
 DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@FreeBSD.org
+COMMENT=	XEmacs elisp packages for Mule(mule-packages)
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-mule-packages/pkg-comment b/editors/xemacs-mule-packages/pkg-comment
deleted file mode 100644
index d8bc5ce62bcf..000000000000
--- a/editors/xemacs-mule-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs elisp packages for Mule(mule-packages)
diff --git a/editors/xemacs-oa-packages/Makefile b/editors/xemacs-oa-packages/Makefile
index 954e76ca9a61..343612a6302c 100644
--- a/editors/xemacs-oa-packages/Makefile
+++ b/editors/xemacs-oa-packages/Makefile
@@ -23,6 +23,7 @@ DISTFILES=	\
 DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@FreeBSD.org
+COMMENT=	XEmacs elisp packages for Office Automation(oa)
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-oa-packages/pkg-comment b/editors/xemacs-oa-packages/pkg-comment
deleted file mode 100644
index 783a4d97e0b8..000000000000
--- a/editors/xemacs-oa-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs elisp packages for Office Automation(oa)
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index a65aac5c5f9b..5f04b82c5cbc 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -119,6 +119,7 @@ DISTFILES=	\
 DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@FreeBSD.org
+COMMENT=	Basic XEmacs elisp packages(xemacs-packages)
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-packages/pkg-comment b/editors/xemacs-packages/pkg-comment
deleted file mode 100644
index 81fea6e21032..000000000000
--- a/editors/xemacs-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Basic XEmacs elisp packages(xemacs-packages)
diff --git a/editors/xemacs-prog-packages/Makefile b/editors/xemacs-prog-packages/Makefile
index 08418c5357e5..dd482f86d407 100644
--- a/editors/xemacs-prog-packages/Makefile
+++ b/editors/xemacs-prog-packages/Makefile
@@ -24,6 +24,7 @@ DISTFILES=	\
 DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@FreeBSD.org
+COMMENT=	XEmacs elisp packages for Programing(prog)
 
 RUN_DEPENDS=	${XEMACSDIR}/mule-packages/lisp/elib/avltree.el:${.CURDIR}/../xemacs-basic-mule-packages
 
diff --git a/editors/xemacs-prog-packages/pkg-comment b/editors/xemacs-prog-packages/pkg-comment
deleted file mode 100644
index c050eebf9d57..000000000000
--- a/editors/xemacs-prog-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs elisp packages for Programing(prog)
diff --git a/editors/xemacs-wp-packages/Makefile b/editors/xemacs-wp-packages/Makefile
index 7d0cf87db95f..f02b190e0d4c 100644
--- a/editors/xemacs-wp-packages/Makefile
+++ b/editors/xemacs-wp-packages/Makefile
@@ -20,6 +20,7 @@ DISTFILES=	\
 DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@FreeBSD.org
+COMMENT=	XEmacs elisp packages for Word Processing(wp)
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-wp-packages/pkg-comment b/editors/xemacs-wp-packages/pkg-comment
deleted file mode 100644
index b114988fa689..000000000000
--- a/editors/xemacs-wp-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs elisp packages for Word Processing(wp)
diff --git a/editors/xemacs21-sumo/Makefile b/editors/xemacs21-sumo/Makefile
index 08fe17c2ebfe..20ec7281efc0 100644
--- a/editors/xemacs21-sumo/Makefile
+++ b/editors/xemacs21-sumo/Makefile
@@ -13,6 +13,7 @@ DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	kiri@FreeBSD.org
+COMMENT=	The "meta-port" for XEmacs with SUMO packages
 
 RUN_DEPENDS=	${RUN_DEP_LIST}
 # below line would be remove comment and add RUN_DEPNDS after any xemacs-*-packages added
diff --git a/editors/xemacs21-sumo/pkg-comment b/editors/xemacs21-sumo/pkg-comment
deleted file mode 100644
index 7e0724b12229..000000000000
--- a/editors/xemacs21-sumo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The "meta-port" for XEmacs with SUMO packages
diff --git a/editors/xenon/Makefile b/editors/xenon/Makefile
index 0b899d3c2a3a..c9f70f8c015f 100644
--- a/editors/xenon/Makefile
+++ b/editors/xenon/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://sydney.proximity.com.au/~ben/xenon/dist/ \
 		ftp://yankee.proximitygroup.com/pub/xenon/
 
 MAINTAINER=	jedgar@FreeBSD.org
+COMMENT=	Simple X-based text editor
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/editors/xenon/pkg-comment b/editors/xenon/pkg-comment
deleted file mode 100644
index 21a3b1729025..000000000000
--- a/editors/xenon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple X-based text editor
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index 5610bb014aa8..d9afdde65262 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= apps/editors/X
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jkoshy@freebsd.org
+COMMENT=	Multi-lingual unicode text editor with TTF support
 
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
diff --git a/editors/yudit/pkg-comment b/editors/yudit/pkg-comment
deleted file mode 100644
index 16a187d485b8..000000000000
--- a/editors/yudit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multi-lingual unicode text editor with TTF support