Update to version 21.1.10

Rearrange xemacs mule packages

PR:	19021
PR:	19023
Submitted by: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>

12 files changed, 20 insertions, 13 deletions

diff --git a/japanese/xemacs21-canna+freewnn/Makefile b/japanese/xemacs21-canna+freewnn/Makefile
index f916271fd24b..3aed7741cf50 100644
--- a/japanese/xemacs21-canna+freewnn/Makefile
+++ b/japanese/xemacs21-canna+freewnn/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=		${.CURDIR}/pkg/COMMENT
+
 XEMACS_MAJOR_VER=	21
 CANNA=			yes
 WNN4=			yes
diff --git a/japanese/xemacs21-canna+wnn6/Makefile b/japanese/xemacs21-canna+wnn6/Makefile
index bd9953538aac..d5a3ae72375c 100644
--- a/japanese/xemacs21-canna+wnn6/Makefile
+++ b/japanese/xemacs21-canna+wnn6/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=		${.CURDIR}/pkg/COMMENT
+
 XEMACS_MAJOR_VER=	21
 CANNA=			yes
 WNN6=			yes
diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile
index 1d4f7844c765..faf0463c9de3 100644
--- a/japanese/xemacs21-canna/Makefile
+++ b/japanese/xemacs21-canna/Makefile
@@ -13,8 +13,6 @@
 #	MULE_PORT         : Mule port if defined(means COMMN or SLAVE)
 #	MULE_COMMON       : COMMON port if defined
 #	MULE_SLAVE        : SLAVE port if defined
-#	PKGLDIR           : Local PKGDIR of editors/xemacs${XEMACS_MAJOR_VER}-mule
-#                           (that is editors/xemacs${XEMACS_MAJOR_VER}-mule/pkg)
 #	SITE_INCLUDES     : site include path(configure arguments)
 #	SITE_LIBRARIES    : site libraries path(configure arguments)
 #	WITH_INPUT_METHOD : input methods(configure arguments)
@@ -25,6 +23,7 @@ CATEGORIES=	japanese
 
 MANLANG=	ja
 MAN1=		xemacs-ja.1
