Destroy pkg-comment for some of the stranger uses in the tree,

pending the final semi-automatic purge.

Approved by:	portmgr (implicitly)

54 files changed, 52 insertions, 35 deletions

diff --git a/print/acroread-commfont/Makefile b/print/acroread-commfont/Makefile
index 5f1d8a453506..1bd430658516 100644
--- a/print/acroread-commfont/Makefile
+++ b/print/acroread-commfont/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
 DISTNAME?=	commfont # dummy
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT?=	Asian Font Packs for Acrobat Reader 4.0 (for common files)
 
 NO_BUILD=	yes
 SLAVEDIRS=	chinese/acroread-chsfont chinese/acroread-chtfont
@@ -42,7 +43,6 @@ RUN_DEPENDS=	acroread4:${PORTSDIR}/print/acroread4
 .else
 ###### For slave ports ##############################
 ## Use a local directory of the slave port!!
-COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 FILESDIR=	${.CURDIR}/files
diff --git a/print/acroread-commfont/pkg-comment b/print/acroread-commfont/pkg-comment
deleted file mode 100644
index 7f4d0c22c07f..000000000000
--- a/print/acroread-commfont/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Asian Font Packs for Acrobat Reader 4.0 (for common files)
diff --git a/print/bjfilter360/Makefile b/print/bjfilter360/Makefile
index 420caf7d7580..856485bb63c4 100644
--- a/print/bjfilter360/Makefile
+++ b/print/bjfilter360/Makefile
@@ -7,6 +7,8 @@
 
 MASTERDIR=	${.CURDIR}/../bjfilter850
 
+COMMENT=	Canon Bubble Jet Print Filter for Linux -- BJ F360
+
 PRTYPE?=	360
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/bjfilter360/pkg-comment b/print/bjfilter360/pkg-comment
deleted file mode 100644
index a18a10806d7d..000000000000
--- a/print/bjfilter360/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ F360
diff --git a/print/bjfilter850/Makefile b/print/bjfilter850/Makefile
index ed3fb1ce8556..4fc0605e5530 100644
--- a/print/bjfilter850/Makefile
+++ b/print/bjfilter850/Makefile
@@ -8,6 +8,8 @@
 PORTNAME=	bjfilter${PREFIX_PRTYPE}${PRTYPE}${SUFFIX_PRTYPE}
 MASTERDIR=	${.CURDIR}/../bjfiltercom
 
+COMMENT?=	Canon Bubble Jet Print Filter for Linux -- BJ F850
+
 SLAVE_PORT=	yes
 PRTYPE?=	850
 SUFIX_PRTYPE?=	
diff --git a/print/bjfilter850/pkg-comment b/print/bjfilter850/pkg-comment
deleted file mode 100644
index bdb2aa0d6875..000000000000
--- a/print/bjfilter850/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ F850
diff --git a/print/bjfilter850ug/Makefile b/print/bjfilter850ug/Makefile
index d6eb93344401..e9ce1a09a1d5 100644
--- a/print/bjfilter850ug/Makefile
+++ b/print/bjfilter850ug/Makefile
@@ -7,6 +7,8 @@
 
 MASTERDIR=	${.CURDIR}/../bjfilter850
 
+COMMENT=	Canon Bubble Jet Print Filter for Linux -- BJ F850 (supported BCI-6 inks)
+
 PRTYPE=		850
 SUFFIX_PRTYPE=	ug
 
diff --git a/print/bjfilter850ug/pkg-comment b/print/bjfilter850ug/pkg-comment
deleted file mode 100644
index de9cc9ce943a..000000000000
--- a/print/bjfilter850ug/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ F850 (supported BCI-6 inks)
diff --git a/print/bjfilter860/Makefile b/print/bjfilter860/Makefile
index c528e573d3ab..68ee515e8997 100644
--- a/print/bjfilter860/Makefile
+++ b/print/bjfilter860/Makefile
@@ -7,6 +7,8 @@
 
 MASTERDIR=	${.CURDIR}/../bjfilter850
 
