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>

80 files changed, 1259 insertions, 1489 deletions

diff --git a/chinese/Makefile b/chinese/Makefile
index d0f0f2d7b047..19b4c9cf175e 100644
--- a/chinese/Makefile
+++ b/chinese/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 1997/03/06 08:41:31 asami Exp $
+# $Id: Makefile,v 1.10 1997/04/09 07:07:20 asami Exp $
 #
 
     SUBDIR += Wnn
@@ -11,6 +11,7 @@
     SUBDIR += gbscript
     SUBDIR += hc
     SUBDIR += lunar
+    SUBDIR += mule-wnn4
     SUBDIR += nvi-big5
     SUBDIR += nvi-euc-cn
     SUBDIR += nvi-euc-tw
diff --git a/chinese/mule-freewnn/Makefile b/chinese/mule-freewnn/Makefile
new file mode 100644
index 000000000000..61f37dd45327
--- /dev/null
+++ b/chinese/mule-freewnn/Makefile
@@ -0,0 +1,13 @@
+# New ports collection makefile for:	mule with Wnn4
+# Version required:	2.3
+# Date created:		20 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	cn-mule-wnn4-2.3
+CATEGORIES=	chinese editors
+CWNN4=		yes
+
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/chinese/mule-freewnn/pkg-comment b/chinese/mule-freewnn/pkg-comment
new file mode 100644
index 000000000000..b29b02db5863
--- /dev/null
+++ b/chinese/mule-freewnn/pkg-comment
@@ -0,0 +1 @@
+A multilingual emacs, with Wnn4 support built in (Only the executables)
diff --git a/chinese/mule-freewnn/pkg-descr b/chinese/mule-freewnn/pkg-descr
new file mode 100644
index 000000000000..dfb0a642323b
--- /dev/null
+++ b/chinese/mule-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 Chinese 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.
+
+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/editors/Makefile b/editors/Makefile
index 5ac1c21ec136..b7812c001784 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.41 1997/07/10 06:29:40 tg Exp $
+# $Id: Makefile,v 1.42 1997/09/03 19:39:15 gj Exp $
 #
 
     SUBDIR += asedit
@@ -12,6 +12,7 @@
     SUBDIR += joe
     SUBDIR += jove
     SUBDIR += mule
+    SUBDIR += mule-common
     SUBDIR += nedit
     SUBDIR += nvi
     SUBDIR += staroffice
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index c8f11501b34d..d66a03119ae4 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -1,38 +1,73 @@
-# New ports collection makefile for:	mule
+# New ports collection makefile for:	files except executables for mule
 # 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:31 asami Exp $
+# $Id$
 #
 
 DISTNAME=	mule-2.3
-CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.cs.buffalo.edu/pub/mule/ \
-		ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/ \
-		ftp://ftp.funet.fi/pub/gnu/emacs/mule/
+PKGNAME=	mule-common-2.3
+CATEGORIES=	editors chinese japanese korean
+MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
+		ftp://ftp.mei.co.jp/archive/free/gnu/emacs/Mule/ \
+		ftp://ftp.iij.ad.jp/pub/misc/mule/ \
+		ftp://ports.jp.FreeBSD.org/pub/incoming/distfiles/
+DISTFILES=	mule-2.3.tar.gz mule-2.3.patch-970819.tar.gz
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
+
+EXTRACT_ONLY=	mule-2.3.tar.gz
+.for dir in editors/mule japanese/mule-canna japanese/mule-canna+sj3 \
+	japanese/mule-canna japanese/mule-canna+sj3 \
+	japanese/mule-canna+sj3+wnn4 japanese/mule-canna+sj3+wnn6 \
+	japanese/mule-canna+wnn4 japanese/mule-canna+wnn6 \
+	japanese/mule-sj3 japanese/mule-sj3+wnn japanese/mule-sj3+wnn6 \
+	japanese/mule-wnn4 japanese/mule-wnn6 \
+	chinese/mule-wnn4 korean/mule-wnn4
+.if exists(${.CURDIR}/../../${dir}/work/.build_done)
+WRKDIR?=	${.CURDIR}/../../${dir}/work
+.endif
+.endfor
+WRKSRC= ${WRKDIR}/mule
+
+.if !defined(WRKDIR) && !defined(PACKAGE_BUILDING)
+BROKEN=		You should build install one of the other mule ports first
+.endif
+
+INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
+PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
+
+USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit \
 		--terminal-face \
+		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \
 		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
 STRIP=
 MAN1=		coco.1 ctags.1 etags.1 m2ps.1 mule.1
 
+INSTALL_TARGET=	install-arch-indep
+
+post-extract:
+	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3.patch-970819.tar.gz
+	cd ${WRKSRC}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ./takana.tar.gz
+
+pre-patch:
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/patch
+
+post-patch:
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Mule-2.3.patch
+
 pre-build:
