Share files among various mule ports, both port files and within

packages.  The editors/mule-common package contains the language-
independent parts.  Add some new ports based on input methods.  They
don't take up much space because of efficient sharing.

PR:		4411
Submitted by:	Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>

51 files changed, 727 insertions, 338 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 96675a942116..7dce275a707e 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.78 1997/08/25 00:27:46 asami Exp $
+# $Id: Makefile,v 1.79 1997/09/10 07:55:26 asami Exp $
 #
 
     SUBDIR += Canna
@@ -51,8 +51,16 @@
     SUBDIR += mmm
     SUBDIR += mnews
     SUBDIR += mule-canna
+    SUBDIR += mule-canna+sj3
+    SUBDIR += mule-canna+sj3+wnn4
+    SUBDIR += mule-canna+sj3+wnn6
+    SUBDIR += mule-canna+wnn4
+    SUBDIR += mule-canna+wnn6
     SUBDIR += mule-sj3
-    SUBDIR += mule-wnn
+    SUBDIR += mule-sj3+wnn4
+    SUBDIR += mule-sj3+wnn6
+    SUBDIR += mule-wnn4
+    SUBDIR += mule-wnn6
     SUBDIR += nethack
     SUBDIR += newosaka
     SUBDIR += nkf
diff --git a/japanese/mule-canna+freewnn+sj3/pkg-comment b/japanese/mule-canna+freewnn+sj3/pkg-comment
new file mode 100644
index 000000000000..1da39c0db214
--- /dev/null
+++ b/japanese/mule-canna+freewnn+sj3/pkg-comment
@@ -0,0 +1 @@
+A multilingual emacs, with Canna, sj3 and Wnn4 support built in (Only the executables)
diff --git a/japanese/mule-canna+freewnn+sj3/pkg-descr b/japanese/mule-canna+freewnn+sj3/pkg-descr
new file mode 100644
index 000000000000..ce7e41b0c013
--- /dev/null
+++ b/japanese/mule-canna+freewnn+sj3/pkg-descr
@@ -0,0 +1,40 @@
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
+
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
+
+This package is built with Japanese support, using Canna, sj3(*1) or
+Wnn4. It is supported input methods, jeonkak, hangul for
+Korean(Hanja), and quanjiao, zhuyin, erpin for Chinese (check out
+lib/mule/site-lisp/site-start.el), using Wnn4, too.
+
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
+
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
+
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
+
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
+
+------------------------------
+(*1)
+If you want to use 'sj3' as a Japanese input method, then you should
+insert the following two lines into ~/.emacs.
+
+(load "sj3-egg")
+(setq egg-default-startup-file "eggrc-sj3")
diff --git a/japanese/mule-canna+freewnn+sj3/pkg-install b/japanese/mule-canna+freewnn+sj3/pkg-install
new file mode 100644
index 000000000000..3a04bb08351c
--- /dev/null
+++ b/japanese/mule-canna+freewnn+sj3/pkg-install
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
+echo "####################################################################"
+echo "If you want to use 'SJ3' as a japanese input method, then you should"
+echo "insert the following two lines into ~/.emacs"
+echo ""
+echo "(load \"sj3-egg\")"
+echo "(setq egg-default-startup-file \"eggrc-sj3\")"
+echo "####################################################################"
diff --git a/japanese/mule-canna+freewnn/Makefile b/japanese/mule-canna+freewnn/Makefile
new file mode 100644
index 000000000000..b5c64c8a9cc4
--- /dev/null
+++ b/japanese/mule-canna+freewnn/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for:	mule with Canna and Wnn4
+# Version required:	2.3
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	jp-mule-canna+wnn4-2.3
+CATEGORIES=	japanese editors
+
+CANNA=		yes
+WNN4=		yes
+
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-canna+freewnn/pkg-comment b/japanese/mule-canna+freewnn/pkg-comment
new file mode 100644
index 000000000000..9dbc18a984f7
--- /dev/null
+++ b/japanese/mule-canna+freewnn/pkg-comment
@@ -0,0 +1 @@
+A multilingual emacs, with Canna and Wnn4 support built in (Only the executables)
diff --git a/japanese/mule-canna+freewnn/pkg-descr b/japanese/mule-canna+freewnn/pkg-descr
new file mode 100644
index 000000000000..a0eba4d40a63
--- /dev/null
+++ b/japanese/mule-canna+freewnn/pkg-descr
@@ -0,0 +1,32 @@
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
+
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
+
+This package is built with Japanese support, using Canna or Wnn4. It
+is supported input methods, jeonkak, hangul for Korean(Hanja), and
+quanjiao, zhuyin, erpin for Chinese (check out
+lib/mule/site-lisp/site-start.el), using Wnn4, too.
+
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
+
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
+
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
+
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
diff --git a/japanese/mule-canna+sj3+wnn6/Makefile b/japanese/mule-canna+sj3+wnn6/Makefile
new file mode 100644
index 000000000000..d48889a87ab7
--- /dev/null
+++ b/japanese/mule-canna+sj3+wnn6/Makefile
@@ -0,0 +1,16 @@
+# New ports collection makefile for:	mule with Canna, sj3 and Wnn6
+# Version required:	2.3
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	jp-mule-canna+sj3+wnn6-2.3
+CATEGORIES=	japanese editors
+
+CANNA=		yes
+SJ3=		yes
+WNN6=		yes
+
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-canna+sj3+wnn6/pkg-comment b/japanese/mule-canna+sj3+wnn6/pkg-comment
new file mode 100644
index 000000000000..6a40bf4bcb7f
--- /dev/null
+++ b/japanese/mule-canna+sj3+wnn6/pkg-comment
@@ -0,0 +1 @@
+A multilingual emacs, with Canna, sj3, Wnn4 and Wnn6 support built in (Only the executables)
diff --git a/japanese/mule-canna+sj3+wnn6/pkg-descr b/japanese/mule-canna+sj3+wnn6/pkg-descr
new file mode 100644
index 000000000000..dc0415e0200e
--- /dev/null
+++ b/japanese/mule-canna+sj3+wnn6/pkg-descr
@@ -0,0 +1,40 @@
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
+
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
+
+This package is built with Japanese support, using Canna, sj3(*1),
+Wnn4 or Wnn6. It is supported input methods, jeonkak, hangul for
+Korean(Hanja), and quanjiao, zhuyin, erpin for Chinese (check out
+lib/mule/site-lisp/site-start.el), using Wnn4, too.
+
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
+
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
+
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
+
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
+
+------------------------------
+(*1)
+If you want to use 'sj3' as a Japanese input method, then you should
+insert the following two lines into ~/.emacs.
+
+(load "sj3-egg")
+(setq egg-default-startup-file "eggrc-sj3")
diff --git a/japanese/mule-canna+sj3+wnn6/pkg-install b/japanese/mule-canna+sj3+wnn6/pkg-install
new file mode 100644
index 000000000000..3a04bb08351c
--- /dev/null
+++ b/japanese/mule-canna+sj3+wnn6/pkg-install
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
+echo "####################################################################"
+echo "If you want to use 'SJ3' as a japanese input method, then you should"
+echo "insert the following two lines into ~/.emacs"
+echo ""
+echo "(load \"sj3-egg\")"
+echo "(setq egg-default-startup-file \"eggrc-sj3\")"
+echo "####################################################################"
diff --git a/japanese/mule-canna+sj3+wnn7/Makefile b/japanese/mule-canna+sj3+wnn7/Makefile
new file mode 100644
index 000000000000..d48889a87ab7
--- /dev/null
+++ b/japanese/mule-canna+sj3+wnn7/Makefile
@@ -0,0 +1,16 @@
+# New ports collection makefile for:	mule with Canna, sj3 and Wnn6
+# Version required:	2.3
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	jp-mule-canna+sj3+wnn6-2.3
+CATEGORIES=	japanese editors
+
+CANNA=		yes
+SJ3=		yes
+WNN6=		yes
+
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-canna+sj3+wnn7/pkg-comment b/japanese/mule-canna+sj3+wnn7/pkg-comment
new file mode 100644
index 000000000000..6a40bf4bcb7f
--- /dev/null
+++ b/japanese/mule-canna+sj3+wnn7/pkg-comment
@@ -0,0 +1 @@
+A multilingual emacs, with Canna, sj3, Wnn4 and Wnn6 support built in (Only the executables)
diff --git a/japanese/mule-canna+sj3+wnn7/pkg-descr b/japanese/mule-canna+sj3+wnn7/pkg-descr
new file mode 100644
index 000000000000..dc0415e0200e
--- /dev/null
+++ b/japanese/mule-canna+sj3+wnn7/pkg-descr
@@ -0,0 +1,40 @@
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
+
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
+
+This package is built with Japanese support, using Canna, sj3(*1),
+Wnn4 or Wnn6. It is supported input methods, jeonkak, hangul for
+Korean(Hanja), and quanjiao, zhuyin, erpin for Chinese (check out
+lib/mule/site-lisp/site-start.el), using Wnn4, too.
+
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
+
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
+
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
+
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
+
+------------------------------
+(*1)
+If you want to use 'sj3' as a Japanese input method, then you should
+insert the following two lines into ~/.emacs.
+
+(load "sj3-egg")
+(setq egg-default-startup-file "eggrc-sj3")
diff --git a/japanese/mule-canna+sj3+wnn7/pkg-install b/japanese/mule-canna+sj3+wnn7/pkg-install
new file mode 100644
index 000000000000..3a04bb08351c
--- /dev/null
+++ b/japanese/mule-canna+sj3+wnn7/pkg-install
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
+echo "####################################################################"
+echo "If you want to use 'SJ3' as a japanese input method, then you should"
+echo "insert the following two lines into ~/.emacs"
+echo ""
+echo "(load \"sj3-egg\")"
+echo "(setq egg-default-startup-file \"eggrc-sj3\")"
+echo "####################################################################"
diff --git a/japanese/mule-canna+sj3/Makefile b/japanese/mule-canna+sj3/Makefile
new file mode 100644
index 000000000000..9bd5586c8390
--- /dev/null
+++ b/japanese/mule-canna+sj3/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for:	mule with Canna and sj3
+# Version required:	2.3
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	jp-mule-canna+sj3-2.3
+CATEGORIES=	japanese editors
+
+CANNA=		yes
+SJ3=		yes
+
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-canna+sj3/pkg-comment b/japanese/mule-canna+sj3/pkg-comment
new file mode 100644
index 000000000000..83b5ba8440ad
--- /dev/null
+++ b/japanese/mule-canna+sj3/pkg-comment
@@ -0,0 +1 @@
+A multilingual emacs, with Canna and sj3 support built in (Only the executables)
diff --git a/japanese/mule-canna+sj3/pkg-descr b/japanese/mule-canna+sj3/pkg-descr
new file mode 100644
index 000000000000..117c42a4f384
--- /dev/null
+++ b/japanese/mule-canna+sj3/pkg-descr
@@ -0,0 +1,29 @@
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
+
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
+
+This package is built with Japanese support, using Canna or sj3.
+
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
+
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
+
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
+
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
diff --git a/japanese/mule-canna+wnn6/Makefile b/japanese/mule-canna+wnn6/Makefile
new file mode 100644
index 000000000000..2442bb0c0f38
--- /dev/null
+++ b/japanese/mule-canna+wnn6/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for:	mule with Canna and Wnn6
+# Version required:	2.3
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	jp-mule-canna+wnn6-2.3
+CATEGORIES=	japanese editors
+
+CANNA=		yes
+WNN6=		yes
+
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-canna+wnn6/pkg-comment b/japanese/mule-canna+wnn6/pkg-comment
new file mode 100644
index 000000000000..95b580f93b83
--- /dev/null
+++ b/japanese/mule-canna+wnn6/pkg-comment
@@ -0,0 +1 @@
+A multilingual emacs, with Canna, Wnn4 and Wnn6 support built in (Only the executables)
diff --git a/japanese/mule-canna+wnn6/pkg-descr b/japanese/mule-canna+wnn6/pkg-descr
new file mode 100644
index 000000000000..42045810f0fc
--- /dev/null
+++ b/japanese/mule-canna+wnn6/pkg-descr
@@ -0,0 +1,32 @@
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
+
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
+
+This package is built with Japanese support, using Canna, Wnn4 or
+Wnn6. It is supported input methods, jeonkak, hangul for
+Korean(Hanja), and quanjiao, zhuyin, erpin for Chinese (check out
+lib/mule/site-lisp/site-start.el), using Wnn4, too.
+
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
+
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
+
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
+
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
diff --git a/japanese/mule-canna+wnn7/Makefile b/japanese/mule-canna+wnn7/Makefile
new file mode 100644
index 000000000000..2442bb0c0f38
--- /dev/null
+++ b/japanese/mule-canna+wnn7/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for:	mule with Canna and Wnn6
+# Version required:	2.3
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	jp-mule-canna+wnn6-2.3
+CATEGORIES=	japanese editors
+
+CANNA=		yes
+WNN6=		yes
+
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-canna+wnn7/pkg-comment b/japanese/mule-canna+wnn7/pkg-comment
new file mode 100644
index 000000000000..95b580f93b83
--- /dev/null
+++ b/japanese/mule-canna+wnn7/pkg-comment
@@ -0,0 +1 @@
+A multilingual emacs, with Canna, Wnn4 and Wnn6 support built in (Only the executables)
diff --git a/japanese/mule-canna+wnn7/pkg-descr b/japanese/mule-canna+wnn7/pkg-descr
new file mode 100644
index 000000000000..42045810f0fc
--- /dev/null
+++ b/japanese/mule-canna+wnn7/pkg-descr
@@ -0,0 +1,32 @@
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
+
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
+
+This package is built with Japanese support, using Canna, Wnn4 or
+Wnn6. It is supported input methods, jeonkak, hangul for
+Korean(Hanja), and quanjiao, zhuyin, erpin for Chinese (check out
+lib/mule/site-lisp/site-start.el), using Wnn4, too.
+
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
+
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
+
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
+
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile
index 2f319bae8bba..003bbd81a720 100644
--- a/japanese/mule-canna/Makefile
+++ b/japanese/mule-canna/Makefile
@@ -1,51 +1,14 @@
 # New ports collection makefile for:	mule with Canna
 # Version required:	2.3