+COMMENT?=	${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg/COMMENT
 DESCR=		${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg/DESCR
 
 XEMACS_MAJOR_VER?=	21
diff --git a/japanese/xemacs21-canna/files/DESCR.tmpl b/japanese/xemacs21-canna/files/DESCR.tmpl
index 8b83c2b71be5..901ecbcfdf0e 100644
--- a/japanese/xemacs21-canna/files/DESCR.tmpl
+++ b/japanese/xemacs21-canna/files/DESCR.tmpl
@@ -1,7 +1,7 @@
 This is a package containing only the executables for XEmacs with
 Mule(version %%XEMACS_VER%%), the next generation of Emacs.
 
-You need to install a package, xemacs-common-%%XEMACS_REL%%, containing emacs
+You need to install a package, xemacs-common-%%XEMACS_VER%%, containing emacs
 lisp files, info pages, and so on (except executables) for
 XEmacs with Mule(version %%XEMACS_VER%%).
 
@@ -19,7 +19,7 @@ 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-%%XEMACS_REL%%, might clobber any
+This package and the package xemacs-common-%%XEMACS_VER%%, 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.
diff --git a/japanese/xemacs21-canna/pkg-descr b/japanese/xemacs21-canna/pkg-descr
index ef0115b9751d..4829628e0898 100644
--- a/japanese/xemacs21-canna/pkg-descr
+++ b/japanese/xemacs21-canna/pkg-descr
@@ -1,9 +1,9 @@
 This is a package containing only the executables for XEmacs with
-Mule(version 21.1.9), the next generation of Emacs.
+Mule(version 21.1.10), the next generation of Emacs.
 
-You need to install a package, xemacs-common-21.1, containing emacs
+You need to install a package, xemacs-common-21.1.10, containing emacs
 lisp files, info pages, and so on (except executables) for
-XEmacs with Mule(version 21.1.9).
+XEmacs with Mule(version 21.1.10).
 
 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
@@ -19,7 +19,7 @@ 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, might clobber any
+This package and the package xemacs-common-21.1.10, 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.
diff --git a/japanese/xemacs21-freewnn/Makefile b/japanese/xemacs21-freewnn/Makefile
index 83c6e31d55b7..5274918a8808 100644
--- a/japanese/xemacs21-freewnn/Makefile
+++ b/japanese/xemacs21-freewnn/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=		${.CURDIR}/pkg/COMMENT
+
 XEMACS_MAJOR_VER=	21
 WNN4=			yes
 
diff --git a/japanese/xemacs21-sumo-canna+freewnn/Makefile b/japanese/xemacs21-sumo-canna+freewnn/Makefile
index f12771c43d34..a0c647bfa2ed 100644
--- a/japanese/xemacs21-sumo-canna+freewnn/Makefile
+++ b/japanese/xemacs21-sumo-canna+freewnn/Makefile
@@ -10,6 +10,6 @@ CATEGORIES=	japanese
 XEMACS_MAJOR_VER=	21
 PKGNAMESUFFIX=		-canna+wnn4
 
-MASTERDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-sumo
+MASTERDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-sumo
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-sumo-canna+wnn6/Makefile b/japanese/xemacs21-sumo-canna+wnn6/Makefile
index 697a2674c89d..12315e2046e6 100644
--- a/japanese/xemacs21-sumo-canna+wnn6/Makefile
+++ b/japanese/xemacs21-sumo-canna+wnn6/Makefile
@@ -10,6 +10,6 @@ CATEGORIES=	japanese
 XEMACS_MAJOR_VER=	21
 PKGNAMESUFFIX=		-canna+wnn6
 
-MASTERDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-sumo
+MASTERDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-sumo
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-sumo-canna/Makefile b/japanese/xemacs21-sumo-canna/Makefile
index b2d61b25d2f8..767e0f03d63d 100644
--- a/japanese/xemacs21-sumo-canna/Makefile
+++ b/japanese/xemacs21-sumo-canna/Makefile
@@ -10,6 +10,6 @@ CATEGORIES=	japanese
 XEMACS_MAJOR_VER=	21
 PKGNAMESUFFIX=		-canna
 
-MASTERDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-sumo
+MASTERDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-sumo
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-sumo-freewnn/Makefile b/japanese/xemacs21-sumo-freewnn/Makefile
index 7fd900595d6e..488a7675ab82 100644
--- a/japanese/xemacs21-sumo-freewnn/Makefile
+++ b/japanese/xemacs21-sumo-freewnn/Makefile
@@ -10,6 +10,6 @@ CATEGORIES=	japanese
 XEMACS_MAJOR_VER=	21
 PKGNAMESUFFIX=		-wnn4
 
-MASTERDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-sumo
+MASTERDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-sumo
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-sumo-wnn6/Makefile b/japanese/xemacs21-sumo-wnn6/Makefile
index c7dd1219f9d2..237f5f0d5bc9 100644
--- a/japanese/xemacs21-sumo-wnn6/Makefile
+++ b/japanese/xemacs21-sumo-wnn6/Makefile
@@ -10,6 +10,6 @@ CATEGORIES=	japanese
 XEMACS_MAJOR_VER=	21
 PKGNAMESUFFIX=		-wnn6
 
-MASTERDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-sumo
+MASTERDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-sumo
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-wnn6/Makefile b/japanese/xemacs21-wnn6/Makefile
index a4f915e16bc9..821a7368040d 100644
--- a/japanese/xemacs21-wnn6/Makefile
+++ b/japanese/xemacs21-wnn6/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+COMMENT=		${.CURDIR}/pkg/COMMENT
+
 XEMACS_MAJOR_VER=	21
 WNN6=			yes