-	find ${WRKSRC} -name \*.orig -exec /bin/rm -f \{} \;
+	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
+	${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-19.28.*
 
 post-install:
-# note that any2ps is a script
-.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; \
+	  ${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
@@ -43,5 +78,10 @@ post-install:
 	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
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
+
+post-package:
+	@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
 
 .include <bsd.port.mk>
diff --git a/editors/mule-common/distinfo b/editors/mule-common/distinfo
index b6026659567d..cd2ed03a779e 100644
--- a/editors/mule-common/distinfo
+++ b/editors/mule-common/distinfo
@@ -1 +1,2 @@
-MD5 (mule-2.3.tar.gz) = 1394af7f1f0f1fa4552984924e7789db
+MD5 (mule-2.3.tar.gz) = e97cfbf19ee43442b416004eb92aac41
+MD5 (mule-2.3.patch-970819.tar.gz) = affdd51086c15abbb0a50999ac2e2796
diff --git a/editors/mule-common/files/patch-ac b/editors/mule-common/files/patch-ac
index 4b0f8afd8bfe..f9d3e07d53be 100644
--- a/editors/mule-common/files/patch-ac
+++ b/editors/mule-common/files/patch-ac
@@ -1,4 +1,4 @@
---- ./src/s/freebsd.h.org	Fri Nov  4 03:11:17 1994
+--- ../mule-2.3.org/src/s/freebsd.h.org	Fri Nov  4 03:11:17 1994
 +++ ./src/s/freebsd.h	Wed Aug  9 02:29:56 1995
 @@ -31,10 +31,10 @@
  
diff --git a/editors/mule-common/files/site-start.el.tmpl b/editors/mule-common/files/site-start.el.tmpl
new file mode 100644
index 000000000000..d5a9dfa4453a
--- /dev/null
+++ b/editors/mule-common/files/site-start.el.tmpl
@@ -0,0 +1,37 @@
+;; Chinese
+;;(load "its/erpin")
+;;(load "its/zhuyin")
+;;(load "its/quanjiao")
+;;(set-primary-environment 'chinese);;CHINESE
+
+;; Korean
+;;(if (boundp 'WNN);;KOREAN
+;;    (load "its/Korean"));;KOREAN
+;;(set-primary-environment 'korean);;KOREAN
+
+;; Japanese
+;;(set-primary-environment 'japanese);;JAPANESE
+
+;; For languages except Korean (kr-mule-wnn)
+(defun set-korean-environment ()
+  (setq *coding-category-iso-8-2* '*euc-korea*)
+
+  (set-coding-priority
+   '(*coding-category-iso-8-2*
+     *coding-category-iso-8-1*))
+
+  (set-default-file-coding-system '*iso-2022-kr*)
+
+  (if (boundp 'WNN)
+      (progn
+;;	(load "its/Korean");;not KOREAN
+	(set-default-wnn-environment 'kserver)))
+
+  (setq-default quail-current-package (assoc "hangul" quail-package-alist))
+  )
+
+;; Add System Info path '/usr/share/info' into Info-default-directory-list
+(setq Info-default-directory-list
+      (append (list
+	       "/usr/share/info"
+	       ) Info-default-directory-list)) 
diff --git a/editors/mule-common/pkg-comment b/editors/mule-common/pkg-comment
index a942ef6fd09f..b8a538c20d85 100644
--- a/editors/mule-common/pkg-comment
+++ b/editors/mule-common/pkg-comment
@@ -1 +1 @@
-A multilingual emacs
+For a multilingual emacs (mule-2.3), emacs lisp files, info pages, etc (except executables)
diff --git a/editors/mule-common/pkg-descr b/editors/mule-common/pkg-descr
index c30d1534f978..0e97b0f7f334 100644
--- a/editors/mule-common/pkg-descr
+++ b/editors/mule-common/pkg-descr
@@ -1,21 +1,29 @@
-This is mule-2.3, a multilingual editor based on emacs-19.28.
+This is emacs lisp files, info pages, and so on (except executables)
+for mule-2.3, a multilingual editor based on emacs-19.28.
 
-This package is not built with any particular language support.  If
-you want a built-in input method, look into the mule ports in language-
-specific directories.  Currently only Japanese (Wnn and Canna) is
-available.
+You must install one of packages, mule-2.3, jp-mule-*-2.3 (
+jp-mule-canna-2.3, jp-mule-canna+sj3-2.3, etc.), cn-mule-wnn4-2.3 and
+kr-mule-wnn4-2.3, each of which contains only the executables for
+mule-2.3.
 
-This package is designed *not* to clobber any existing emacs
-installation.  In particular, the executables and man pages of
-etags/ctags are not installed, and the info pages that come with the
-original emacs don't get installed too.  Remove the file
-patches/patch-ab if you want this package to stand on its own.
-The Japanese version is build to install everything, by the way.
+This package and the above package of the executables *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.
 
-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!
+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.
 
-- 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!
+
+[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/editors/mule-common/pkg-install b/editors/mule-common/pkg-install
new file mode 100644
index 000000000000..892eeb848ba6
--- /dev/null
+++ b/editors/mule-common/pkg-install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
+echo "############################################################"
+echo "You must install one of packages, mule-2.3, jp-mule-*-2.3"
+echo "(jp-mule-canna-2.3, jp-mule-canna+sj3-2.3, etc.),"
+echo "cn-mule-wnn4-2.3 and kr-mule-wnn4-2.3, each of"
+echo "which contains only the executables for mule-2.3"
+echo "############################################################"
diff --git a/editors/mule-common/pkg-plist b/editors/mule-common/pkg-plist
index fb4e72b549f6..c06f38e9890e 100644
--- a/editors/mule-common/pkg-plist
+++ b/editors/mule-common/pkg-plist
@@ -1,19 +1,9 @@
 @exec mkdir -p %D/share/emacs/site-lisp
+@dirrm share/emacs/site-lisp
+@dirrm share/emacs
 @exec mkdir -p %D/lib/mule/site-lisp
 @exec mkdir -p %D/lib/mule/lock
 @exec chmod 777 %D/lib/mule/lock
-@unexec rmdir %D/lib/mule/site-lisp
-@unexec rmdir %D/lib/mule/lock
-bin/mule-19.28
-@exec ln -sf %D/%F %B/mule
-@unexec rm %B/mule
-bin/any2ps
-bin/b2m
-bin/coco
-bin/ctags
-bin/etags
-bin/m2ps
-bin/rcs-checkin
 man/man1/coco.1.gz
 man/man1/ctags.1.gz
 man/man1/etags.1.gz
@@ -205,22 +195,6 @@ lib/mule/19.28/etc/tom.xbm
 lib/mule/19.28/etc/ulimit.hack
 lib/mule/19.28/etc/vipcard.tex
 lib/mule/19.28/etc/yow.lines
-lib/mule/19.28/i386--freebsd/cvtmail
-lib/mule/19.28/i386--freebsd/digest-doc
-lib/mule/19.28/i386--freebsd/emacsserver
-lib/mule/19.28/i386--freebsd/fakemail
-lib/mule/19.28/i386--freebsd/hexl
-lib/mule/19.28/i386--freebsd/make-docfile
-lib/mule/19.28/i386--freebsd/make-path
-lib/mule/19.28/i386--freebsd/movemail
-lib/mule/19.28/i386--freebsd/profile
-lib/mule/19.28/i386--freebsd/rcs2log
-lib/mule/19.28/i386--freebsd/sorted-doc
-lib/mule/19.28/i386--freebsd/test-distrib
-lib/mule/19.28/i386--freebsd/timer
-lib/mule/19.28/i386--freebsd/vcdiff
-lib/mule/19.28/i386--freebsd/wakeup
-lib/mule/19.28/i386--freebsd/yow
 lib/mule/19.28/lisp/COPYING
 lib/mule/19.28/lisp/ChangeLog
 lib/mule/19.28/lisp/ChangeLog.1
@@ -568,6 +542,8 @@ lib/mule/19.28/lisp/lucid.el
 lib/mule/19.28/lisp/lucid.elc
 lib/mule/19.28/lisp/lunar.el
 lib/mule/19.28/lisp/lunar.elc
+lib/mule/19.28/lisp/m2ps-util.el
+lib/mule/19.28/lisp/m2ps-util.elc
 lib/mule/19.28/lisp/macros.el
 lib/mule/19.28/lisp/macros.elc
 lib/mule/19.28/lisp/mail-extr.el
@@ -641,6 +617,7 @@ lib/mule/19.28/lisp/mule-diag.el
 lib/mule/19.28/lisp/mule-diag.elc
 lib/mule/19.28/lisp/mule-init.el
 lib/mule/19.28/lisp/mule-init.elc
+lib/mule/19.28/lisp/mule-init.el.old
 lib/mule/19.28/lisp/mule-inst.el
 lib/mule/19.28/lisp/mule-util.el
 lib/mule/19.28/lisp/mule-util.elc
@@ -903,6 +880,13 @@ lib/mule/19.28/lisp/its/kata.el
 lib/mule/19.28/lisp/its/pinyin.el
 lib/mule/19.28/lisp/its/zenkaku.el
 lib/mule/19.28/lisp/its/zhuyin.el
+lib/mule/19.28/lisp/its/Chinese.el
+lib/mule/19.28/lisp/its/Japanese.el
+lib/mule/19.28/lisp/its/Korean.el
+lib/mule/19.28/lisp/its/erpin.el
+lib/mule/19.28/lisp/its/jeonkak.el
+lib/mule/19.28/lisp/its/quanjiao.el
+lib/mule/19.28/lisp/quail/4c-CNS.el
 lib/mule/19.28/lisp/quail/ccdospy.el
 lib/mule/19.28/lisp/quail/ccdospy.elc
 lib/mule/19.28/lisp/quail/ctlau.el
@@ -937,6 +921,8 @@ lib/mule/19.28/lisp/quail/punct-b5.el
 lib/mule/19.28/lisp/quail/punct-b5.elc
 lib/mule/19.28/lisp/quail/punct.el
 lib/mule/19.28/lisp/quail/punct.elc
+lib/mule/19.28/lisp/quail/py-CNS.el
+lib/mule/19.28/lisp/quail/py-CNS.elc
 lib/mule/19.28/lisp/quail/py-b5.el
 lib/mule/19.28/lisp/quail/py-b5.elc
 lib/mule/19.28/lisp/quail/py.el
@@ -945,6 +931,8 @@ lib/mule/19.28/lisp/quail/qj-b5.el
 lib/mule/19.28/lisp/quail/qj-b5.elc
 lib/mule/19.28/lisp/quail/qj.el
 lib/mule/19.28/lisp/quail/qj.elc
+lib/mule/19.28/lisp/quail/sisheng.el
+lib/mule/19.28/lisp/quail/sisheng.elc
 lib/mule/19.28/lisp/quail/sw.el
 lib/mule/19.28/lisp/quail/sw.elc
 lib/mule/19.28/lisp/quail/tcode.el
@@ -1002,3 +990,13 @@ lib/mule/19.28/lisp/term/wyse50.el
 lib/mule/19.28/lisp/term/wyse50.elc
 lib/mule/19.28/lisp/term/x-win.el
 lib/mule/19.28/lisp/term/x-win.elc
+@dirrm lib/mule/19.28/etc
+@dirrm lib/mule/19.28/lisp/term
+@dirrm lib/mule/19.28/lisp/its
+@dirrm lib/mule/19.28/lisp/quail
+@dirrm lib/mule/19.28/lisp
+@dirrm lib/mule/19.28/i386--freebsd
+@dirrm lib/mule/19.28
+@dirrm lib/mule/lock
+@dirrm lib/mule/site-lisp
+@dirrm lib/mule
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index c8f11501b34d..859793b5d3fb 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,47 +1,115 @@
 # New ports collection makefile for:	mule
 # Version required:	2.3
-# Date created:		22 November 1994
-# Whom:			Satoshi Asami (asami)
+# Date created:		6 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.28 1997/05/28 03:06:31 asami Exp $
+# $Id: Makefile,v 1.29 1997/06/08 12:54:52 asami Exp $
 #
 
 DISTNAME=	mule-2.3
-CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.cs.buffalo.edu/pub/mule/ \
-		ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/ \
-		ftp://ftp.funet.fi/pub/gnu/emacs/mule/
+PKGNAME?=	mule-2.3
+CATEGORIES?=	editors
+MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
+		ftp://ftp.mei.co.jp/archive/free/gnu/emacs/Mule/ \
+		ftp://ftp.iij.ad.jp/pub/misc/mule/ \
+		ftp://ports.jp.FreeBSD.org/pub/incoming/distfiles/
+DISTFILES=	mule-2.3.tar.gz mule-2.3.patch-970819.tar.gz
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER?=	taoka@infonets.hiroshima-u.ac.jp
 
+RUN_DEPENDS=	${PREFIX}/lib/mule/19.28/lisp/mule.el:${PORTSDIR}/editors/mule-common
+LIB_DEPENDS=	${LIB_INPUT_METHOD}
+BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
+
+EXTRACT_ONLY=	mule-2.3.tar.gz
+WRKSRC=		${WRKDIR}/mule
+PATCHDIR=	${.CURDIR}/../../editors/mule-common/patches
+FILESDIR=	${.CURDIR}/../../editors/mule-common/files
+SCRIPTDIR=	${.CURDIR}/../../editors/mule-common/scripts
+PLIST=		${.CURDIR}/../../editors/mule/pkg/PLIST
+INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
+PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit \
-		--terminal-face \
-		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
+CONFIGURE_ARGS=	i386--freebsd --terminal-face \
+		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \
+		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp \
+		${WITH_INPUT_METHOD} ${WITH_DIALOGS}
 STRIP=
-MAN1=		coco.1 ctags.1 etags.1 m2ps.1 mule.1
+
+INSTALL_TARGET=	install-arch-dep
+
+.if defined(CANNA)
+LIB_INPUT_METHOD+=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
+WITH_INPUT_METHOD+=	--canna --canna-libraries=${PREFIX}/lib \
+		--canna-includes=${PREFIX}/include
+.endif
+.if defined(SJ3)
+BUILD_INPUT_METHOD+=sj3serv:${PORTSDIR}/japanese/sj3
+WITH_INPUT_METHOD+= --sj3
+.endif
+.if defined(WNN4)
+BUILD_INPUT_METHOD+=${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
+WITH_INPUT_METHOD+=	--with-wnn4 --wnn-libraries=${X11BASE}/lib/libwnn.a \
+		--wnn-includes=${X11BASE}/include/wnn
+.elif defined(CWNN4)
+BUILD_INPUT_METHOD+=${PREFIX}/bin/cWnn4/cserver:${PORTSDIR}/chinese/Wnn
+WITH_INPUT_METHOD+=	--with-wnn4 --wnn-libraries=${X11BASE}/lib/libcwnn.a \
+		--wnn-includes=${X11BASE}/include/cwnn
+.elif defined(KWNN4)
+BUILD_INPUT_METHOD+=${PREFIX}/bin/kWnn4/kserver:${PORTSDIR}/korean/Wnn
+WITH_INPUT_METHOD+=	--with-wnn4 --wnn-libraries=${X11BASE}/lib/libkwnn.a \
+		--wnn-includes=${X11BASE}/include/kwnn
+.elif defined(WNN6)
+BUILD_INPUT_METHOD+=${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib
+WITH_INPUT_METHOD+=	--with-wnn6 --wnn-libraries=${PREFIX}/lib/libwnn.a \
+		--wnn-includes=${PREFIX}/include/wnn
+.endif
+
+WITH_DIALOGS=	--with-x-toolkit
+
+SITE_START=${PREFIX}/lib/mule/site-lisp/site-start.el
+
+post-extract:
+	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3.patch-970819.tar.gz
+	cd ${WRKSRC}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ./takana.tar.gz
+
+pre-patch:
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/patch
+
+post-patch:
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Mule-2.3.patch
 
 pre-build:
-	find ${WRKSRC} -name \*.orig -exec /bin/rm -f \{} \;
+	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
+	${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-19.28.*
 
 post-install:
 # note that any2ps is a script
-.for file in b2m coco ctags etags m2ps mule-19.28
+.for file in b2m coco ctags emacsclient 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; \
+# for wnn4+sj3 or wnn6+sj3
+	@if [ -e ${PKGDIR}/INSTALL ]; then \
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL; \
 	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
+# Installing site-start.el
+#   (we redefun set-korean-environment etc)
+.if defined(CWNN4)
+	${SED} -e 's/;;\(.*\);;CHINESE$$/\1;;CHINESE/' \
+		-e 's/;;\(.*\);;not KOREAN$$/\1;;not KOREAN/' \
+		${FILESDIR}/site-start.el.tmpl >> ${SITE_START}
+.elif defined(KWNN4)
+	${SED} -e 's/;;\(.*\);;KOREAN$$/\1;;KOREAN/' \
+		${FILESDIR}/site-start.el.tmpl >> ${SITE_START}
+.else
+	${SED} -e 's/;;\(.*\);;not KOREAN$$/\1;;not KOREAN/' \
+		${FILESDIR}/site-start.el.tmpl >> ${SITE_START}
+.endif
+	@${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
+
+post-package:
+	@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
 
 .include <bsd.port.mk>
+
diff --git a/editors/mule/pkg-comment b/editors/mule/pkg-comment
index a942ef6fd09f..e1c594242774 100644
--- a/editors/mule/pkg-comment
+++ b/editors/mule/pkg-comment
@@ -1 +1 @@
-A multilingual emacs
+A multilingual emacs (Only the executables)
diff --git a/editors/mule/pkg-descr b/editors/mule/pkg-descr
index c30d1534f978..94c20632793e 100644
--- a/editors/mule/pkg-descr
+++ b/editors/mule/pkg-descr
@@ -1,21 +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 not built with any particular language support.  If
-you want a built-in input method, look into the mule ports in language-
-specific directories.  Currently only Japanese (Wnn and Canna) is
-available.
+you want a built-in input method, look into the mule ports in
+language- specific directories.  Currently only Japanese (Canna, SJ3,
+Wnn4 and Wnn6) is available.
 
-This package is designed *not* to clobber any existing emacs
-installation.  In particular, the executables and man pages of
-etags/ctags are not installed, and the info pages that come with the
-original emacs don't get installed too.  Remove the file
-patches/patch-ab if you want this package to stand on its own.
+This package and the package, mule-common-2.3 are designed *not* to
+clobber any existing emacs installation.  In particular, the
+executables and man pages of etags/ctags are not installed, and the
+info pages that come with the original emacs don't get installed too.
 The Japanese version is build to install everything, by the way.
 
-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!
+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.
 
-- Satoshi
-asami@cs.berkeley.edu
+- S. Taoka
+taoka@infonets.hiroshima-u.ac.jp
diff --git a/editors/mule/pkg-plist b/editors/mule/pkg-plist
index fb4e72b549f6..84914f4cffa2 100644
--- a/editors/mule/pkg-plist
+++ b/editors/mule/pkg-plist
@@ -1,9 +1,3 @@
-@exec mkdir -p %D/share/emacs/site-lisp
-@exec mkdir -p %D/lib/mule/site-lisp
-@exec mkdir -p %D/lib/mule/lock
-@exec chmod 777 %D/lib/mule/lock
-@unexec rmdir %D/lib/mule/site-lisp
-@unexec rmdir %D/lib/mule/lock
 bin/mule-19.28
 @exec ln -sf %D/%F %B/mule
 @unexec rm %B/mule
@@ -11,200 +5,10 @@ bin/any2ps
 bin/b2m
 bin/coco
 bin/ctags
+bin/emacsclient
 bin/etags
 bin/m2ps
 bin/rcs-checkin
-man/man1/coco.1.gz
-man/man1/ctags.1.gz
-man/man1/etags.1.gz
-man/man1/m2ps.1.gz
-man/man1/mule.1.gz
-@unexec install-info --delete %D/info/emacs %D/info/dir
-@unexec install-info --delete %D/info/vip %D/info/dir
-@unexec install-info --delete %D/info/forms %D/info/dir
-@unexec install-info --delete %D/info/gnus %D/info/dir
-@unexec install-info --delete %D/info/cl %D/info/dir
-@unexec install-info --delete %D/info/sc %D/info/dir
-@unexec install-info --delete %D/info/dired-x %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" %D/info/antenews-jp %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
-@comment
-@comment emacs stuff
-@comment
-info/cl
-info/cl-1
-info/cl-2
-info/cl-3
-info/cl-4
-info/cl-5
-info/cl-6
-info/dired-x
-info/emacs
-info/emacs-1
-info/emacs-2
-info/emacs-3
-info/emacs-4
-info/emacs-5
-info/emacs-6
-info/emacs-7
-info/emacs-8
-info/emacs-9
-info/emacs-10
-info/emacs-11
-info/emacs-12
-info/emacs-13
-info/emacs-14
-info/emacs-15
-info/emacs-16
-info/emacs-17
-info/emacs-18
-info/emacs-19
-info/emacs-20
-info/emacs-21
-info/emacs-22
-info/emacs-23
-info/emacs-24
-info/forms
-info/gnus
-info/gnus-1
-info/gnus-2
-info/gnus-3
-info/sc
-info/sc-1
-info/sc-2
-info/sc-3
-info/vip
-info/vip-1
-info/vip-2
-@comment
-@comment mule-specific stuff
-@comment
-info/CCL
-info/ISO2022
-info/R2L
-info/XFONT
-info/antenews-jp
-info/canna-jp
-info/egg
-info/egg-jp
-info/egg-jp-1
-info/egg-jp-2
-info/kbd-trans
-info/languages
-info/m2ps
-info/mule
-info/mule-jp
-info/mule-jp-1
-info/mule-jp-2
-info/mule-jp-3
-info/quail
-info/terminology
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/emacs %D/info/dir
-@exec install-info %D/info/vip %D/info/dir
-@exec install-info %D/info/forms %D/info/dir
-@exec install-info %D/info/gnus %D/info/dir
-@exec install-info %D/info/cl %D/info/dir
-@exec install-info %D/info/sc %D/info/dir
-@exec install-info %D/info/dired-x %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" %D/info/antenews-jp %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).			Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).			Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).			Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
-lib/mule/19.28/etc/3B-MAXMEM
-lib/mule/19.28/etc/AIX.DUMP
-lib/mule/19.28/etc/APPLE
-lib/mule/19.28/etc/BABYL
-lib/mule/19.28/etc/CHARSETS
-lib/mule/19.28/etc/CODINGS
-lib/mule/19.28/etc/COOKIES
-lib/mule/19.28/etc/COPYING
-lib/mule/19.28/etc/ChangeLog
-lib/mule/19.28/etc/DEBUG
-lib/mule/19.28/etc/DISTRIB
-lib/mule/19.28/etc/DOC
-lib/mule/19.28/etc/DOC-19.28.1
-lib/mule/19.28/etc/FAQ
-lib/mule/19.28/etc/FAQ-Mule
-lib/mule/19.28/etc/FAQ-Mule.cn
-lib/mule/19.28/etc/FAQ-Mule.jp
-lib/mule/19.28/etc/FAQ-Mule.kr
-lib/mule/19.28/etc/FAQ-Mule.th
-lib/mule/19.28/etc/FAQ-NEW
-lib/mule/19.28/etc/FTP
-lib/mule/19.28/etc/GNU
-lib/mule/19.28/etc/INTERVIEW
-lib/mule/19.28/etc/JOKES
-lib/mule/19.28/etc/LEDIT
-lib/mule/19.28/etc/LNEWS
-lib/mule/19.28/etc/LPF
-lib/mule/19.28/etc/MACHINES
-lib/mule/19.28/etc/MAILINGLISTS
-lib/mule/19.28/etc/MH-E-NEWS
-lib/mule/19.28/etc/MORE.STUFF
-lib/mule/19.28/etc/MOTIVATION
-lib/mule/19.28/etc/MSDOS
-lib/mule/19.28/etc/Makefile
-lib/mule/19.28/etc/Makefile.in
-lib/mule/19.28/etc/NEWS
-lib/mule/19.28/etc/ONEWS
-lib/mule/19.28/etc/OONEWS
-lib/mule/19.28/etc/OOONEWS
-lib/mule/19.28/etc/OOOONEWS
-lib/mule/19.28/etc/ORDERS
-lib/mule/19.28/etc/ORDERS.EUROPE
-lib/mule/19.28/etc/ORDERS.JAPAN
-lib/mule/19.28/etc/OTHER.EMACSES
-lib/mule/19.28/etc/README
-lib/mule/19.28/etc/SERVICE
-lib/mule/19.28/etc/SUN-SUPPORT
-lib/mule/19.28/etc/TERMS
-lib/mule/19.28/etc/TUTORIAL
-lib/mule/19.28/etc/TUTORIAL.jp
-lib/mule/19.28/etc/TUTORIAL.kr
-lib/mule/19.28/etc/TUTORIAL.th
-lib/mule/19.28/etc/VERSIONS
-lib/mule/19.28/etc/Xkeymap.txt
-lib/mule/19.28/etc/celibacy.1
-lib/mule/19.28/etc/charset
-lib/mule/19.28/etc/coco.1
-lib/mule/19.28/etc/condom.1
-lib/mule/19.28/etc/copying.paper
-lib/mule/19.28/etc/ctags.1
-lib/mule/19.28/etc/demo.ps
-lib/mule/19.28/etc/echo.msg
-lib/mule/19.28/etc/emacs.1
-lib/mule/19.28/etc/emacs.bash
-lib/mule/19.28/etc/emacs.csh
-lib/mule/19.28/etc/emacs.icon
-lib/mule/19.28/etc/emacs.xbm
-lib/mule/19.28/etc/emacstool.1
-lib/mule/19.28/etc/etags.1
-lib/mule/19.28/etc/etags.notes
-lib/mule/19.28/etc/etags.vms
-lib/mule/19.28/etc/ledit.l
-lib/mule/19.28/etc/m2ps.1
-lib/mule/19.28/etc/m2ps.ps
-lib/mule/19.28/etc/ms-kermit
-lib/mule/19.28/etc/ms-kermit-7bit
-lib/mule/19.28/etc/mule-refcard.tex
-lib/mule/19.28/etc/mule.1
-lib/mule/19.28/etc/mule.xbm
-lib/mule/19.28/etc/news.texi
-lib/mule/19.28/etc/refcard.ps
-lib/mule/19.28/etc/refcard.tex
-lib/mule/19.28/etc/sex.6
-lib/mule/19.28/etc/spook.lines
-lib/mule/19.28/etc/termcap.dat
-lib/mule/19.28/etc/termcap.ucb
-lib/mule/19.28/etc/tom.xbm
-lib/mule/19.28/etc/ulimit.hack
-lib/mule/19.28/etc/vipcard.tex
-lib/mule/19.28/etc/yow.lines
 lib/mule/19.28/i386--freebsd/cvtmail
 lib/mule/19.28/i386--freebsd/digest-doc
 lib/mule/19.28/i386--freebsd/emacsserver
@@ -221,784 +25,4 @@ lib/mule/19.28/i386--freebsd/timer
 lib/mule/19.28/i386--freebsd/vcdiff
 lib/mule/19.28/i386--freebsd/wakeup
 lib/mule/19.28/i386--freebsd/yow
-lib/mule/19.28/lisp/COPYING
-lib/mule/19.28/lisp/ChangeLog
-lib/mule/19.28/lisp/ChangeLog.1
-lib/mule/19.28/lisp/ChangeLog.2
-lib/mule/19.28/lisp/ChangeLog.3
-lib/mule/19.28/lisp/Makefile
-lib/mule/19.28/lisp/README
-lib/mule/19.28/lisp/abbrev.el
-lib/mule/19.28/lisp/abbrev.elc
-lib/mule/19.28/lisp/abbrevlist.el
-lib/mule/19.28/lisp/abbrevlist.elc
-lib/mule/19.28/lisp/ada.el
-lib/mule/19.28/lisp/ada.elc
-lib/mule/19.28/lisp/add-log.el
-lib/mule/19.28/lisp/add-log.elc
-lib/mule/19.28/lisp/advice.el
-lib/mule/19.28/lisp/advice.elc
-lib/mule/19.28/lisp/allout.el
-lib/mule/19.28/lisp/allout.elc
-lib/mule/19.28/lisp/ange-ftp.el
-lib/mule/19.28/lisp/ange-ftp.elc
-lib/mule/19.28/lisp/appt.el
-lib/mule/19.28/lisp/appt.elc
-lib/mule/19.28/lisp/apropos.el
-lib/mule/19.28/lisp/apropos.elc
-lib/mule/19.28/lisp/arabic.el
-lib/mule/19.28/lisp/arabic.elc
-lib/mule/19.28/lisp/array.el
-lib/mule/19.28/lisp/array.elc
-lib/mule/19.28/lisp/asm-mode.el
-lib/mule/19.28/lisp/asm-mode.elc
-lib/mule/19.28/lisp/assoc.el
-lib/mule/19.28/lisp/assoc.elc
-lib/mule/19.28/lisp/autoinsert.el
-lib/mule/19.28/lisp/autoinsert.elc
-lib/mule/19.28/lisp/autoload.el
-lib/mule/19.28/lisp/autoload.elc
-lib/mule/19.28/lisp/avoid.el
-lib/mule/19.28/lisp/avoid.elc
-lib/mule/19.28/lisp/awk-mode.el
-lib/mule/19.28/lisp/awk-mode.elc
-lib/mule/19.28/lisp/backquote.el
-lib/mule/19.28/lisp/backquote.elc
-lib/mule/19.28/lisp/bib-mode.el
-lib/mule/19.28/lisp/bib-mode.elc
-lib/mule/19.28/lisp/bibtex.el
-lib/mule/19.28/lisp/bibtex.elc
-lib/mule/19.28/lisp/blackbox.el
-lib/mule/19.28/lisp/blackbox.elc
-lib/mule/19.28/lisp/blessmail.el
-lib/mule/19.28/lisp/bookmark.el
-lib/mule/19.28/lisp/bookmark.elc
-lib/mule/19.28/lisp/buff-menu.el
-lib/mule/19.28/lisp/buff-menu.elc
-lib/mule/19.28/lisp/busyu.el
-lib/mule/19.28/lisp/byte-opt.el
-lib/mule/19.28/lisp/byte-opt.elc
-lib/mule/19.28/lisp/byte-run.el
-lib/mule/19.28/lisp/byte-run.elc
-lib/mule/19.28/lisp/bytecomp.el
-lib/mule/19.28/lisp/bytecomp.elc
-lib/mule/19.28/lisp/c-mode.el
-lib/mule/19.28/lisp/c-mode.elc
-lib/mule/19.28/lisp/cal-dst.el
-lib/mule/19.28/lisp/cal-dst.elc
-lib/mule/19.28/lisp/cal-french.el
-lib/mule/19.28/lisp/cal-french.elc
-lib/mule/19.28/lisp/cal-mayan.el
-lib/mule/19.28/lisp/cal-mayan.elc
-lib/mule/19.28/lisp/cal-menu.el
-lib/mule/19.28/lisp/cal-menu.elc
-lib/mule/19.28/lisp/calendar.el
-lib/mule/19.28/lisp/calendar.elc
-lib/mule/19.28/lisp/can-n-egg.el
-lib/mule/19.28/lisp/canna.el
-lib/mule/19.28/lisp/canna.elc
-lib/mule/19.28/lisp/case-table.el
-lib/mule/19.28/lisp/case-table.elc
-lib/mule/19.28/lisp/cc-mode.el
-lib/mule/19.28/lisp/cc-mode.elc
-lib/mule/19.28/lisp/ccl.el
-lib/mule/19.28/lisp/ccl.elc
-lib/mule/19.28/lisp/cdl.el
-lib/mule/19.28/lisp/cdl.elc
-lib/mule/19.28/lisp/chinese.el
-lib/mule/19.28/lisp/chinese.elc
-lib/mule/19.28/lisp/chistory.el
-lib/mule/19.28/lisp/chistory.elc
-lib/mule/19.28/lisp/cl-compat.el
-lib/mule/19.28/lisp/cl-compat.elc
-lib/mule/19.28/lisp/cl-extra.el
-lib/mule/19.28/lisp/cl-extra.elc
-lib/mule/19.28/lisp/cl-indent.el
-lib/mule/19.28/lisp/cl-indent.elc
-lib/mule/19.28/lisp/cl-macs.el
-lib/mule/19.28/lisp/cl-macs.elc
-lib/mule/19.28/lisp/cl-seq.el
-lib/mule/19.28/lisp/cl-seq.elc
-lib/mule/19.28/lisp/cl-specs.el
-lib/mule/19.28/lisp/cl-specs.elc
-lib/mule/19.28/lisp/cl.el
-lib/mule/19.28/lisp/cl.elc
-lib/mule/19.28/lisp/cmacexp.el
-lib/mule/19.28/lisp/cmacexp.elc
-lib/mule/19.28/lisp/cmuscheme.el
-lib/mule/19.28/lisp/cmuscheme.elc
-lib/mule/19.28/lisp/comint.el
-lib/mule/19.28/lisp/comint.elc
-lib/mule/19.28/lisp/compare-w.el
-lib/mule/19.28/lisp/compare-w.elc
-lib/mule/19.28/lisp/compile.el
-lib/mule/19.28/lisp/compile.elc
-lib/mule/19.28/lisp/complete.el
-lib/mule/19.28/lisp/complete.elc
-lib/mule/19.28/lisp/completion.el
-lib/mule/19.28/lisp/completion.elc
-lib/mule/19.28/lisp/cookie1.el
-lib/mule/19.28/lisp/cookie1.elc
-lib/mule/19.28/lisp/cplus-md.el
-lib/mule/19.28/lisp/cplus-md.elc
-lib/mule/19.28/lisp/cust-print.el
-lib/mule/19.28/lisp/cust-print.elc
-lib/mule/19.28/lisp/cyrillic.el
-lib/mule/19.28/lisp/cyrillic.elc
-lib/mule/19.28/lisp/dabbrev.el
-lib/mule/19.28/lisp/dabbrev.elc
-lib/mule/19.28/lisp/debug.el
-lib/mule/19.28/lisp/debug.elc
-lib/mule/19.28/lisp/delsel.el
-lib/mule/19.28/lisp/delsel.elc
-lib/mule/19.28/lisp/derived.el
-lib/mule/19.28/lisp/derived.elc
-lib/mule/19.28/lisp/desktop.el
-lib/mule/19.28/lisp/desktop.elc
-lib/mule/19.28/lisp/diary-ins.el
-lib/mule/19.28/lisp/diary-ins.elc
-lib/mule/19.28/lisp/diary-lib.el
-lib/mule/19.28/lisp/diary-lib.elc
-lib/mule/19.28/lisp/diff.el
-lib/mule/19.28/lisp/diff.elc
-lib/mule/19.28/lisp/dired-aux.el
-lib/mule/19.28/lisp/dired-aux.elc
-lib/mule/19.28/lisp/dired-x.el
-lib/mule/19.28/lisp/dired-x.elc
-lib/mule/19.28/lisp/dired.el
-lib/mule/19.28/lisp/dired.elc
-lib/mule/19.28/lisp/dired.todo
-lib/mule/19.28/lisp/disass.el
-lib/mule/19.28/lisp/disass.elc
-lib/mule/19.28/lisp/disp-table.el
-lib/mule/19.28/lisp/disp-table.elc
-lib/mule/19.28/lisp/dissociate.el
-lib/mule/19.28/lisp/dissociate.elc
-lib/mule/19.28/lisp/doctor.el
-lib/mule/19.28/lisp/doctor.elc
-lib/mule/19.28/lisp/dos-fns.el
-lib/mule/19.28/lisp/dos-fns.elc
-lib/mule/19.28/lisp/double.el
-lib/mule/19.28/lisp/double.elc
-lib/mule/19.28/lisp/dunnet.el
-lib/mule/19.28/lisp/dunnet.elc
-lib/mule/19.28/lisp/easymenu.el
-lib/mule/19.28/lisp/easymenu.elc
-lib/mule/19.28/lisp/ebuff-menu.el
-lib/mule/19.28/lisp/ebuff-menu.elc
-lib/mule/19.28/lisp/echistory.el
-lib/mule/19.28/lisp/echistory.elc
-lib/mule/19.28/lisp/edebug.el
-lib/mule/19.28/lisp/edebug.elc
-lib/mule/19.28/lisp/ediff.el
-lib/mule/19.28/lisp/ediff.elc
-lib/mule/19.28/lisp/edmacro.el
-lib/mule/19.28/lisp/edmacro.elc
-lib/mule/19.28/lisp/edt.el
-lib/mule/19.28/lisp/edt.elc
-lib/mule/19.28/lisp/egg-jsymbol.el
-lib/mule/19.28/lisp/egg-keymap.el
-lib/mule/19.28/lisp/egg.el
-lib/mule/19.28/lisp/egg.elc
-lib/mule/19.28/lisp/eggrc-sj3
-lib/mule/19.28/lisp/eggrc-wnn
-lib/mule/19.28/lisp/ehelp.el
-lib/mule/19.28/lisp/ehelp.elc
-lib/mule/19.28/lisp/electric.el
-lib/mule/19.28/lisp/electric.elc
-lib/mule/19.28/lisp/emacsbug.el
-lib/mule/19.28/lisp/emacsbug.elc
-lib/mule/19.28/lisp/emerge.el
-lib/mule/19.28/lisp/emerge.elc
-lib/mule/19.28/lisp/env.el
-lib/mule/19.28/lisp/env.elc
-lib/mule/19.28/lisp/etags.el
-lib/mule/19.28/lisp/etags.elc
-lib/mule/19.28/lisp/ethio.el
-lib/mule/19.28/lisp/ethio.elc
-lib/mule/19.28/lisp/european.el
-lib/mule/19.28/lisp/european.elc
-lib/mule/19.28/lisp/eval-reg.el
-lib/mule/19.28/lisp/eval-reg.elc
-lib/mule/19.28/lisp/faces.el
-lib/mule/19.28/lisp/faces.elc
-lib/mule/19.28/lisp/files.el
-lib/mule/19.28/lisp/files.elc
-lib/mule/19.28/lisp/fill.el
-lib/mule/19.28/lisp/fill.elc
-lib/mule/19.28/lisp/find-dired.el
-lib/mule/19.28/lisp/find-dired.elc
-lib/mule/19.28/lisp/find-gc.el
-lib/mule/19.28/lisp/find-gc.elc
-lib/mule/19.28/lisp/finder-inf.el
-lib/mule/19.28/lisp/finder-inf.elc
-lib/mule/19.28/lisp/finder.el
-lib/mule/19.28/lisp/finder.elc
-lib/mule/19.28/lisp/float-sup.el
-lib/mule/19.28/lisp/float-sup.elc
-lib/mule/19.28/lisp/float.el
-lib/mule/19.28/lisp/float.elc
-lib/mule/19.28/lisp/flow-ctrl.el
-lib/mule/19.28/lisp/flow-ctrl.elc
-lib/mule/19.28/lisp/foldout.el
-lib/mule/19.28/lisp/foldout.elc
-lib/mule/19.28/lisp/font-lock.el
-lib/mule/19.28/lisp/font-lock.elc
-lib/mule/19.28/lisp/forms-d2.dat
-lib/mule/19.28/lisp/forms-d2.el
-lib/mule/19.28/lisp/forms-pass.el
-lib/mule/19.28/lisp/forms.el
-lib/mule/19.28/lisp/forms.elc
-lib/mule/19.28/lisp/fortran.el
-lib/mule/19.28/lisp/fortran.elc
-lib/mule/19.28/lisp/frame.el
-lib/mule/19.28/lisp/frame.elc
-lib/mule/19.28/lisp/gnus-uu.el
-lib/mule/19.28/lisp/gnus-uu.elc
-lib/mule/19.28/lisp/gnus.el
-lib/mule/19.28/lisp/gnus.elc
-lib/mule/19.28/lisp/gnusmail.el
-lib/mule/19.28/lisp/gnusmail.elc
-lib/mule/19.28/lisp/gnusmisc.el
-lib/mule/19.28/lisp/gnusmisc.elc
-lib/mule/19.28/lisp/gnuspost.el
-lib/mule/19.28/lisp/gnuspost.elc
-lib/mule/19.28/lisp/gnusutil.el
-lib/mule/19.28/lisp/gnusutil.elc
-lib/mule/19.28/lisp/gomoku.el
-lib/mule/19.28/lisp/gomoku.elc
-lib/mule/19.28/lisp/gud.el
-lib/mule/19.28/lisp/gud.elc
-lib/mule/19.28/lisp/hanoi.el
-lib/mule/19.28/lisp/hanoi.elc
-lib/mule/19.28/lisp/help-macro.el
-lib/mule/19.28/lisp/help-macro.elc
-lib/mule/19.28/lisp/help.el
-lib/mule/19.28/lisp/help.elc
-lib/mule/19.28/lisp/helper.el
-lib/mule/19.28/lisp/helper.elc
-lib/mule/19.28/lisp/hexl.el
-lib/mule/19.28/lisp/hexl.elc
-lib/mule/19.28/lisp/hideif.el
-lib/mule/19.28/lisp/hideif.elc
-lib/mule/19.28/lisp/hilit19.el
-lib/mule/19.28/lisp/hilit19.elc
-lib/mule/19.28/lisp/hippie-exp.el
-lib/mule/19.28/lisp/hippie-exp.elc
-lib/mule/19.28/lisp/holidays.el
-lib/mule/19.28/lisp/holidays.elc
-lib/mule/19.28/lisp/icomplete.el
-lib/mule/19.28/lisp/icomplete.elc
-lib/mule/19.28/lisp/icon.el
-lib/mule/19.28/lisp/icon.elc
-lib/mule/19.28/lisp/ielm.el
-lib/mule/19.28/lisp/ielm.elc
-lib/mule/19.28/lisp/imenu.el
-lib/mule/19.28/lisp/imenu.elc
-lib/mule/19.28/lisp/indent.el
-lib/mule/19.28/lisp/indent.elc
-lib/mule/19.28/lisp/inf-lisp.el
-lib/mule/19.28/lisp/inf-lisp.elc
-lib/mule/19.28/lisp/info.el
-lib/mule/19.28/lisp/info.elc
-lib/mule/19.28/lisp/informat.el
-lib/mule/19.28/lisp/informat.elc
-lib/mule/19.28/lisp/isearch-ext.el
-lib/mule/19.28/lisp/isearch-ext.elc
-lib/mule/19.28/lisp/isearch.el
-lib/mule/19.28/lisp/isearch.elc
-lib/mule/19.28/lisp/iso-acc.el
-lib/mule/19.28/lisp/iso-acc.elc
-lib/mule/19.28/lisp/iso-ascii.el
-lib/mule/19.28/lisp/iso-ascii.elc
-lib/mule/19.28/lisp/iso-cvt.el
-lib/mule/19.28/lisp/iso-cvt.elc
-lib/mule/19.28/lisp/iso-insert.el
-lib/mule/19.28/lisp/iso-insert.elc
-lib/mule/19.28/lisp/iso-swed.el
-lib/mule/19.28/lisp/iso-swed.elc
-lib/mule/19.28/lisp/iso-syntax.el
-lib/mule/19.28/lisp/iso-syntax.elc
-lib/mule/19.28/lisp/iso-transl.el
-lib/mule/19.28/lisp/iso-transl.elc
-lib/mule/19.28/lisp/ispell.el
-lib/mule/19.28/lisp/ispell.elc
-lib/mule/19.28/lisp/ispell4.el
-lib/mule/19.28/lisp/ispell4.elc
-lib/mule/19.28/lisp/japanese.el
-lib/mule/19.28/lisp/japanese.elc
-lib/mule/19.28/lisp/jisx0201.el
-lib/mule/19.28/lisp/jka-compr.el
-lib/mule/19.28/lisp/jka-compr.elc
-lib/mule/19.28/lisp/kbd-isearch.el
-lib/mule/19.28/lisp/kermit.el
-lib/mule/19.28/lisp/kermit.elc
-lib/mule/19.28/lisp/keyboard.el
-lib/mule/19.28/lisp/keyboard.elc
-lib/mule/19.28/lisp/kinsoku.el
-lib/mule/19.28/lisp/kinsoku.elc
-lib/mule/19.28/lisp/korean.el
-lib/mule/19.28/lisp/korean.elc
-lib/mule/19.28/lisp/ledit.el
-lib/mule/19.28/lisp/ledit.elc
-lib/mule/19.28/lisp/levents.el
-lib/mule/19.28/lisp/levents.elc
-lib/mule/19.28/lisp/life.el
-lib/mule/19.28/lisp/life.elc
-lib/mule/19.28/lisp/lisp-mnt.el
-lib/mule/19.28/lisp/lisp-mnt.elc
-lib/mule/19.28/lisp/lisp-mode.el
-lib/mule/19.28/lisp/lisp-mode.elc
-lib/mule/19.28/lisp/lisp.el
-lib/mule/19.28/lisp/lisp.elc
-lib/mule/19.28/lisp/lmenu.el
-lib/mule/19.28/lisp/lmenu.elc
-lib/mule/19.28/lisp/loaddefs.el
-lib/mule/19.28/lisp/loaddefs.elc
-lib/mule/19.28/lisp/loadhist.el
-lib/mule/19.28/lisp/loadhist.elc
-lib/mule/19.28/lisp/loadup.el
-lib/mule/19.28/lisp/lpr.el
-lib/mule/19.28/lisp/lpr.elc
-lib/mule/19.28/lisp/ls-lisp.el
-lib/mule/19.28/lisp/ls-lisp.elc
-lib/mule/19.28/lisp/lselect.el
-lib/mule/19.28/lisp/lselect.elc
-lib/mule/19.28/lisp/lucid.el
-lib/mule/19.28/lisp/lucid.elc
-lib/mule/19.28/lisp/lunar.el
-lib/mule/19.28/lisp/lunar.elc
-lib/mule/19.28/lisp/macros.el
-lib/mule/19.28/lisp/macros.elc
-lib/mule/19.28/lisp/mail-extr.el
-lib/mule/19.28/lisp/mail-extr.elc
-lib/mule/19.28/lisp/mail-hist.el
-lib/mule/19.28/lisp/mail-hist.elc
-lib/mule/19.28/lisp/mail-utils.el
-lib/mule/19.28/lisp/mail-utils.elc
-lib/mule/19.28/lisp/mailabbrev.el
-lib/mule/19.28/lisp/mailabbrev.elc
-lib/mule/19.28/lisp/mailalias.el
-lib/mule/19.28/lisp/mailalias.elc
-lib/mule/19.28/lisp/mailpost.el
-lib/mule/19.28/lisp/mailpost.elc
-lib/mule/19.28/lisp/makefile.el
-lib/mule/19.28/lisp/makefile.elc
-lib/mule/19.28/lisp/makeinfo.el
-lib/mule/19.28/lisp/makeinfo.elc
-lib/mule/19.28/lisp/makesum.el
-lib/mule/19.28/lisp/makesum.elc
-lib/mule/19.28/lisp/man.el
-lib/mule/19.28/lisp/man.elc
-lib/mule/19.28/lisp/map-ynp.el
-lib/mule/19.28/lisp/map-ynp.elc
-lib/mule/19.28/lisp/medit.el
-lib/mule/19.28/lisp/medit.elc
-lib/mule/19.28/lisp/meese.el
-lib/mule/19.28/lisp/meese.elc
-lib/mule/19.28/lisp/menu-bar.el
-lib/mule/19.28/lisp/menu-bar.elc
-lib/mule/19.28/lisp/metamail.el
-lib/mule/19.28/lisp/metamail.elc
-lib/mule/19.28/lisp/mh-comp.el
-lib/mule/19.28/lisp/mh-comp.elc
-lib/mule/19.28/lisp/mh-e.el
-lib/mule/19.28/lisp/mh-e.elc
-lib/mule/19.28/lisp/mh-funcs.el
-lib/mule/19.28/lisp/mh-funcs.elc
-lib/mule/19.28/lisp/mh-mime.el
-lib/mule/19.28/lisp/mh-mime.elc
-lib/mule/19.28/lisp/mh-pick.el
-lib/mule/19.28/lisp/mh-pick.elc
-lib/mule/19.28/lisp/mh-seq.el
-lib/mule/19.28/lisp/mh-seq.elc
-lib/mule/19.28/lisp/mh-utils.el
-lib/mule/19.28/lisp/mh-utils.elc
-lib/mule/19.28/lisp/mhspool.el
-lib/mule/19.28/lisp/mhspool.elc
-lib/mule/19.28/lisp/mim-mode.el
-lib/mule/19.28/lisp/mim-mode.elc
-lib/mule/19.28/lisp/mim-syntax.el
-lib/mule/19.28/lisp/mim-syntax.elc
-lib/mule/19.28/lisp/misc.el
-lib/mule/19.28/lisp/misc.elc
-lib/mule/19.28/lisp/mlconvert.el
-lib/mule/19.28/lisp/mlconvert.elc
-lib/mule/19.28/lisp/mldrag.el
-lib/mule/19.28/lisp/mldrag.elc
-lib/mule/19.28/lisp/mlsupport.el
-lib/mule/19.28/lisp/mlsupport.elc
-lib/mule/19.28/lisp/modula2.el
-lib/mule/19.28/lisp/modula2.elc
-lib/mule/19.28/lisp/mouse-sel.el
-lib/mule/19.28/lisp/mouse-sel.elc
-lib/mule/19.28/lisp/mouse.el
-lib/mule/19.28/lisp/mouse.elc
-lib/mule/19.28/lisp/mpuz.el
-lib/mule/19.28/lisp/mpuz.elc
-lib/mule/19.28/lisp/mule-conf.el
-lib/mule/19.28/lisp/mule-diag.el
-lib/mule/19.28/lisp/mule-diag.elc
-lib/mule/19.28/lisp/mule-init.el
-lib/mule/19.28/lisp/mule-init.elc
-lib/mule/19.28/lisp/mule-inst.el
-lib/mule/19.28/lisp/mule-util.el
-lib/mule/19.28/lisp/mule-util.elc
-lib/mule/19.28/lisp/mule.el
-lib/mule/19.28/lisp/mule.elc
-lib/mule/19.28/lisp/netunam.el
-lib/mule/19.28/lisp/netunam.elc
-lib/mule/19.28/lisp/nnspool.el
-lib/mule/19.28/lisp/nnspool.elc
-lib/mule/19.28/lisp/nntp.el
-lib/mule/19.28/lisp/nntp.elc
-lib/mule/19.28/lisp/novice.el
-lib/mule/19.28/lisp/novice.elc
-lib/mule/19.28/lisp/nroff-mode.el
-lib/mule/19.28/lisp/nroff-mode.elc
-lib/mule/19.28/lisp/options.el
-lib/mule/19.28/lisp/options.elc
-lib/mule/19.28/lisp/outline.el
-lib/mule/19.28/lisp/outline.elc
-lib/mule/19.28/lisp/page-ext.el
-lib/mule/19.28/lisp/page-ext.elc
-lib/mule/19.28/lisp/page.el
-lib/mule/19.28/lisp/page.elc
-lib/mule/19.28/lisp/paragraphs.el
-lib/mule/19.28/lisp/paragraphs.elc
-lib/mule/19.28/lisp/paren.el
-lib/mule/19.28/lisp/paren.elc
-lib/mule/19.28/lisp/pascal.el
-lib/mule/19.28/lisp/pascal.elc
-lib/mule/19.28/lisp/paths.el
-lib/mule/19.28/lisp/perl-mode.el
-lib/mule/19.28/lisp/perl-mode.elc
-lib/mule/19.28/lisp/picture.el
-lib/mule/19.28/lisp/picture.elc
-lib/mule/19.28/lisp/pp.el
-lib/mule/19.28/lisp/pp.elc
-lib/mule/19.28/lisp/profile.el
-lib/mule/19.28/lisp/profile.elc
-lib/mule/19.28/lisp/prolog.el
-lib/mule/19.28/lisp/prolog.elc
-lib/mule/19.28/lisp/quail-egg.el
-lib/mule/19.28/lisp/quail.el
-lib/mule/19.28/lisp/quail.elc
-lib/mule/19.28/lisp/rcompile.el
-lib/mule/19.28/lisp/rcompile.elc
-lib/mule/19.28/lisp/rect.el
-lib/mule/19.28/lisp/rect.elc
-lib/mule/19.28/lisp/refbib.el
-lib/mule/19.28/lisp/refbib.elc
-lib/mule/19.28/lisp/refer.el
-lib/mule/19.28/lisp/refer.elc
-lib/mule/19.28/lisp/regi.el
-lib/mule/19.28/lisp/regi.elc
-lib/mule/19.28/lisp/register.el
-lib/mule/19.28/lisp/register.elc
-lib/mule/19.28/lisp/replace.el
-lib/mule/19.28/lisp/replace.elc
-lib/mule/19.28/lisp/reporter.el
-lib/mule/19.28/lisp/reporter.elc
-lib/mule/19.28/lisp/reposition.el
-lib/mule/19.28/lisp/reposition.elc
-lib/mule/19.28/lisp/resume.el
-lib/mule/19.28/lisp/resume.elc
-lib/mule/19.28/lisp/rfc822.el
-lib/mule/19.28/lisp/rfc822.elc
-lib/mule/19.28/lisp/ring.el
-lib/mule/19.28/lisp/ring.elc
-lib/mule/19.28/lisp/rlogin.el
-lib/mule/19.28/lisp/rlogin.elc
-lib/mule/19.28/lisp/rmail.el
-lib/mule/19.28/lisp/rmail.elc
-lib/mule/19.28/lisp/rmailedit.el
-lib/mule/19.28/lisp/rmailedit.elc
-lib/mule/19.28/lisp/rmailkwd.el
-lib/mule/19.28/lisp/rmailkwd.elc
-lib/mule/19.28/lisp/rmailmsc.el
-lib/mule/19.28/lisp/rmailmsc.elc
-lib/mule/19.28/lisp/rmailout.el
-lib/mule/19.28/lisp/rmailout.elc
-lib/mule/19.28/lisp/rmailsort.el
-lib/mule/19.28/lisp/rmailsort.elc
-lib/mule/19.28/lisp/rmailsum.el
-lib/mule/19.28/lisp/rmailsum.elc
-lib/mule/19.28/lisp/rnews.el
-lib/mule/19.28/lisp/rnews.elc
-lib/mule/19.28/lisp/rnewspost.el
-lib/mule/19.28/lisp/rnewspost.elc
-lib/mule/19.28/lisp/rot13.el
-lib/mule/19.28/lisp/rot13.elc
-lib/mule/19.28/lisp/rsz-mini.el
-lib/mule/19.28/lisp/rsz-mini.elc
-lib/mule/19.28/lisp/s-region.el
-lib/mule/19.28/lisp/s-region.elc
-lib/mule/19.28/lisp/saveplace.el
-lib/mule/19.28/lisp/saveplace.elc
-lib/mule/19.28/lisp/sc.el
-lib/mule/19.28/lisp/scheme.el
-lib/mule/19.28/lisp/scheme.elc
-lib/mule/19.28/lisp/scribe.el
-lib/mule/19.28/lisp/scribe.elc
-lib/mule/19.28/lisp/scroll-bar.el
-lib/mule/19.28/lisp/scroll-bar.elc
-lib/mule/19.28/lisp/select.el
-lib/mule/19.28/lisp/select.elc
-lib/mule/19.28/lisp/sendmail.el
-lib/mule/19.28/lisp/sendmail.elc
-lib/mule/19.28/lisp/server.el
-lib/mule/19.28/lisp/server.elc
-lib/mule/19.28/lisp/sgml-mode.el
-lib/mule/19.28/lisp/sgml-mode.elc
-lib/mule/19.28/lisp/sh-script.el
-lib/mule/19.28/lisp/sh-script.elc
-lib/mule/19.28/lisp/shadowfile.el
-lib/mule/19.28/lisp/shadowfile.elc
-lib/mule/19.28/lisp/shell.el
-lib/mule/19.28/lisp/shell.elc
-lib/mule/19.28/lisp/simple.el
-lib/mule/19.28/lisp/simple.elc
-lib/mule/19.28/lisp/simula.el
-lib/mule/19.28/lisp/simula.elc
-lib/mule/19.28/lisp/sj3-client.el
-lib/mule/19.28/lisp/sj3-client.elc
-lib/mule/19.28/lisp/sj3-egg.el
-lib/mule/19.28/lisp/sj3-egg.elc
-lib/mule/19.28/lisp/skeleton.el
-lib/mule/19.28/lisp/skeleton.elc
-lib/mule/19.28/lisp/solar.el
-lib/mule/19.28/lisp/solar.elc
-lib/mule/19.28/lisp/sort.el
-lib/mule/19.28/lisp/sort.elc
-lib/mule/19.28/lisp/soundex.el
-lib/mule/19.28/lisp/soundex.elc
-lib/mule/19.28/lisp/spell.el
-lib/mule/19.28/lisp/spell.elc
-lib/mule/19.28/lisp/spook.el
-lib/mule/19.28/lisp/spook.elc
-lib/mule/19.28/lisp/startup.el
-lib/mule/19.28/lisp/startup.elc
-lib/mule/19.28/lisp/studly.el
-lib/mule/19.28/lisp/studly.elc
-lib/mule/19.28/lisp/subr.el
-lib/mule/19.28/lisp/subr.elc
-lib/mule/19.28/lisp/sun-curs.el
-lib/mule/19.28/lisp/sun-fns.el
-lib/mule/19.28/lisp/supercite.el
-lib/mule/19.28/lisp/supercite.elc
-lib/mule/19.28/lisp/swedish.el
-lib/mule/19.28/lisp/swedish.elc
-lib/mule/19.28/lisp/tabify.el
-lib/mule/19.28/lisp/tabify.elc
-lib/mule/19.28/lisp/tar-mode.el
-lib/mule/19.28/lisp/tar-mode.elc
-lib/mule/19.28/lisp/tcl-mode.el
-lib/mule/19.28/lisp/tcl-mode.elc
-lib/mule/19.28/lisp/tcp.el
-lib/mule/19.28/lisp/tcp.elc
-lib/mule/19.28/lisp/telnet.el
-lib/mule/19.28/lisp/telnet.elc
-lib/mule/19.28/lisp/tempo.el
-lib/mule/19.28/lisp/tempo.elc
-lib/mule/19.28/lisp/term-nasty.el
-lib/mule/19.28/lisp/terminal.el
-lib/mule/19.28/lisp/terminal.elc
-lib/mule/19.28/lisp/tex-mode.el
-lib/mule/19.28/lisp/tex-mode.elc
-lib/mule/19.28/lisp/texinfmt.el
-lib/mule/19.28/lisp/texinfmt.elc
-lib/mule/19.28/lisp/texinfo.el
-lib/mule/19.28/lisp/texinfo.elc
-lib/mule/19.28/lisp/texnfo-upd.el
-lib/mule/19.28/lisp/texnfo-upd.elc
-lib/mule/19.28/lisp/text-mode.el
-lib/mule/19.28/lisp/text-mode.elc
-lib/mule/19.28/lisp/thai.el
-lib/mule/19.28/lisp/thai.elc
-lib/mule/19.28/lisp/thingatpt.el
-lib/mule/19.28/lisp/thingatpt.elc
-lib/mule/19.28/lisp/time-stamp.el
-lib/mule/19.28/lisp/time-stamp.elc
-lib/mule/19.28/lisp/time.el
-lib/mule/19.28/lisp/time.elc
-lib/mule/19.28/lisp/timer.el
-lib/mule/19.28/lisp/timer.elc
-lib/mule/19.28/lisp/timezone.el
-lib/mule/19.28/lisp/timezone.elc
-lib/mule/19.28/lisp/tpu-doc.el
-lib/mule/19.28/lisp/tpu-edt.el
-lib/mule/19.28/lisp/tpu-edt.elc
-lib/mule/19.28/lisp/tpu-extras.el
-lib/mule/19.28/lisp/tpu-extras.elc
-lib/mule/19.28/lisp/tpu-mapper.el
-lib/mule/19.28/lisp/tpu-mapper.elc
-lib/mule/19.28/lisp/tq.el
-lib/mule/19.28/lisp/tq.elc
-lib/mule/19.28/lisp/trace.el
-lib/mule/19.28/lisp/trace.elc
-lib/mule/19.28/lisp/trex.el
-lib/mule/19.28/lisp/trex.elc
-lib/mule/19.28/lisp/two-column.el
-lib/mule/19.28/lisp/two-column.elc
-lib/mule/19.28/lisp/uncompress.el
-lib/mule/19.28/lisp/uncompress.elc
-lib/mule/19.28/lisp/underline.el
-lib/mule/19.28/lisp/underline.elc
-lib/mule/19.28/lisp/undigest.el
-lib/mule/19.28/lisp/undigest.elc
-lib/mule/19.28/lisp/unrmail.el
-lib/mule/19.28/lisp/unrmail.elc
-lib/mule/19.28/lisp/unused.el
-lib/mule/19.28/lisp/unused.elc
-lib/mule/19.28/lisp/upd-copyr.el
-lib/mule/19.28/lisp/upd-copyr.elc
-lib/mule/19.28/lisp/userlock.el
-lib/mule/19.28/lisp/userlock.elc
-lib/mule/19.28/lisp/vc-hooks.el
-lib/mule/19.28/lisp/vc-hooks.elc
-lib/mule/19.28/lisp/vc.el
-lib/mule/19.28/lisp/vc.elc
-lib/mule/19.28/lisp/version.el
-lib/mule/19.28/lisp/vi.el
-lib/mule/19.28/lisp/vi.elc
-lib/mule/19.28/lisp/viet.el
-lib/mule/19.28/lisp/viet.elc
-lib/mule/19.28/lisp/view.el
-lib/mule/19.28/lisp/view.elc
-lib/mule/19.28/lisp/vip.el
-lib/mule/19.28/lisp/vip.elc
-lib/mule/19.28/lisp/visual.el
-lib/mule/19.28/lisp/visual.elc
-lib/mule/19.28/lisp/vms-patch.el
-lib/mule/19.28/lisp/vms-patch.elc
-lib/mule/19.28/lisp/vms-pmail.el
-lib/mule/19.28/lisp/vms-pmail.elc
-lib/mule/19.28/lisp/vmsproc.el
-lib/mule/19.28/lisp/vmsproc.elc
-lib/mule/19.28/lisp/vmsx.el
-lib/mule/19.28/lisp/vmsx.elc
-lib/mule/19.28/lisp/vt-control.el
-lib/mule/19.28/lisp/vt100-led.el
-lib/mule/19.28/lisp/vt100-led.elc
-lib/mule/19.28/lisp/window.el
-lib/mule/19.28/lisp/window.elc
-lib/mule/19.28/lisp/wnn-client.el
-lib/mule/19.28/lisp/wnn-egg.el
-lib/mule/19.28/lisp/wnn-egg.elc
-lib/mule/19.28/lisp/ws-mode.el
-lib/mule/19.28/lisp/ws-mode.elc
-lib/mule/19.28/lisp/x-menu.el
-lib/mule/19.28/lisp/x-menu.elc
-lib/mule/19.28/lisp/xscheme.el
-lib/mule/19.28/lisp/xscheme.elc
-lib/mule/19.28/lisp/yow.el
-lib/mule/19.28/lisp/yow.elc
-lib/mule/19.28/lisp/its/han-kata.el
-lib/mule/19.28/lisp/its/hangul.el
-lib/mule/19.28/lisp/its/hankaku.el
-lib/mule/19.28/lisp/its/hira.el
-lib/mule/19.28/lisp/its/kanainput.el
-lib/mule/19.28/lisp/its/kata.el
-lib/mule/19.28/lisp/its/pinyin.el
-lib/mule/19.28/lisp/its/zenkaku.el
-lib/mule/19.28/lisp/its/zhuyin.el
-lib/mule/19.28/lisp/quail/ccdospy.el
-lib/mule/19.28/lisp/quail/ccdospy.elc
-lib/mule/19.28/lisp/quail/ctlau.el
-lib/mule/19.28/lisp/quail/ctlau.elc
-lib/mule/19.28/lisp/quail/ctlaub.el
-lib/mule/19.28/lisp/quail/ctlaub.elc
-lib/mule/19.28/lisp/quail/cyrillic.el
-lib/mule/19.28/lisp/quail/cyrillic.elc
-lib/mule/19.28/lisp/quail/ethio.el
-lib/mule/19.28/lisp/quail/ethio.elc
-lib/mule/19.28/lisp/quail/etzy.el
-lib/mule/19.28/lisp/quail/etzy.elc
-lib/mule/19.28/lisp/quail/greek.el
-lib/mule/19.28/lisp/quail/greek.elc
-lib/mule/19.28/lisp/quail/hangul.el
-lib/mule/19.28/lisp/quail/hangul.elc
-lib/mule/19.28/lisp/quail/hangul3.el
-lib/mule/19.28/lisp/quail/hangul3.elc
-lib/mule/19.28/lisp/quail/hanja-jis.el
-lib/mule/19.28/lisp/quail/hanja-jis.elc
-lib/mule/19.28/lisp/quail/hanja-ksc.el
-lib/mule/19.28/lisp/quail/hanja-ksc.elc
-lib/mule/19.28/lisp/quail/hebrew.el
-lib/mule/19.28/lisp/quail/hebrew.elc
-lib/mule/19.28/lisp/quail/hsymbol.el
-lib/mule/19.28/lisp/quail/hsymbol.elc
-lib/mule/19.28/lisp/quail/ipa.el
-lib/mule/19.28/lisp/quail/ipa.elc
-lib/mule/19.28/lisp/quail/latin.el
-lib/mule/19.28/lisp/quail/latin.elc
-lib/mule/19.28/lisp/quail/punct-b5.el
-lib/mule/19.28/lisp/quail/punct-b5.elc
-lib/mule/19.28/lisp/quail/punct.el
-lib/mule/19.28/lisp/quail/punct.elc
-lib/mule/19.28/lisp/quail/py-b5.el
-lib/mule/19.28/lisp/quail/py-b5.elc
-lib/mule/19.28/lisp/quail/py.el
-lib/mule/19.28/lisp/quail/py.elc
-lib/mule/19.28/lisp/quail/qj-b5.el
-lib/mule/19.28/lisp/quail/qj-b5.elc
-lib/mule/19.28/lisp/quail/qj.el
-lib/mule/19.28/lisp/quail/qj.elc
-lib/mule/19.28/lisp/quail/sw.el
-lib/mule/19.28/lisp/quail/sw.elc
-lib/mule/19.28/lisp/quail/tcode.el
-lib/mule/19.28/lisp/quail/tcode.elc
-lib/mule/19.28/lisp/quail/thai.el
-lib/mule/19.28/lisp/quail/thai.elc
-lib/mule/19.28/lisp/quail/tit.el
-lib/mule/19.28/lisp/quail/tit.elc
-lib/mule/19.28/lisp/quail/tonepy.el
-lib/mule/19.28/lisp/quail/tonepy.elc
-lib/mule/19.28/lisp/quail/viet.el
-lib/mule/19.28/lisp/quail/viet.elc
-lib/mule/19.28/lisp/quail/zozy.el
-lib/mule/19.28/lisp/quail/zozy.elc
-lib/mule/19.28/lisp/term/AT386.el
-lib/mule/19.28/lisp/term/README
-lib/mule/19.28/lisp/term/apollo.el
-lib/mule/19.28/lisp/term/apollo.elc
-lib/mule/19.28/lisp/term/bg-mouse.el
-lib/mule/19.28/lisp/term/bg-mouse.elc
-lib/mule/19.28/lisp/term/bobcat.el
-lib/mule/19.28/lisp/term/f-term.el
-lib/mule/19.28/lisp/term/ibmpc.el
-lib/mule/19.28/lisp/term/internal.el
-lib/mule/19.28/lisp/term/keyswap.el
-lib/mule/19.28/lisp/term/lk201.el
-lib/mule/19.28/lisp/term/news.el
-lib/mule/19.28/lisp/term/news.elc
-lib/mule/19.28/lisp/term/sun-curs.el
-lib/mule/19.28/lisp/term/sun-fns.el
-lib/mule/19.28/lisp/term/sun-mouse.el
-lib/mule/19.28/lisp/term/sun-mouse.elc
-lib/mule/19.28/lisp/term/sun.el
-lib/mule/19.28/lisp/term/sun.elc
-lib/mule/19.28/lisp/term/sup-mouse.el
-lib/mule/19.28/lisp/term/sup-mouse.elc
-lib/mule/19.28/lisp/term/tvi970.el
-lib/mule/19.28/lisp/term/tvi970.elc
-lib/mule/19.28/lisp/term/vt100-led.el
-lib/mule/19.28/lisp/term/vt100-led.elc
-lib/mule/19.28/lisp/term/vt100.el
-lib/mule/19.28/lisp/term/vt100.elc
-lib/mule/19.28/lisp/term/vt102.el
-lib/mule/19.28/lisp/term/vt125.el
-lib/mule/19.28/lisp/term/vt200.el
-lib/mule/19.28/lisp/term/vt200.elc
-lib/mule/19.28/lisp/term/vt201.el
-lib/mule/19.28/lisp/term/vt220.el
-lib/mule/19.28/lisp/term/vt240.el
-lib/mule/19.28/lisp/term/vt300.el
-lib/mule/19.28/lisp/term/vt320.el
-lib/mule/19.28/lisp/term/vt400.el
-lib/mule/19.28/lisp/term/vt420.el
-lib/mule/19.28/lisp/term/wyse50.el
-lib/mule/19.28/lisp/term/wyse50.elc
-lib/mule/19.28/lisp/term/x-win.el
-lib/mule/19.28/lisp/term/x-win.elc
+lib/mule/site-lisp/site-start.el
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
diff --git a/korean/Makefile b/korean/Makefile
index 6ea6d65efbfa..8258edf4675a 100644
--- a/korean/Makefile
+++ b/korean/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.14 1997/06/04 09:12:03 asami Exp $
+# $Id: Makefile,v 1.15 1997/06/06 07:45:13 obrien Exp $
 #
 
     SUBDIR += Wnn
@@ -20,6 +20,7 @@
     SUBDIR += hpscat
     SUBDIR += johabfonts
     SUBDIR += linuxdoc-sgml
+    SUBDIR += mule-wnn4
     SUBDIR += netscape3
     SUBDIR += nh2ps
     SUBDIR += nhpf
diff --git a/korean/mule-freewnn/Makefile b/korean/mule-freewnn/Makefile
new file mode 100644
index 000000000000..d1d57077fa51
--- /dev/null
+++ b/korean/mule-freewnn/Makefile
@@ -0,0 +1,13 @@
+# New ports collection makefile for:	mule with Wnn4
+# Version required:	2.3
+# Date created:		20 July 1997
+# Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
+#
+# $Id$
+#
+
+PKGNAME=	kr-mule-wnn4-2.3
+CATEGORIES=	korean editors
+KWNN4=		yes
+
+.include "${.CURDIR}/../../editors/mule/Makefile"
diff --git a/korean/mule-freewnn/pkg-comment b/korean/mule-freewnn/pkg-comment
new file mode 100644
index 000000000000..b29b02db5863
--- /dev/null
+++ b/korean/mule-freewnn/pkg-comment
@@ -0,0 +1 @@
+A multilingual emacs, with Wnn4 support built in (Only the executables)
diff --git a/korean/mule-freewnn/pkg-descr b/korean/mule-freewnn/pkg-descr
new file mode 100644
index 000000000000..14ca6e4ae3c1
--- /dev/null
+++ b/korean/mule-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 Korean(Hanja) 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.
+
+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/textproc/coco/Makefile b/textproc/coco/Makefile
index c8f11501b34d..d66a03119ae4 100644
--- a/textproc/coco/Makefile
+++ b/textproc/coco/Makefile
@@ -1,38 +1,73 @@
-# New ports collection makefile for:	mule
+# New ports collection makefile for:	files except executables for mule
 # 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:31 asami Exp $
+# $Id$
 #
 
 DISTNAME=	mule-2.3
-CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.cs.buffalo.edu/pub/mule/ \
-		ftp://etlport.etl.go.jp/pub/mule/ \
-		ftp://sh.wide.ad.jp/JAPAN/mule/ \
-		ftp://ftp.funet.fi/pub/gnu/emacs/mule/
+PKGNAME=	mule-common-2.3
+CATEGORIES=	editors chinese japanese korean
+MASTER_SITES=	ftp://etlport.etl.go.jp/pub/mule/ \
+		ftp://ftp.mei.co.jp/archive/free/gnu/emacs/Mule/ \
+		ftp://ftp.iij.ad.jp/pub/misc/mule/ \
+		ftp://ports.jp.FreeBSD.org/pub/incoming/distfiles/
+DISTFILES=	mule-2.3.tar.gz mule-2.3.patch-970819.tar.gz
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
+
+EXTRACT_ONLY=	mule-2.3.tar.gz
+.for dir in editors/mule japanese/mule-canna japanese/mule-canna+sj3 \
+	japanese/mule-canna japanese/mule-canna+sj3 \
+	japanese/mule-canna+sj3+wnn4 japanese/mule-canna+sj3+wnn6 \
+	japanese/mule-canna+wnn4 japanese/mule-canna+wnn6 \
+	japanese/mule-sj3 japanese/mule-sj3+wnn japanese/mule-sj3+wnn6 \
+	japanese/mule-wnn4 japanese/mule-wnn6 \
+	chinese/mule-wnn4 korean/mule-wnn4
+.if exists(${.CURDIR}/../../${dir}/work/.build_done)
+WRKDIR?=	${.CURDIR}/../../${dir}/work
+.endif
+.endfor
+WRKSRC= ${WRKDIR}/mule
+
+.if !defined(WRKDIR) && !defined(PACKAGE_BUILDING)
+BROKEN=		You should build install one of the other mule ports first
+.endif
+
+INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
+PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
+
+USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	i386--freebsd --with-x-toolkit \
 		--terminal-face \
+		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \
 		--locallisppath=${PREFIX}/lib/mule/site-lisp:${PREFIX}/share/emacs/site-lisp
 STRIP=
 MAN1=		coco.1 ctags.1 etags.1 m2ps.1 mule.1
 
+INSTALL_TARGET=	install-arch-indep
+
+post-extract:
+	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3.patch-970819.tar.gz
+	cd ${WRKSRC}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ./takana.tar.gz
+
+pre-patch:
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/patch
+
+post-patch:
+	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Mule-2.3.patch
+
 pre-build:
-	find ${WRKSRC} -name \*.orig -exec /bin/rm -f \{} \;
+	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
+	${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-19.28.*
 
 post-install:
-# note that any2ps is a script
-.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; \
+	  ${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
@@ -43,5 +78,10 @@ post-install:
 	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
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
+
+post-package:
+	@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
 
 .include <bsd.port.mk>
diff --git a/textproc/coco/distinfo b/textproc/coco/distinfo
index b6026659567d..cd2ed03a779e 100644
--- a/textproc/coco/distinfo
+++ b/textproc/coco/distinfo
@@ -1 +1,2 @@
-MD5 (mule-2.3.tar.gz) = 1394af7f1f0f1fa4552984924e7789db
+MD5 (mule-2.3.tar.gz) = e97cfbf19ee43442b416004eb92aac41
+MD5 (mule-2.3.patch-970819.tar.gz) = affdd51086c15abbb0a50999ac2e2796
diff --git a/textproc/coco/files/patch-ac b/textproc/coco/files/patch-ac
index 4b0f8afd8bfe..f9d3e07d53be 100644
--- a/textproc/coco/files/patch-ac
+++ b/textproc/coco/files/patch-ac
@@ -1,4 +1,4 @@
---- ./src/s/freebsd.h.org	Fri Nov  4 03:11:17 1994
+--- ../mule-2.3.org/src/s/freebsd.h.org	Fri Nov  4 03:11:17 1994
 +++ ./src/s/freebsd.h	Wed Aug  9 02:29:56 1995
 @@ -31,10 +31,10 @@
  
diff --git a/textproc/coco/files/site-start.el.tmpl b/textproc/coco/files/site-start.el.tmpl
new file mode 100644
index 000000000000..d5a9dfa4453a
--- /dev/null
+++ b/textproc/coco/files/site-start.el.tmpl
@@ -0,0 +1,37 @@
+;; Chinese
+;;(load "its/erpin")
+;;(load "its/zhuyin")
+;;(load "its/quanjiao")
+;;(set-primary-environment 'chinese);;CHINESE
+
+;; Korean
+;;(if (boundp 'WNN);;KOREAN
+;;    (load "its/Korean"));;KOREAN
+;;(set-primary-environment 'korean);;KOREAN
+
+;; Japanese
+;;(set-primary-environment 'japanese);;JAPANESE
+
+;; For languages except Korean (kr-mule-wnn)
+(defun set-korean-environment ()
+  (setq *coding-category-iso-8-2* '*euc-korea*)
+
+  (set-coding-priority
+   '(*coding-category-iso-8-2*
+     *coding-category-iso-8-1*))
+
+  (set-default-file-coding-system '*iso-2022-kr*)
+
+  (if (boundp 'WNN)
+      (progn
+;;	(load "its/Korean");;not KOREAN
+	(set-default-wnn-environment 'kserver)))
+
+  (setq-default quail-current-package (assoc "hangul" quail-package-alist))
+  )
+
+;; Add System Info path '/usr/share/info' into Info-default-directory-list
+(setq Info-default-directory-list
+      (append (list
+	       "/usr/share/info"
+	       ) Info-default-directory-list)) 
diff --git a/textproc/coco/pkg-comment b/textproc/coco/pkg-comment
index a942ef6fd09f..b8a538c20d85 100644
--- a/textproc/coco/pkg-comment
+++ b/textproc/coco/pkg-comment
@@ -1 +1 @@
-A multilingual emacs
+For a multilingual emacs (mule-2.3), emacs lisp files, info pages, etc (except executables)
diff --git a/textproc/coco/pkg-descr b/textproc/coco/pkg-descr
index c30d1534f978..0e97b0f7f334 100644
--- a/textproc/coco/pkg-descr
+++ b/textproc/coco/pkg-descr
@@ -1,21 +1,29 @@
-This is mule-2.3, a multilingual editor based on emacs-19.28.
+This is emacs lisp files, info pages, and so on (except executables)
+for mule-2.3, a multilingual editor based on emacs-19.28.
 
-This package is not built with any particular language support.  If
-you want a built-in input method, look into the mule ports in language-
-specific directories.  Currently only Japanese (Wnn and Canna) is
-available.
+You must install one of packages, mule-2.3, jp-mule-*-2.3 (
+jp-mule-canna-2.3, jp-mule-canna+sj3-2.3, etc.), cn-mule-wnn4-2.3 and
+kr-mule-wnn4-2.3, each of which contains only the executables for
+mule-2.3.
 
-This package is designed *not* to clobber any existing emacs
-installation.  In particular, the executables and man pages of
-etags/ctags are not installed, and the info pages that come with the
-original emacs don't get installed too.  Remove the file
-patches/patch-ab if you want this package to stand on its own.
-The Japanese version is build to install everything, by the way.
+This package and the above package of the executables *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.
 
-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!
+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.
 
-- 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!
+
+[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/textproc/coco/pkg-install b/textproc/coco/pkg-install
new file mode 100644
index 000000000000..892eeb848ba6
--- /dev/null
+++ b/textproc/coco/pkg-install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
+echo "############################################################"
+echo "You must install one of packages, mule-2.3, jp-mule-*-2.3"
+echo "(jp-mule-canna-2.3, jp-mule-canna+sj3-2.3, etc.),"
+echo "cn-mule-wnn4-2.3 and kr-mule-wnn4-2.3, each of"
+echo "which contains only the executables for mule-2.3"
+echo "############################################################"
diff --git a/textproc/coco/pkg-plist b/textproc/coco/pkg-plist
index fb4e72b549f6..c06f38e9890e 100644
--- a/textproc/coco/pkg-plist
+++ b/textproc/coco/pkg-plist
@@ -1,19 +1,9 @@
 @exec mkdir -p %D/share/emacs/site-lisp
+@dirrm share/emacs/site-lisp
+@dirrm share/emacs
 @exec mkdir -p %D/lib/mule/site-lisp
 @exec mkdir -p %D/lib/mule/lock
 @exec chmod 777 %D/lib/mule/lock
-@unexec rmdir %D/lib/mule/site-lisp
-@unexec rmdir %D/lib/mule/lock
-bin/mule-19.28
-@exec ln -sf %D/%F %B/mule
-@unexec rm %B/mule
-bin/any2ps
-bin/b2m
-bin/coco
-bin/ctags
-bin/etags
-bin/m2ps
-bin/rcs-checkin
 man/man1/coco.1.gz
 man/man1/ctags.1.gz
 man/man1/etags.1.gz
@@ -205,22 +195,6 @@ lib/mule/19.28/etc/tom.xbm
 lib/mule/19.28/etc/ulimit.hack
 lib/mule/19.28/etc/vipcard.tex
 lib/mule/19.28/etc/yow.lines
-lib/mule/19.28/i386--freebsd/cvtmail
-lib/mule/19.28/i386--freebsd/digest-doc
-lib/mule/19.28/i386--freebsd/emacsserver
-lib/mule/19.28/i386--freebsd/fakemail
-lib/mule/19.28/i386--freebsd/hexl
-lib/mule/19.28/i386--freebsd/make-docfile
-lib/mule/19.28/i386--freebsd/make-path
-lib/mule/19.28/i386--freebsd/movemail
-lib/mule/19.28/i386--freebsd/profile
-lib/mule/19.28/i386--freebsd/rcs2log
-lib/mule/19.28/i386--freebsd/sorted-doc
-lib/mule/19.28/i386--freebsd/test-distrib
-lib/mule/19.28/i386--freebsd/timer
-lib/mule/19.28/i386--freebsd/vcdiff
-lib/mule/19.28/i386--freebsd/wakeup
-lib/mule/19.28/i386--freebsd/yow
 lib/mule/19.28/lisp/COPYING
 lib/mule/19.28/lisp/ChangeLog
 lib/mule/19.28/lisp/ChangeLog.1
@@ -568,6 +542,8 @@ lib/mule/19.28/lisp/lucid.el
 lib/mule/19.28/lisp/lucid.elc
 lib/mule/19.28/lisp/lunar.el
 lib/mule/19.28/lisp/lunar.elc
+lib/mule/19.28/lisp/m2ps-util.el
+lib/mule/19.28/lisp/m2ps-util.elc
 lib/mule/19.28/lisp/macros.el
 lib/mule/19.28/lisp/macros.elc
 lib/mule/19.28/lisp/mail-extr.el
@@ -641,6 +617,7 @@ lib/mule/19.28/lisp/mule-diag.el
 lib/mule/19.28/lisp/mule-diag.elc
 lib/mule/19.28/lisp/mule-init.el
 lib/mule/19.28/lisp/mule-init.elc
+lib/mule/19.28/lisp/mule-init.el.old
 lib/mule/19.28/lisp/mule-inst.el
 lib/mule/19.28/lisp/mule-util.el
 lib/mule/19.28/lisp/mule-util.elc
@@ -903,6 +880,13 @@ lib/mule/19.28/lisp/its/kata.el
 lib/mule/19.28/lisp/its/pinyin.el
 lib/mule/19.28/lisp/its/zenkaku.el
 lib/mule/19.28/lisp/its/zhuyin.el
+lib/mule/19.28/lisp/its/Chinese.el
+lib/mule/19.28/lisp/its/Japanese.el
+lib/mule/19.28/lisp/its/Korean.el
+lib/mule/19.28/lisp/its/erpin.el
+lib/mule/19.28/lisp/its/jeonkak.el
+lib/mule/19.28/lisp/its/quanjiao.el
+lib/mule/19.28/lisp/quail/4c-CNS.el
 lib/mule/19.28/lisp/quail/ccdospy.el
 lib/mule/19.28/lisp/quail/ccdospy.elc
 lib/mule/19.28/lisp/quail/ctlau.el
@@ -937,6 +921,8 @@ lib/mule/19.28/lisp/quail/punct-b5.el
 lib/mule/19.28/lisp/quail/punct-b5.elc
 lib/mule/19.28/lisp/quail/punct.el
 lib/mule/19.28/lisp/quail/punct.elc
+lib/mule/19.28/lisp/quail/py-CNS.el
+lib/mule/19.28/lisp/quail/py-CNS.elc
 lib/mule/19.28/lisp/quail/py-b5.el
 lib/mule/19.28/lisp/quail/py-b5.elc
 lib/mule/19.28/lisp/quail/py.el
@@ -945,6 +931,8 @@ lib/mule/19.28/lisp/quail/qj-b5.el
 lib/mule/19.28/lisp/quail/qj-b5.elc
 lib/mule/19.28/lisp/quail/qj.el
 lib/mule/19.28/lisp/quail/qj.elc
+lib/mule/19.28/lisp/quail/sisheng.el
+lib/mule/19.28/lisp/quail/sisheng.elc
 lib/mule/19.28/lisp/quail/sw.el
 lib/mule/19.28/lisp/quail/sw.elc
 lib/mule/19.28/lisp/quail/tcode.el
@@ -1002,3 +990,13 @@ lib/mule/19.28/lisp/term/wyse50.el
 lib/mule/19.28/lisp/term/wyse50.elc
 lib/mule/19.28/lisp/term/x-win.el
 lib/mule/19.28/lisp/term/x-win.elc
+@dirrm lib/mule/19.28/etc
+@dirrm lib/mule/19.28/lisp/term
+@dirrm lib/mule/19.28/lisp/its
+@dirrm lib/mule/19.28/lisp/quail
+@dirrm lib/mule/19.28/lisp
+@dirrm lib/mule/19.28/i386--freebsd
+@dirrm lib/mule/19.28
+@dirrm lib/mule/lock
+@dirrm lib/mule/site-lisp
+@dirrm lib/mule