Updated XEmacs-mule to 21.1.6

(1) Add the following ports for XEmacs packages (by repository-copy).

ports/editors/xemacs-base-packages
ports/editors/xemacs-mule-base-packages
ports/editors/xemacs-mule-sumo-packages
ports/editors/xemacs-sumo-packages

The last two ports are for japanese.

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

(2) Add the following ports for XEmacs packages for mule (by repository-copy).

ports/japanese/xemacs-sumo
ports/japanese/xemacs-sumo-canna
ports/japanese/xemacs-sumo-canna+wnn4
ports/japanese/xemacs-sumo-canna+wnn6
ports/japanese/xemacs-sumo-wnn4
ports/japanese/xemacs-sumo-wnn6

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

(3) Modified the following ports in order to update to 21.1.6.

ports/japanese/xemacs
ports/japanese/xemacs-canna
ports/japanese/xemacs-canna+wnn4
ports/japanese/xemacs-canna+wnn6
ports/japanese/xemacs-wnn4
ports/japanese/xemacs-wnn6
ports/editors/xemacs-mule
ports/editors/xemacs-mule-common

PR:		13390
Submitted by:	maintainer, KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>

11 files changed, 40 insertions, 67 deletions

diff --git a/japanese/xemacs21-canna+freewnn/Makefile b/japanese/xemacs21-canna+freewnn/Makefile
index 4ab56f1..fa9b7f8 100644
--- a/japanese/xemacs21-canna+freewnn/Makefile
+++ b/japanese/xemacs21-canna+freewnn/Makefile
@@ -1,13 +1,11 @@
 # New ports collection makefile for:	XEmacs with Canna and Wnn4
-# Version required:	20.4
+# Version required:	21.1.6
 # Date created:		5 Dec 1997
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-xemacs-canna+wnn4-20.4
-
 CANNA=		yes
 WNN4=		yes
 
diff --git a/japanese/xemacs21-canna+wnn6/Makefile b/japanese/xemacs21-canna+wnn6/Makefile
index 4078dca..a7a92b2 100644
--- a/japanese/xemacs21-canna+wnn6/Makefile
+++ b/japanese/xemacs21-canna+wnn6/Makefile
@@ -6,8 +6,6 @@
 # $FreeBSD$
 #
 
-PKGNAME=	ja-xemacs-canna+wnn6-20.4
-
 CANNA=		yes
 WNN6=		yes
 
diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile
index c931fed..99cb55c 100644
--- a/japanese/xemacs21-canna/Makefile
+++ b/japanese/xemacs21-canna/Makefile
@@ -6,8 +6,6 @@
 # $FreeBSD$
 #
 
-PKGNAME?=	ja-xemacs-canna-20.4
-
 CANNA=		yes
 
 MASTERDIR=	${.CURDIR}/../../japanese/xemacs
diff --git a/japanese/xemacs21-canna/pkg-descr b/japanese/xemacs21-canna/pkg-descr
index 357169f..3d9393e 100644
--- a/japanese/xemacs21-canna/pkg-descr
+++ b/japanese/xemacs21-canna/pkg-descr
@@ -1,16 +1,16 @@
-This is a package containing only the executables for xemacs-20.4, the
+This is a package containing only the executables for xemacs-21.1.6, the
 next generation of Emacs.
 
-You need to install a package, xemacs-common-20.4, containing emacs
+You need to install a package, xemacs-common-21.1.6, containing emacs
 lisp files, info pages, and so on (except executables) for
-xemacs-20.4.
+xemacs-21.1.6.
 
 This package is built with Japanese support by using Canna or SJ3 as
 an external input engine. If you use with SJ3, you should be installed 
 sj3serv in advance. SKK is supported as already builtin. Also it will
 support several input methods under leim. 
 
-This package and the package xemacs-common-20.4, might clobber any
+This package and the package xemacs-common-21.1.6, 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 c012742..5049417 100644
--- a/japanese/xemacs21-freewnn/Makefile
+++ b/japanese/xemacs21-freewnn/Makefile
@@ -6,8 +6,6 @@
 # $FreeBSD$
 #
 
-PKGNAME=	ja-xemacs-wnn4-20.4
-
 WNN4=		yes
 
 MASTERDIR=	${.CURDIR}/../../japanese/xemacs
diff --git a/japanese/xemacs21-sumo-canna+freewnn/Makefile b/japanese/xemacs21-sumo-canna+freewnn/Makefile
index 4ab56f1..b566ad1 100644
--- a/japanese/xemacs21-sumo-canna+freewnn/Makefile
+++ b/japanese/xemacs21-sumo-canna+freewnn/Makefile
@@ -1,17 +1,13 @@
-# New ports collection makefile for:	XEmacs with Canna and Wnn4
-# Version required:	20.4
-# Date created:		5 Dec 1997
-# Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
+# New ports collection makefile for:   Meta port of XEmacs mule with sumo package
+# Version required:    1.0
+# Date created:        19 August 1999
+# Whom:                KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
-# $FreeBSD$
+# $Id$
 #
 
