8 files changed, 23 insertions, 31 deletions
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index f5506e24f076..3066883836e9 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -18,7 +18,7 @@ DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} \
 DIST_SUBDIR=	xemacs
 
 MAINTAINER=	kiri@FreeBSD.org
-COMMENT?=	XEmacs(gamma version) text editor with mule(Only the executables)
+COMMENT?=	XEmacs(stable version) text editor with mule(Only the executables)
 
 .include <bsd.port.pre.mk>
 
diff --git a/editors/xemacs21-mule/pkg-descr b/editors/xemacs21-mule/pkg-descr
index 2d8d16342879..d5c6ddcf2045 100644
--- a/editors/xemacs21-mule/pkg-descr
+++ b/editors/xemacs21-mule/pkg-descr
@@ -1,6 +1,5 @@
-This is a package containing only the executables for development
-version(gamma) of XEmacs with Mule(version 21.4.12), the next
-generation of Emacs.
+This is a package containing only the executables for stable
+version of XEmacs with Mule, the next generation of Emacs.
 
 This package is not built with any particular language support except for
 already built-in Imput Method - SKK and SJ3.  If you want other built-in
diff --git a/editors/xemacs21-mule/pkg-descr.ja b/editors/xemacs21-mule/pkg-descr.ja
index 398a41a1fb66..711d363a7d7d 100644
--- a/editors/xemacs21-mule/pkg-descr.ja
+++ b/editors/xemacs21-mule/pkg-descr.ja
@@ -1,32 +1,20 @@
-This is a package containing only the executables for development
-version(gamma) of XEmacs with Mule(version 21.4.12), the next
-generation of Emacs.
+This is a package containing only the executables for stable
+version of XEmacs with Mule, the next generation of Emacs.
 
-You need to install a full package, xemacs-devel-mule-21.4.12, containing emacs
-executables, lisp files, info pages, and so on for XEmacs with Mule
-(version 21.4.12).
+You need to install a full package for editors/xemacs21-mule
+containing emacs executables, lisp files, info pages, and so on for
+XEmacs with Mule. 
 
 This package is built with Japanese support by using SKK, SJ3, Canna,
 FreeWnn or Wnn6 as an external input engine. Each input method would be
 supported in following ports respectively:
 
-    japanese/xemacs-devel-canna ........... SKK, SJ3, Canna
-    japanese/xemacs-devel-canna+freewnn ... SKK, SJ3, Canna, FreeWnn
-    japanese/xemacs-devel-canna+wnn6 ...... SKK, SJ3, Canna, Wnn6
-    japanese/xemacs-devel-freewnn ......... SKK, SJ3, FreeWnn
-    japanese/xemacs-devel-wnn6 ............ SKK, SJ3, Wnn6
+    japanese/xemacs21-canna ........... SKK, SJ3, Canna
+    japanese/xemacs21-canna+freewnn ... SKK, SJ3, Canna, FreeWnn
+    japanese/xemacs21-canna+wnn6 ...... SKK, SJ3, Canna, Wnn6
+    japanese/xemacs21-freewnn ......... SKK, SJ3, FreeWnn
+    japanese/xemacs21-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-devel-mule-21.4.12, 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-canna+freewnn/Makefile b/japanese/xemacs21-canna+freewnn/Makefile
index e0e50b839499..f9c4d2deca12 100644
--- a/japanese/xemacs21-canna+freewnn/Makefile
+++ b/japanese/xemacs21-canna+freewnn/Makefile
@@ -7,8 +7,9 @@
 
 CATEGORIES=	japanese
 
+COMMENT=	XEmacs(stable version) text editor(SJ3, SKK, Canna and FreeWnn)
+
 MASTERDIR=	${.CURDIR}/../../editors/xemacs21-mule
-COMMENT=	XEmacs(gamma version) text editor, with SJ3, SKK, Canna and FreeWnn support
 
 CANNA=		yes
 FREEWNN=	yes
diff --git a/japanese/xemacs21-canna+wnn6/Makefile b/japanese/xemacs21-canna+wnn6/Makefile
index becd96b2ac47..aee6df0eb2ec 100644
--- a/japanese/xemacs21-canna+wnn6/Makefile
+++ b/japanese/xemacs21-canna+wnn6/Makefile
@@ -7,8 +7,9 @@
 
 CATEGORIES=	japanese
 
+COMMENT=	XEmacs(stable version) text editor(SJ3, SKK, Canna and Wnn6)
+
 MASTERDIR=	${.CURDIR}/../../editors/xemacs21-mule
-COMMENT=	XEmacs(gamma version) text editor, with SJ3, SKK, Canna and Wnn6 support
 
 CANNA=		yes
 WNN6=		yes
diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile
index 12bf9b8dce87..1ebf793b7ebf 100644
--- a/japanese/xemacs21-canna/Makefile
+++ b/japanese/xemacs21-canna/Makefile
@@ -7,8 +7,9 @@
 
 CATEGORIES=	japanese
 
+COMMENT=	XEmacs(stable version) text editor(SJ3, SKK and Canna)
+
 MASTERDIR=	${.CURDIR}/../../editors/xemacs21-mule
-COMMENT=	XEmacs(gamma version) text editor, with SJ3, SKK and Canna support
 
 CANNA=		yes
 
diff --git a/japanese/xemacs21-freewnn/Makefile b/japanese/xemacs21-freewnn/Makefile
index 8063c0d5def0..b446304023e5 100644
--- a/japanese/xemacs21-freewnn/Makefile
+++ b/japanese/xemacs21-freewnn/Makefile
@@ -7,8 +7,9 @@
 
 CATEGORIES=	japanese
 
+COMMENT=	XEmacs(stable version) text editor(SJ3, SKK and FreeWnn)
+
 MASTERDIR=	${.CURDIR}/../../editors/xemacs21-mule
-COMMENT=	XEmacs(gamma version) text editor, with SJ3, SKK and FreeWnn support
 
 FREEWNN=	yes
 
diff --git a/japanese/xemacs21-wnn6/Makefile b/japanese/xemacs21-wnn6/Makefile
index 9a2458b9f6b7..4d2c927b246e 100644
--- a/japanese/xemacs21-wnn6/Makefile
+++ b/japanese/xemacs21-wnn6/Makefile
@@ -8,8 +8,9 @@
 
 CATEGORIES=	japanese
 
+COMMENT=	XEmacs(stable version) text editor(SJ3, SKK and Wnn6)
+
 MASTERDIR=	${.CURDIR}/../../editors/xemacs21-mule
-COMMENT=	XEmacs(gamma version) text editor, with SJ3, SKK and Wnn6 support
 
 WNN6=		yes