-# Date created:		22 November 1994
-# Whom:			Satoshi Asami (asami)
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.28 1997/05/28 03:06:35 asami Exp $
+# $Id: Makefile,v 1.29 1997/06/08 12:54:56 asami Exp $
 #
 
-DISTNAME=	mule-2.3
-PKGNAME=	jp-cmule-2.3
+PKGNAME=	jp-mule-canna-2.3
 CATEGORIES=	japanese editors
-MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://ftp.cs.buffalo.edu/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/ \
-		ftp://ftp.funet.fi/pub/gnu/emacs/mule/
 
-MAINTAINER=	asami@FreeBSD.ORG
+CANNA=		yes
 
-LIB_DEPENDS=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
-
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_ARGS=        i386--freebsd --with-x-toolkit \
-		--canna --canna-libraries=/usr/local/lib \
-		--canna-includes=/usr/local/include --terminal-face \
-		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
-STRIP=
-MAN1=		coco.1 ctags.1 etags.1 m2ps.1 mule.1
-
-pre-build:
-	find ${WRKSRC} -name \*.orig -exec /bin/rm -f \{} \;
-
-post-install:
-# note that rcs-checkn and any2ps are scripts
-.for file in b2m coco ctags etags m2ps mule-19.28
-	strip ${PREFIX}/bin/${file}
-.endfor
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-.for info in emacs vip forms gnus cl sc
-	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-# Our makeinfo can't handle files with Japanese characters. :<
-	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
-
-.include <bsd.port.mk>
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-canna/pkg-comment b/japanese/mule-canna/pkg-comment
index 702628be3371..875179e100a7 100644
--- a/japanese/mule-canna/pkg-comment
+++ b/japanese/mule-canna/pkg-comment
@@ -1 +1 @@
-A multilingual emacs, with Canna support built in
+A multilingual emacs, with Canna support built in (Only the executables)
diff --git a/japanese/mule-canna/pkg-descr b/japanese/mule-canna/pkg-descr
index 4b97defbc9a0..a7b13eaeead6 100644
--- a/japanese/mule-canna/pkg-descr
+++ b/japanese/mule-canna/pkg-descr
@@ -1,32 +1,29 @@
-This is mule-2.3, a multilingual editor based on emacs-19.28.
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
+
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
 
 This package is built with Japanese support, using Canna as default.
 
