summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--devel/qt-designer/Makefile1
-rw-r--r--devel/qt-designer/pkg-comment1
-rw-r--r--editors/custom-emacs/Makefile1
-rw-r--r--editors/custom-emacs/pkg-comment1
-rw-r--r--editors/custom-mule/Makefile1
-rw-r--r--editors/custom-mule/pkg-comment1
-rw-r--r--editors/mule/Makefile1
-rw-r--r--editors/mule/pkg-comment1
-rw-r--r--editors/ooodict-bg_BG/Makefile1
-rw-r--r--editors/ooodict-bg_BG/pkg-comment1
-rw-r--r--editors/ooodict-ca_ES/Makefile1
-rw-r--r--editors/ooodict-ca_ES/pkg-comment1
-rw-r--r--editors/ooodict-cs_CZ/Makefile1
-rw-r--r--editors/ooodict-cs_CZ/pkg-comment1
-rw-r--r--editors/ooodict-da_DK/Makefile1
-rw-r--r--editors/ooodict-da_DK/pkg-comment1
-rw-r--r--editors/ooodict-el_GR/Makefile1
-rw-r--r--editors/ooodict-el_GR/pkg-comment1
-rw-r--r--editors/ooodict-en_CA/Makefile1
-rw-r--r--editors/ooodict-en_CA/pkg-comment1
-rw-r--r--editors/ooodict-en_GB/Makefile1
-rw-r--r--editors/ooodict-en_GB/pkg-comment1
-rw-r--r--editors/ooodict-en_US/Makefile1
-rw-r--r--editors/ooodict-en_US/pkg-comment1
-rw-r--r--editors/ooodict-es_ES/Makefile1
-rw-r--r--editors/ooodict-es_ES/pkg-comment1
-rw-r--r--editors/ooodict-hr_HR/Makefile1
-rw-r--r--editors/ooodict-hr_HR/pkg-comment1
-rw-r--r--editors/ooodict-hu_HU/Makefile1
-rw-r--r--editors/ooodict-hu_HU/pkg-comment1
-rw-r--r--editors/ooodict-it_IT/Makefile1
-rw-r--r--editors/ooodict-it_IT/pkg-comment1
-rw-r--r--editors/ooodict-nl_NL/Makefile1
-rw-r--r--editors/ooodict-nl_NL/pkg-comment1
-rw-r--r--editors/ooodict-pl_PL/Makefile1
-rw-r--r--editors/ooodict-pl_PL/pkg-comment1
-rw-r--r--editors/ooodict-sk_SK/Makefile1
-rw-r--r--editors/ooodict-sk_SK/pkg-comment1
-rw-r--r--editors/ooodict-sv_SE/Makefile1
-rw-r--r--editors/ooodict-sv_SE/pkg-comment1
-rw-r--r--editors/openoffice-1.0/Makefile4
-rw-r--r--editors/openoffice.org-1.0/Makefile4
-rw-r--r--editors/openoffice/Makefile4
-rw-r--r--editors/psgml-emacs19/Makefile1
-rw-r--r--editors/psgml-emacs19/pkg-comment1
-rw-r--r--editors/psgml-emacs20/Makefile1
-rw-r--r--editors/psgml-emacs20/pkg-comment1
-rw-r--r--editors/psgml-mule/Makefile1
-rw-r--r--editors/psgml-mule/pkg-comment1
-rw-r--r--editors/psgml/Makefile1
-rw-r--r--editors/psgml/pkg-comment1
-rw-r--r--french/ooodict-fr_FR/Makefile1
-rw-r--r--french/ooodict-fr_FR/pkg-comment1
-rw-r--r--german/ooodict-de_CH/Makefile1
-rw-r--r--german/ooodict-de_CH/pkg-comment1
-rw-r--r--german/ooodict-de_DE/Makefile1
-rw-r--r--german/ooodict-de_DE/pkg-comment1
-rw-r--r--graphics/xv-m17n/Makefile1
-rw-r--r--graphics/xv-m17n/pkg-comment1
-rw-r--r--graphics/xv/Makefile1
-rw-r--r--graphics/xv/pkg-comment1
-rw-r--r--hungarian/ooodict/Makefile1
-rw-r--r--hungarian/ooodict/pkg-comment1
-rw-r--r--japanese/FreeWnn-lib/Makefile1
-rw-r--r--japanese/FreeWnn-lib/pkg-comment1
-rw-r--r--japanese/FreeWnn-server/Makefile1
-rw-r--r--japanese/FreeWnn-server/pkg-comment1
-rw-r--r--japanese/acroread5-jpnfont/Makefile1
-rw-r--r--japanese/acroread5-jpnfont/pkg-comment1
-rw-r--r--japanese/gp/Makefile1
-rw-r--r--japanese/gp/pkg-comment1
-rw-r--r--japanese/jtex209-ascii/Makefile2
-rw-r--r--japanese/jtex209-ascii/pkg-comment1
-rw-r--r--japanese/jtex209-both/Makefile1
-rw-r--r--japanese/jtex209-both/pkg-comment1
-rw-r--r--japanese/jtex209-ntt/Makefile2
-rw-r--r--japanese/jtex209-ntt/pkg-comment1
-rw-r--r--japanese/jvim-canna+freewnn/Makefile1
-rw-r--r--japanese/jvim-canna+freewnn/pkg-comment1
-rw-r--r--japanese/jvim-canna+wnn6/Makefile1
-rw-r--r--japanese/jvim-canna+wnn6/pkg-comment1
-rw-r--r--japanese/jvim-canna+wnn7/Makefile1
-rw-r--r--japanese/jvim-canna+wnn7/pkg-comment1
-rw-r--r--japanese/jvim-canna/Makefile1
-rw-r--r--japanese/jvim-canna/pkg-comment1
-rw-r--r--japanese/jvim-freewnn/Makefile2
-rw-r--r--japanese/jvim-freewnn/pkg-comment1
-rw-r--r--japanese/jvim-wnn6/Makefile1
-rw-r--r--japanese/jvim-wnn6/pkg-comment1
-rw-r--r--japanese/jvim-wnn7/Makefile2
-rw-r--r--japanese/jvim-wnn7/pkg-comment1
-rw-r--r--japanese/jvim/Makefile1
-rw-r--r--japanese/jvim/pkg-comment1
-rw-r--r--japanese/jvim3-canna+freewnn/Makefile2
-rw-r--r--japanese/jvim3-canna+freewnn/pkg-comment1
-rw-r--r--japanese/jvim3-canna+wnn6/Makefile2
-rw-r--r--japanese/jvim3-canna+wnn6/pkg-comment1
-rw-r--r--japanese/jvim3-canna+wnn7/Makefile2
-rw-r--r--japanese/jvim3-canna+wnn7/pkg-comment1
-rw-r--r--japanese/jvim3-canna/Makefile2
-rw-r--r--japanese/jvim3-canna/pkg-comment1
-rw-r--r--japanese/jvim3-direct_canna/Makefile2
-rw-r--r--japanese/jvim3-direct_canna/pkg-comment1
-rw-r--r--japanese/jvim3-freewnn/Makefile2
-rw-r--r--japanese/jvim3-freewnn/pkg-comment1
-rw-r--r--japanese/jvim3-wnn6/Makefile2
-rw-r--r--japanese/jvim3-wnn6/pkg-comment1
-rw-r--r--japanese/jvim3-wnn7/Makefile2
-rw-r--r--japanese/jvim3-wnn7/pkg-comment1
-rw-r--r--japanese/jvim3/Makefile1
-rw-r--r--japanese/jvim3/pkg-comment1
-rw-r--r--japanese/kinput2-canna+freewnn+sj3/Makefile2
-rw-r--r--japanese/kinput2-canna+freewnn+sj3/pkg-comment1
-rw-r--r--japanese/kinput2-canna+freewnn/Makefile2
-rw-r--r--japanese/kinput2-canna+freewnn/pkg-comment1
-rw-r--r--japanese/kinput2-canna+sj3+wnn6/Makefile2
-rw-r--r--japanese/kinput2-canna+sj3+wnn6/pkg-comment1
-rw-r--r--japanese/kinput2-canna+sj3+wnn7/Makefile2
-rw-r--r--japanese/kinput2-canna+sj3+wnn7/pkg-comment1
-rw-r--r--japanese/kinput2-canna+sj3/Makefile2
-rw-r--r--japanese/kinput2-canna+sj3/pkg-comment1
-rw-r--r--japanese/kinput2-canna+wnn6/Makefile2
-rw-r--r--japanese/kinput2-canna+wnn6/pkg-comment1
-rw-r--r--japanese/kinput2-canna+wnn7/Makefile2
-rw-r--r--japanese/kinput2-canna+wnn7/pkg-comment1
-rw-r--r--japanese/kinput2-canna/Makefile2
-rw-r--r--japanese/kinput2-canna/pkg-comment1
-rw-r--r--japanese/kinput2-freewnn+sj3/Makefile2
-rw-r--r--japanese/kinput2-freewnn+sj3/pkg-comment1
-rw-r--r--japanese/kinput2-freewnn/Makefile1
-rw-r--r--japanese/kinput2-freewnn/pkg-comment1
-rw-r--r--japanese/kinput2-sj3+wnn6/Makefile2
-rw-r--r--japanese/kinput2-sj3+wnn6/pkg-comment1
-rw-r--r--japanese/kinput2-sj3+wnn7/Makefile2
-rw-r--r--japanese/kinput2-sj3+wnn7/pkg-comment1
-rw-r--r--japanese/kinput2-sj3/Makefile2
-rw-r--r--japanese/kinput2-sj3/pkg-comment1
-rw-r--r--japanese/kinput2-wnn6/Makefile2
-rw-r--r--japanese/kinput2-wnn6/pkg-comment1
-rw-r--r--japanese/kinput2-wnn7/Makefile2
-rw-r--r--japanese/kinput2-wnn7/pkg-comment1
-rw-r--r--japanese/kinput2/Makefile1
-rw-r--r--japanese/kinput2/pkg-comment1
-rw-r--r--japanese/lookup-emacs20/pkg-comment1
-rw-r--r--japanese/lookup-emacs21/Makefile1
-rw-r--r--japanese/lookup-emacs21/pkg-comment1
-rw-r--r--japanese/lookup-mule/pkg-comment1
-rw-r--r--japanese/lookup/Makefile1
-rw-r--r--japanese/lookup/pkg-comment1
-rw-r--r--japanese/mule-canna+freewnn+sj3/Makefile1
-rw-r--r--japanese/mule-canna+freewnn+sj3/pkg-comment1
-rw-r--r--japanese/mule-canna+freewnn/Makefile1
-rw-r--r--japanese/mule-canna+freewnn/pkg-comment1
-rw-r--r--japanese/mule-canna+sj3+wnn6/Makefile1
-rw-r--r--japanese/mule-canna+sj3+wnn6/pkg-comment1
-rw-r--r--japanese/mule-canna+sj3+wnn7/Makefile2
-rw-r--r--japanese/mule-canna+sj3+wnn7/pkg-comment1
-rw-r--r--japanese/mule-canna+sj3/Makefile1
-rw-r--r--japanese/mule-canna+sj3/pkg-comment1
-rw-r--r--japanese/mule-canna+wnn6/Makefile1
-rw-r--r--japanese/mule-canna+wnn6/pkg-comment1
-rw-r--r--japanese/mule-canna+wnn7/Makefile2
-rw-r--r--japanese/mule-canna+wnn7/pkg-comment1
-rw-r--r--japanese/mule-canna/Makefile1
-rw-r--r--japanese/mule-canna/pkg-comment1
-rw-r--r--japanese/mule-freewnn+sj3/Makefile1
-rw-r--r--japanese/mule-freewnn+sj3/pkg-comment1
-rw-r--r--japanese/mule-freewnn/Makefile1
-rw-r--r--japanese/mule-freewnn/pkg-comment1
-rw-r--r--japanese/mule-sj3+wnn6/Makefile1
-rw-r--r--japanese/mule-sj3+wnn6/pkg-comment1
-rw-r--r--japanese/mule-sj3+wnn7/Makefile2
-rw-r--r--japanese/mule-sj3+wnn7/pkg-comment1
-rw-r--r--japanese/mule-sj3/Makefile1
-rw-r--r--japanese/mule-sj3/pkg-comment1
-rw-r--r--japanese/mule-wnn6/Makefile1
-rw-r--r--japanese/mule-wnn6/pkg-comment1
-rw-r--r--japanese/mule-wnn7/Makefile2
-rw-r--r--japanese/mule-wnn7/pkg-comment1
-rw-r--r--japanese/onew-canna+freewnn/Makefile2
-rw-r--r--japanese/onew-canna+freewnn/pkg-comment1
-rw-r--r--japanese/onew-canna+wnn6/Makefile2
-rw-r--r--japanese/onew-canna+wnn6/pkg-comment1
-rw-r--r--japanese/onew-canna+wnn7/Makefile2
-rw-r--r--japanese/onew-canna+wnn7/pkg-comment1
-rw-r--r--japanese/onew-canna/Makefile2
-rw-r--r--japanese/onew-canna/pkg-comment1
-rw-r--r--japanese/onew-freewnn/Makefile1
-rw-r--r--japanese/onew-freewnn/pkg-comment1
-rw-r--r--japanese/onew-wnn6/Makefile2
-rw-r--r--japanese/onew-wnn6/pkg-comment1
-rw-r--r--japanese/onew-wnn7/Makefile2
-rw-r--r--japanese/onew-wnn7/pkg-comment1
-rw-r--r--japanese/onew/Makefile1
-rw-r--r--japanese/onew/pkg-comment1
-rw-r--r--japanese/tgif2tex/Makefile1
-rw-r--r--japanese/tgif2tex/pkg-comment1
-rw-r--r--japanese/w3/Makefile1
-rw-r--r--japanese/w3/pkg-comment1
-rw-r--r--japanese/xv/Makefile1
-rw-r--r--japanese/xv/pkg-comment1
-rw-r--r--korean/FreeWnn-lib/Makefile1
-rw-r--r--korean/FreeWnn-lib/pkg-comment1
-rw-r--r--korean/FreeWnn-server/Makefile1
-rw-r--r--korean/FreeWnn-server/pkg-comment1
-rw-r--r--korean/acroread5-korfont/Makefile1
-rw-r--r--korean/acroread5-korfont/pkg-comment1
-rw-r--r--korean/hlatexp-pkfonts1200/Makefile2
-rw-r--r--korean/hlatexp-pkfonts1200/pkg-comment1
-rw-r--r--korean/hlatexp-pkfonts300/Makefile1
-rw-r--r--korean/hlatexp-pkfonts300/pkg-comment1
-rw-r--r--korean/hlatexp-pkfonts600/Makefile1
-rw-r--r--korean/hlatexp-pkfonts600/pkg-comment1
-rw-r--r--korean/mule-freewnn/Makefile1
-rw-r--r--korean/mule-freewnn/pkg-comment1
-rw-r--r--mail/mew-emacs20/Makefile1
-rw-r--r--mail/mew-emacs20/pkg-comment1
-rw-r--r--mail/mew-mule/Makefile1
-rw-r--r--mail/mew-mule/pkg-comment1
-rw-r--r--mail/mew-xemacs21-mule/Makefile1
-rw-r--r--mail/mew-xemacs21-mule/pkg-comment1
-rw-r--r--mail/mew-xemacs21/Makefile1
-rw-r--r--mail/mew-xemacs21/pkg-comment1
-rw-r--r--mail/mew/pkg-comment0
-rw-r--r--mail/mew2-emacs20/Makefile1
-rw-r--r--mail/mew2-emacs20/pkg-comment1
-rw-r--r--mail/mew2-xemacs21-mule/Makefile1
-rw-r--r--mail/mew2-xemacs21-mule/pkg-comment1
-rw-r--r--mail/mew2-xemacs21/Makefile1
-rw-r--r--mail/mew2-xemacs21/pkg-comment1
-rw-r--r--mail/mew3-emacs20/Makefile1
-rw-r--r--mail/mew3-emacs20/pkg-comment1
-rw-r--r--mail/mew3-xemacs21-mule/Makefile1
-rw-r--r--mail/mew3-xemacs21-mule/pkg-comment1
-rw-r--r--mail/mew3-xemacs21/Makefile1
-rw-r--r--mail/mew3-xemacs21/pkg-comment1
-rw-r--r--polish/ooodict_PL/Makefile1
-rw-r--r--polish/ooodict_PL/pkg-comment1
-rw-r--r--portuguese/ooodict-pt_BR/Makefile1
-rw-r--r--portuguese/ooodict-pt_BR/pkg-comment1
-rw-r--r--portuguese/ooodict-pt_PT/Makefile1
-rw-r--r--portuguese/ooodict-pt_PT/pkg-comment1
-rw-r--r--portuguese/openoffice-1.0/Makefile1
-rw-r--r--portuguese/openoffice-1.0/pkg-comment1
-rw-r--r--portuguese/openoffice/Makefile1
-rw-r--r--portuguese/openoffice/pkg-comment1
-rw-r--r--print/acroread5-commfont/Makefile2
-rw-r--r--print/ghostscript-gnu-commfont/Makefile.common1
-rw-r--r--print/ghostscript-gnu-commfont/pkg-comment1
-rw-r--r--print/ghostscript7-commfont/Makefile.common1
-rw-r--r--print/ghostscript7-commfont/pkg-comment1
-rw-r--r--print/gp/Makefile1
-rw-r--r--print/gp/pkg-comment1
-rw-r--r--print/tgif2tex/Makefile1
-rw-r--r--print/tgif2tex/pkg-comment1
-rw-r--r--security/nmap/Makefile2
-rw-r--r--security/nmapfe/Makefile1
-rw-r--r--security/nmapfe/pkg-comment1
-rw-r--r--security/zenmap/Makefile1
-rw-r--r--security/zenmap/pkg-comment1
-rw-r--r--www/w3/Makefile1
-rw-r--r--www/w3/pkg-comment1
-rw-r--r--x11-toolkits/fox-xunicode/pkg-comment1
-rw-r--r--x11-toolkits/qt23/Makefile1
-rw-r--r--x11-toolkits/qt23/pkg-comment1
265 files changed, 170 insertions, 142 deletions
diff --git a/devel/qt-designer/Makefile b/devel/qt-designer/Makefile
index d862aa6c16ae..3fe4a9280d6d 100644
--- a/devel/qt-designer/Makefile
+++ b/devel/qt-designer/Makefile
@@ -6,6 +6,7 @@
#
MASTERDIR= ${.CURDIR}/../../x11-toolkits/qt23
+COMMENT= GUI C++ IDE based on QT
PORTNAME= qt-designer
CATEGORIES= devel
diff --git a/devel/qt-designer/pkg-comment b/devel/qt-designer/pkg-comment
deleted file mode 100644
index 901225f07b1e..000000000000
--- a/devel/qt-designer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GUI C++ IDE based on QT
diff --git a/editors/custom-emacs/Makefile b/editors/custom-emacs/Makefile
index 13621382eea9..14e1fb44f1b8 100644
--- a/editors/custom-emacs/Makefile
+++ b/editors/custom-emacs/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.dina.kvl.dk/pub/Staff/Per.Abrahamsen/custom/ \
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= shige@FreeBSD.org
+COMMENT?= The Custom Library for emacs
# custom library
CUSTOM_VER= 1.9962
diff --git a/editors/custom-emacs/pkg-comment b/editors/custom-emacs/pkg-comment
deleted file mode 100644
index c6529fc68cc3..000000000000
--- a/editors/custom-emacs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Custom Library for emacs
diff --git a/editors/custom-mule/Makefile b/editors/custom-mule/Makefile
index 4c61b05d82ae..87911b2643c7 100644
--- a/editors/custom-mule/Makefile
+++ b/editors/custom-mule/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= The Custom Library for mule
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/custom-mule/pkg-comment b/editors/custom-mule/pkg-comment
deleted file mode 100644
index bada766c34b4..000000000000
--- a/editors/custom-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Custom Library for mule
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 34217491897d..a923d764ac63 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -17,6 +17,7 @@ DISTFILES= mule-${MULE_VERSION}-${EMACS_VERSION}.tar.gz \
mule-${MULE_VERSION}-${EMACS_VERSION}.patch-981002.tar.gz
MAINTAINER?= taoka@FreeBSD.org
+COMMENT?= A multilingual emacs based 19.34 (Only the executables)
RUN_DEPENDS= ${PREFIX}/share/${EMACS_PREFIX}/${EMACS_VERSION}/lisp/mule.el:${PORTSDIR}/editors/mule-common
LIB_DEPENDS= ${LIB_INPUT_METHOD}
diff --git a/editors/mule/pkg-comment b/editors/mule/pkg-comment
deleted file mode 100644
index 51b3bafb5e4b..000000000000
--- a/editors/mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multilingual emacs based 19.34 (Only the executables)
diff --git a/editors/ooodict-bg_BG/Makefile b/editors/ooodict-bg_BG/Makefile
index fb10baf5d942..b5e9c381e117 100644
--- a/editors/ooodict-bg_BG/Makefile
+++ b/editors/ooodict-bg_BG/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Bulgarian (Bulgaria) MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= bg
diff --git a/editors/ooodict-bg_BG/pkg-comment b/editors/ooodict-bg_BG/pkg-comment
deleted file mode 100644
index f0c88b8eeb66..000000000000
--- a/editors/ooodict-bg_BG/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bulgarian (Bulgaria) MySpell dictionary for OpenOffice.org
diff --git a/editors/ooodict-ca_ES/Makefile b/editors/ooodict-ca_ES/Makefile
index ab2e0f90ebc4..ab809bb157bd 100644
--- a/editors/ooodict-ca_ES/Makefile
+++ b/editors/ooodict-ca_ES/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Catalan MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= ca
diff --git a/editors/ooodict-ca_ES/pkg-comment b/editors/ooodict-ca_ES/pkg-comment
deleted file mode 100644
index 2c41ed8e6694..000000000000
--- a/editors/ooodict-ca_ES/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Catalan MySpell dictionary for OpenOffice.org
diff --git a/editors/ooodict-cs_CZ/Makefile b/editors/ooodict-cs_CZ/Makefile
index d15e00586728..1480ae59d052 100644
--- a/editors/ooodict-cs_CZ/Makefile
+++ b/editors/ooodict-cs_CZ/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Czech (Czech Republic) MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= cs
diff --git a/editors/ooodict-cs_CZ/pkg-comment b/editors/ooodict-cs_CZ/pkg-comment
deleted file mode 100644
index d8508704a2d5..000000000000
--- a/editors/ooodict-cs_CZ/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Czech (Czech Republic) MySpell dictionary for OpenOffice.org
diff --git a/editors/ooodict-da_DK/Makefile b/editors/ooodict-da_DK/Makefile
index c1456cbef34a..22c4f36ab56c 100644
--- a/editors/ooodict-da_DK/Makefile
+++ b/editors/ooodict-da_DK/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Danish (Denmark) MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= da
diff --git a/editors/ooodict-da_DK/pkg-comment b/editors/ooodict-da_DK/pkg-comment
deleted file mode 100644
index 1ba4d5c3d644..000000000000
--- a/editors/ooodict-da_DK/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Danish (Denmark) MySpell dictionary for OpenOffice.org
diff --git a/editors/ooodict-el_GR/Makefile b/editors/ooodict-el_GR/Makefile
index fd9bf8a6e03b..e1348d2db51c 100644
--- a/editors/ooodict-el_GR/Makefile
+++ b/editors/ooodict-el_GR/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Greek (Greece) MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= el
diff --git a/editors/ooodict-el_GR/pkg-comment b/editors/ooodict-el_GR/pkg-comment
deleted file mode 100644
index 51f0f9acd9f8..000000000000
--- a/editors/ooodict-el_GR/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Greek (Greece) MySpell dictionary for OpenOffice.org
diff --git a/editors/ooodict-en_CA/Makefile b/editors/ooodict-en_CA/Makefile
index f9d8eee6a48d..684b990175de 100644
--- a/editors/ooodict-en_CA/Makefile
+++ b/editors/ooodict-en_CA/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= English (Canada) MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= en
diff --git a/editors/ooodict-en_CA/pkg-comment b/editors/ooodict-en_CA/pkg-comment
deleted file mode 100644
index 9f65270028ea..000000000000
--- a/editors/ooodict-en_CA/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-English (Canada) MySpell dictionary for OpenOffice.org
diff --git a/editors/ooodict-en_GB/Makefile b/editors/ooodict-en_GB/Makefile
index 4417033f8387..2bb495ca410d 100644
--- a/editors/ooodict-en_GB/Makefile
+++ b/editors/ooodict-en_GB/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= English (United Kingdom) MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= en
diff --git a/editors/ooodict-en_GB/pkg-comment b/editors/ooodict-en_GB/pkg-comment
deleted file mode 100644
index 812dcf99d913..000000000000
--- a/editors/ooodict-en_GB/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-English (United Kingdom) MySpell dictionary for OpenOffice.org
diff --git a/editors/ooodict-en_US/Makefile b/editors/ooodict-en_US/Makefile
index 20176cc5f02c..66e12930108d 100644
--- a/editors/ooodict-en_US/Makefile
+++ b/editors/ooodict-en_US/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= English (United States) MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= en
diff --git a/editors/ooodict-en_US/pkg-comment b/editors/ooodict-en_US/pkg-comment
deleted file mode 100644
index e1affcc0b004..000000000000
--- a/editors/ooodict-en_US/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-English (United States) MySpell dictionary for OpenOffice.org
diff --git a/editors/ooodict-es_ES/Makefile b/editors/ooodict-es_ES/Makefile
index ee7b4fa73e0b..5c0187c46d17 100644
--- a/editors/ooodict-es_ES/Makefile
+++ b/editors/ooodict-es_ES/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Spanish (Spain) MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= es
diff --git a/editors/ooodict-es_ES/pkg-comment b/editors/ooodict-es_ES/pkg-comment
deleted file mode 100644
index a394c1190a60..000000000000
--- a/editors/ooodict-es_ES/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Spanish (Spain) MySpell dictionary for OpenOffice.org
diff --git a/editors/ooodict-hr_HR/Makefile b/editors/ooodict-hr_HR/Makefile
index 838c5a62a9fd..aef12e4fff43 100644
--- a/editors/ooodict-hr_HR/Makefile
+++ b/editors/ooodict-hr_HR/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Croatian (Croatia) Myspell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= hr
diff --git a/editors/ooodict-hr_HR/pkg-comment b/editors/ooodict-hr_HR/pkg-comment
deleted file mode 100644
index 324bbce05eef..000000000000
--- a/editors/ooodict-hr_HR/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Croatian (Croatia) Myspell dictionary for OpenOffice.org
diff --git a/editors/ooodict-hu_HU/Makefile b/editors/ooodict-hu_HU/Makefile
index 2deb823a966b..05433da9b3dc 100644
--- a/editors/ooodict-hu_HU/Makefile
+++ b/editors/ooodict-hu_HU/Makefile
@@ -8,6 +8,7 @@
#
CATEGORIES= editors
+COMMENT= Hungarian (Hungary) Myspell dictionary for OpenOffice.org
LANGPREFIX= hu
LANGSUFFIX= HU
diff --git a/editors/ooodict-hu_HU/pkg-comment b/editors/ooodict-hu_HU/pkg-comment
deleted file mode 100644
index bfc312afeb12..000000000000
--- a/editors/ooodict-hu_HU/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hungarian (Hungary) Myspell dictionary for OpenOffice.org
diff --git a/editors/ooodict-it_IT/Makefile b/editors/ooodict-it_IT/Makefile
index 8f8a623ade19..b25d344a1204 100644
--- a/editors/ooodict-it_IT/Makefile
+++ b/editors/ooodict-it_IT/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Italian (Italy) MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= it
diff --git a/editors/ooodict-it_IT/pkg-comment b/editors/ooodict-it_IT/pkg-comment
deleted file mode 100644
index 0c616a0eac80..000000000000
--- a/editors/ooodict-it_IT/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Italian (Italy) MySpell dictionary for OpenOffice.org
diff --git a/editors/ooodict-nl_NL/Makefile b/editors/ooodict-nl_NL/Makefile
index cf712ec9fc0e..1cd2f50c4b9c 100644
--- a/editors/ooodict-nl_NL/Makefile
+++ b/editors/ooodict-nl_NL/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Dutch (Netherland) MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= nl
diff --git a/editors/ooodict-nl_NL/pkg-comment b/editors/ooodict-nl_NL/pkg-comment
deleted file mode 100644
index f41498533c48..000000000000
--- a/editors/ooodict-nl_NL/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dutch (Netherland) MySpell dictionary for OpenOffice.org
diff --git a/editors/ooodict-pl_PL/Makefile b/editors/ooodict-pl_PL/Makefile
index 2944035f3b57..bde7fa98eaaf 100644
--- a/editors/ooodict-pl_PL/Makefile
+++ b/editors/ooodict-pl_PL/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Polish (Poland) MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= pl
diff --git a/editors/ooodict-pl_PL/pkg-comment b/editors/ooodict-pl_PL/pkg-comment
deleted file mode 100644
index b7383c0850d4..000000000000
--- a/editors/ooodict-pl_PL/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Polish (Poland) MySpell dictionary for OpenOffice.org
diff --git a/editors/ooodict-sk_SK/Makefile b/editors/ooodict-sk_SK/Makefile
index a109e9accb03..4f207f340125 100644
--- a/editors/ooodict-sk_SK/Makefile
+++ b/editors/ooodict-sk_SK/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Slovak MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= sk
diff --git a/editors/ooodict-sk_SK/pkg-comment b/editors/ooodict-sk_SK/pkg-comment
deleted file mode 100644
index d60b5b43cd22..000000000000
--- a/editors/ooodict-sk_SK/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Slovak MySpell dictionary for OpenOffice.org
diff --git a/editors/ooodict-sv_SE/Makefile b/editors/ooodict-sv_SE/Makefile
index 43521121dd8c..31e14180e5bd 100644
--- a/editors/ooodict-sv_SE/Makefile
+++ b/editors/ooodict-sv_SE/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Swedish (Sweden) MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= sv
diff --git a/editors/ooodict-sv_SE/pkg-comment b/editors/ooodict-sv_SE/pkg-comment
deleted file mode 100644
index 263320de64a8..000000000000
--- a/editors/ooodict-sv_SE/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Swedish (Sweden) MySpell dictionary for OpenOffice.org
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index 492ffc0efc8b..545132d817fb 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -106,9 +106,7 @@ CXX= g++32
EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
+COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
#.if !defined(USE_GCC)
#BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
#.endif
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 492ffc0efc8b..545132d817fb 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -106,9 +106,7 @@ CXX= g++32
EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
+COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
#.if !defined(USE_GCC)
#BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
#.endif
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index 492ffc0efc8b..545132d817fb 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -106,9 +106,7 @@ CXX= g++32
EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
-.if !defined(COMMENT)
-COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
-.endif
+COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
#.if !defined(USE_GCC)
#BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
#.endif
diff --git a/editors/psgml-emacs19/Makefile b/editors/psgml-emacs19/Makefile
index f2d7ec4d48f3..934296f7ae67 100644
--- a/editors/psgml-emacs19/Makefile
+++ b/editors/psgml-emacs19/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= A major mode for editing SGML and XML documents for emacs19
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/psgml-emacs19/pkg-comment b/editors/psgml-emacs19/pkg-comment
deleted file mode 100644
index e797b65d0591..000000000000
--- a/editors/psgml-emacs19/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A major mode for editing SGML and XML documents for emacs19
diff --git a/editors/psgml-emacs20/Makefile b/editors/psgml-emacs20/Makefile
index 971a234cc328..54d8bd7b0baf 100644
--- a/editors/psgml-emacs20/Makefile
+++ b/editors/psgml-emacs20/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= A major mode for editing SGML and XML documents for emacs20
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/psgml-emacs20/pkg-comment b/editors/psgml-emacs20/pkg-comment
deleted file mode 100644
index e1f1868b1ee0..000000000000
--- a/editors/psgml-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A major mode for editing SGML and XML documents for emacs20
diff --git a/editors/psgml-mule/Makefile b/editors/psgml-mule/Makefile
index 52132ff7c36b..15fd2911988d 100644
--- a/editors/psgml-mule/Makefile
+++ b/editors/psgml-mule/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= A major mode for editing SGML and XML documents for mule
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/psgml-mule/pkg-comment b/editors/psgml-mule/pkg-comment
deleted file mode 100644
index 72f58adffa14..000000000000
--- a/editors/psgml-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A major mode for editing SGML and XML documents for mule
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 79a94cfb29cb..a0e7415bc867 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -19,6 +19,7 @@ PATCH_SITE_SUBDIR= kuriyama
PATCHFILES= psgml-symbol-conflict-020120.gz
MAINTAINER?= shige@FreeBSD.org
+COMMENT?= A major mode for editing SGML and XML documents for emacs21
# distfile version
PSGML_VER= 1.2.4
diff --git a/editors/psgml/pkg-comment b/editors/psgml/pkg-comment
deleted file mode 100644
index fd7e5686f5d8..000000000000
--- a/editors/psgml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A major mode for editing SGML and XML documents for emacs21
diff --git a/french/ooodict-fr_FR/Makefile b/french/ooodict-fr_FR/Makefile
index 5bb11246b4ab..ee7b3bab829d 100644
--- a/french/ooodict-fr_FR/Makefile
+++ b/french/ooodict-fr_FR/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= French (France) MySpell dictionary for OpenOffice.org
CATEGORIES= french
LANGPREFIX= fr
diff --git a/french/ooodict-fr_FR/pkg-comment b/french/ooodict-fr_FR/pkg-comment
deleted file mode 100644
index 12bba3257cf1..000000000000
--- a/french/ooodict-fr_FR/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-French (France) MySpell dictionary for OpenOffice.org
diff --git a/german/ooodict-de_CH/Makefile b/german/ooodict-de_CH/Makefile
index dc86b0aaac5a..9b91b5d23162 100644
--- a/german/ooodict-de_CH/Makefile
+++ b/german/ooodict-de_CH/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= German (Switzerland) MySpell dictionary for OpenOffice.org
CATEGORIES= german
LANGPREFIX= de
diff --git a/german/ooodict-de_CH/pkg-comment b/german/ooodict-de_CH/pkg-comment
deleted file mode 100644
index 55e132ded217..000000000000
--- a/german/ooodict-de_CH/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-German (Switzerland) MySpell dictionary for OpenOffice.org
diff --git a/german/ooodict-de_DE/Makefile b/german/ooodict-de_DE/Makefile
index fec19e16b062..25d1466db079 100644
--- a/german/ooodict-de_DE/Makefile
+++ b/german/ooodict-de_DE/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= German (Germany) MySpell dictionary for OpenOffice.org
CATEGORIES= german
LANGPREFIX= de
diff --git a/german/ooodict-de_DE/pkg-comment b/german/ooodict-de_DE/pkg-comment
deleted file mode 100644
index 3ee155226d4b..000000000000
--- a/german/ooodict-de_DE/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-German (Germany) MySpell dictionary for OpenOffice.org
diff --git a/graphics/xv-m17n/Makefile b/graphics/xv-m17n/Makefile
index b48f33cafe93..241de6c3cc4b 100644
--- a/graphics/xv-m17n/Makefile
+++ b/graphics/xv-m17n/Makefile
@@ -8,6 +8,7 @@
PKGNAMESUFFIX= -m17n
MAINTAINER= shige@FreeBSD.org
+COMMENT= An X11 program that displays images of various formats with multilingualization
MASTERDIR= ${.CURDIR}/../../graphics/xv
PKGDIR= ${.CURDIR}
diff --git a/graphics/xv-m17n/pkg-comment b/graphics/xv-m17n/pkg-comment
deleted file mode 100644
index a272310d357a..000000000000
--- a/graphics/xv-m17n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 program that displays images of various formats with multilingualization
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index fb13ea6d6a8b..be68effaa5eb 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -34,6 +34,7 @@ PATCHFILES= ${DISTNAME}.JPEG-patch ${DISTNAME}.TIFF-patch \
tiff1200.patch gssafer.patch
MAINTAINER?= shige@FreeBSD.org
+COMMENT?= An X11 program that displays images of various formats
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/graphics/xv/pkg-comment b/graphics/xv/pkg-comment
deleted file mode 100644
index e25e85a43ab0..000000000000
--- a/graphics/xv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 program that displays images of various formats
diff --git a/hungarian/ooodict/Makefile b/hungarian/ooodict/Makefile
index 2deb823a966b..05433da9b3dc 100644
--- a/hungarian/ooodict/Makefile
+++ b/hungarian/ooodict/Makefile
@@ -8,6 +8,7 @@
#
CATEGORIES= editors
+COMMENT= Hungarian (Hungary) Myspell dictionary for OpenOffice.org
LANGPREFIX= hu
LANGSUFFIX= HU
diff --git a/hungarian/ooodict/pkg-comment b/hungarian/ooodict/pkg-comment
deleted file mode 100644
index bfc312afeb12..000000000000
--- a/hungarian/ooodict/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hungarian (Hungary) Myspell dictionary for OpenOffice.org
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
diff --git a/korean/FreeWnn-lib/Makefile b/korean/FreeWnn-lib/Makefile
index aa219c5b72b4..50aee341c5f6 100644
--- a/korean/FreeWnn-lib/Makefile
+++ b/korean/FreeWnn-lib/Makefile
@@ -6,6 +6,7 @@
#
PKGNAMESUFFIX= -lib
+COMMENT= A Japanese/Chinese/Korean input method (Korean client libraries)
CATEGORIES= korean
MASTERDIR= ${.CURDIR}/../../japanese/FreeWnn-lib
PKGDIR= ${.CURDIR}
diff --git a/korean/FreeWnn-lib/pkg-comment b/korean/FreeWnn-lib/pkg-comment
deleted file mode 100644
index bb1345145f3c..000000000000
--- a/korean/FreeWnn-lib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Japanese/Chinese/Korean input method (Korean client libraries)
diff --git a/korean/FreeWnn-server/Makefile b/korean/FreeWnn-server/Makefile
index 3fa336e49f70..e7ba8cd83813 100644
--- a/korean/FreeWnn-server/Makefile
+++ b/korean/FreeWnn-server/Makefile
@@ -6,6 +6,7 @@
#
PKGNAMESUFFIX= -server
+COMMENT= A Japanese/Chinese/Korean input method (Korean server)
CATEGORIES= korean
MASTERDIR= ${.CURDIR}/../../japanese/FreeWnn-lib
PKGDIR= ${.CURDIR}
diff --git a/korean/FreeWnn-server/pkg-comment b/korean/FreeWnn-server/pkg-comment
deleted file mode 100644
index 4cb4a75398e4..000000000000
--- a/korean/FreeWnn-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Japanese/Chinese/Korean input method (Korean server)
diff --git a/korean/acroread5-korfont/Makefile b/korean/acroread5-korfont/Makefile
index f404df1c03e5..cc9b87728eaa 100644
--- a/korean/acroread5-korfont/Makefile
+++ b/korean/acroread5-korfont/Makefile
@@ -8,6 +8,7 @@
DISTNAME= korfont
DIST_SUBDIR= Acrobat5
CATEGORIES= korean
+COMMENT= Asian Font Packs for Acrobat Reader 5.0 (for Korean)
MASTERDIR= ${.CURDIR}/../../print/acroread5-commfont
diff --git a/korean/acroread5-korfont/pkg-comment b/korean/acroread5-korfont/pkg-comment
deleted file mode 100644
index 25d0ac3c45ab..000000000000
--- a/korean/acroread5-korfont/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Asian Font Packs for Acrobat Reader 5.0 (for Korean)
diff --git a/korean/hlatexp-pkfonts1200/Makefile b/korean/hlatexp-pkfonts1200/Makefile
index 2a48ad6ef395..b6816818c5ec 100644
--- a/korean/hlatexp-pkfonts1200/Makefile
+++ b/korean/hlatexp-pkfonts1200/Makefile
@@ -10,6 +10,8 @@ FILESDIR= ${.CURDIR}/files
PKGDIR= ${.CURDIR}
MD5_FILE= ${.CURDIR}/distinfo
+COMMENT= Korean pk fonts collection of hLaTeXp(1200dpi)
+
# pkfonts dpi
RESOLUTION= 1200
diff --git a/korean/hlatexp-pkfonts1200/pkg-comment b/korean/hlatexp-pkfonts1200/pkg-comment
deleted file mode 100644
index 1101e43e5e69..000000000000
--- a/korean/hlatexp-pkfonts1200/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Korean pk fonts collection of hLaTeXp(1200dpi)
diff --git a/korean/hlatexp-pkfonts300/Makefile b/korean/hlatexp-pkfonts300/Makefile
index e3212aad6a32..0cf202b4cb9f 100644
--- a/korean/hlatexp-pkfonts300/Makefile
+++ b/korean/hlatexp-pkfonts300/Makefile
@@ -14,6 +14,7 @@ DISTFILES= han.${RESOLUTION}pk.tar.gz hanja.${RESOLUTION}pk.tar.gz symb.${RESOLU
DIST_SUBDIR= htex
MAINTAINER= cjh@FreeBSD.org
+COMMENT?= Korean pk fonts collection of hLaTeXp(300dpi)
# it depends hLaTeXp
RUN_DEPENDS= hlatex:${PORTSDIR}/korean/hlatexp
diff --git a/korean/hlatexp-pkfonts300/pkg-comment b/korean/hlatexp-pkfonts300/pkg-comment
deleted file mode 100644
index c059f2877e4a..000000000000
--- a/korean/hlatexp-pkfonts300/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Korean pk fonts collection of hLaTeXp(300dpi)
diff --git a/korean/hlatexp-pkfonts600/Makefile b/korean/hlatexp-pkfonts600/Makefile
index 2c810fde6985..b2f144ba3b5a 100644
--- a/korean/hlatexp-pkfonts600/Makefile
+++ b/korean/hlatexp-pkfonts600/Makefile
@@ -9,6 +9,7 @@ MASTERDIR= ${.CURDIR}/../hlatexp-pkfonts300
FILESDIR= ${.CURDIR}/files
PKGDIR= ${.CURDIR}
MD5_FILE= ${.CURDIR}/distinfo
+COMMENT= Korean pk fonts collection of hLaTeXp(600dpi)
# pkfonts dpi
RESOLUTION= 600
diff --git a/korean/hlatexp-pkfonts600/pkg-comment b/korean/hlatexp-pkfonts600/pkg-comment
deleted file mode 100644
index b32379c76dba..000000000000
--- a/korean/hlatexp-pkfonts600/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Korean pk fonts collection of hLaTeXp(600dpi)
diff --git a/korean/mule-freewnn/Makefile b/korean/mule-freewnn/Makefile
index c6ff8c7e2e5f..cd958609ade4 100644
--- a/korean/mule-freewnn/Makefile
+++ b/korean/mule-freewnn/Makefile
@@ -7,6 +7,7 @@
CATEGORIES= korean
PKGNAMESUFFIX= -freewnn
+COMMENT= A multilingual emacs, with FreeWnn support built in (Only the executables)
MASTERDIR= ${.CURDIR}/../../editors/mule
PKGDIR= ${.CURDIR}
diff --git a/korean/mule-freewnn/pkg-comment b/korean/mule-freewnn/pkg-comment
deleted file mode 100644
index db3f36c3b7c7..000000000000
--- a/korean/mule-freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multilingual emacs, with FreeWnn support built in (Only the executables)
diff --git a/mail/mew-emacs20/Makefile b/mail/mew-emacs20/Makefile
index afc328768a41..bffbefb9929e 100644
--- a/mail/mew-emacs20/Makefile
+++ b/mail/mew-emacs20/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= kiri@FreeBSD.org
+COMMENT= Message interface to Emacs Window for emacs20
# This is a slave port.
MASTERDIR= ${.CURDIR}/../mew
diff --git a/mail/mew-emacs20/pkg-comment b/mail/mew-emacs20/pkg-comment
deleted file mode 100644
index b7c5459e015b..000000000000
--- a/mail/mew-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message interface to Emacs Window for emacs20
diff --git a/mail/mew-mule/Makefile b/mail/mew-mule/Makefile
index f73833d9f96d..6e2000911a0a 100644
--- a/mail/mew-mule/Makefile
+++ b/mail/mew-mule/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= kiri@FreeBSD.org
+COMMENT= Message interface to Emacs Window for mule
# This is a slave port.
MASTERDIR= ${.CURDIR}/../mew
diff --git a/mail/mew-mule/pkg-comment b/mail/mew-mule/pkg-comment
deleted file mode 100644
index 910232480ceb..000000000000
--- a/mail/mew-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message interface to Emacs Window for mule
diff --git a/mail/mew-xemacs21-mule/Makefile b/mail/mew-xemacs21-mule/Makefile
index dac7ec94d899..0838c6657168 100644
--- a/mail/mew-xemacs21-mule/Makefile
+++ b/mail/mew-xemacs21-mule/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= kiri@FreeBSD.org
+COMMENT= Message interface to Emacs Window for xemacs21-mule
# This is a slave port.
MASTERDIR= ${.CURDIR}/../mew
diff --git a/mail/mew-xemacs21-mule/pkg-comment b/mail/mew-xemacs21-mule/pkg-comment
deleted file mode 100644
index 27c4307b02f8..000000000000
--- a/mail/mew-xemacs21-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message interface to Emacs Window for xemacs21-mule
diff --git a/mail/mew-xemacs21/Makefile b/mail/mew-xemacs21/Makefile
index 70b210ec27ef..569561a33810 100644
--- a/mail/mew-xemacs21/Makefile
+++ b/mail/mew-xemacs21/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= kiri@FreeBSD.org
+COMMENT= Message interface to Emacs Window for xemacs21
# This is a slave port.
MASTERDIR= ${.CURDIR}/../mew
diff --git a/mail/mew-xemacs21/pkg-comment b/mail/mew-xemacs21/pkg-comment
deleted file mode 100644
index 831f19f81de8..000000000000
--- a/mail/mew-xemacs21/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message interface to Emacs Window for xemacs21
diff --git a/mail/mew/pkg-comment b/mail/mew/pkg-comment
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/mail/mew/pkg-comment
+++ /dev/null
diff --git a/mail/mew2-emacs20/Makefile b/mail/mew2-emacs20/Makefile
index 8f361c433798..edd292160546 100644
--- a/mail/mew2-emacs20/Makefile
+++ b/mail/mew2-emacs20/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER?= kiri@FreeBSD.org
+COMMENT= Message interface to Emacs Window (version 2) for emacs20
# Mew major version
MEW_MAJOR_VER?= 2
diff --git a/mail/mew2-emacs20/pkg-comment b/mail/mew2-emacs20/pkg-comment
deleted file mode 100644
index 716e8e2868af..000000000000
--- a/mail/mew2-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message interface to Emacs Window (version 2) for emacs20
diff --git a/mail/mew2-xemacs21-mule/Makefile b/mail/mew2-xemacs21-mule/Makefile
index 4ef2c12d9af9..c2459f27255e 100644
--- a/mail/mew2-xemacs21-mule/Makefile
+++ b/mail/mew2-xemacs21-mule/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= kiri@FreeBSD.org
+COMMENT= Message interface to Emacs Window (version 2) for xemacs21-mule
# Mew major version
MEW_MAJOR_VER= 2
diff --git a/mail/mew2-xemacs21-mule/pkg-comment b/mail/mew2-xemacs21-mule/pkg-comment
deleted file mode 100644
index 21ff490a5b1c..000000000000
--- a/mail/mew2-xemacs21-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message interface to Emacs Window (version 2) for xemacs21-mule
diff --git a/mail/mew2-xemacs21/Makefile b/mail/mew2-xemacs21/Makefile
index 2b4d0461f36a..124b260b4488 100644
--- a/mail/mew2-xemacs21/Makefile
+++ b/mail/mew2-xemacs21/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= kiri@FreeBSD.org
+COMMENT= Message interface to Emacs Window (version 2) for xemacs21
# Mew major version
MEW_MAJOR_VER= 2
diff --git a/mail/mew2-xemacs21/pkg-comment b/mail/mew2-xemacs21/pkg-comment
deleted file mode 100644
index 63b5259e4c8a..000000000000
--- a/mail/mew2-xemacs21/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message interface to Emacs Window (version 2) for xemacs21
diff --git a/mail/mew3-emacs20/Makefile b/mail/mew3-emacs20/Makefile
index 8f361c433798..edd292160546 100644
--- a/mail/mew3-emacs20/Makefile
+++ b/mail/mew3-emacs20/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER?= kiri@FreeBSD.org
+COMMENT= Message interface to Emacs Window (version 2) for emacs20
# Mew major version
MEW_MAJOR_VER?= 2
diff --git a/mail/mew3-emacs20/pkg-comment b/mail/mew3-emacs20/pkg-comment
deleted file mode 100644
index 716e8e2868af..000000000000
--- a/mail/mew3-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message interface to Emacs Window (version 2) for emacs20
diff --git a/mail/mew3-xemacs21-mule/Makefile b/mail/mew3-xemacs21-mule/Makefile
index 4ef2c12d9af9..c2459f27255e 100644
--- a/mail/mew3-xemacs21-mule/Makefile
+++ b/mail/mew3-xemacs21-mule/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= kiri@FreeBSD.org
+COMMENT= Message interface to Emacs Window (version 2) for xemacs21-mule
# Mew major version
MEW_MAJOR_VER= 2
diff --git a/mail/mew3-xemacs21-mule/pkg-comment b/mail/mew3-xemacs21-mule/pkg-comment
deleted file mode 100644
index 21ff490a5b1c..000000000000
--- a/mail/mew3-xemacs21-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message interface to Emacs Window (version 2) for xemacs21-mule
diff --git a/mail/mew3-xemacs21/Makefile b/mail/mew3-xemacs21/Makefile
index 2b4d0461f36a..124b260b4488 100644
--- a/mail/mew3-xemacs21/Makefile
+++ b/mail/mew3-xemacs21/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= kiri@FreeBSD.org
+COMMENT= Message interface to Emacs Window (version 2) for xemacs21
# Mew major version
MEW_MAJOR_VER= 2
diff --git a/mail/mew3-xemacs21/pkg-comment b/mail/mew3-xemacs21/pkg-comment
deleted file mode 100644
index 63b5259e4c8a..000000000000
--- a/mail/mew3-xemacs21/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message interface to Emacs Window (version 2) for xemacs21
diff --git a/polish/ooodict_PL/Makefile b/polish/ooodict_PL/Makefile
index 2944035f3b57..bde7fa98eaaf 100644
--- a/polish/ooodict_PL/Makefile
+++ b/polish/ooodict_PL/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Polish (Poland) MySpell dictionary for OpenOffice.org
CATEGORIES= editors
LANGPREFIX= pl
diff --git a/polish/ooodict_PL/pkg-comment b/polish/ooodict_PL/pkg-comment
deleted file mode 100644
index b7383c0850d4..000000000000
--- a/polish/ooodict_PL/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Polish (Poland) MySpell dictionary for OpenOffice.org
diff --git a/portuguese/ooodict-pt_BR/Makefile b/portuguese/ooodict-pt_BR/Makefile
index 124f0c29568d..cd6504379d89 100644
--- a/portuguese/ooodict-pt_BR/Makefile
+++ b/portuguese/ooodict-pt_BR/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Portuguese (Brasil) MySpell dictionary for OpenOffice.org
CATEGORIES= portuguese
LANGPREFIX= pt
diff --git a/portuguese/ooodict-pt_BR/pkg-comment b/portuguese/ooodict-pt_BR/pkg-comment
deleted file mode 100644
index afc8449a8804..000000000000
--- a/portuguese/ooodict-pt_BR/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Portuguese (Brasil) MySpell dictionary for OpenOffice.org
diff --git a/portuguese/ooodict-pt_PT/Makefile b/portuguese/ooodict-pt_PT/Makefile
index fb86ab9d57da..071de4f0611e 100644
--- a/portuguese/ooodict-pt_PT/Makefile
+++ b/portuguese/ooodict-pt_PT/Makefile
@@ -7,6 +7,7 @@
# $FreeBSD$
#
+COMMENT= Portuguese (Portugal) MySpell dictionary for OpenOffice.org
CATEGORIES= portuguese
LANGPREFIX= pt
diff --git a/portuguese/ooodict-pt_PT/pkg-comment b/portuguese/ooodict-pt_PT/pkg-comment
deleted file mode 100644
index ad928084a18d..000000000000
--- a/portuguese/ooodict-pt_PT/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Portuguese (Portugal) MySpell dictionary for OpenOffice.org
diff --git a/portuguese/openoffice-1.0/Makefile b/portuguese/openoffice-1.0/Makefile
index 54a9f1f3d962..1ff6130a187c 100644
--- a/portuguese/openoffice-1.0/Makefile
+++ b/portuguese/openoffice-1.0/Makefile
@@ -5,6 +5,7 @@
# $FreeBSD$
#
+COMMENT= Editor texto/gráfico, banco de dados/planilha/navegador integrado
CATEGORIES= portuguese
.if !defined (LANG) && !defined(USE_LANG)
diff --git a/portuguese/openoffice-1.0/pkg-comment b/portuguese/openoffice-1.0/pkg-comment
deleted file mode 100644
index 905987662376..000000000000
--- a/portuguese/openoffice-1.0/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Editor texto/gráfico, banco de dados/planilha/navegador integrado
diff --git a/portuguese/openoffice/Makefile b/portuguese/openoffice/Makefile
index 54a9f1f3d962..1ff6130a187c 100644
--- a/portuguese/openoffice/Makefile
+++ b/portuguese/openoffice/Makefile
@@ -5,6 +5,7 @@
# $FreeBSD$
#
+COMMENT= Editor texto/gráfico, banco de dados/planilha/navegador integrado
CATEGORIES= portuguese
.if !defined (LANG) && !defined(USE_LANG)
diff --git a/portuguese/openoffice/pkg-comment b/portuguese/openoffice/pkg-comment
deleted file mode 100644
index 905987662376..000000000000
--- a/portuguese/openoffice/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Editor texto/gráfico, banco de dados/planilha/navegador integrado
diff --git a/print/acroread5-commfont/Makefile b/print/acroread5-commfont/Makefile
index 9aa459a85996..6ed7fd457596 100644
--- a/print/acroread5-commfont/Makefile
+++ b/print/acroread5-commfont/Makefile
@@ -13,7 +13,7 @@ DISTNAME?= commfont # dummy
DIST_SUBDIR= Acrobat5
MAINTAINER= koma2@jiro.c.u-tokyo.ac.jp
-COMMENT= Asian Font Packs for Acrobat Reader 5.0 (for common files)
+COMMENT?= Asian Font Packs for Acrobat Reader 5.0 (for common files)
NO_BUILD= yes
SLAVEDIRS= chinese/acroread-chsfont chinese/acroread-chtfont
diff --git a/print/ghostscript-gnu-commfont/Makefile.common b/print/ghostscript-gnu-commfont/Makefile.common
index 90101880d090..969dea533105 100644
--- a/print/ghostscript-gnu-commfont/Makefile.common
+++ b/print/ghostscript-gnu-commfont/Makefile.common
@@ -7,6 +7,7 @@ DISTNAME= # nonexistent
DISTFILES= # empty
MAINTAINER?= mita@FreeBSD.org
+COMMENT?= GNU ghostscript with Japanese Font support
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu \
${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
diff --git a/print/ghostscript-gnu-commfont/pkg-comment b/print/ghostscript-gnu-commfont/pkg-comment
deleted file mode 100644
index 943c826e0d1d..000000000000
--- a/print/ghostscript-gnu-commfont/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU ghostscript with Japanese Font support
diff --git a/print/ghostscript7-commfont/Makefile.common b/print/ghostscript7-commfont/Makefile.common
index 90101880d090..969dea533105 100644
--- a/print/ghostscript7-commfont/Makefile.common
+++ b/print/ghostscript7-commfont/Makefile.common
@@ -7,6 +7,7 @@ DISTNAME= # nonexistent
DISTFILES= # empty
MAINTAINER?= mita@FreeBSD.org
+COMMENT?= GNU ghostscript with Japanese Font support
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu \
${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
diff --git a/print/ghostscript7-commfont/pkg-comment b/print/ghostscript7-commfont/pkg-comment
deleted file mode 100644
index 943c826e0d1d..000000000000
--- a/print/ghostscript7-commfont/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU ghostscript with Japanese Font support
diff --git a/print/gp/Makefile b/print/gp/Makefile
index 2436f4e9e634..dd41ffdb4afd 100644
--- a/print/gp/Makefile
+++ b/print/gp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.itbrain.co.jp/~ueda/GP/
DISTNAME= GP-2.5p2
MAINTAINER= kiri@kiri.toba-cmt.ac.jp
+COMMENT?= A GUI Printer manager written with Tcl/Tk
PATCHDIR= ${.CURDIR}/../../print/gp/files
FILESDIR= ${.CURDIR}/../../print/gp/files
diff --git a/print/gp/pkg-comment b/print/gp/pkg-comment
deleted file mode 100644
index 19efa7186a29..000000000000
--- a/print/gp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GUI Printer manager written with Tcl/Tk
diff --git a/print/tgif2tex/Makefile b/print/tgif2tex/Makefile
index cbddf7708892..ce0e85e2c1fe 100644
--- a/print/tgif2tex/Makefile
+++ b/print/tgif2tex/Makefile
@@ -11,6 +11,7 @@ CATEGORIES+= print
MASTER_SITES= http://www.jaist.ac.jp/~knakano/tgif2tex/
MAINTAINER= taoka@FreeBSD.org
+COMMENT?= Converting texts in figure by tgif to LaTeX commands
USE_PERL5= yes
diff --git a/print/tgif2tex/pkg-comment b/print/tgif2tex/pkg-comment
deleted file mode 100644
index 824c0cffe473..000000000000
--- a/print/tgif2tex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converting texts in figure by tgif to LaTeX commands
diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index b29370096aa8..6c8d2708c4f8 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -15,7 +15,7 @@ DISTNAME= nmap-${PORTVERSION:S/.b/BETA/}
EXTRACT_SUFX= .tgz
MAINTAINER= d.marks@student.umist.ac.uk
-COMMENT= Port scanning utility for large networks
+COMMENT?= Port scanning utility for large networks
.include <bsd.port.pre.mk>
diff --git a/security/nmapfe/Makefile b/security/nmapfe/Makefile
index 5864cb4ddeea..95f5bd83e0eb 100644
--- a/security/nmapfe/Makefile
+++ b/security/nmapfe/Makefile
@@ -7,6 +7,7 @@
#
MASTERDIR= ${.CURDIR}/../nmap
+COMMENT= GUI frontend for the nmap scanning utility
PORTNAME= nmapfe
diff --git a/security/nmapfe/pkg-comment b/security/nmapfe/pkg-comment
deleted file mode 100644
index 5678ecd23a9f..000000000000
--- a/security/nmapfe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GUI frontend for the nmap scanning utility
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index 5864cb4ddeea..95f5bd83e0eb 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/Makefile
@@ -7,6 +7,7 @@
#
MASTERDIR= ${.CURDIR}/../nmap
+COMMENT= GUI frontend for the nmap scanning utility
PORTNAME= nmapfe
diff --git a/security/zenmap/pkg-comment b/security/zenmap/pkg-comment
deleted file mode 100644
index 5678ecd23a9f..000000000000
--- a/security/zenmap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GUI frontend for the nmap scanning utility
diff --git a/www/w3/Makefile b/www/w3/Makefile
index 48836ad9f6bc..e568444a5f92 100644
--- a/www/w3/Makefile
+++ b/www/w3/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.iij.ad.jp/pub/network/WWW/w3/ \
ftp://ftp.cs.indiana.edu/pub/elisp/w3/
MAINTAINER= kiri@kiri.toba-cmt.ac.jp
+COMMENT?= WWW browser based on emacs/mule
BUILD_DEPENDS?= emacs-19.34:${PORTSDIR}/editors/emacs
RUN_DEPENDS?= emacs-19.34:${PORTSDIR}/editors/emacs
diff --git a/www/w3/pkg-comment b/www/w3/pkg-comment
deleted file mode 100644
index f40be1afb337..000000000000
--- a/www/w3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WWW browser based on emacs/mule
diff --git a/x11-toolkits/fox-xunicode/pkg-comment b/x11-toolkits/fox-xunicode/pkg-comment
deleted file mode 100644
index 6594edfce0e5..000000000000
--- a/x11-toolkits/fox-xunicode/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FOX with Unicode support
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 95d66200f10f..2539e026b67f 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -15,6 +15,7 @@ DISTNAME= qt-x11-${PORTVERSION}
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT?= A C++ X GUI toolkit
LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \
png.5:${PORTSDIR}/graphics/png \
diff --git a/x11-toolkits/qt23/pkg-comment b/x11-toolkits/qt23/pkg-comment
deleted file mode 100644
index 0e56180e5c92..000000000000
--- a/x11-toolkits/qt23/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C++ X GUI toolkit