29 files changed, 14 insertions, 29 deletions

diff --git a/editors/axe/Makefile b/editors/axe/Makefile
index 0feed9d85a84..7d41f0250e71 100644
--- a/editors/axe/Makefile
+++ b/editors/axe/Makefile
@@ -15,8 +15,6 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Simple to use text editor for X
-
 LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 
 USE_IMAKE=	yes
diff --git a/editors/axe/pkg-comment b/editors/axe/pkg-comment
new file mode 100644
index 000000000000..43687566dda5
--- /dev/null
+++ b/editors/axe/pkg-comment
@@ -0,0 +1 @@
+Simple to use text editor for X
diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index a28440556993..c644e7ece119 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -13,8 +13,6 @@ DISTNAME=	${PORTNAME}_${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Binary Editor And Viewer, a full featured binary file editor
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 USE_REINPLACE=	yes
diff --git a/editors/beav/pkg-comment b/editors/beav/pkg-comment
new file mode 100644
index 000000000000..a3c0aabc9c7d
--- /dev/null
+++ b/editors/beav/pkg-comment
@@ -0,0 +1 @@
+Binary Editor And Viewer, a full featured binary file editor
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index 70d24f4291e4..fd1864316897 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -15,8 +15,6 @@ DISTNAME=	${PORTNAME}-2.1_4
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	A clone of the ex/vi text editor
-
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--bindir=${PREFIX}/bin --datadir=${PREFIX}/share/elvis
diff --git a/editors/elvis/pkg-comment b/editors/elvis/pkg-comment
new file mode 100644
index 000000000000..434fd536bcbe
--- /dev/null
+++ b/editors/elvis/pkg-comment
@@ -0,0 +1 @@
+A clone of the ex/vi text editor
diff --git a/editors/em/Makefile b/editors/em/Makefile
index b6411b5a7b99..a215b700e747 100644
--- a/editors/em/Makefile
+++ b/editors/em/Makefile
@@ -14,8 +14,6 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-lt
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Full screen editor based on MicroEMACS
-
 USE_REINPLACE=	yes
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" DEFINES=""
 
diff --git a/editors/em/pkg-comment b/editors/em/pkg-comment
new file mode 100644
index 000000000000..c45c4721660e
--- /dev/null
+++ b/editors/em/pkg-comment
@@ -0,0 +1 @@
+Full screen editor based on MicroEMACS
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index e53ad9bbd8e0..b1109377e34e 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -13,8 +13,6 @@ MASTER_SITE_SUBDIR=	emacs
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	GNU editing macros
-
 EMACS_VERSION=	19.34
 CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
diff --git a/editors/emacs/pkg-comment b/editors/emacs/pkg-comment
new file mode 100644
index 000000000000..5f2e16cd82ff
--- /dev/null
+++ b/editors/emacs/pkg-comment
@@ -0,0 +1 @@
+GNU editing macros
diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile
index e53ad9bbd8e0..b1109377e34e 100644
--- a/editors/emacs19/Makefile
+++ b/editors/emacs19/Makefile
@@ -13,8 +13,6 @@ MASTER_SITE_SUBDIR=	emacs
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	GNU editing macros
-
 EMACS_VERSION=	19.34
 CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
diff --git a/editors/emacs19/pkg-comment b/editors/emacs19/pkg-comment
new file mode 100644
index 000000000000..5f2e16cd82ff
--- /dev/null
+++ b/editors/emacs19/pkg-comment
@@ -0,0 +1 @@
+GNU editing macros
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 11166f16ca73..3ac3cf1bada8 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -19,8 +19,6 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	GNU editing macros
-
 USE_AUTOCONF_VER=213
 USE_GMAKE=	yes
 EMACS_VER=	20.7
diff --git a/editors/emacs20/pkg-comment b/editors/emacs20/pkg-comment
new file mode 100644
index 000000000000..5f2e16cd82ff
--- /dev/null
+++ b/editors/emacs20/pkg-comment
@@ -0,0 +1 @@
+GNU editing macros
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index e53ad9bbd8e0..b1109377e34e 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -13,8 +13,6 @@ MASTER_SITE_SUBDIR=	emacs
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	GNU editing macros
-
 EMACS_VERSION=	19.34
 CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
diff --git a/editors/emacs22/pkg-comment b/editors/emacs22/pkg-comment
new file mode 100644
index 000000000000..5f2e16cd82ff
--- /dev/null
+++ b/editors/emacs22/pkg-comment
@@ -0,0 +1 @@
+GNU editing macros
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index e53ad9bbd8e0..b1109377e34e 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -13,8 +13,6 @@ MASTER_SITE_SUBDIR=	emacs
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	GNU editing macros
-
 EMACS_VERSION=	19.34
 CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
diff --git a/editors/emacs23/pkg-comment b/editors/emacs23/pkg-comment
new file mode 100644
index 000000000000..5f2e16cd82ff
--- /dev/null
+++ b/editors/emacs23/pkg-comment
@@ -0,0 +1 @@
+GNU editing macros
diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile
index 468bf60e64e7..f8aeb720fef9 100644
--- a/editors/gnuserv/Makefile
+++ b/editors/gnuserv/Makefile
@@ -13,8 +13,6 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	A standalone release of gnuserv for GNU Emacs
-
 GNU_CONFIGURE=	yes
 
 BINSUFFIX?=	-emacs
diff --git a/editors/gnuserv/pkg-comment b/editors/gnuserv/pkg-comment
new file mode 100644
index 000000000000..089532c88781
--- /dev/null
+++ b/editors/gnuserv/pkg-comment
@@ -0,0 +1 @@
+A standalone release of gnuserv for GNU Emacs
diff --git a/editors/hexcurse/Makefile b/editors/hexcurse/Makefile
index 630dfef7caed..30d5ef9aaacd 100644
--- a/editors/hexcurse/Makefile
+++ b/editors/hexcurse/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES=	http://jewfish.net/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	A versatile ncurses-based hex editor
-
 GNU_CONFIGURE=	yes
 
 MAN1=	hexcurse.1
diff --git a/editors/hexcurse/pkg-comment b/editors/hexcurse/pkg-comment
new file mode 100644
index 000000000000..34e0bf966f19
--- /dev/null
+++ b/editors/hexcurse/pkg-comment
@@ -0,0 +1 @@
+A versatile ncurses-based hex editor
diff --git a/editors/hte/Makefile b/editors/hte/Makefile
index 0641c414a11e..66afd9e032de 100644
--- a/editors/hte/Makefile
+++ b/editors/hte/Makefile
@@ -15,8 +15,6 @@ DISTNAME=	ht-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	A file editor/viewer/analyzer for executables
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-lm"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/editors/hte/pkg-comment b/editors/hte/pkg-comment
new file mode 100644
index 000000000000..0f8657fb6ec1
--- /dev/null
+++ b/editors/hte/pkg-comment
@@ -0,0 +1 @@
+A file editor/viewer/analyzer for executables
diff --git a/editors/iiimecf/Makefile b/editors/iiimecf/Makefile
index 22fcf5ac74a4..faab19f15f43 100644
--- a/editors/iiimecf/Makefile
+++ b/editors/iiimecf/Makefile
@@ -17,8 +17,6 @@ DISTNAME=	IIIMECF-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Internet/Intranet Input Method Emacs Client Framework for GNU Emacs 20
-
 BUILD_DEPENDS=	${UN_DEFINE}:${PORTSDIR}/converters/mule-ucs-emacs20
 RUN_DEPENDS=	${UN_DEFINE}:${PORTSDIR}/converters/mule-ucs-emacs20
 
diff --git a/editors/iiimecf/pkg-comment b/editors/iiimecf/pkg-comment
new file mode 100644
index 000000000000..b4eb3c7bb7b6
--- /dev/null
+++ b/editors/iiimecf/pkg-comment
@@ -0,0 +1 @@
+Internet/Intranet Input Method Emacs Client Framework for GNU Emacs 20
diff --git a/editors/impress/Makefile b/editors/impress/Makefile
index 416b60e3d0aa..844f6edb9b3d 100644
--- a/editors/impress/Makefile
+++ b/editors/impress/Makefile
@@ -13,8 +13,6 @@ DISTNAME=	imp${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Publishing and presentation tool
-
 RUN_DEPENDS=    wish8.3:${PORTSDIR}/x11-toolkits/tk83
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
diff --git a/editors/impress/pkg-comment b/editors/impress/pkg-comment
new file mode 100644
index 000000000000..19f76fa25c09
--- /dev/null
+++ b/editors/impress/pkg-comment
@@ -0,0 +1 @@
+Publishing and presentation tool
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 4f73982ec27f..5a68069a8063 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -30,7 +30,6 @@ PATCHFILES:=	${PATCHFILES:N6.1.${p}}
 
 MAINTAINER?=	obrien@FreeBSD.org
 
-PORTCOMMENT?=	Vi "workalike", with many additional features
 SLAVEDIRS=	editors/vim-lite
 
 .if defined(PACKAGE_BUILDING) && !defined(LITE)