-This package *will* 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 get
-installed too.
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
 
-Also, it will overwrite itself over another mule using SJ3 and/or Wnn.
-Solutions to this is welcome, too.
-
-A "dir" file is supplied in the files/ subdirectory of the ports
-package.  Copy it into your /usr/local/info to read mule info pages,
-but also make sure you also add everything that may have been added to
-that file!
-
-- Satoshi
-asami@cs.berkeley.edu
-
--------------------------------------------------------------------
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
 
-This also include some patches for FreeBSD or bugfix.
-(some emacs-lisp files and src/mcpath.c)
-If there are any problem in this patches, please know me via E-mail.
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
 
-Hidekazu Kuroki
-(hidekazu@cs.titech.ac.jp)
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
diff --git a/japanese/mule-freewnn+sj3/Makefile b/japanese/mule-freewnn+sj3/Makefile
new file mode 100644
index 000000000000..20c17a79943a
--- /dev/null
+++ b/japanese/mule-freewnn+sj3/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for:	mule with sj3 and Wnn4
+# Version required:	2.3
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	jp-mule-sj3+wnn4-2.3
+CATEGORIES=	japanese editors
+
+SJ3=		yes
+WNN4=		yes
+
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-freewnn+sj3/pkg-comment b/japanese/mule-freewnn+sj3/pkg-comment
new file mode 100644
index 000000000000..b5d2b48d9f73
--- /dev/null
+++ b/japanese/mule-freewnn+sj3/pkg-comment
@@ -0,0 +1 @@
+A multilingual emacs, with sj3 and Wnn4 support built in (Only the executables)
diff --git a/japanese/mule-freewnn+sj3/pkg-descr b/japanese/mule-freewnn+sj3/pkg-descr
new file mode 100644
index 000000000000..3b05c8e10c36
--- /dev/null
+++ b/japanese/mule-freewnn+sj3/pkg-descr
@@ -0,0 +1,40 @@
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
+
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
+
+This package is built with Japanese support, using sj3(*1) or Wnn4. It
+is supported input methods, jeonkak, hangul for Korean(Hanja), and
+quanjiao, zhuyin, erpin for Chinese (check out
+lib/mule/site-lisp/site-start.el), using Wnn4, too.
+
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
+
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
+
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
+
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
+
+------------------------------
+(*1)
+If you want to use 'sj3' as a Japanese input method, then you should
+insert the following two lines into ~/.emacs.
+
+(load "sj3-egg")
+(setq egg-default-startup-file "eggrc-sj3")
diff --git a/japanese/mule-freewnn+sj3/pkg-install b/japanese/mule-freewnn+sj3/pkg-install
new file mode 100644
index 000000000000..3a04bb08351c
--- /dev/null
+++ b/japanese/mule-freewnn+sj3/pkg-install
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
+echo "####################################################################"
+echo "If you want to use 'SJ3' as a japanese input method, then you should"
+echo "insert the following two lines into ~/.emacs"
+echo ""
+echo "(load \"sj3-egg\")"
+echo "(setq egg-default-startup-file \"eggrc-sj3\")"
+echo "####################################################################"
diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile
index 542763a1c759..1d95d7bd6d66 100644
--- a/japanese/mule-freewnn/Makefile
+++ b/japanese/mule-freewnn/Makefile
@@ -1,51 +1,14 @@
-# New ports collection makefile for:	mule with Wnn
+# New ports collection makefile for:	mule with Wnn4
 # Version required:	2.3