+COMMENT=	Canon Bubble Jet Print Filter for Linux -- BJ F860
+
 PRTYPE=		860
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/bjfilter860/pkg-comment b/print/bjfilter860/pkg-comment
deleted file mode 100644
index 2b4a6fa9de1d..000000000000
--- a/print/bjfilter860/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ F860
diff --git a/print/bjfilter870/Makefile b/print/bjfilter870/Makefile
index 48a01ac3e6aa..798c542b1f5e 100644
--- a/print/bjfilter870/Makefile
+++ b/print/bjfilter870/Makefile
@@ -7,6 +7,8 @@
 
 MASTERDIR=	${.CURDIR}/../bjfilter850
 
+COMMENT=	Canon Bubble Jet Print Filter for Linux -- BJ F870
+
 PRTYPE=		870
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/bjfilter870/pkg-comment b/print/bjfilter870/pkg-comment
deleted file mode 100644
index fc7d4ee868a5..000000000000
--- a/print/bjfilter870/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ F870
diff --git a/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile
index 47e9597b8d64..da23b3941b6b 100644
--- a/print/bjfiltercom/Makefile
+++ b/print/bjfiltercom/Makefile
@@ -17,6 +17,7 @@ DISTFILES+=	${DOC_DISTFILES}
 EXTRACT_ONLY=	${RPMFILE}
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT?=	Canon Bubble Jet Print Filter for Linux -- Common files
 
 BUILD_DEPENDS=  rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
 .if defined(SLAVE_PORT)
@@ -40,7 +41,6 @@ EXTRACT_AFTER_ARGS=	| cpio -id --quiet
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}${_SUF1}${_SUF2}
 DIST_SUBDIR=	bjfilter
 PLIST=		${.CURDIR}/pkg-plist
-COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 MD5_FILE=	${.CURDIR}/distinfo
 ONLY_FOR_ARCHS=	i386
diff --git a/print/bjfiltercom/pkg-comment b/print/bjfiltercom/pkg-comment
deleted file mode 100644
index fe6bda38f500..000000000000
--- a/print/bjfiltercom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- Common files
diff --git a/print/bjfilters600/Makefile b/print/bjfilters600/Makefile
index 0fa61035a9db..e9ae6748d728 100644
--- a/print/bjfilters600/Makefile
+++ b/print/bjfilters600/Makefile
@@ -7,6 +7,8 @@
 
 MASTERDIR=	${.CURDIR}/../bjfilter850
 
+COMMENT=	Canon Bubble Jet Print Filter for Linux -- BJ S600
+
 PREFIX_PRTYPE=	s
 PRTYPE?=	600
 
diff --git a/print/bjfilters600/pkg-comment b/print/bjfilters600/pkg-comment
deleted file mode 100644
index 387e676ef5d9..000000000000
--- a/print/bjfilters600/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ S600
diff --git a/print/bjfilters630/Makefile b/print/bjfilters630/Makefile
index 0af71cd13108..338c3a248516 100644
--- a/print/bjfilters630/Makefile
+++ b/print/bjfilters630/Makefile
@@ -7,6 +7,8 @@
 
 MASTERDIR=	${.CURDIR}/../bjfilter850
 
+COMMENT=	Canon Bubble Jet Print Filter for Linux -- BJ S630
+
 PREFIX_PRTYPE=	s
 PRTYPE?=	630
 
diff --git a/print/bjfilters630/pkg-comment b/print/bjfilters630/pkg-comment
deleted file mode 100644
index a618365aa933..000000000000
--- a/print/bjfilters630/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ S630
diff --git a/print/bjfilters6300/Makefile b/print/bjfilters6300/Makefile
index fcc669cb33b9..5cc1e14f17a7 100644
--- a/print/bjfilters6300/Makefile
+++ b/print/bjfilters6300/Makefile
@@ -7,6 +7,8 @@
 
 MASTERDIR=	${.CURDIR}/../bjfilter850
 
+COMMENT=	Canon Bubble Jet Print Filter for Linux -- BJ S6300
+
 PREFIX_PRTYPE=	s
 PRTYPE?=	6300
 
diff --git a/print/bjfilters6300/pkg-comment b/print/bjfilters6300/pkg-comment
deleted file mode 100644
index b32078c97813..000000000000
--- a/print/bjfilters6300/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ S6300
diff --git a/print/pips2200/Makefile b/print/pips2200/Makefile
index bc5740901d7a..ae2669e2c2c8 100644
--- a/print/pips2200/Makefile
+++ b/print/pips2200/Makefile
@@ -6,6 +6,8 @@
 #
 
 MASTERDIR=	${.CURDIR}/../pips800
+COMMENT=	Photo Image Print System for Linux --- EPSON PM-2200C
+
 PRTYPE=		2200
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips2200/pkg-comment b/print/pips2200/pkg-comment
deleted file mode 100644
index b9181d222353..000000000000
--- a/print/pips2200/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-2200C
diff --git a/print/pips3000/Makefile b/print/pips3000/Makefile
index ece5249c5ab7..f991bf93fdad 100644
--- a/print/pips3000/Makefile
+++ b/print/pips3000/Makefile
@@ -6,6 +6,8 @@
 #
 
 MASTERDIR=	${.CURDIR}/../pips800
+COMMENT=	Photo Image Print System for Linux --- EPSON PM-3000C
+
 PRTYPE=		3000
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips3000/pkg-comment b/print/pips3000/pkg-comment
deleted file mode 100644
index 14c685bd0403..000000000000
--- a/print/pips3000/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-3000C
diff --git a/print/pips3300/Makefile b/print/pips3300/Makefile
index a5da29f08d55..c8f147e8ed5d 100644
--- a/print/pips3300/Makefile
+++ b/print/pips3300/Makefile
@@ -8,6 +8,8 @@
 PORTVERSION=	1.3
 PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
+COMMENT=	Photo Image Print System for Linux --- EPSON PM-3300C
+
 PRTYPE=		3300
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips3300/pkg-comment b/print/pips3300/pkg-comment
deleted file mode 100644
index de769869d484..000000000000
--- a/print/pips3300/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-3300C
diff --git a/print/pips3500/Makefile b/print/pips3500/Makefile
index 571082390c3b..cc9642b6df1f 100644
--- a/print/pips3500/Makefile
+++ b/print/pips3500/Makefile
@@ -7,6 +7,8 @@
 
 PORTVERSION=	1.3
 MASTERDIR=	${.CURDIR}/../pips800
+COMMENT=	Photo Image Print System for Linux --- EPSON PM-3500C
+
 PRTYPE=		3500
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips3500/pkg-comment b/print/pips3500/pkg-comment
deleted file mode 100644
index b93719eadab2..000000000000
--- a/print/pips3500/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-3500C
diff --git a/print/pips670/Makefile b/print/pips670/Makefile
index a154c9a2b3d5..a1dddf258d32 100644
--- a/print/pips670/Makefile
+++ b/print/pips670/Makefile
@@ -6,6 +6,8 @@
 #
 
 MASTERDIR=	${.CURDIR}/../pips800
+COMMENT=	Photo Image Print System for Linux --- EPSON PM-670C
+
 PRTYPE=		670
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips670/pkg-comment b/print/pips670/pkg-comment
deleted file mode 100644
index f13c861b4ddd..000000000000
--- a/print/pips670/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-670C
diff --git a/print/pips750_2000/Makefile b/print/pips750_2000/Makefile
index eec70e2deea2..785f8a00e945 100644
--- a/print/pips750_2000/Makefile
+++ b/print/pips750_2000/Makefile
@@ -7,6 +7,8 @@
 
 MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/750/
 MASTERDIR=	${.CURDIR}/../pips800
+COMMENT=	Photo Image Print System for Linux --- EPSON PM-750C PM-2000C
+
 PRTYPE=		750_2000
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips750_2000/pkg-comment b/print/pips750_2000/pkg-comment
deleted file mode 100644
index b273423aa237..000000000000
--- a/print/pips750_2000/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-750C PM-2000C
diff --git a/print/pips760/Makefile b/print/pips760/Makefile
index 56d5f6c15110..0c75ca154886 100644
--- a/print/pips760/Makefile
+++ b/print/pips760/Makefile
@@ -6,6 +6,8 @@
 #
 
 MASTERDIR=	${.CURDIR}/../pips800
