138 files changed, 104 insertions, 70 deletions

diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 0697f93889cd..0a2261e4355a 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -13,6 +13,7 @@ PKGNAMESUFFIX?=	-lib
 DISTNAME=	${PORTNAME}-${WMMVERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT?=	A Japanese/Chinese/Korean input method (Japanese client libraries)
 
 #WRKSRC=	${WRKDIR}/${DISTNAME}/Xsi
 WRKSRC=	${WRKDIR}/FreeWnn-1.1.1-a017-pl4/Xsi
diff --git a/japanese/FreeWnn-lib/pkg-comment b/japanese/FreeWnn-lib/pkg-comment
deleted file mode 100644
index 40b66b40a603..000000000000
--- a/japanese/FreeWnn-lib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Japanese/Chinese/Korean input method (Japanese client libraries)
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index 14fea615a163..b645821ef1ee 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -6,6 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-server
+COMMENT=	A Japanese/Chinese/Korean input method (Japanese server)
 
 MASTERDIR=	${.CURDIR}/../FreeWnn-lib
 PKGDIR=		${.CURDIR}
diff --git a/japanese/FreeWnn-server/pkg-comment b/japanese/FreeWnn-server/pkg-comment
deleted file mode 100644
index 8b4a413c2957..000000000000
--- a/japanese/FreeWnn-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Japanese/Chinese/Korean input method (Japanese server)
diff --git a/japanese/acroread5-jpnfont/Makefile b/japanese/acroread5-jpnfont/Makefile
index b22b022b1b46..751322e58b2c 100644
--- a/japanese/acroread5-jpnfont/Makefile
+++ b/japanese/acroread5-jpnfont/Makefile
@@ -8,6 +8,7 @@
 DISTNAME=	jpnfont
 DIST_SUBDIR=	Acrobat5
 CATEGORIES=	japanese
+COMMENT=	Asian Font Packs for Acrobat Reader 5.0 (for Japanese)
 
 MASTERDIR=	${.CURDIR}/../../print/acroread5-commfont
 
diff --git a/japanese/acroread5-jpnfont/pkg-comment b/japanese/acroread5-jpnfont/pkg-comment
deleted file mode 100644
index 669ff4d0115d..000000000000
--- a/japanese/acroread5-jpnfont/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Asian Font Packs for Acrobat Reader 5.0 (for Japanese)
diff --git a/japanese/gp/Makefile b/japanese/gp/Makefile
index a4a36befb96c..c12a75f08604 100644
--- a/japanese/gp/Makefile
+++ b/japanese/gp/Makefile
@@ -8,6 +8,7 @@
 CATEGORIES=	japanese
 
 LANGUAGE=	Japanese
+COMMENT=	A GUI Printer manager written with Tcl/Tk (Japanese)
 
 MASTERDIR=	${.CURDIR}/../../print/gp
 PKGDIR=		${.CURDIR}
diff --git a/japanese/gp/pkg-comment b/japanese/gp/pkg-comment
deleted file mode 100644
index 19efa7186a29..000000000000
--- a/japanese/gp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GUI Printer manager written with Tcl/Tk
diff --git a/japanese/jtex209-ascii/Makefile b/japanese/jtex209-ascii/Makefile
index b4a6440c9a6e..b0eed6be9925 100644
--- a/japanese/jtex209-ascii/Makefile
+++ b/japanese/jtex209-ascii/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	ASCII Japanese pTeX based on LaTeX-209
+
 BATCH_TEX=	ASCII
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of jtex-*
diff --git a/japanese/jtex209-ascii/pkg-comment b/japanese/jtex209-ascii/pkg-comment
deleted file mode 100644
index 5bda25b7e790..000000000000
--- a/japanese/jtex209-ascii/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ASCII Japanese pTeX based on LaTeX-209
diff --git a/japanese/jtex209-both/Makefile b/japanese/jtex209-both/Makefile
index f3b4cec82f7b..fed04aa750f4 100644
--- a/japanese/jtex209-both/Makefile
+++ b/japanese/jtex209-both/Makefile
@@ -18,6 +18,7 @@ DISTFILES=	jtex-${NTT_VERSION}.tar.gz \
 		pTeX-JIS-patch
 
 MAINTAINER=	mita@jp.FreeBSD.org
+COMMENT?=	Japanese TeX based on LaTeX-209 with both NTT and ASCII
 
 ASCII_VERSION=	1.7
 NTT_VERSION=	1.52
diff --git a/japanese/jtex209-both/pkg-comment b/japanese/jtex209-both/pkg-comment
deleted file mode 100644
index 62cf817a6826..000000000000
--- a/japanese/jtex209-both/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese TeX based on LaTeX-209 with both NTT and ASCII
diff --git a/japanese/jtex209-ntt/Makefile b/japanese/jtex209-ntt/Makefile
index a6569a38ce76..7a91f86788b5 100644
--- a/japanese/jtex209-ntt/Makefile
+++ b/japanese/jtex209-ntt/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	NTT Japanese TeX based on LaTeX-209
+
 BATCH_TEX=	NTT
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of jtex-*
diff --git a/japanese/jtex209-ntt/pkg-comment b/japanese/jtex209-ntt/pkg-comment
deleted file mode 100644
index fff18e6d8f16..000000000000
--- a/japanese/jtex209-ntt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-NTT Japanese TeX based on LaTeX-209
diff --git a/japanese/jvim-canna+freewnn/Makefile b/japanese/jvim-canna+freewnn/Makefile
index a4d4a5dab751..bdf2aceb5ef4 100644
--- a/japanese/jvim-canna+freewnn/Makefile
+++ b/japanese/jvim-canna+freewnn/Makefile
@@ -6,6 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-canna+freewnn
+COMMENT=	Japanized Vim (with Canna and FreeWnn)
 CANNA=		yes
 FREEWNN=	yes
 
diff --git a/japanese/jvim-canna+freewnn/pkg-comment b/japanese/jvim-canna+freewnn/pkg-comment
deleted file mode 100644
index e2d682ea5158..000000000000
--- a/japanese/jvim-canna+freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim (with Canna and FreeWnn)
diff --git a/japanese/jvim-canna+wnn6/Makefile b/japanese/jvim-canna+wnn6/Makefile
index 310b3a8cb447..79f1bbc905eb 100644
--- a/japanese/jvim-canna+wnn6/Makefile
+++ b/japanese/jvim-canna+wnn6/Makefile
@@ -6,6 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-canna+wnn6
+COMMENT=	Japanized Vim (with Canna and Wnn6)
 CANNA=		yes
 WNN6=		yes
 
diff --git a/japanese/jvim-canna+wnn6/pkg-comment b/japanese/jvim-canna+wnn6/pkg-comment
deleted file mode 100644
index 20d54285eebf..000000000000
--- a/japanese/jvim-canna+wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim (with Canna and Wnn6)
diff --git a/japanese/jvim-canna+wnn7/Makefile b/japanese/jvim-canna+wnn7/Makefile
index 40709391fad5..23b161ca34bd 100644
--- a/japanese/jvim-canna+wnn7/Makefile
+++ b/japanese/jvim-canna+wnn7/Makefile
@@ -5,6 +5,7 @@
 # $FreeBSD$
 #
 
+COMMENT=	Japanized Vim (with Canna and Wnn7)
 CANNA=		yes
 WNN7=		yes
 
diff --git a/japanese/jvim-canna+wnn7/pkg-comment b/japanese/jvim-canna+wnn7/pkg-comment
deleted file mode 100644
index d20c1a40ccc4..000000000000
--- a/japanese/jvim-canna+wnn7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim (with Canna and Wnn7)
diff --git a/japanese/jvim-canna/Makefile b/japanese/jvim-canna/Makefile
index c14537105db1..d349b59e9cc6 100644
--- a/japanese/jvim-canna/Makefile
+++ b/japanese/jvim-canna/Makefile
@@ -6,6 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-canna
+COMMENT=	Japanized Vim (with Canna)
 CANNA=		yes
 
 MASTERDIR=	${.CURDIR}/../jvim
diff --git a/japanese/jvim-canna/pkg-comment b/japanese/jvim-canna/pkg-comment
deleted file mode 100644
index d4fbea21a5fa..000000000000
--- a/japanese/jvim-canna/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim (with Canna)
diff --git a/japanese/jvim-freewnn/Makefile b/japanese/jvim-freewnn/Makefile
index 5b6def445750..cee4adb18af0 100644
--- a/japanese/jvim-freewnn/Makefile
+++ b/japanese/jvim-freewnn/Makefile
@@ -6,6 +6,8 @@
 #
 
 PKGNAMESUFFIX=	-freewnn
+COMMENT=	Japanized Vim (with FreeWnn)
+
 FREEWNN=	yes
 
 MASTERDIR=	${.CURDIR}/../jvim
diff --git a/japanese/jvim-freewnn/pkg-comment b/japanese/jvim-freewnn/pkg-comment
deleted file mode 100644
index 44cfb44bbbee..000000000000
--- a/japanese/jvim-freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim (with FreeWnn)
diff --git a/japanese/jvim-wnn6/Makefile b/japanese/jvim-wnn6/Makefile
index c351b2e8d27b..665fc277970e 100644
--- a/japanese/jvim-wnn6/Makefile
+++ b/japanese/jvim-wnn6/Makefile
@@ -6,6 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-wnn6
+COMMENT=	Japanized Vim (with Wnn6)
 WNN6=		yes
 
 MASTERDIR=	${.CURDIR}/../jvim
diff --git a/japanese/jvim-wnn6/pkg-comment b/japanese/jvim-wnn6/pkg-comment
deleted file mode 100644
index 3a3fb7a6fff5..000000000000
--- a/japanese/jvim-wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim (with Wnn6)
diff --git a/japanese/jvim-wnn7/Makefile b/japanese/jvim-wnn7/Makefile
index 775335f2ceda..31d4392b99e0 100644
--- a/japanese/jvim-wnn7/Makefile
+++ b/japanese/jvim-wnn7/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Japanized Vim (with Wnn7)
+
 WNN7=		yes
 
 MASTERDIR=	${.CURDIR}/../jvim
diff --git a/japanese/jvim-wnn7/pkg-comment b/japanese/jvim-wnn7/pkg-comment
deleted file mode 100644
index fcd8e0c646f1..000000000000
--- a/japanese/jvim-wnn7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim (with Wnn7)
diff --git a/japanese/jvim/Makefile b/japanese/jvim/Makefile
index 485239551a28..591932f13bea 100644
--- a/japanese/jvim/Makefile
+++ b/japanese/jvim/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Japan/onew/ \
 DISTNAME=	${PORTNAME}${PORTVERSION}+onew2.2.10
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT?=	Japanized Vim
 
 PATCHDIR=	${.CURDIR}/../jvim/files
 FILESDIR=	${.CURDIR}/../jvim/files
diff --git a/japanese/jvim/pkg-comment b/japanese/jvim/pkg-comment
deleted file mode 100644
index 819b1f5084a2..000000000000
--- a/japanese/jvim/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim
diff --git a/japanese/jvim3-canna+freewnn/Makefile b/japanese/jvim3-canna+freewnn/Makefile
index 639aeb32c223..6f51344f5ca8 100644
--- a/japanese/jvim3-canna+freewnn/Makefile
+++ b/japanese/jvim3-canna+freewnn/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Japanized Vim-3.0 (with Canna and FreeWnn)
+
 CANNA=		yes
 FREEWNN=	yes
 
diff --git a/japanese/jvim3-canna+freewnn/pkg-comment b/japanese/jvim3-canna+freewnn/pkg-comment
deleted file mode 100644
index a1d14811911d..000000000000
--- a/japanese/jvim3-canna+freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim-3.0 (with Canna and FreeWnn)
diff --git a/japanese/jvim3-canna+wnn6/Makefile b/japanese/jvim3-canna+wnn6/Makefile
index 3088260ab82f..2b683e523b41 100644
--- a/japanese/jvim3-canna+wnn6/Makefile
+++ b/japanese/jvim3-canna+wnn6/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Japanized Vim-3.0 (with Canna and Wnn6)
+
 CANNA=		yes
 WNN6=		yes
 
diff --git a/japanese/jvim3-canna+wnn6/pkg-comment b/japanese/jvim3-canna+wnn6/pkg-comment
deleted file mode 100644
index 1f63536f57dd..000000000000
--- a/japanese/jvim3-canna+wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim-3.0 (with Canna and Wnn6)
diff --git a/japanese/jvim3-canna+wnn7/Makefile b/japanese/jvim3-canna+wnn7/Makefile
index c78cf80a6a26..3796391cc715 100644
--- a/japanese/jvim3-canna+wnn7/Makefile
+++ b/japanese/jvim3-canna+wnn7/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Japanized Vim-3.0 (with Canna and Wnn7)
+
 CANNA=		yes
 WNN7=		yes
 
diff --git a/japanese/jvim3-canna+wnn7/pkg-comment b/japanese/jvim3-canna+wnn7/pkg-comment
deleted file mode 100644
index f3028b3196c5..000000000000
--- a/japanese/jvim3-canna+wnn7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim-3.0 (with Canna and Wnn7)
diff --git a/japanese/jvim3-canna/Makefile b/japanese/jvim3-canna/Makefile
index 84678da9f79c..97204bfe049a 100644
--- a/japanese/jvim3-canna/Makefile
+++ b/japanese/jvim3-canna/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Japanized Vim-3.0 (with Canna)
+
 CANNA=		yes
 
 MASTERDIR=	${.CURDIR}/../jvim3
diff --git a/japanese/jvim3-canna/pkg-comment b/japanese/jvim3-canna/pkg-comment
deleted file mode 100644
index 2c576bd18bbf..000000000000
--- a/japanese/jvim3-canna/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim-3.0 (with Canna)
diff --git a/japanese/jvim3-direct_canna/Makefile b/japanese/jvim3-direct_canna/Makefile
index 4dc35cf67046..c77d43b55fcb 100644
--- a/japanese/jvim3-direct_canna/Makefile
+++ b/japanese/jvim3-direct_canna/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Japanized Vim-3.0 (direct connection to Canna)
+
 DIRECT_CANNA=	yes
 
 MASTERDIR=	${.CURDIR}/../jvim3
diff --git a/japanese/jvim3-direct_canna/pkg-comment b/japanese/jvim3-direct_canna/pkg-comment
deleted file mode 100644
index e212dcfe02df..000000000000
--- a/japanese/jvim3-direct_canna/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim-3.0 (direct connection to Canna)
diff --git a/japanese/jvim3-freewnn/Makefile b/japanese/jvim3-freewnn/Makefile
index 9d29c12073cc..fcf58169b1d9 100644
--- a/japanese/jvim3-freewnn/Makefile
+++ b/japanese/jvim3-freewnn/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Japanized Vim-3.0 (with FreeWnn)
+
 FREEWNN=	yes
 
 MASTERDIR=	${.CURDIR}/../jvim3
diff --git a/japanese/jvim3-freewnn/pkg-comment b/japanese/jvim3-freewnn/pkg-comment
deleted file mode 100644
index 1c4dc25d14c4..000000000000
--- a/japanese/jvim3-freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim-3.0 (with FreeWnn)
diff --git a/japanese/jvim3-wnn6/Makefile b/japanese/jvim3-wnn6/Makefile
index cbacb366dff3..9361542feee4 100644
--- a/japanese/jvim3-wnn6/Makefile
+++ b/japanese/jvim3-wnn6/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Japanized Vim-3.0 (with Wnn6)
+
 WNN6=		yes
 
 MASTERDIR=	${.CURDIR}/../jvim3
diff --git a/japanese/jvim3-wnn6/pkg-comment b/japanese/jvim3-wnn6/pkg-comment
deleted file mode 100644
index 97595d0815e5..000000000000
--- a/japanese/jvim3-wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim-3.0 (with Wnn6)
diff --git a/japanese/jvim3-wnn7/Makefile b/japanese/jvim3-wnn7/Makefile
index 2363104e8dd2..679c0f429ba8 100644
--- a/japanese/jvim3-wnn7/Makefile
+++ b/japanese/jvim3-wnn7/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Japanized Vim-3.0 (with Wnn7)
+
 WNN7=		yes
 
 MASTERDIR=	${.CURDIR}/../jvim3
diff --git a/japanese/jvim3-wnn7/pkg-comment b/japanese/jvim3-wnn7/pkg-comment
deleted file mode 100644
index 04cc70d1b793..000000000000
--- a/japanese/jvim3-wnn7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim-3.0 (with Wnn7)
diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index 9006146decf2..332c7a2dee73 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -15,6 +15,7 @@ DISTFILES=	vim-3.0.tar.gz \
 		${JPATCH}
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT?=	Japanized Vim-3.0
 
 NO_LATEST_LINK=	YES	# waiting for jgrep, jfold, jcat
 PATCHDIR=	${.CURDIR}/../jvim3/files
diff --git a/japanese/jvim3/pkg-comment b/japanese/jvim3/pkg-comment
deleted file mode 100644
index 5cd3f841e2e0..000000000000
--- a/japanese/jvim3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized Vim-3.0
diff --git a/japanese/kinput2-canna+freewnn+sj3/Makefile b/japanese/kinput2-canna+freewnn+sj3/Makefile
index 478d39e4a97a..c067bc27326e 100644
--- a/japanese/kinput2-canna+freewnn+sj3/Makefile
+++ b/japanese/kinput2-canna+freewnn+sj3/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Input server of Japanese text (Canna+FreeWnn+SJ3)
+
 CANNA=		yes
 SJ3=		yes
 FREEWNN=	yes
diff --git a/japanese/kinput2-canna+freewnn+sj3/pkg-comment b/japanese/kinput2-canna+freewnn+sj3/pkg-comment
deleted file mode 100644
index 167f6cbc0229..000000000000
--- a/japanese/kinput2-canna+freewnn+sj3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (Canna+FreeWnn+SJ3)
diff --git a/japanese/kinput2-canna+freewnn/Makefile b/japanese/kinput2-canna+freewnn/Makefile
index 112596697d74..4da165aea453 100644
--- a/japanese/kinput2-canna+freewnn/Makefile
+++ b/japanese/kinput2-canna+freewnn/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Input server of Japanese text (Canna+FreeWnn)
+
 CANNA=		yes
 FREEWNN=	yes
 
diff --git a/japanese/kinput2-canna+freewnn/pkg-comment b/japanese/kinput2-canna+freewnn/pkg-comment
deleted file mode 100644
index fd3113ee6168..000000000000
--- a/japanese/kinput2-canna+freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (Canna+FreeWnn)
diff --git a/japanese/kinput2-canna+sj3+wnn6/Makefile b/japanese/kinput2-canna+sj3+wnn6/Makefile
index b0cedcde9944..b78948ea98a7 100644
--- a/japanese/kinput2-canna+sj3+wnn6/Makefile
+++ b/japanese/kinput2-canna+sj3+wnn6/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Input server of Japanese text (Canna+SJ3+Wnn6)
+
 CANNA=		yes
 SJ3=		yes
 WNN6=		yes
diff --git a/japanese/kinput2-canna+sj3+wnn6/pkg-comment b/japanese/kinput2-canna+sj3+wnn6/pkg-comment
deleted file mode 100644
index f446320b0e30..000000000000
--- a/japanese/kinput2-canna+sj3+wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (Canna+SJ3+Wnn6)
diff --git a/japanese/kinput2-canna+sj3+wnn7/Makefile b/japanese/kinput2-canna+sj3+wnn7/Makefile
index 3d8be98f5f8b..9bed3653aef6 100644
--- a/japanese/kinput2-canna+sj3+wnn7/Makefile
+++ b/japanese/kinput2-canna+sj3+wnn7/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Input server of Japanese text (Canna+SJ3+Wnn7)
+
 CANNA=		yes
 SJ3=		yes
 WNN7=		yes
diff --git a/japanese/kinput2-canna+sj3+wnn7/pkg-comment b/japanese/kinput2-canna+sj3+wnn7/pkg-comment
deleted file mode 100644
index 3a28ceadca77..000000000000
--- a/japanese/kinput2-canna+sj3+wnn7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (Canna+SJ3+Wnn7)
diff --git a/japanese/kinput2-canna+sj3/Makefile b/japanese/kinput2-canna+sj3/Makefile
index 64b6c2308b00..3c620962f1ec 100644
--- a/japanese/kinput2-canna+sj3/Makefile
+++ b/japanese/kinput2-canna+sj3/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Input server of Japanese text (Canna+SJ3)
+
 CANNA=		yes
 SJ3=		yes
 
diff --git a/japanese/kinput2-canna+sj3/pkg-comment b/japanese/kinput2-canna+sj3/pkg-comment
deleted file mode 100644
index 9e880a5c68a8..000000000000
--- a/japanese/kinput2-canna+sj3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (Canna+SJ3)
diff --git a/japanese/kinput2-canna+wnn6/Makefile b/japanese/kinput2-canna+wnn6/Makefile
index 83fa48e6d38f..8a0f348434af 100644
--- a/japanese/kinput2-canna+wnn6/Makefile
+++ b/japanese/kinput2-canna+wnn6/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Input server of Japanese text (Canna+Wnn6)
+
 CANNA=		yes
 WNN6=		yes
 
diff --git a/japanese/kinput2-canna+wnn6/pkg-comment b/japanese/kinput2-canna+wnn6/pkg-comment
deleted file mode 100644
index 6b24282e24fc..000000000000
--- a/japanese/kinput2-canna+wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (Canna+Wnn6)
diff --git a/japanese/kinput2-canna+wnn7/Makefile b/japanese/kinput2-canna+wnn7/Makefile
index 4ae20ef7b853..e615bfa1b85b 100644
--- a/japanese/kinput2-canna+wnn7/Makefile
+++ b/japanese/kinput2-canna+wnn7/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Input server of Japanese text (Canna+Wnn7)
+
 CANNA=		yes
 WNN7=		yes
 
diff --git a/japanese/kinput2-canna+wnn7/pkg-comment b/japanese/kinput2-canna+wnn7/pkg-comment
deleted file mode 100644
index 9985b86f16d6..000000000000
--- a/japanese/kinput2-canna+wnn7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (Canna+Wnn7)
diff --git a/japanese/kinput2-canna/Makefile b/japanese/kinput2-canna/Makefile
index df1f90f9899d..d390bbad0bb2 100644
--- a/japanese/kinput2-canna/Makefile
+++ b/japanese/kinput2-canna/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Input server of Japanese text (Canna)
+
 CANNA=		yes
 
 MASTERDIR=	${.CURDIR}/../kinput2-freewnn/
diff --git a/japanese/kinput2-canna/pkg-comment b/japanese/kinput2-canna/pkg-comment
deleted file mode 100644
index 42852edaf0da..000000000000
--- a/japanese/kinput2-canna/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (Canna)
diff --git a/japanese/kinput2-freewnn+sj3/Makefile b/japanese/kinput2-freewnn+sj3/Makefile
index fa81460d69dc..f4cced2d2ed3 100644
--- a/japanese/kinput2-freewnn+sj3/Makefile
+++ b/japanese/kinput2-freewnn+sj3/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Input server of Japanese text (FreeWnn+SJ3)
+
 SJ3=		yes
 FREEWNN=	yes
 
diff --git a/japanese/kinput2-freewnn+sj3/pkg-comment b/japanese/kinput2-freewnn+sj3/pkg-comment
deleted file mode 100644
index ccb495ef6430..000000000000
--- a/japanese/kinput2-freewnn+sj3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (FreeWnn+SJ3)
diff --git a/japanese/kinput2-freewnn/Makefile b/japanese/kinput2-freewnn/Makefile
index 134e200f5414..4d6e69987024 100644
--- a/japanese/kinput2-freewnn/Makefile
+++ b/japanese/kinput2-freewnn/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.sra.co.jp/pub/x11/kinput2/
 DISTNAME=	kinput2-v3.1
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT?=	Input server of Japanese text (FreeWnn)
 
 LIB_DEPENDS=	${LIB_INPUT_METHOD}
 BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
diff --git a/japanese/kinput2-freewnn/pkg-comment b/japanese/kinput2-freewnn/pkg-comment
deleted file mode 100644
index d474e4f41085..000000000000
--- a/japanese/kinput2-freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (FreeWnn)
diff --git a/japanese/kinput2-sj3+wnn6/Makefile b/japanese/kinput2-sj3+wnn6/Makefile
index beef5feb502c..4f750a646a21 100644
--- a/japanese/kinput2-sj3+wnn6/Makefile
+++ b/japanese/kinput2-sj3+wnn6/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Input server of Japanese text (SJ3+Wnn6)
+
 SJ3=		yes
 WNN6=		yes
 
diff --git a/japanese/kinput2-sj3+wnn6/pkg-comment b/japanese/kinput2-sj3+wnn6/pkg-comment
deleted file mode 100644
index 8420ac991ae4..000000000000
--- a/japanese/kinput2-sj3+wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (SJ3+Wnn6)
diff --git a/japanese/kinput2-sj3+wnn7/Makefile b/japanese/kinput2-sj3+wnn7/Makefile
index bfc2de08411f..29ab4215616b 100644
--- a/japanese/kinput2-sj3+wnn7/Makefile
+++ b/japanese/kinput2-sj3+wnn7/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Input server of Japanese text (SJ3+Wnn7)
+
 SJ3=		yes
 WNN7=		yes
 
diff --git a/japanese/kinput2-sj3+wnn7/pkg-comment b/japanese/kinput2-sj3+wnn7/pkg-comment
deleted file mode 100644
index 97e3b54f1e60..000000000000
--- a/japanese/kinput2-sj3+wnn7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (SJ3+Wnn7)
diff --git a/japanese/kinput2-sj3/Makefile b/japanese/kinput2-sj3/Makefile
index a995c1d51643..b3da940db5d7 100644
--- a/japanese/kinput2-sj3/Makefile
+++ b/japanese/kinput2-sj3/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Input server of Japanese text (SJ3)
+
 SJ3=		yes
 
 MASTERDIR=	${.CURDIR}/../kinput2-freewnn/
diff --git a/japanese/kinput2-sj3/pkg-comment b/japanese/kinput2-sj3/pkg-comment
deleted file mode 100644
index 3c8fcb659144..000000000000
--- a/japanese/kinput2-sj3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (SJ3)
diff --git a/japanese/kinput2-wnn6/Makefile b/japanese/kinput2-wnn6/Makefile
index e6c8263d21b7..3e69d339e99a 100644
--- a/japanese/kinput2-wnn6/Makefile
+++ b/japanese/kinput2-wnn6/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Input server of Japanese text (Wnn6)
+
 WNN6=		yes
 
 MASTERDIR=	${.CURDIR}/../kinput2-freewnn/
diff --git a/japanese/kinput2-wnn6/pkg-comment b/japanese/kinput2-wnn6/pkg-comment
deleted file mode 100644
index ab81784de0e9..000000000000
--- a/japanese/kinput2-wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (Wnn6)
diff --git a/japanese/kinput2-wnn7/Makefile b/japanese/kinput2-wnn7/Makefile
index 21ffa2ce41b9..1bd39bc180e2 100644
--- a/japanese/kinput2-wnn7/Makefile
+++ b/japanese/kinput2-wnn7/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	Input server of Japanese text (Wnn7)
+
 WNN7=		yes
 
 MASTERDIR=	${.CURDIR}/../kinput2-freewnn/
diff --git a/japanese/kinput2-wnn7/pkg-comment b/japanese/kinput2-wnn7/pkg-comment
deleted file mode 100644
index 4cca6e820991..000000000000
--- a/japanese/kinput2-wnn7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (Wnn7)
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
index 134e200f5414..4d6e69987024 100644
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.sra.co.jp/pub/x11/kinput2/
 DISTNAME=	kinput2-v3.1
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT?=	Input server of Japanese text (FreeWnn)
 
 LIB_DEPENDS=	${LIB_INPUT_METHOD}
 BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
diff --git a/japanese/kinput2/pkg-comment b/japanese/kinput2/pkg-comment
deleted file mode 100644
index d474e4f41085..000000000000
--- a/japanese/kinput2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Input server of Japanese text (FreeWnn)
diff --git a/japanese/lookup-emacs20/pkg-comment b/japanese/lookup-emacs20/pkg-comment
deleted file mode 100644
index 5fa24b97ec4c..000000000000
--- a/japanese/lookup-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Search interface on Emacsen from CD-ROM books, etc
diff --git a/japanese/lookup-emacs21/Makefile b/japanese/lookup-emacs21/Makefile
index d85097f14888..48fbe8359034 100644
--- a/japanese/lookup-emacs21/Makefile
+++ b/japanese/lookup-emacs21/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	japanese elisp
 MASTER_SITES=	http://download.sourceforge.net/lookup/
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	Search interface on ${EMACS_PORT_NAME} for CD-ROM books, etc
 
 RUN_DEPENDS+=	eblook:${PORTSDIR}/japanese/eblook
 
diff --git a/japanese/lookup-emacs21/pkg-comment b/japanese/lookup-emacs21/pkg-comment
deleted file mode 100644
index b0a0310534c4..000000000000
--- a/japanese/lookup-emacs21/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Search interface on Emacsen for CD-ROM books, etc
diff --git a/japanese/lookup-mule/pkg-comment b/japanese/lookup-mule/pkg-comment
deleted file mode 100644
index b0a0310534c4..000000000000
--- a/japanese/lookup-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Search interface on Emacsen for CD-ROM books, etc
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index d85097f14888..48fbe8359034 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	japanese elisp
 MASTER_SITES=	http://download.sourceforge.net/lookup/
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	Search interface on ${EMACS_PORT_NAME} for CD-ROM books, etc
 
 RUN_DEPENDS+=	eblook:${PORTSDIR}/japanese/eblook
 
diff --git a/japanese/lookup/pkg-comment b/japanese/lookup/pkg-comment
deleted file mode 100644
index b0a0310534c4..000000000000
--- a/japanese/lookup/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Search interface on Emacsen for CD-ROM books, etc
diff --git a/japanese/mule-canna+freewnn+sj3/Makefile b/japanese/mule-canna+freewnn+sj3/Makefile
index 100ee184a5f8..0eff7037bd5a 100644
--- a/japanese/mule-canna+freewnn+sj3/Makefile
+++ b/japanese/mule-canna+freewnn+sj3/Makefile
@@ -7,6 +7,7 @@
 
 PKGNAMESUFFIX=	-canna+freewnn+sj3
 CATEGORIES=	japanese
+COMMENT=	Multilingual emacs, with Canna, sj3, and FreeWnn support built-in
 
 CANNA=		yes
 SJ3=		yes
diff --git a/japanese/mule-canna+freewnn+sj3/pkg-comment b/japanese/mule-canna+freewnn+sj3/pkg-comment
deleted file mode 100644
index 0b34f88db935..000000000000
--- a/japanese/mule-canna+freewnn+sj3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multilingual emacs, with Canna, sj3, and FreeWnn support built-in
diff --git a/japanese/mule-canna+freewnn/Makefile b/japanese/mule-canna+freewnn/Makefile
index d371cf24ceb9..99108d8c05b8 100644
--- a/japanese/mule-canna+freewnn/Makefile
+++ b/japanese/mule-canna+freewnn/Makefile
@@ -7,6 +7,7 @@
 
 PKGNAMESUFFIX=	-canna+freewnn
 CATEGORIES=	japanese
+COMMENT=	Multilingual emacs, with Canna and FreeWnn support built-in
 
 CANNA=		yes
 FREEWNN=	yes
diff --git a/japanese/mule-canna+freewnn/pkg-comment b/japanese/mule-canna+freewnn/pkg-comment
deleted file mode 100644
index d83b57115a91..000000000000
--- a/japanese/mule-canna+freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multilingual emacs, with Canna and FreeWnn support built-in
diff --git a/japanese/mule-canna+sj3+wnn6/Makefile b/japanese/mule-canna+sj3+wnn6/Makefile
index 8620e654f287..b2f2e8de85d8 100644
--- a/japanese/mule-canna+sj3+wnn6/Makefile
+++ b/japanese/mule-canna+sj3+wnn6/Makefile
@@ -7,6 +7,7 @@
 
 PKGNAMESUFFIX=	-canna+sj3+wnn6
 CATEGORIES=	japanese
+COMMENT=	Multilingual emacs, with Canna, sj3, Wnn4, and Wnn6 support built-in
 
 CANNA=		yes
 SJ3=		yes
diff --git a/japanese/mule-canna+sj3+wnn6/pkg-comment b/japanese/mule-canna+sj3+wnn6/pkg-comment
deleted file mode 100644
index 66813a9c7338..000000000000
--- a/japanese/mule-canna+sj3+wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multilingual emacs, with Canna, sj3, Wnn4, and Wnn6 support built-in
diff --git a/japanese/mule-canna+sj3+wnn7/Makefile b/japanese/mule-canna+sj3+wnn7/Makefile
index 2dffa040cbfe..f0951eb42ca1 100644
--- a/japanese/mule-canna+sj3+wnn7/Makefile
+++ b/japanese/mule-canna+sj3+wnn7/Makefile
@@ -6,6 +6,8 @@
 #
 
 CATEGORIES=	japanese
+COMMENT=	A multilingual emacs, with Canna, sj3, FreeWnn, Wnn6 and Wnn7 support built-in
+
 CANNA=		yes
 SJ3=		yes
 WNN7=		yes
diff --git a/japanese/mule-canna+sj3+wnn7/pkg-comment b/japanese/mule-canna+sj3+wnn7/pkg-comment
deleted file mode 100644
index e31cc4f9b3e4..000000000000
--- a/japanese/mule-canna+sj3+wnn7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multilingual emacs, with Canna, sj3, FreeWnn, Wnn6 and Wnn7 support built-in
diff --git a/japanese/mule-canna+sj3/Makefile b/japanese/mule-canna+sj3/Makefile
index 0a21dae9ce4a..1b7fcc742bc1 100644
--- a/japanese/mule-canna+sj3/Makefile
+++ b/japanese/mule-canna+sj3/Makefile
@@ -7,6 +7,7 @@
 
 PKGNAMESUFFIX=	-canna+sj3
 CATEGORIES=	japanese
+COMMENT=	A multilingual emacs, with Canna and sj3 support built in (Only the executables)
 
 CANNA=		yes
 SJ3=		yes
diff --git a/japanese/mule-canna+sj3/pkg-comment b/japanese/mule-canna+sj3/pkg-comment
deleted file mode 100644
index 83b5ba8440ad..000000000000
--- a/japanese/mule-canna+sj3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multilingual emacs, with Canna and sj3 support built in (Only the executables)
diff --git a/japanese/mule-canna+wnn6/Makefile b/japanese/mule-canna+wnn6/Makefile
index 225171354406..214fc77bbfa9 100644
--- a/japanese/mule-canna+wnn6/Makefile
+++ b/japanese/mule-canna+wnn6/Makefile
@@ -7,6 +7,7 @@
 
 PKGNAMESUFFIX=	-canna+wnn6
 CATEGORIES=	japanese
+COMMENT=	Multilingual emacs, with Canna, Wnn4, and Wnn6 support built-in
 
 CANNA=		yes
 WNN6=		yes
diff --git a/japanese/mule-canna+wnn6/pkg-comment b/japanese/mule-canna+wnn6/pkg-comment
deleted file mode 100644
index e67e75949ddd..000000000000
--- a/japanese/mule-canna+wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multilingual emacs, with Canna, Wnn4, and Wnn6 support built-in
diff --git a/japanese/mule-canna+wnn7/Makefile b/japanese/mule-canna+wnn7/Makefile
index cd00f7474e7b..85507adf043d 100644
--- a/japanese/mule-canna+wnn7/Makefile
+++ b/japanese/mule-canna+wnn7/Makefile
@@ -6,6 +6,8 @@
 #
 
 CATEGORIES=	japanese
+COMMENT=	A multilingual emacs, with Canna, FreeWnn, Wnn6 and Wnn7 support built-in
+
 CANNA=		yes
 WNN7=		yes
 
diff --git a/japanese/mule-canna+wnn7/pkg-comment b/japanese/mule-canna+wnn7/pkg-comment
deleted file mode 100644
index b334c0e570c8..000000000000
--- a/japanese/mule-canna+wnn7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multilingual emacs, with Canna, FreeWnn, Wnn6 and Wnn7 support built-in
diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile
index bb2bd1a26b43..aeb3fd4433ca 100644
--- a/japanese/mule-canna/Makefile
+++ b/japanese/mule-canna/Makefile
@@ -7,6 +7,7 @@
 
 PKGNAMESUFFIX=	-canna
 CATEGORIES=	japanese
+COMMENT=	A multilingual emacs, with Canna support built in (Only the executables)
 
 CANNA=		yes
 
diff --git a/japanese/mule-canna/pkg-comment b/japanese/mule-canna/pkg-comment
deleted file mode 100644
index 875179e100a7..000000000000
--- a/japanese/mule-canna/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multilingual emacs, with Canna support built in (Only the executables)
diff --git a/japanese/mule-freewnn+sj3/Makefile b/japanese/mule-freewnn+sj3/Makefile
index 3f5a75f0bf72..4879ac99692d 100644
--- a/japanese/mule-freewnn+sj3/Makefile
+++ b/japanese/mule-freewnn+sj3/Makefile
@@ -7,6 +7,7 @@
 
 PKGNAMESUFFIX=	-freewnn+sj3
 CATEGORIES=	japanese
+COMMENT=	A multilingual emacs, with sj3 and FreeWnn support built in (Only the executables)
 
 SJ3=		yes
 FREEWNN=	yes
diff --git a/japanese/mule-freewnn+sj3/pkg-comment b/japanese/mule-freewnn+sj3/pkg-comment
deleted file mode 100644
index aa1b76663303..000000000000
--- a/japanese/mule-freewnn+sj3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multilingual emacs, with sj3 and FreeWnn support built in (Only the executables)
diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile
index 1b84f2697442..7624e4edbdb6 100644
--- a/japanese/mule-freewnn/Makefile
+++ b/japanese/mule-freewnn/Makefile
@@ -7,6 +7,7 @@
 
 PKGNAMESUFFIX=	-freewnn
 CATEGORIES=	japanese
+COMMENT=	A multilingual emacs, with FreeWnn support built in (Only the executables)
 
 FREEWNN=	yes
 
diff --git a/japanese/mule-freewnn/pkg-comment b/japanese/mule-freewnn/pkg-comment
deleted file mode 100644
index db3f36c3b7c7..000000000000
--- a/japanese/mule-freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multilingual emacs, with FreeWnn support built in (Only the executables)
diff --git a/japanese/mule-sj3+wnn6/Makefile b/japanese/mule-sj3+wnn6/Makefile
index 95fa0a2d81c3..a5877476a27f 100644
--- a/japanese/mule-sj3+wnn6/Makefile
+++ b/japanese/mule-sj3+wnn6/Makefile
@@ -7,6 +7,7 @@
 
 PKGNAMESUFFIX=	-sj3+wnn6
 CATEGORIES=	japanese
+COMMENT=	Multilingual emacs, with sj3, Wnn4, and Wnn6 support built-in
 
 SJ3=		yes
 WNN6=		yes
diff --git a/japanese/mule-sj3+wnn6/pkg-comment b/japanese/mule-sj3+wnn6/pkg-comment
deleted file mode 100644
index 1fe39129b64a..000000000000
--- a/japanese/mule-sj3+wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multilingual emacs, with sj3, Wnn4, and Wnn6 support built-in
diff --git a/japanese/mule-sj3+wnn7/Makefile b/japanese/mule-sj3+wnn7/Makefile
index b8795d9b3bd0..de05c05ab0fc 100644
--- a/japanese/mule-sj3+wnn7/Makefile
+++ b/japanese/mule-sj3+wnn7/Makefile
@@ -6,6 +6,8 @@
 #
 
 CATEGORIES=	japanese
+COMMENT=	A multilingual emacs, with sj3, FreeWnn, Wnn6 and Wnn7 support built-in
+
 SJ3=		yes
 WNN7=		yes
 
diff --git a/japanese/mule-sj3+wnn7/pkg-comment b/japanese/mule-sj3+wnn7/pkg-comment
deleted file mode 100644
index 5929be414783..000000000000
--- a/japanese/mule-sj3+wnn7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multilingual emacs, with sj3, FreeWnn, Wnn6 and Wnn7 support built-in
diff --git a/japanese/mule-sj3/Makefile b/japanese/mule-sj3/Makefile
index 04988366f0e1..0280e0e7a522 100644
--- a/japanese/mule-sj3/Makefile
+++ b/japanese/mule-sj3/Makefile
@@ -7,6 +7,7 @@
 
 PKGNAMESUFFIX=	-sj3
 CATEGORIES=	japanese
+COMMENT=	A multilingual emacs, with SJ3 support built in (Only the executables)
 
 SJ3=		yes
 
diff --git a/japanese/mule-sj3/pkg-comment b/japanese/mule-sj3/pkg-comment
deleted file mode 100644
index 520999bdee22..000000000000
--- a/japanese/mule-sj3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multilingual emacs, with SJ3 support built in (Only the executables)
diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile
index 98c1d7c63b16..069b389c83a3 100644
--- a/japanese/mule-wnn6/Makefile
+++ b/japanese/mule-wnn6/Makefile
@@ -7,6 +7,7 @@
 
 PKGNAMESUFFIX=	-wnn6
 CATEGORIES=	japanese
+COMMENT=	Multilingual emacs, with Wnn4, and Wnn6 support built-in
 
 WNN6=		yes
 
diff --git a/japanese/mule-wnn6/pkg-comment b/japanese/mule-wnn6/pkg-comment
deleted file mode 100644
index 8bc93df1ae5d..000000000000
--- a/japanese/mule-wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multilingual emacs, with Wnn4, and Wnn6 support built-in
diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile
index eb526b4b986c..6dd569afa81e 100644
--- a/japanese/mule-wnn7/Makefile
+++ b/japanese/mule-wnn7/Makefile
@@ -6,6 +6,8 @@
 #
 
 CATEGORIES=	japanese
+COMMENT=	A multilingual emacs, with FreeWnn, Wnn6 and Wnn7 support built-in
+
 WNN7=		yes
 
 MASTERDIR=	${.CURDIR}/../../editors/mule
diff --git a/japanese/mule-wnn7/pkg-comment b/japanese/mule-wnn7/pkg-comment
deleted file mode 100644
index 5e9c8ba76c95..000000000000
--- a/japanese/mule-wnn7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multilingual emacs, with FreeWnn, Wnn6 and Wnn7 support built-in
diff --git a/japanese/onew-canna+freewnn/Makefile b/japanese/onew-canna+freewnn/Makefile
index 15322c59ca46..f37630c894f6 100644
--- a/japanese/onew-canna+freewnn/Makefile
+++ b/japanese/onew-canna+freewnn/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	A library for Japanese Input Method Canna and FreeWnn
+
 CANNA=		yes
 FREEWNN=	yes
 
diff --git a/japanese/onew-canna+freewnn/pkg-comment b/japanese/onew-canna+freewnn/pkg-comment
deleted file mode 100644
index 9b3e49bad8e7..000000000000
--- a/japanese/onew-canna+freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for Japanese Input Method Canna and FreeWnn
diff --git a/japanese/onew-canna+wnn6/Makefile b/japanese/onew-canna+wnn6/Makefile
index a27515142150..e9ad95f7e171 100644
--- a/japanese/onew-canna+wnn6/Makefile
+++ b/japanese/onew-canna+wnn6/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	A library for Japanese Input Method Canna and Wnn6
+
 CANNA=		yes
 WNN6=		yes
 
diff --git a/japanese/onew-canna+wnn6/pkg-comment b/japanese/onew-canna+wnn6/pkg-comment
deleted file mode 100644
index dd8191cadb81..000000000000
--- a/japanese/onew-canna+wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for Japanese Input Method Canna and Wnn6
diff --git a/japanese/onew-canna+wnn7/Makefile b/japanese/onew-canna+wnn7/Makefile
index d26338253485..36556b805b87 100644
--- a/japanese/onew-canna+wnn7/Makefile
+++ b/japanese/onew-canna+wnn7/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	A library for Japanese Input Methods: Canna and Wnn7
+
 CANNA=		yes
 WNN7=		yes
 
diff --git a/japanese/onew-canna+wnn7/pkg-comment b/japanese/onew-canna+wnn7/pkg-comment
deleted file mode 100644
index 6794bcee48f0..000000000000
--- a/japanese/onew-canna+wnn7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for Japanese Input Methods: Canna and Wnn7
diff --git a/japanese/onew-canna/Makefile b/japanese/onew-canna/Makefile
index 1562a4cfa624..d53fecfaba32 100644
--- a/japanese/onew-canna/Makefile
+++ b/japanese/onew-canna/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	A library for Japanese Input Method Canna
+
 CANNA=		yes
 
 MASTERDIR=	${.CURDIR}/../onew-freewnn
diff --git a/japanese/onew-canna/pkg-comment b/japanese/onew-canna/pkg-comment
deleted file mode 100644
index af22963f1ae1..000000000000
--- a/japanese/onew-canna/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for Japanese Input Method Canna
diff --git a/japanese/onew-freewnn/Makefile b/japanese/onew-freewnn/Makefile
index fcc325bdd199..6ded48126f23 100644
--- a/japanese/onew-freewnn/Makefile
+++ b/japanese/onew-freewnn/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Japan/onew/ \
 DISTNAME=	jvim2.0r+${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT?=	A library for a Japanese Input Method: FreeWnn
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 # A value 'all' must not be set to TARGET.
diff --git a/japanese/onew-freewnn/pkg-comment b/japanese/onew-freewnn/pkg-comment
deleted file mode 100644
index eaa92c5431fb..000000000000
--- a/japanese/onew-freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for a Japanese Input Method: FreeWnn
diff --git a/japanese/onew-wnn6/Makefile b/japanese/onew-wnn6/Makefile
index 1e07108d66c8..cd3bcbcee47e 100644
--- a/japanese/onew-wnn6/Makefile
+++ b/japanese/onew-wnn6/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	A library for Japanese Input Method Wnn6
+
 WNN6=		yes
 
 MASTERDIR=	${.CURDIR}/../onew-freewnn
diff --git a/japanese/onew-wnn6/pkg-comment b/japanese/onew-wnn6/pkg-comment
deleted file mode 100644
index 5c1fc137335e..000000000000
--- a/japanese/onew-wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for Japanese Input Method Wnn6
diff --git a/japanese/onew-wnn7/Makefile b/japanese/onew-wnn7/Makefile
index 450238f285c9..a98fea179a12 100644
--- a/japanese/onew-wnn7/Makefile
+++ b/japanese/onew-wnn7/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=	A library for a Japanese Input Method: Wnn7
+
 WNN7=		yes
 
 MASTERDIR=	${.CURDIR}/../onew-freewnn
diff --git a/japanese/onew-wnn7/pkg-comment b/japanese/onew-wnn7/pkg-comment
deleted file mode 100644
index dfa95ccd5bc0..000000000000
--- a/japanese/onew-wnn7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for a Japanese Input Method: Wnn7
diff --git a/japanese/onew/Makefile b/japanese/onew/Makefile
index fcc325bdd199..6ded48126f23 100644
--- a/japanese/onew/Makefile
+++ b/japanese/onew/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Japan/onew/ \
 DISTNAME=	jvim2.0r+${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT?=	A library for a Japanese Input Method: FreeWnn
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 # A value 'all' must not be set to TARGET.
diff --git a/japanese/onew/pkg-comment b/japanese/onew/pkg-comment
deleted file mode 100644
index eaa92c5431fb..000000000000
--- a/japanese/onew/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for a Japanese Input Method: FreeWnn
diff --git a/japanese/tgif2tex/Makefile b/japanese/tgif2tex/Makefile
index bcdc12831148..185fbdcc32ed 100644
--- a/japanese/tgif2tex/Makefile
+++ b/japanese/tgif2tex/Makefile
@@ -6,6 +6,7 @@
 #
 
 CATEGORIES=	japanese
+COMMENT=	Converting texts in figure by tgif to LaTeX commands (for Japanese)
 
 RUN_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 
diff --git a/japanese/tgif2tex/pkg-comment b/japanese/tgif2tex/pkg-comment
deleted file mode 100644
index aa703f62acc5..000000000000
--- a/japanese/tgif2tex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converting texts in figure by tgif to LaTeX commands (for Japanese)
diff --git a/japanese/w3/Makefile b/japanese/w3/Makefile
index b1f6e18a605a..39e47f5eb449 100644
--- a/japanese/w3/Makefile
+++ b/japanese/w3/Makefile
@@ -5,6 +5,7 @@
 # $FreeBSD$
 #
 
+COMMENT=	WWW browser based on emacs/mule
 CATEGORIES=	japanese
 
 # Don't RUN_DEPENDS on mule because we don't know which version the
diff --git a/japanese/w3/pkg-comment b/japanese/w3/pkg-comment
deleted file mode 100644
index f40be1afb337..000000000000
--- a/japanese/w3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WWW browser based on emacs/mule
diff --git a/japanese/xv/Makefile b/japanese/xv/Makefile
index d861ee659d55..5ea5e786761f 100644
--- a/japanese/xv/Makefile
+++ b/japanese/xv/Makefile
@@ -8,6 +8,7 @@
 CATEGORIES=	japanese
 
 MAINTAINER=	shige@FreeBSD.org
+COMMENT=	An X11 program that displays images of various formats with japanization
 
 MASTERDIR=	${.CURDIR}/../../graphics/xv
 PKGDIR=		${.CURDIR}
diff --git a/japanese/xv/pkg-comment b/japanese/xv/pkg-comment
deleted file mode 100644
index ee0ad9fe1a6d..000000000000
--- a/japanese/xv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 program that displays images of various formats with japanization