-# Date created:		22 November 1994
-# Whom:			Satoshi Asami (asami)
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.28 1997/05/28 03:06:38 asami Exp $
+# $Id: Makefile,v 1.29 1997/06/08 12:54:59 asami Exp $
 #
 
-DISTNAME=	mule-2.3
-PKGNAME=	jp-wmule-2.3
+PKGNAME=	jp-mule-wnn4-2.3
 CATEGORIES=	japanese editors
-MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://ftp.cs.buffalo.edu/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/ \
-		ftp://ftp.funet.fi/pub/gnu/emacs/mule/
 
-MAINTAINER=	asami@FreeBSD.ORG
+WNN4=		yes
 
-BUILD_DEPENDS=	${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
-
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit \
-		--with-wnn4 --wnn-libraries=/usr/X11R6/lib \
-		--wnn-includes=/usr/X11R6/include/wnn --terminal-face \
-		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
-STRIP=
-MAN1=		coco.1 ctags.1 etags.1 m2ps.1 mule.1
-
-pre-build:
-	find ${WRKSRC} -name \*.orig -exec /bin/rm -f \{} \;
-
-post-install:
-# note that rcs-checkn and any2ps are scripts
-.for file in b2m coco ctags etags m2ps mule-19.28
-	strip ${PREFIX}/bin/${file}
-.endfor
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-.for info in emacs vip forms gnus cl sc
-	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-# Our makeinfo can't handle files with Japanese characters. :<
-	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
-
-.include <bsd.port.mk>
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-freewnn/pkg-comment b/japanese/mule-freewnn/pkg-comment
index a91dd53bc03c..b29b02db5863 100644
--- a/japanese/mule-freewnn/pkg-comment
+++ b/japanese/mule-freewnn/pkg-comment
@@ -1 +1 @@
-A multilingual emacs, with Wnn support built in
+A multilingual emacs, with Wnn4 support built in (Only the executables)
diff --git a/japanese/mule-freewnn/pkg-descr b/japanese/mule-freewnn/pkg-descr
index 9ac0011ca18d..4082a0367e63 100644
--- a/japanese/mule-freewnn/pkg-descr
+++ b/japanese/mule-freewnn/pkg-descr
@@ -1,32 +1,32 @@
-This is mule-2.3, a multilingual editor based on emacs-19.28.
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
 
-This package is built with Japanese support, using Wnn as default.
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
 
-This package *will* 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 get
-installed too.
+This package is built with Japanese support, using Wnn4 as default. It
+is supported input methods, jeonkak, hangul for Korean(Hanja), and
+quanjiao, zhuyin, erpin for Chinese (check out
+lib/mule/site-lisp/site-start.el), using Wnn4, too.
+
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
 
-Also, it will overwrite itself over another mule using Canna and/or SJ3.
-Solutions to this is welcome, too.
-
-A "dir" file is supplied in the files/ subdirectory of the ports
-package.  Copy it into your /usr/local/info to read mule info pages,
-but also make sure you also add everything that may have been added to
-that file!
-
-- Satoshi
-asami@cs.berkeley.edu
-
--------------------------------------------------------------------
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
 
-This also include some patches for FreeBSD or bugfix.
-(some emacs-lisp files and src/mcpath.c)
-If there are any problem in this patches, please know me via E-mail.
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
 
-Hidekazu Kuroki
-(hidekazu@cs.titech.ac.jp)
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
diff --git a/japanese/mule-sj3+wnn6/Makefile b/japanese/mule-sj3+wnn6/Makefile
new file mode 100644
index 000000000000..a6e4e7941cc9
--- /dev/null
+++ b/japanese/mule-sj3+wnn6/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for:	mule with sj3 and Wnn6
+# Version required:	2.3
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	jp-mule-sj3+wnn6-2.3
+CATEGORIES=	japanese editors
+
+SJ3=		yes
+WNN6=		yes
+
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-sj3+wnn6/pkg-comment b/japanese/mule-sj3+wnn6/pkg-comment
new file mode 100644
index 000000000000..c1151eec4d38
--- /dev/null
+++ b/japanese/mule-sj3+wnn6/pkg-comment
@@ -0,0 +1 @@
+A multilingual emacs, with sj3, Wnn4 and Wnn6 support built in (Only the executables)
diff --git a/japanese/mule-sj3+wnn6/pkg-descr b/japanese/mule-sj3+wnn6/pkg-descr
new file mode 100644
index 000000000000..646479bef9d4
--- /dev/null
+++ b/japanese/mule-sj3+wnn6/pkg-descr
@@ -0,0 +1,40 @@
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
+
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
+
+This package is built with Japanese support, using sj3(*1), Wnn4 or
+Wnn6. It is supported input methods, jeonkak, hangul for
+Korean(Hanja), and quanjiao, zhuyin, erpin for Chinese (check out
+lib/mule/site-lisp/site-start.el), using Wnn4, too.
+
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
+
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
+
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
+
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
+
+------------------------------
+(*1)
+If you want to use 'sj3' as a Japanese input method, then you should
+insert the following two lines into ~/.emacs.
+
+(load "sj3-egg")
+(setq egg-default-startup-file "eggrc-sj3")
diff --git a/japanese/mule-sj3+wnn6/pkg-install b/japanese/mule-sj3+wnn6/pkg-install
new file mode 100644
index 000000000000..3a04bb08351c
--- /dev/null
+++ b/japanese/mule-sj3+wnn6/pkg-install
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
+echo "####################################################################"
+echo "If you want to use 'SJ3' as a japanese input method, then you should"
+echo "insert the following two lines into ~/.emacs"
+echo ""
+echo "(load \"sj3-egg\")"
+echo "(setq egg-default-startup-file \"eggrc-sj3\")"
+echo "####################################################################"
diff --git a/japanese/mule-sj3+wnn7/Makefile b/japanese/mule-sj3+wnn7/Makefile
new file mode 100644
index 000000000000..a6e4e7941cc9
--- /dev/null
+++ b/japanese/mule-sj3+wnn7/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for:	mule with sj3 and Wnn6
+# Version required:	2.3
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	jp-mule-sj3+wnn6-2.3
+CATEGORIES=	japanese editors
+
+SJ3=		yes
+WNN6=		yes
+
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-sj3+wnn7/pkg-comment b/japanese/mule-sj3+wnn7/pkg-comment
new file mode 100644
index 000000000000..c1151eec4d38
--- /dev/null
+++ b/japanese/mule-sj3+wnn7/pkg-comment
@@ -0,0 +1 @@
+A multilingual emacs, with sj3, Wnn4 and Wnn6 support built in (Only the executables)
diff --git a/japanese/mule-sj3+wnn7/pkg-descr b/japanese/mule-sj3+wnn7/pkg-descr
new file mode 100644
index 000000000000..646479bef9d4
--- /dev/null
+++ b/japanese/mule-sj3+wnn7/pkg-descr
@@ -0,0 +1,40 @@
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
+
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
+
+This package is built with Japanese support, using sj3(*1), Wnn4 or
+Wnn6. It is supported input methods, jeonkak, hangul for
+Korean(Hanja), and quanjiao, zhuyin, erpin for Chinese (check out
+lib/mule/site-lisp/site-start.el), using Wnn4, too.
+
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
+
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
+
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
+
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
+
+------------------------------
+(*1)
+If you want to use 'sj3' as a Japanese input method, then you should
+insert the following two lines into ~/.emacs.
+
+(load "sj3-egg")
+(setq egg-default-startup-file "eggrc-sj3")
diff --git a/japanese/mule-sj3+wnn7/pkg-install b/japanese/mule-sj3+wnn7/pkg-install
new file mode 100644
index 000000000000..3a04bb08351c
--- /dev/null
+++ b/japanese/mule-sj3+wnn7/pkg-install
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
+echo "####################################################################"
+echo "If you want to use 'SJ3' as a japanese input method, then you should"
+echo "insert the following two lines into ~/.emacs"
+echo ""
+echo "(load \"sj3-egg\")"
+echo "(setq egg-default-startup-file \"eggrc-sj3\")"
+echo "####################################################################"
diff --git a/japanese/mule-sj3/Makefile b/japanese/mule-sj3/Makefile
index a13a9ba623dd..48385c3a63fc 100644
--- a/japanese/mule-sj3/Makefile
+++ b/japanese/mule-sj3/Makefile
@@ -1,50 +1,14 @@
 # New ports collection makefile for:	mule with sj3
 # Version required:	2.3
-# Date created:		8 August 1996
-# Whom:			Hidekazu Kuroki <hidekazu@cs.titech.ac.jp>
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.5 1997/05/28 03:06:37 asami Exp $
+# $Id: Makefile,v 1.6 1997/06/08 12:54:57 asami Exp $
 #
 
-DISTNAME=	mule-2.3
-PKGNAME=	jp-smule-2.3
+PKGNAME=	jp-mule-sj3-2.3
 CATEGORIES=	japanese editors
-MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://ftp.cs.buffalo.edu/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/ \
-		ftp://ftp.funet.fi/pub/gnu/emacs/mule/
 
-MAINTAINER=	hidekazu@cs.titech.ac.jp
+SJ3=		yes
 
-BUILD_DEPENDS=	sj3serv:${PORTSDIR}/japanese/sj3
-
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit \
-		--sj3 --terminal-face \
-		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
-STRIP=
-MAN1=		coco.1 ctags.1 etags.1 m2ps.1 mule.1
-
-pre-build:
-	find ${WRKSRC} -name \*.orig -exec /bin/rm -f \{} \;
-
-post-install:
-# note that rcs-checkn and any2ps are scripts
-.for file in b2m coco ctags etags m2ps mule-19.28
-	strip ${PREFIX}/bin/${file}
-.endfor
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-.for info in emacs vip forms gnus cl sc
-	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-# Our makeinfo can't handle files with Japanese characters. :<
-	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
-
-.include <bsd.port.mk>
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-sj3/pkg-comment b/japanese/mule-sj3/pkg-comment
index 01842329211b..520999bdee22 100644
--- a/japanese/mule-sj3/pkg-comment
+++ b/japanese/mule-sj3/pkg-comment
@@ -1 +1 @@
-A multilingual emacs, with SJ3 support built in
+A multilingual emacs, with SJ3 support built in (Only the executables)
diff --git a/japanese/mule-sj3/pkg-descr b/japanese/mule-sj3/pkg-descr
index ca688ede2a8d..73c562f8d6b8 100644
--- a/japanese/mule-sj3/pkg-descr
+++ b/japanese/mule-sj3/pkg-descr
@@ -1,33 +1,29 @@
-This is mule-2.3, a multilingual editor based on emacs-19.28.
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
+
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
 
 This package is built with Japanese support, using SJ3 as default.
 
-This package *will* 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 get
-installed too.
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
 
-Also, it will overwrite itself over another mule using Canna and/or Wnn.
-Solutions to this is welcome, too.
-
-A "dir" file is supplied in the files/ subdirectory of the ports
-package.  Copy it into your /usr/local/info to read mule info pages,
-but also make sure you also add everything that may have been added to
-that file!
-
-- Satoshi
-asami@cs.berkeley.edu
-
--------------------------------------------------------------------
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
 
-I ported mule-2.3 for SJ3.
-And this also include some patches for FreeBSD or bugfix.
-(some emacs-lisp files and src/mcpath.c)
-If there are any problem in this patches, please know me via E-mail.
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
 
-Hidekazu Kuroki
-(hidekazu@cs.titech.ac.jp)
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile
index 542763a1c759..ef51fc82fc84 100644
--- a/japanese/mule-wnn6/Makefile
+++ b/japanese/mule-wnn6/Makefile
@@ -1,51 +1,14 @@
-# New ports collection makefile for:	mule with Wnn
+# New ports collection makefile for:	mule with Wnn6
 # Version required:	2.3
-# Date created:		22 November 1994
-# Whom:			Satoshi Asami (asami)
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.28 1997/05/28 03:06:38 asami Exp $
+# $Id: Makefile,v 1.29 1997/06/08 12:54:59 asami Exp $
 #
 
-DISTNAME=	mule-2.3
-PKGNAME=	jp-wmule-2.3
+PKGNAME=	jp-mule-wnn6-2.3
 CATEGORIES=	japanese editors
-MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://ftp.cs.buffalo.edu/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/ \
-		ftp://ftp.funet.fi/pub/gnu/emacs/mule/
 
-MAINTAINER=	asami@FreeBSD.ORG
+WNN6=		yes
 
-BUILD_DEPENDS=	${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
-
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit \
-		--with-wnn4 --wnn-libraries=/usr/X11R6/lib \
-		--wnn-includes=/usr/X11R6/include/wnn --terminal-face \
-		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
-STRIP=
-MAN1=		coco.1 ctags.1 etags.1 m2ps.1 mule.1
-
-pre-build:
-	find ${WRKSRC} -name \*.orig -exec /bin/rm -f \{} \;
-
-post-install:
-# note that rcs-checkn and any2ps are scripts
-.for file in b2m coco ctags etags m2ps mule-19.28
-	strip ${PREFIX}/bin/${file}
-.endfor
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-.for info in emacs vip forms gnus cl sc
-	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-# Our makeinfo can't handle files with Japanese characters. :<
-	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
-
-.include <bsd.port.mk>
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-wnn6/pkg-comment b/japanese/mule-wnn6/pkg-comment
index a91dd53bc03c..f342b38f3580 100644
--- a/japanese/mule-wnn6/pkg-comment
+++ b/japanese/mule-wnn6/pkg-comment
@@ -1 +1 @@
-A multilingual emacs, with Wnn support built in
+A multilingual emacs, with Wnn4 and Wnn6 support built in (Only the executables)
diff --git a/japanese/mule-wnn6/pkg-descr b/japanese/mule-wnn6/pkg-descr
index 9ac0011ca18d..c1f9601ec6d6 100644
--- a/japanese/mule-wnn6/pkg-descr
+++ b/japanese/mule-wnn6/pkg-descr
@@ -1,32 +1,32 @@
-This is mule-2.3, a multilingual editor based on emacs-19.28.
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
 
-This package is built with Japanese support, using Wnn as default.
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
 
-This package *will* 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 get
-installed too.
+This package is built with Japanese support, using Wnn4 or Wnn6. It is
+supported input methods, jeonkak, hangul for Korean(Hanja), and
+quanjiao, zhuyin, erpin for Chinese (check out
+lib/mule/site-lisp/site-start.el), using Wnn4, too.
+
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
 
-Also, it will overwrite itself over another mule using Canna and/or SJ3.
-Solutions to this is welcome, too.
-
-A "dir" file is supplied in the files/ subdirectory of the ports
-package.  Copy it into your /usr/local/info to read mule info pages,
-but also make sure you also add everything that may have been added to
-that file!
-
-- Satoshi
-asami@cs.berkeley.edu
-
--------------------------------------------------------------------
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
 
-This also include some patches for FreeBSD or bugfix.
-(some emacs-lisp files and src/mcpath.c)
-If there are any problem in this patches, please know me via E-mail.
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
 
-Hidekazu Kuroki
-(hidekazu@cs.titech.ac.jp)
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile
index 542763a1c759..ef51fc82fc84 100644
--- a/japanese/mule-wnn7/Makefile
+++ b/japanese/mule-wnn7/Makefile
@@ -1,51 +1,14 @@
-# New ports collection makefile for:	mule with Wnn
+# New ports collection makefile for:	mule with Wnn6
 # Version required:	2.3
-# Date created:		22 November 1994
-# Whom:			Satoshi Asami (asami)
+# Date created:		7 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.28 1997/05/28 03:06:38 asami Exp $
+# $Id: Makefile,v 1.29 1997/06/08 12:54:59 asami Exp $
 #
 
-DISTNAME=	mule-2.3
-PKGNAME=	jp-wmule-2.3
+PKGNAME=	jp-mule-wnn6-2.3
 CATEGORIES=	japanese editors
-MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://ftp.cs.buffalo.edu/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/ \
-		ftp://ftp.funet.fi/pub/gnu/emacs/mule/
 
-MAINTAINER=	asami@FreeBSD.ORG
+WNN6=		yes
 
-BUILD_DEPENDS=	${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
-
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit \
-		--with-wnn4 --wnn-libraries=/usr/X11R6/lib \
-		--wnn-includes=/usr/X11R6/include/wnn --terminal-face \
-		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
-STRIP=
-MAN1=		coco.1 ctags.1 etags.1 m2ps.1 mule.1
-
-pre-build:
-	find ${WRKSRC} -name \*.orig -exec /bin/rm -f \{} \;
-
-post-install:
-# note that rcs-checkn and any2ps are scripts
-.for file in b2m coco ctags etags m2ps mule-19.28
-	strip ${PREFIX}/bin/${file}
-.endfor
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-.for info in emacs vip forms gnus cl sc
-	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-# Our makeinfo can't handle files with Japanese characters. :<
-	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
-
-.include <bsd.port.mk>
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/japanese/mule-wnn7/pkg-comment b/japanese/mule-wnn7/pkg-comment
index a91dd53bc03c..f342b38f3580 100644
--- a/japanese/mule-wnn7/pkg-comment
+++ b/japanese/mule-wnn7/pkg-comment
@@ -1 +1 @@
-A multilingual emacs, with Wnn support built in
+A multilingual emacs, with Wnn4 and Wnn6 support built in (Only the executables)
diff --git a/japanese/mule-wnn7/pkg-descr b/japanese/mule-wnn7/pkg-descr
index 9ac0011ca18d..c1f9601ec6d6 100644
--- a/japanese/mule-wnn7/pkg-descr
+++ b/japanese/mule-wnn7/pkg-descr
@@ -1,32 +1,32 @@
-This is mule-2.3, a multilingual editor based on emacs-19.28.
+This is a package containing only the executables for mule-2.3, a
+multilingual editor based on emacs-19.28.
 
-This package is built with Japanese support, using Wnn as default.
+You should install a package, mule-common-2.3, containing emacs lisp
+files, info pages, and so on (except executables) for mule-2.3.
 
-This package *will* 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 get
-installed too.
+This package is built with Japanese support, using Wnn4 or Wnn6. It is
+supported input methods, jeonkak, hangul for Korean(Hanja), and
+quanjiao, zhuyin, erpin for Chinese (check out
+lib/mule/site-lisp/site-start.el), using Wnn4, too.
+
+This package and the package, mule-common-2.3, *will* 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 get installed 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.
 
-Also, it will overwrite itself over another mule using Canna and/or SJ3.
-Solutions to this is welcome, too.
-
-A "dir" file is supplied in the files/ subdirectory of the ports
-package.  Copy it into your /usr/local/info to read mule info pages,
-but also make sure you also add everything that may have been added to
-that file!
-
-- Satoshi
-asami@cs.berkeley.edu
-
--------------------------------------------------------------------
+A "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
+subdirectory of the ports package.  Copy it into your /usr/local/info
+to read mule info pages, but also make sure you also add everything
+that may have been added to that file!
 
-This also include some patches for FreeBSD or bugfix.
-(some emacs-lisp files and src/mcpath.c)
-If there are any problem in this patches, please know me via E-mail.
+[Notice]
+Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
+Patches for those are in 'mule-2.3.patch.tar.gz' and are applied in
+this port.
 
-Hidekazu Kuroki
-(hidekazu@cs.titech.ac.jp)
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp