35 files changed, 29 insertions, 50 deletions

diff --git a/editors/bitmap-emacs20/Makefile b/editors/bitmap-emacs20/Makefile
index 01b1ed13b876..27c70b9e13a1 100644
--- a/editors/bitmap-emacs20/Makefile
+++ b/editors/bitmap-emacs20/Makefile
@@ -6,6 +6,7 @@
 #
 
 MAINTAINER=	shige@FreeBSD.org
+COMMENT=	Bitmap-mule, Package to use bitmap in Emacs20
 
 # This is a slave port.
 PORTCLASS=	slave
diff --git a/editors/bitmap-mule/Makefile b/editors/bitmap-mule/Makefile
index 2d8c2129ed7c..bfe896f3fe75 100644
--- a/editors/bitmap-mule/Makefile
+++ b/editors/bitmap-mule/Makefile
@@ -6,6 +6,7 @@
 #
 
 MAINTAINER=	shige@FreeBSD.org
+COMMENT=	Package to use bitmap in MULE
 
 # This is a slave port.
 PORTCLASS=	slave
diff --git a/editors/bitmap/Makefile b/editors/bitmap/Makefile
index aca34d5fbc89..0501835a53ba 100644
--- a/editors/bitmap/Makefile
+++ b/editors/bitmap/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	bitmap-mule-${BITMAP_DISTVER}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	shige@FreeBSD.org
+COMMENT?=	Bitmap-mule, Package to use bitmap in Emacs21
 
 # ports version
 BITMAP_VER=		${BITMAP_MVER}${BITMAP_SNAP_PREFIX}${BITMAP_SNAP}
diff --git a/editors/bitmap/pkg-comment.emacs20 b/editors/bitmap/pkg-comment.emacs20
deleted file mode 100644
index a528f7da5134..000000000000
--- a/editors/bitmap/pkg-comment.emacs20
+++ /dev/null
@@ -1 +0,0 @@
-Bitmap-mule, Package to use bitmap in Emacs20
diff --git a/editors/bitmap/pkg-comment.emacs21 b/editors/bitmap/pkg-comment.emacs21
deleted file mode 100644
index a923bbab194f..000000000000
--- a/editors/bitmap/pkg-comment.emacs21
+++ /dev/null
@@ -1 +0,0 @@
-Bitmap-mule, Package to use bitmap in Emacs21
diff --git a/editors/bitmap/pkg-comment.mule b/editors/bitmap/pkg-comment.mule
deleted file mode 100644
index 14026f9a0004..000000000000
--- a/editors/bitmap/pkg-comment.mule
+++ /dev/null
@@ -1 +0,0 @@
-Package to use bitmap in MULE
diff --git a/editors/xemacs21-mule-common/Makefile b/editors/xemacs21-mule-common/Makefile
index 3e5bcfc4862d..d0fc85181f79 100644
--- a/editors/xemacs21-mule-common/Makefile
+++ b/editors/xemacs21-mule-common/Makefile
@@ -39,7 +39,7 @@ MULE_COMMON=		yes
 PKGNAMESUFFIX=		-mule-common
 DESCR_TMPL=		${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-mule-common/files/DESCR.tmpl
 INSTALL_TMPL=		${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-mule-common/files/INSTALL.tmpl
-COMMENT_TEXT=		XEmacs(version ${XEMACS_MAJOR_VER}) with mule, lisp files, info pages, etc (except executables)
+COMMENT?=		XEmacs(version ${XEMACS_MAJOR_VER}) with mule, lisp files, info pages, etc (except executables)
 
 WRKDIR=	${WRKDIRPREFIX}/${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-mule/work
 
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 4c837dc8328b..f9281fdf0b75 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -24,7 +24,7 @@ MULE_SLAVE=	yes
 .endif
 
 MAINTAINER?=	kiri@FreeBSD.org
-COMMENT=?	XEmacs(version 21) text editor with mule(Only the executables)
+COMMENT?=	XEmacs(version 21) text editor with mule(Only the executables)
 
 BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
 .if defined(MULE_SLAVE)
@@ -77,7 +77,6 @@ XEMACS_MAJOR_VER?=	21
 MULE_PORT=		yes
 PKGNAMESUFFIX?=		-mule
 DESCR_TMPL?=		${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-mule/files/DESCR.tmpl
-COMMENT_TEXT?=		XEmacs(version ${XEMACS_MAJOR_VER}) text editor with mule(Only the executables)
 .if defined(MULE_SLAVE)
 BINNAMEEXT=		-mule
 SITE_INCLUDES+=		${LOCALBASE}/include
@@ -105,10 +104,9 @@ post-install::
 post-package:
 	@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
 
-## for make DESCR and COMMENT (only maintainer use)
+## for make DESCR (only maintainer use)
 #pre-arrange::
 #	@${MKDIR} ${PKGDIR}
-#	@${ECHO_CMD} "${COMMENT_TEXT}" > ${COMMENT}
 #.if (${PKGNAMESUFFIX} == "-canna") || (${PKGNAMESUFFIX} == "-mule") || (${PKGNAMESUFFIX} == "-mule-common")
 #	@${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
 #		-e "s/%%XEMACS_REL%%/${XEMACS_REL}/g" \
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index 344c0e9c8a54..d69b53e95012 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -14,7 +14,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}
 DIST_SUBDIR=	xemacs
 
 MAINTAINER?=	gj@FreeBSD.org
-COMMENT=	XEmacs text editor version 21
+COMMENT?=	XEmacs text editor version 21
 
 RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
 .if !defined(WITHOUT_X11)
diff --git a/japanese/jpilot/Makefile b/japanese/jpilot/Makefile
index cfe928b645a0..a3a793b25f92 100644
--- a/japanese/jpilot/Makefile
+++ b/japanese/jpilot/Makefile
@@ -6,7 +6,6 @@
 #
 
 MASTERDIR=	${.CURDIR}/../../palm/jpilot
-COMMENTFILE=	${.CURDIR}/pkg-comment
 
 CATEGORIES=	japanese
 
diff --git a/japanese/xemacs21-canna+freewnn/Makefile b/japanese/xemacs21-canna+freewnn/Makefile
index 4674f346e7a6..9d954065b49e 100644
--- a/japanese/xemacs21-canna+freewnn/Makefile
+++ b/japanese/xemacs21-canna+freewnn/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-COMMENTFILE=		${.CURDIR}/pkg-comment
-
 XEMACS_MAJOR_VER=	21
 CANNA=			yes
 FREEWNN=		yes
diff --git a/japanese/xemacs21-canna+freewnn/pkg-comment b/japanese/xemacs21-canna+freewnn/pkg-comment
deleted file mode 100644
index 3dab065ded59..000000000000
--- a/japanese/xemacs21-canna+freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(version 21) text editor, with SJ3, SKK, Canna and FreeWnn support
diff --git a/japanese/xemacs21-canna+wnn6/Makefile b/japanese/xemacs21-canna+wnn6/Makefile
index f501d5b48825..bd9953538aac 100644
--- a/japanese/xemacs21-canna+wnn6/Makefile
+++ b/japanese/xemacs21-canna+wnn6/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-COMMENTFILE=		${.CURDIR}/pkg-comment
-
 XEMACS_MAJOR_VER=	21
 CANNA=			yes
 WNN6=			yes
diff --git a/japanese/xemacs21-canna+wnn6/pkg-comment b/japanese/xemacs21-canna+wnn6/pkg-comment
deleted file mode 100644
index c96249d92f4e..000000000000
--- a/japanese/xemacs21-canna+wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(version 21) text editor, with SJ3, SKK, Canna and Wnn6 support
diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile
index a1f12c66a45b..96376055cb8c 100644
--- a/japanese/xemacs21-canna/Makefile
+++ b/japanese/xemacs21-canna/Makefile
@@ -27,7 +27,7 @@ CATEGORIES=	japanese
 
 MANLANG=	ja
 MAN1=		xemacs-ja.1
-COMMENTFILE?=	${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg-comment
+COMMENT?=	XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and Canna support
 DESCR=		${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg-descr
 
 XEMACS_MAJOR_VER?=	21
@@ -37,30 +37,30 @@ PKGNAMESUFFIX=		-canna+freewnn
 WITH_INPUT_METHOD=	--with-canna --with-wnn --with-wnn6=no
 LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna \
 			wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
-COMMENT_TEXT=		XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK, Canna and FreeWnn support
+COMMENT=	XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK, Canna and FreeWnn support
 .elif defined(CANNA) && defined(WNN6)
 PKGNAMESUFFIX=		-canna+wnn6
 SITE_INCLUDES=		${LOCALBASE}/include/wnn6
 WITH_INPUT_METHOD=	--with-canna --with-wnn6
 LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna \
 			wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
-COMMENT_TEXT=		XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK, Canna and Wnn6 support
+COMMENT=	XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK, Canna and Wnn6 support
 .elif defined(FREEWNN)
 PKGNAMESUFFIX=		-freewnn
 WITH_INPUT_METHOD=	--with-wnn --with-canna=no --with-wnn6=no
 LIB_INPUT_METHOD=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
-COMMENT_TEXT=		XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and FreeWnn support
+COMMENT=	XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and FreeWnn support
 .elif defined(WNN6)
 PKGNAMESUFFIX=		-wnn6
 SITE_INCLUDES=		${LOCALBASE}/include/wnn6
 WITH_INPUT_METHOD=	--with-wnn6 --with-canna=no
 LIB_INPUT_METHOD=	wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
-COMMENT_TEXT=		XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and Wnn6 support
+COMMENT=	XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and Wnn6 support
 .else
 PKGNAMESUFFIX=		-canna
 WITH_INPUT_METHOD=	--with-canna --with-wnn=no --with-wnn6=no
 LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna
-COMMENT_TEXT=		XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and Canna support
+COMMENT=	XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and Canna support
 .endif
 
 post-install::
diff --git a/japanese/xemacs21-canna/pkg-comment b/japanese/xemacs21-canna/pkg-comment
deleted file mode 100644
index 36f53a63d199..000000000000
--- a/japanese/xemacs21-canna/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(version 21) text editor, with SJ3, SKK and Canna support
diff --git a/japanese/xemacs21-wnn6/Makefile b/japanese/xemacs21-wnn6/Makefile
index 5743f19cc616..a4f915e16bc9 100644
--- a/japanese/xemacs21-wnn6/Makefile
+++ b/japanese/xemacs21-wnn6/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-COMMENTFILE=		${.CURDIR}/pkg-comment
-
 XEMACS_MAJOR_VER=	21
 WNN6=			yes
 
diff --git a/japanese/xemacs21-wnn6/pkg-comment b/japanese/xemacs21-wnn6/pkg-comment
deleted file mode 100644
index 7d5101b69847..000000000000
--- a/japanese/xemacs21-wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(version 21) text editor, with SJ3, SKK and Wnn6 support
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index e9f596d3ba26..9e16fb4de4f1 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/old/ \
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	kiri@FreeBSD.org
+COMMENT?=	Message interface to Emacs Window for emacs
 
 # distfile version
 MEW_VER=	1.94.2
@@ -62,9 +63,8 @@ post-install:
 .endif
 
 ############################################################
-## Make DESCR,COMMENT and PLIST (only for MAINTAINER use)
+## Make DESCR and PLIST (only for MAINTAINER use)
 ############################################################
-#COMMENT_TEXT=	Message interface to Emacs Window for ${EMACS_PORT_NAME}
 #.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
 #ELISPDIR=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${PORTNAME}
 #INFODIR=	${PREFIX}/${EMACS_PACKAGESDIR}/info
@@ -85,7 +85,6 @@ post-install:
 #		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 #
 #pre-arrange:
-#	${ECHO_CMD} ${COMMENT_TEXT} > ${PKGDIR}/pkg-comment
 #	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=pkg-descr \
 #		${SH} ${FILESDIR}/tmpl2file.sh
 #	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} ${SH} ${FILESDIR}/message.sh
diff --git a/mail/mew/pkg-comment b/mail/mew/pkg-comment
index a949d8cbc02d..e69de29bb2d1 100644
--- a/mail/mew/pkg-comment
+++ b/mail/mew/pkg-comment
@@ -1 +0,0 @@
-Message interface to Emacs Window for emacs
diff --git a/mail/mew2/Makefile b/mail/mew2/Makefile
index f7656689ba2d..5713d111199f 100644
--- a/mail/mew2/Makefile
+++ b/mail/mew2/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/ \
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	kiri@FreeBSD.org
+COMMENT?=	Message interface to Emacs Window (version 2) for emacs21
 
 # Mew major version
 MEW_MAJOR_VER?=	2
@@ -55,9 +56,8 @@ post-install:
 .endif
 
 ############################################################
-## Make DESCR,COMMENT and PLIST (only for MAINTAINER use)
+## Make DESCR and PLIST (only for MAINTAINER use)
 ############################################################
-#COMMENT_TEXT=	'Message interface to Emacs Window (version ${MEW_MAJOR_VER}) for ${EMACS_PORT_NAME}'
 #.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
 #ELISPDIR=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${PORTNAME}${MEW_MAJOR_VER}
 #INFODIR=	${PREFIX}/${EMACS_PACKAGESDIR}/info
@@ -77,7 +77,6 @@ post-install:
 #		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 #
 #pre-arrange:
-#	${ECHO_CMD} ${COMMENT_TEXT} > ${PKGDIR}/pkg-comment
 #	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=pkg-descr \
 #		MEW_MAJOR_VER=${MEW_MAJOR_VER} \
 #		${SH} ${FILESDIR}/tmpl2file.sh
diff --git a/mail/mew2/pkg-comment b/mail/mew2/pkg-comment
deleted file mode 100644
index a31b49d89530..000000000000
--- a/mail/mew2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message interface to Emacs Window (version 2) for emacs21
diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile
index f7656689ba2d..5713d111199f 100644
--- a/mail/mew3/Makefile
+++ b/mail/mew3/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/ \
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	kiri@FreeBSD.org
+COMMENT?=	Message interface to Emacs Window (version 2) for emacs21
 
 # Mew major version
 MEW_MAJOR_VER?=	2
@@ -55,9 +56,8 @@ post-install:
 .endif
 
 ############################################################
-## Make DESCR,COMMENT and PLIST (only for MAINTAINER use)
+## Make DESCR and PLIST (only for MAINTAINER use)
 ############################################################
-#COMMENT_TEXT=	'Message interface to Emacs Window (version ${MEW_MAJOR_VER}) for ${EMACS_PORT_NAME}'
 #.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
 #ELISPDIR=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${PORTNAME}${MEW_MAJOR_VER}
 #INFODIR=	${PREFIX}/${EMACS_PACKAGESDIR}/info
@@ -77,7 +77,6 @@ post-install:
 #		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 #
 #pre-arrange:
-#	${ECHO_CMD} ${COMMENT_TEXT} > ${PKGDIR}/pkg-comment
 #	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=pkg-descr \
 #		MEW_MAJOR_VER=${MEW_MAJOR_VER} \
 #		${SH} ${FILESDIR}/tmpl2file.sh
diff --git a/mail/mew3/pkg-comment b/mail/mew3/pkg-comment
deleted file mode 100644
index a31b49d89530..000000000000
--- a/mail/mew3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message interface to Emacs Window (version 2) for emacs21
diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index b92db49efb2f..9de355565384 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../amanda-server
-COMMENTFILE=	${PKGDIR}/pkg-comment.client
+COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
 PKGINSTALL=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index eebd2d49fb24..df4df04260e8 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	amanda
 DISTFILES=	amanda-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	jeh@FreeBSD.org
-COMMENT=	The Advanced Maryland Automatic Network Disk Archiver
+COMMENT?=	The Advanced Maryland Automatic Network Disk Archiver (server)
 
 WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
 SLAVEDIRS=	misc/amanda-client
diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile
index b92db49efb2f..9de355565384 100644
--- a/misc/amanda25-client/Makefile
+++ b/misc/amanda25-client/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../amanda-server
-COMMENTFILE=	${PKGDIR}/pkg-comment.client
+COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
 PKGINSTALL=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index eebd2d49fb24..df4df04260e8 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	amanda
 DISTFILES=	amanda-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	jeh@FreeBSD.org
-COMMENT=	The Advanced Maryland Automatic Network Disk Archiver
+COMMENT?=	The Advanced Maryland Automatic Network Disk Archiver (server)
 
 WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
 SLAVEDIRS=	misc/amanda-client
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index b92db49efb2f..9de355565384 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../amanda-server
-COMMENTFILE=	${PKGDIR}/pkg-comment.client
+COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
 PKGINSTALL=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index eebd2d49fb24..df4df04260e8 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	amanda
 DISTFILES=	amanda-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	jeh@FreeBSD.org
-COMMENT=	The Advanced Maryland Automatic Network Disk Archiver
+COMMENT?=	The Advanced Maryland Automatic Network Disk Archiver (server)
 
 WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
 SLAVEDIRS=	misc/amanda-client
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index b92db49efb2f..9de355565384 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../amanda-server
-COMMENTFILE=	${PKGDIR}/pkg-comment.client
+COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
 PKGINSTALL=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index eebd2d49fb24..df4df04260e8 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	amanda
 DISTFILES=	amanda-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	jeh@FreeBSD.org
-COMMENT=	The Advanced Maryland Automatic Network Disk Archiver
+COMMENT?=	The Advanced Maryland Automatic Network Disk Archiver (server)
 
 WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
 SLAVEDIRS=	misc/amanda-client
diff --git a/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile
index da23b3941b6b..14f487134b15 100644
--- a/print/bjfiltercom/Makefile
+++ b/print/bjfiltercom/Makefile
@@ -115,7 +115,7 @@ do-install:
 .endif
 
 # a target for the maintainer
-_MAKE_COMMENT_DESCR:
+_MAKE_DESCR:
 .if defined(SLAVE_PORT) && ${PORTNAME} != "bjfilter850"
 .for file in pkg-comment pkg-descr
 	${SED}	-e 's/F850/${PRMODEL}/g' \
diff --git a/print/pips800/Makefile b/print/pips800/Makefile
index cd60fc45ebcf..8ac06f9e83be 100644
--- a/print/pips800/Makefile
+++ b/print/pips800/Makefile
@@ -247,7 +247,7 @@ post-install:
 .endif
 
 # a target for the maintainer
-_MAKE_COMMENT_DESCR:
+_MAKE_DESCR:
 .if defined(INTERNATIONAL_PRODUCTS)
 .if ${PRTYPE} != -sc880 || ${PORTVERSION} != 1.0
 .for file in pkg-descr
diff --git a/shells/zsh+euc_hack/Makefile b/shells/zsh+euc_hack/Makefile
index ccb31a96eca3..1b8e3827d76c 100644
--- a/shells/zsh+euc_hack/Makefile
+++ b/shells/zsh+euc_hack/Makefile
@@ -13,8 +13,6 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	The Z shell with EUC encoding support
 
 EXTRA_PATCHES=	${.CURDIR}/files/patch-*
-
-COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 
 .include "${MASTERDIR}/Makefile"