-PKGNAME=	ja-xemacs-canna+wnn4-20.4
+NAMEEXT=	-canna+wnn4
 
-CANNA=		yes
-WNN4=		yes
-
-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
-PKGDIR=		${.CURDIR}/pkg
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs-sumo
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-sumo-canna+wnn6/Makefile b/japanese/xemacs21-sumo-canna+wnn6/Makefile
index 4078dca..0bef9ad 100644
--- a/japanese/xemacs21-sumo-canna+wnn6/Makefile
+++ b/japanese/xemacs21-sumo-canna+wnn6/Makefile
@@ -1,17 +1,13 @@
-# New ports collection makefile for:	XEmacs with Canna and Wnn6
-# Version required:	20.4
-# Date created:		5 Dec 1997
-# Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
+# New ports collection makefile for:   Meta port of XEmacs mule with sumo package
+# Version required:    1.0
+# Date created:        19 August 1999
+# Whom:                KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
-# $FreeBSD$
+# $Id$
 #
 
-PKGNAME=	ja-xemacs-canna+wnn6-20.4
+NAMEEXT=	-canna+wnn6
 
-CANNA=		yes
-WNN6=		yes
-
-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
-PKGDIR=		${.CURDIR}/pkg
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs-sumo
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-sumo-canna/Makefile b/japanese/xemacs21-sumo-canna/Makefile
index c931fed..9f2e2ef 100644
--- a/japanese/xemacs21-sumo-canna/Makefile
+++ b/japanese/xemacs21-sumo-canna/Makefile
@@ -1,16 +1,13 @@
-# New ports collection makefile for:	XEmacs for Japanese with Canna
-# Version required:	20.4
-# Date created:		5 Dec 1997
-# Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
+# New ports collection makefile for:   Meta port of XEmacs mule with sumo package
+# Version required:    1.0
+# Date created:        19 August 1999
+# Whom:                KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
-# $FreeBSD$
+# $Id$
 #
 
-PKGNAME?=	ja-xemacs-canna-20.4
+NAMEEXT=	-canna
 
-CANNA=		yes
-
-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
-PKGDIR=		${.CURDIR}/pkg
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs-sumo
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-sumo-freewnn/Makefile b/japanese/xemacs21-sumo-freewnn/Makefile
index c012742..c2a3e8d 100644
--- a/japanese/xemacs21-sumo-freewnn/Makefile
+++ b/japanese/xemacs21-sumo-freewnn/Makefile
@@ -1,16 +1,13 @@
-# New ports collection makefile for:	XEmacs with Wnn4
-# Version required:	20.4
-# Date created:		25 January 1998
-# Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
+# New ports collection makefile for:   Meta port of XEmacs mule with sumo package
+# Version required:    1.0
+# Date created:        19 August 1999
+# Whom:                KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
-# $FreeBSD$
+# $Id$
 #
 
-PKGNAME=	ja-xemacs-wnn4-20.4
+NAMEEXT=	-wnn4
 
-WNN4=		yes
-
-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
-PKGDIR=		${.CURDIR}/pkg
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs-sumo
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-sumo-wnn6/Makefile b/japanese/xemacs21-sumo-wnn6/Makefile
index 9cd2319..f2546cf 100644
--- a/japanese/xemacs21-sumo-wnn6/Makefile
+++ b/japanese/xemacs21-sumo-wnn6/Makefile
@@ -1,16 +1,13 @@
-# New ports collection makefile for:	XEmacs with Wnn6
-# Version required:	20.4
-# Date created:		25 January 1998
-# Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
+# New ports collection makefile for:   Meta port of XEmacs mule with sumo package
+# Version required:    1.0
+# Date created:        19 August 1999
+# Whom:                KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
-# $FreeBSD$
+# $Id$
 #
 
-PKGNAME=	ja-xemacs-wnn6-20.4
+NAMEEXT=	-wnn6
 
-WNN6=		yes
-
-MASTERDIR=	${.CURDIR}/../../japanese/xemacs
-PKGDIR=		${.CURDIR}/pkg
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs-sumo
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-wnn6/Makefile b/japanese/xemacs21-wnn6/Makefile
index 9cd2319..3ae83a2 100644
--- a/japanese/xemacs21-wnn6/Makefile
+++ b/japanese/xemacs21-wnn6/Makefile
@@ -6,8 +6,6 @@
 # $FreeBSD$
 #
 
-PKGNAME=	ja-xemacs-wnn6-20.4
-
 WNN6=		yes
 
 MASTERDIR=	${.CURDIR}/../../japanese/xemacs