+COMMENT=	Photo Image Print System for Linux --- EPSON PM-760C
+
 PRTYPE=		760
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips760/pkg-comment b/print/pips760/pkg-comment
deleted file mode 100644
index ee9a96452470..000000000000
--- a/print/pips760/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-760C
diff --git a/print/pips770/Makefile b/print/pips770/Makefile
index 1065c884da80..6a5939a83c1f 100644
--- a/print/pips770/Makefile
+++ b/print/pips770/Makefile
@@ -6,6 +6,8 @@
 #
 
 MASTERDIR=	${.CURDIR}/../pips800
+COMMENT=	Photo Image Print System for Linux --- EPSON PM-770C
+
 PRTYPE=		770
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips770/pkg-comment b/print/pips770/pkg-comment
deleted file mode 100644
index 1fc964f72db7..000000000000
--- a/print/pips770/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-770C
diff --git a/print/pips780/Makefile b/print/pips780/Makefile
index b15e1357acef..3b4194ab2e56 100644
--- a/print/pips780/Makefile
+++ b/print/pips780/Makefile
@@ -7,6 +7,8 @@
 
 PORTVERSION=	1.3
 MASTERDIR=	${.CURDIR}/../pips800
+COMMENT=	Photo Image Print System for Linux --- EPSON PM-780C
+
 PRTYPE=		780
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips780/pkg-comment b/print/pips780/pkg-comment
deleted file mode 100644
index 4d27b3f19665..000000000000
--- a/print/pips780/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-780C
diff --git a/print/pips800/Makefile b/print/pips800/Makefile
index ca4b32c8ebf9..cd60fc45ebcf 100644
--- a/print/pips800/Makefile
+++ b/print/pips800/Makefile
@@ -29,6 +29,7 @@ DISTNAME?=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.i386.tgz
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT?=	Photo Image Print System for Linux --- EPSON PM-800C
 
 RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
 		${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk \
@@ -72,7 +73,6 @@ FILTER=		${FILESDIR}/filter.rev
 BASE_NAME=	pips${PRTYPE}
 PAPERSIZE?=	a4
 # for slave ports
-COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 .if ${PORTVERSION} == 2.0 && !defined(INTERNATIONAL_PRODUCTS)
 LANGS=		ja
@@ -250,7 +250,7 @@ post-install:
 _MAKE_COMMENT_DESCR:
 .if defined(INTERNATIONAL_PRODUCTS)
 .if ${PRTYPE} != -sc880 || ${PORTVERSION} != 1.0
-.for file in pkg-comment pkg-descr
+.for file in pkg-descr
 .if ${PRTYPE} == -sc680_777
 	${SED}	-e 's,Stylus Color 880,Stylus Color 680/Stylus Color 777,g' \
 		-e 's/880/${PRTYPE:S/^-sc//}/g' \
@@ -275,7 +275,7 @@ _MAKE_COMMENT_DESCR:
 .endif
 .else # for defined(INTERNATIONAL_PRODUCTS)
 .if ${PRTYPE} != 800
-.for file in pkg-comment pkg-descr
+.for file in pkg-descr
 .if ${PRTYPE} == 750_2000
 	${SED}	-e 's/PM-800C/PM-750C PM-2000C/g' \
 		-e 's/pm800c/pm750c_2000c/g' \
diff --git a/print/pips800/pkg-comment b/print/pips800/pkg-comment
deleted file mode 100644
index 47986b1204f0..000000000000
--- a/print/pips800/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-800C
diff --git a/print/pips820/Makefile b/print/pips820/Makefile
index 656a2c51ec7c..854809142fe2 100644
--- a/print/pips820/Makefile
+++ b/print/pips820/Makefile
@@ -7,6 +7,8 @@
 
 PORTVERSION=	1.3.1
 MASTERDIR=	${.CURDIR}/../pips800
+COMMENT=	Photo Image Print System for Linux --- EPSON PM-820C
+
 PRTYPE=		820
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips820/pkg-comment b/print/pips820/pkg-comment
deleted file mode 100644
index 78670c6dbb06..000000000000
--- a/print/pips820/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-820C
diff --git a/print/pips880/Makefile b/print/pips880/Makefile
index 2c7352df291f..892582aeee76 100644
--- a/print/pips880/Makefile
+++ b/print/pips880/Makefile
@@ -7,6 +7,8 @@
 
 PORTVERSION=	1.3
 MASTERDIR=	${.CURDIR}/../pips800
+COMMENT=	Photo Image Print System for Linux --- EPSON PM-880C
+
 PRTYPE=		880
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips880/pkg-comment b/print/pips880/pkg-comment
deleted file mode 100644
index 9d509f90017a..000000000000
--- a/print/pips880/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-880C
diff --git a/print/pips900/Makefile b/print/pips900/Makefile
index 5bb17242d993..481584844b0e 100644
--- a/print/pips900/Makefile
+++ b/print/pips900/Makefile
@@ -7,6 +7,8 @@
 
 PORTVERSION=	1.3
 MASTERDIR=	${.CURDIR}/../pips800
+COMMENT=	Photo Image Print System for Linux --- EPSON PM-900C
+
 PRTYPE=		900
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips900/pkg-comment b/print/pips900/pkg-comment
deleted file mode 100644
index 9cd0c173c676..000000000000
--- a/print/pips900/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-900C
diff --git a/print/yatex-mule/Makefile b/print/yatex-mule/Makefile
index 6349cdbcd4d1..f24d548aa015 100644
--- a/print/yatex-mule/Makefile
+++ b/print/yatex-mule/Makefile
@@ -8,7 +8,8 @@
 PKGNAMESUFFIX=	-mule
 
 MASTERDIR=	${.CURDIR}/../yatex
-COMMENTFILE=	${.CURDIR}/pkg-comment
+COMMENT=	Yet Another LaTeX mode and html mode on Emacs (for mule 2.3)
+
 EMACS_PORT_NAME=mule
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/print/yatex-mule/pkg-comment b/print/yatex-mule/pkg-comment
deleted file mode 100644
index 5e9578779bfb..000000000000
--- a/print/yatex-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet Another LaTeX mode and html mode on Emacs (for mule 2.3)
diff --git a/print/yatex-xemacs-mule/Makefile b/print/yatex-xemacs-mule/Makefile
index ff825e5d5c08..48af002262b2 100644
--- a/print/yatex-xemacs-mule/Makefile
+++ b/print/yatex-xemacs-mule/Makefile
@@ -8,7 +8,8 @@
 PKGNAMESUFFIX=	-xemacs-mule
 
 MASTERDIR=	${.CURDIR}/../yatex
-COMMENTFILE=	${.CURDIR}/pkg-comment
+COMMENT=	Yet Another LaTeX mode and html mode on Emacs (for XEmacs21-mule)
+
 EMACS_PORT_NAME=xemacs21-mule
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs-mule/pkg-comment b/print/yatex-xemacs-mule/pkg-comment
deleted file mode 100644
index 2f8b3092f31f..000000000000
--- a/print/yatex-xemacs-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet Another LaTeX mode and html mode on Emacs (for XEmacs21-mule)
diff --git a/print/yatex-xemacs/Makefile b/print/yatex-xemacs/Makefile
index 8db590e2260e..0e4f35013136 100644
--- a/print/yatex-xemacs/Makefile
+++ b/print/yatex-xemacs/Makefile
@@ -8,7 +8,8 @@
 PKGNAMESUFFIX=	-xemacs
 
 MASTERDIR=	${.CURDIR}/../yatex
-COMMENTFILE=	${.CURDIR}/pkg-comment
+COMMENT=	Yet Another LaTeX mode and html mode on Emacs (for XEmacs21)
+
 EMACS_PORT_NAME=xemacs21
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs/pkg-comment b/print/yatex-xemacs/pkg-comment
deleted file mode 100644
index afdc8b01ea85..000000000000
--- a/print/yatex-xemacs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet Another LaTeX mode and html mode on Emacs (for XEmacs21)
diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index f02946e0d3cc..33119b3d7feb 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.yatex.org/ \
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT?=	Yet Another LaTeX mode and html mode on Emacs (for Emacs{19,20} and XEmacs{19,20})
 
 PKGINSTALL=	${WRKDIR}/INSTALL
 PKGDEINSTALL=	${WRKDIR}/DEINSTALL
diff --git a/print/yatex/pkg-comment b/print/yatex/pkg-comment
deleted file mode 100644
index 048dedbc1198..000000000000
--- a/print/yatex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet Another LaTeX mode and html mode on Emacs (for Emacs{19,20} and XEmacs{19,20})