Revived COMMENT, DESCR in these ports and then modified about it.

PR:		15331
Submitted by:	maintainer

7 files changed, 44 insertions, 12 deletions

diff --git a/japanese/xemacs21-canna+freewnn/pkg-comment b/japanese/xemacs21-canna+freewnn/pkg-comment
index b3cba2f0d39e..a6caec3c136d 100644
--- a/japanese/xemacs21-canna+freewnn/pkg-comment
+++ b/japanese/xemacs21-canna+freewnn/pkg-comment
@@ -1 +1 @@
-XEmacs text editor, with Canna, Wnn4, SJ3 and SKK support
+XEmacs(version 21.1.8) text editor, with SJ3, SKK, Canna and Wnn4 support.
diff --git a/japanese/xemacs21-canna+wnn6/pkg-comment b/japanese/xemacs21-canna+wnn6/pkg-comment
index c4c2a3a6c9ab..eca2557a760c 100644
--- a/japanese/xemacs21-canna+wnn6/pkg-comment
+++ b/japanese/xemacs21-canna+wnn6/pkg-comment
@@ -1 +1 @@
-XEmacs text editor, with Canna, Wnn6, SJ3 and SKK
+XEmacs(version 21.1.8) text editor, with SJ3, SKK, Canna and Wnn6 support.
diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile
index d74fcfd20995..61de09456b98 100644
--- a/japanese/xemacs21-canna/Makefile
+++ b/japanese/xemacs21-canna/Makefile
@@ -20,15 +20,13 @@
 
 CATEGORIES=	japanese editors
 
-JAPANESE=	yes
 MANLANG=	ja
 MAN1=		xemacs-ja.1
-DESCR_TMPL=	${.CURDIR}/../xemacs-canna/files/DESCR.tmpl
+DESCR=		${.CURDIR}/../xemacs-canna/pkg/DESCR
 PLIST=		${PKGLDIR}/PLIST-ja
 
+DESCR_TMPL=	${.CURDIR}/../xemacs-canna/files/DESCR.tmpl
 LANGPREFIX=	ja-
-COMMENT=	${WRKDIR}/COMMENT
-DESCR=		${WRKDIR}/DESCR
 .if defined(CANNA) && defined(WNN4)
 PKGNAMEEXT=		-canna+wnn4
 SITE_INCLUDES=		${X11BASE}/include
@@ -54,7 +52,7 @@ COMMENT_TEXT=		XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK and Wnn4
 PKGNAMEEXT=		-wnn6
 WITH_INPUT_METHOD=	--with-wnn6 --with-canna=no
 BUILD_INPUT_METHOD=	${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib
-COMMENT_TEXT=		XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK, Canna and Wnn6 support.
+COMMENT_TEXT=		XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK and Wnn6 support.
 .else
 PKGNAMEEXT=		-canna
 WITH_INPUT_METHOD=	--with-canna --with-wnn=no --with-wnn6=no
@@ -62,12 +60,14 @@ LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna
 COMMENT_TEXT=		XEmacs(version ${XEMACS_VER}) text editor, with SJ3, SKK and Canna support.
 .endif
 
-post-configure::
-	@${ECHO} "${COMMENT_TEXT}" > ${COMMENT}
-
 post-install::
 	@${MKDIR} ${PREFIX}/man/ja/man1
 	@${INSTALL_MAN} ${WRKSRC}/etc/xemacs-ja.1 ${PREFIX}/man/ja/man1
 	@${LN} -sf ja ${PREFIX}/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.EUC
 
+# for make COMMENT (only maintainer use)
+arrange::
+	@${MKDIR} ${PKGDIR} ${.CURDIR}/../xemacs-canna/pkg
+	@${ECHO} "${COMMENT_TEXT}" > ${COMMENT}
+
 .include "${.CURDIR}/../../editors/xemacs-mule/Makefile"
diff --git a/japanese/xemacs21-canna/pkg-comment b/japanese/xemacs21-canna/pkg-comment
new file mode 100644
index 000000000000..ada90301ac39
--- /dev/null
+++ b/japanese/xemacs21-canna/pkg-comment
@@ -0,0 +1 @@
+XEmacs(version 21.1.8) text editor, with SJ3, SKK and Canna support.
diff --git a/japanese/xemacs21-canna/pkg-descr b/japanese/xemacs21-canna/pkg-descr
new file mode 100644
index 000000000000..503bbd8aeee3
--- /dev/null
+++ b/japanese/xemacs21-canna/pkg-descr
@@ -0,0 +1,31 @@
+This is a package containing only the executables for XEmacs with
+Mule(version 21.1.8), the next generation of Emacs.
+
+You need to install a package, xemacs-common-21.1.8, containing emacs
+lisp files, info pages, and so on (except executables) for
+XEmacs with Mule(version 21.1.8).
+
+This package is built with Japanese support by using SKK, SJ3, Canna,
+Wnn4 or Wnn6 as an external input engine. Each input method would be
+supported in following ports respectively:
+
+	japanese/xemacs-canna ........ SKK, SJ3, Canna
+	japanese/xemacs-canna+wnn4 ... SKK, SJ3, Canna, Wnn4
+	japanese/xemacs-canna+wnn6 ... SKK, SJ3, Canna, Wnn6
+	japanese/xemacs-wnn4 ......... SKK, SJ3, Wnn4
+	japanese/xemacs-wnn6 ......... SKK, SJ3, Wnn6
+
+If you use with SJ3 or SKK, you should be installed sj3serv or skkserv
+in advance. SKK is supported as already builtin. Also it will
+support several input methods under leim. 
+
+This package and the package xemacs-common-21.1.8, might clobber any
+existing emacs installation.  In particular, the executables and man
+pages of etags/ctags are installed, and the info pages that come with
+the original emacs will be overwritten too.
+
+Although this shouldn't cause any problems to run both mule and emacs,
+it may cause some confusion when one of them is pkg_delete'd.  If
+someone has a solution to this, please tell me.
+Or to avoid this problem, you could select prefix for top install
+directory. By default it is pointed to the usual place, /usr/local.
diff --git a/japanese/xemacs21-freewnn/pkg-comment b/japanese/xemacs21-freewnn/pkg-comment
index 3a8ebf39bc10..e28656c4f538 100644
--- a/japanese/xemacs21-freewnn/pkg-comment
+++ b/japanese/xemacs21-freewnn/pkg-comment
@@ -1 +1 @@
-XEmacs text editor, with Wnn4, SJ3 and SKK
+XEmacs(version 21.1.8) text editor, with SJ3, SKK and Wnn4 support.
diff --git a/japanese/xemacs21-wnn6/pkg-comment b/japanese/xemacs21-wnn6/pkg-comment
index f6571d5432cb..219b478b7868 100644
--- a/japanese/xemacs21-wnn6/pkg-comment
+++ b/japanese/xemacs21-wnn6/pkg-comment
@@ -1 +1 @@
-XEmacs text editor, with Wnn6, SJ3 and SKK
+XEmacs(version 21.1.8) text editor, with SJ3, SKK and Wnn6 support.