20 files changed, 11 insertions, 18 deletions
diff --git a/japanese/acroread-jpnfont/Makefile b/japanese/acroread-jpnfont/Makefile
index 45a83e1d5a97..13dc82a34dbc 100644
--- a/japanese/acroread-jpnfont/Makefile
+++ b/japanese/acroread-jpnfont/Makefile
@@ -8,6 +8,8 @@
 DISTNAME=	jpnfont
 CATEGORIES=	japanese
 
+COMMENT=	Asian Font Packs for Acrobat Reader 4.0 (for Japanese)
+
 MASTERDIR=	${.CURDIR}/../../print/acroread-commfont
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/acroread-jpnfont/pkg-comment b/japanese/acroread-jpnfont/pkg-comment
deleted file mode 100644
index a0cfcada69b7..000000000000
--- a/japanese/acroread-jpnfont/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Asian Font Packs for Acrobat Reader 4.0 (for Japanese)
diff --git a/japanese/exmh2/Makefile b/japanese/exmh2/Makefile
index 7d5c88b73fd8..9f00d31b0312 100644
--- a/japanese/exmh2/Makefile
+++ b/japanese/exmh2/Makefile
@@ -8,11 +8,11 @@
 CATEGORIES=	japanese
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	X11/TK based mail reader front end to MH for Japanese environments
 
 JAPANESE_EXMH=	yes
 
 MASTERDIR=	${.CURDIR}/../../mail/exmh2
-COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 
diff --git a/japanese/exmh2/pkg-comment b/japanese/exmh2/pkg-comment
deleted file mode 100644
index c7c0b8f89026..000000000000
--- a/japanese/exmh2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11/TK based mail reader front end to MH for Japanese environments
diff --git a/japanese/magicpoint/Makefile b/japanese/magicpoint/Makefile
index ccd158e44ee9..3d83c6d695bb 100644
--- a/japanese/magicpoint/Makefile
+++ b/japanese/magicpoint/Makefile
@@ -6,7 +6,7 @@
 #
 
 MASTERDIR=	${.CURDIR}/../../misc/magicpoint
-COMMENTFILE=	${.CURDIR}/pkg-comment
+COMMENT=	An X11-based presentation tool, configured with vflib support
 
 LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
 
diff --git a/japanese/magicpoint/pkg-comment b/japanese/magicpoint/pkg-comment
deleted file mode 100644
index c10efef92efd..000000000000
--- a/japanese/magicpoint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11-based presentation tool, configured with vflib support
diff --git a/japanese/skk-jisyo-cdb/Makefile b/japanese/skk-jisyo-cdb/Makefile
index fbea0d261ad4..bbd5c694f0c4 100644
--- a/japanese/skk-jisyo-cdb/Makefile
+++ b/japanese/skk-jisyo-cdb/Makefile
@@ -10,13 +10,13 @@ PORTVERSION=	200209
 PORTREVISION=	0
 
 MAINTAINER=	toru@tkd.ne.jp
+COMMENT=	CDB jisyo (dictionary) files for the SKK Japanese-input software
 
 SKK_JISYO_SUFFIX=	.cdb
 
 MASTERDIR=	${.CURDIR}/../skk-jisyo
 
 MD5_FILE=	${.CURDIR}/distinfo
-COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/skk-jisyo-cdb/pkg-comment b/japanese/skk-jisyo-cdb/pkg-comment
deleted file mode 100644
index 2bf728f96959..000000000000
--- a/japanese/skk-jisyo-cdb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CDB jisyo (dictionary) files for the SKK Japanese-input software
diff --git a/japanese/skk-jisyo/Makefile b/japanese/skk-jisyo/Makefile
index 520a9420e605..710cc3493404 100644
--- a/japanese/skk-jisyo/Makefile
+++ b/japanese/skk-jisyo/Makefile
@@ -15,6 +15,7 @@ DISTFILES?=	SKK-JISYO.L.${PORTVERSION}${SKK_JISYO_SUFFIX}.gz \
 DIST_SUBDIR=	skk-jisyo
 
 MAINTAINER?=	yoichi@FreeBSD.org
+COMMENT?=	Jisyo (dictionary) files for the SKK Japanese-input software
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/japanese/skk-jisyo/pkg-comment b/japanese/skk-jisyo/pkg-comment
deleted file mode 100644
index e5221b534a5a..000000000000
--- a/japanese/skk-jisyo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Jisyo (dictionary) files for the SKK Japanese-input software
diff --git a/japanese/xemacs-devel-canna+freewnn/Makefile b/japanese/xemacs-devel-canna+freewnn/Makefile
index 14fb846c236f..f99df928af9c 100644
--- a/japanese/xemacs-devel-canna+freewnn/Makefile
+++ b/japanese/xemacs-devel-canna+freewnn/Makefile
@@ -8,7 +8,7 @@
 CATEGORIES=	japanese
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENTFILE=	${.CURDIR}/../../japanese/xemacs-devel-canna+freewnn/pkg-comment
+COMMENT=	XEmacs(gamma version) text editor, with SJ3, SKK, Canna and FreeWnn support
 
 CANNA=		yes
 FREEWNN=	yes
diff --git a/japanese/xemacs-devel-canna+freewnn/pkg-comment b/japanese/xemacs-devel-canna+freewnn/pkg-comment
deleted file mode 100644
index ef39b44ca453..000000000000
--- a/japanese/xemacs-devel-canna+freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(gamma version) text editor, with SJ3, SKK, Canna and FreeWnn support
diff --git a/japanese/xemacs-devel-canna+wnn6/Makefile b/japanese/xemacs-devel-canna+wnn6/Makefile
index d9f7135460d2..3ec8ac636040 100644
--- a/japanese/xemacs-devel-canna+wnn6/Makefile
+++ b/japanese/xemacs-devel-canna+wnn6/Makefile
@@ -8,7 +8,7 @@
 CATEGORIES=	japanese
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENTFILE=	${.CURDIR}/../../japanese/xemacs-devel-canna+wnn6/pkg-comment
+COMMENT=	XEmacs(gamma version) text editor, with SJ3, SKK, Canna and Wnn6 support
 
 CANNA=		yes
 WNN6=		yes
diff --git a/japanese/xemacs-devel-canna+wnn6/pkg-comment b/japanese/xemacs-devel-canna+wnn6/pkg-comment
deleted file mode 100644
index e50147ab1c9a..000000000000
--- a/japanese/xemacs-devel-canna+wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(gamma version) text editor, with SJ3, SKK, Canna and Wnn6 support
diff --git a/japanese/xemacs-devel-canna/Makefile b/japanese/xemacs-devel-canna/Makefile
index 85cd934b5723..e128d600b498 100644
--- a/japanese/xemacs-devel-canna/Makefile
+++ b/japanese/xemacs-devel-canna/Makefile
@@ -8,7 +8,7 @@
 CATEGORIES=	japanese
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENTFILE=	${.CURDIR}/../../japanese/xemacs-devel-canna/pkg-comment
+COMMENT=	XEmacs(gamma version) text editor, with SJ3, SKK and Canna support
 
 CANNA=		yes
 
diff --git a/japanese/xemacs-devel-canna/pkg-comment b/japanese/xemacs-devel-canna/pkg-comment
deleted file mode 100644
index b1b11b1e3523..000000000000
--- a/japanese/xemacs-devel-canna/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(gamma version) text editor, with SJ3, SKK and Canna support
diff --git a/japanese/xemacs-devel-freewnn/Makefile b/japanese/xemacs-devel-freewnn/Makefile
index 531732f1d0d4..b7dbed12717c 100644
--- a/japanese/xemacs-devel-freewnn/Makefile
+++ b/japanese/xemacs-devel-freewnn/Makefile
@@ -8,7 +8,7 @@
 CATEGORIES=	japanese
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENTFILE=	${.CURDIR}/../../japanese/xemacs-devel-freewnn/pkg-comment
+COMMENT=	XEmacs(gamma version) text editor, with SJ3, SKK and FreeWnn support
 
 FREEWNN=	yes
 
diff --git a/japanese/xemacs-devel-freewnn/pkg-comment b/japanese/xemacs-devel-freewnn/pkg-comment
deleted file mode 100644
index e79f92642115..000000000000
--- a/japanese/xemacs-devel-freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(gamma version) text editor, with SJ3, SKK and FreeWnn support
diff --git a/japanese/xemacs-devel-wnn6/Makefile b/japanese/xemacs-devel-wnn6/Makefile
index 0e77470cd89d..6d320e580a7c 100644
--- a/japanese/xemacs-devel-wnn6/Makefile
+++ b/japanese/xemacs-devel-wnn6/Makefile
@@ -8,7 +8,7 @@
 CATEGORIES=	japanese
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENTFILE=	${.CURDIR}/../../japanese/xemacs-devel-wnn6/pkg-comment
+COMMENT=	XEmacs(gamma version) text editor, with SJ3, SKK and Wnn6 support
 
 WNN6=		yes
 
diff --git a/japanese/xemacs-devel-wnn6/pkg-comment b/japanese/xemacs-devel-wnn6/pkg-comment
deleted file mode 100644
index f70759bfae05..000000000000
--- a/japanese/xemacs-devel-wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(gamma version) text editor, with SJ3, SKK and Wnn6 support