4 files changed, 191 insertions, 132 deletions

diff --git a/mail/mew-mule/Makefile b/mail/mew-mule/Makefile
index 54ba4ad5a84c..f73833d9f96d 100644
--- a/mail/mew-mule/Makefile
+++ b/mail/mew-mule/Makefile
@@ -5,6 +5,22 @@
 # $FreeBSD$
 #
 
-EMACS_PORT_NAME=	mule
+MAINTAINER=	kiri@FreeBSD.org
 
-.include "${.CURDIR}/../mew/Makefile"
+# This is a slave port.
+MASTERDIR=	${.CURDIR}/../mew
+
+# set emacs port
+EMACS_PORT_NAME=mule
+
+# target name for make build and install
+ALL_TARGET=	all # info jinfo
+INSTALL_TARGET=	install install-info install-jinfo install-etc
+
+# set *-setupel.el
+EMACS_SETUPEL=	${PORTNAME}-setup.el
+
+# use pkg-* files in ${.CURDIR}
+PKGDIR=		${.CURDIR}
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/mew-mule/pkg-descr b/mail/mew-mule/pkg-descr
index 6f8843cfe650..dad8cb7add54 100644
--- a/mail/mew-mule/pkg-descr
+++ b/mail/mew-mule/pkg-descr
@@ -9,12 +9,12 @@ and to make it easy to view and compose them. With Mew you can send a
 picture of a birthday cake with the song "Happy Birthday to you" to your
 friend, which is encrypted by strong cryptograph.
 
-This port is the Mew for mule-19.34(mail/mew-mule). 
+This port is the Mew for mule-19.34(editors/mule). 
 The Mew port and corresponding Emacs port are listed bellow and elisp
 `site-lisp' directory(elisp load path), info path and etc directory(only
 effective for xemacs ports) are shown as well. 
 
-mail/mew-mule(mew-mule-1.94.1) ===> editors/mule(mule-19.34) 
+mail/mew-mule(mew-mule-1.94.2) ===> editors/mule(mule-19.34) 
 	Lisp directory : /usr/local/share/mule/site-lisp/mew
-	Info directory : /usr/local/share/mule/info
+	Info directory : /usr/local/info
 	ETC directory  : /usr/local/share/mule/etc/mew
diff --git a/mail/mew-mule/pkg-message b/mail/mew-mule/pkg-message
index c199aa18d934..a57d221f353e 100644
--- a/mail/mew-mule/pkg-message
+++ b/mail/mew-mule/pkg-message
@@ -1,7 +1,7 @@
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
-*       (require 'mew-mule-startup)                                  *
+*       (require 'mew-setup)                                  *
 *       (autoload 'mew "mew" nil t)                                     *
 *       (autoload 'mew-send "mew" nil t)                                *
 *       (setq mew-mail-domain-list '("Name_Server_Domain_Name"))        *
diff --git a/mail/mew-mule/pkg-plist b/mail/mew-mule/pkg-plist
index 5c9769b9a73e..fed723dfe6e5 100644
--- a/mail/mew-mule/pkg-plist
+++ b/mail/mew-mule/pkg-plist
@@ -2,129 +2,172 @@ bin/mewcat
 bin/mewdecode
 bin/mewencode
 bin/uumerge
-share/doc/mew/00changes
-share/doc/mew/00copyright
-share/doc/mew/00copyright.jis
-share/doc/mew/00diff
-share/doc/mew/00readme
-share/doc/mew/contrib/00readme
-share/doc/mew/contrib/00readme-namazu.jis
-share/doc/mew/contrib/bbdb-ml-ext.el
-share/doc/mew/contrib/bbdb-ml.el
-share/doc/mew/contrib/im+.el
-share/doc/mew/contrib/im+.readme.jis
-share/doc/mew/contrib/imget.sh
-share/doc/mew/contrib/imls.sh
-share/doc/mew/contrib/imput.sh
-share/doc/mew/contrib/ja.Emacs
-share/doc/mew/contrib/mailto.el
-share/doc/mew/contrib/mew-browse.el
-share/doc/mew/contrib/mew-caesar.el
-share/doc/mew/contrib/mew-cite-color.el
-share/doc/mew/contrib/mew-f.el
-share/doc/mew/contrib/mew-fake-imap.el
-share/doc/mew/contrib/mew-gnus.el
-share/doc/mew/contrib/mew-guess.el
-share/doc/mew/contrib/mew-mailto.el
-share/doc/mew/contrib/mew-ml.el
-share/doc/mew/contrib/mew-nmz.el
-share/doc/mew/contrib/mew-petname.el
-share/doc/mew/contrib/mew-refile-misc.el
-share/doc/mew/contrib/mew-refile-view.el
-share/doc/mew/contrib/mew-sol.el
-share/doc/mew/contrib/mew-summary-hl.el
-share/doc/mew/contrib/mew-toolbar-frame.el
-share/doc/mew/contrib/mew-virtual-thread.el
-share/doc/mew/contrib/mew-wheel.el
-share/doc/mew/contrib/mknmz-inc.pl
-share/doc/mew/contrib/rfc2368.el
-share/doc/mew/mew.texi
-share/examples/mew/Addrbook
-share/examples/mew/dot.emacs/dot.emacs.el
-share/examples/mew/user-install
-@exec [ -f %D/share/mule/info/dir ] || sed -ne 1,/Menu:/p /usr/share/info/dir > %D/share/mule/info/dir
-@unexec install-info --delete %D/share/mule/info/mew.info %D/share/mule/info/dir
-share/mule/info/mew.info
-@exec install-info %D/share/mule/info/mew.info %D/share/mule/info/dir
-share/mule/info/mew.info-1
-share/mule/info/mew.info-2
-share/mule/info/mew.info-3
-share/mule/info/mew.jis.info
-share/mule/info/mew.jis.info-1
-share/mule/info/mew.jis.info-2
-%%EMACS_LISPDIR%%/mew-mule-startup.el
-%%EMACS_LISPDIR%%/mew/mew-addrbook.el
-%%EMACS_LISPDIR%%/mew/mew-addrbook.elc
-%%EMACS_LISPDIR%%/mew/mew-attach.el
-%%EMACS_LISPDIR%%/mew/mew-attach.elc
-%%EMACS_LISPDIR%%/mew/mew-bq.el
-%%EMACS_LISPDIR%%/mew/mew-bq.elc
-%%EMACS_LISPDIR%%/mew/mew-cache.el
-%%EMACS_LISPDIR%%/mew/mew-cache.elc
-%%EMACS_LISPDIR%%/mew/mew-complete.el
-%%EMACS_LISPDIR%%/mew/mew-complete.elc
-%%EMACS_LISPDIR%%/mew/mew-decode.el
-%%EMACS_LISPDIR%%/mew/mew-decode.elc
-%%EMACS_LISPDIR%%/mew/mew-demo.el
-%%EMACS_LISPDIR%%/mew/mew-demo.elc
-%%EMACS_LISPDIR%%/mew/mew-draft.el
-%%EMACS_LISPDIR%%/mew/mew-draft.elc
-%%EMACS_LISPDIR%%/mew/mew-encode.el
-%%EMACS_LISPDIR%%/mew/mew-encode.elc
-%%EMACS_LISPDIR%%/mew/mew-env.el
-%%EMACS_LISPDIR%%/mew/mew-env.elc
-%%EMACS_LISPDIR%%/mew/mew-ext.el
-%%EMACS_LISPDIR%%/mew/mew-ext.elc
-%%EMACS_LISPDIR%%/mew/mew-fib.el
-%%EMACS_LISPDIR%%/mew/mew-fib.elc
-%%EMACS_LISPDIR%%/mew/mew-func.el
-%%EMACS_LISPDIR%%/mew/mew-func.elc
-%%EMACS_LISPDIR%%/mew/mew-header.el
-%%EMACS_LISPDIR%%/mew/mew-header.elc
-%%EMACS_LISPDIR%%/mew/mew-highlight.el
-%%EMACS_LISPDIR%%/mew/mew-highlight.elc
-%%EMACS_LISPDIR%%/mew/mew-lang-jp.el
-%%EMACS_LISPDIR%%/mew/mew-mark.el
-%%EMACS_LISPDIR%%/mew/mew-mark.elc
-%%EMACS_LISPDIR%%/mew/mew-message.el
-%%EMACS_LISPDIR%%/mew/mew-message.elc
-%%EMACS_LISPDIR%%/mew/mew-mime.el
-%%EMACS_LISPDIR%%/mew/mew-mime.elc
-%%EMACS_LISPDIR%%/mew/mew-minibuf.el
-%%EMACS_LISPDIR%%/mew/mew-minibuf.elc
-%%EMACS_LISPDIR%%/mew/mew-mule.el
-%%EMACS_LISPDIR%%/mew/mew-mule0.el
-%%EMACS_LISPDIR%%/mew/mew-mule2.el
-%%EMACS_LISPDIR%%/mew/mew-mule3.el
-%%EMACS_LISPDIR%%/mew/mew-os2.el
-%%EMACS_LISPDIR%%/mew/mew-pgp.el
-%%EMACS_LISPDIR%%/mew/mew-pgp.elc
-%%EMACS_LISPDIR%%/mew/mew-pick.el
-%%EMACS_LISPDIR%%/mew/mew-pick.elc
-%%EMACS_LISPDIR%%/mew/mew-refile.el
-%%EMACS_LISPDIR%%/mew/mew-refile.elc
-%%EMACS_LISPDIR%%/mew/mew-scan.el
-%%EMACS_LISPDIR%%/mew/mew-scan.elc
-%%EMACS_LISPDIR%%/mew/mew-sort.el
-%%EMACS_LISPDIR%%/mew/mew-sort.elc
-%%EMACS_LISPDIR%%/mew/mew-summary.el
-%%EMACS_LISPDIR%%/mew/mew-summary.elc
-%%EMACS_LISPDIR%%/mew/mew-syntax.el
-%%EMACS_LISPDIR%%/mew/mew-syntax.elc
-%%EMACS_LISPDIR%%/mew/mew-temacs.el
-%%EMACS_LISPDIR%%/mew/mew-unix.el
-%%EMACS_LISPDIR%%/mew/mew-vars.el
-%%EMACS_LISPDIR%%/mew/mew-vars.elc
-%%EMACS_LISPDIR%%/mew/mew-virtual.el
-%%EMACS_LISPDIR%%/mew/mew-virtual.elc
-%%EMACS_LISPDIR%%/mew/mew-win32.el
-%%EMACS_LISPDIR%%/mew/mew-xemacs.el
-%%EMACS_LISPDIR%%/mew/mew.el
-%%EMACS_LISPDIR%%/mew/mew.elc
-@dirrm %%EMACS_LISPDIR%%/mew
-@unexec rmdir %D/%%EMACS_LISPDIR%% 2>/dev/null || true
-@unexec rmdir %D/share/mule/info 2>/dev/null || true
-@dirrm share/examples/mew/dot.emacs
-@dirrm share/examples/mew
-@dirrm share/doc/mew/contrib
-@dirrm share/doc/mew
+@exec [ -f %D/info/dir ] || sed -ne 1,/Menu:/p /usr/share/info/dir > %D/info/dir
+@unexec install-info --delete %D/info/mew.info %D/info/dir
+info/mew.info
+@exec install-info %D/info/mew.info %D/info/dir
+info/mew.info-1
+info/mew.info-2
+info/mew.info-3
+@exec [ -f %D/info/dir ] || sed -ne 1,/Menu:/p /usr/share/info/dir > %D/info/dir
+@unexec install-info --delete %D/info/mew.jis.info %D/info/dir
+info/mew.jis.info
+@exec install-info %D/info/mew.jis.info %D/info/dir
+info/mew.jis.info-1
+info/mew.jis.info-2
+%%MEW_DOCDIR%%/00changes
+%%MEW_DOCDIR%%/00copyright
+%%MEW_DOCDIR%%/00copyright.jis
+%%MEW_DOCDIR%%/00diff
+%%MEW_DOCDIR%%/00readme
+%%MEW_DOCDIR%%/contrib/00readme
+%%MEW_DOCDIR%%/contrib/00readme-namazu.jis
+%%MEW_DOCDIR%%/contrib/im+.el
+%%MEW_DOCDIR%%/contrib/im+.readme.jis
+%%MEW_DOCDIR%%/contrib/imget.sh
+%%MEW_DOCDIR%%/contrib/imls.sh
+%%MEW_DOCDIR%%/contrib/imput.sh
+%%MEW_DOCDIR%%/contrib/ja.Emacs
+%%MEW_DOCDIR%%/contrib/mailto.el
+%%MEW_DOCDIR%%/contrib/mew-browse.el
+%%MEW_DOCDIR%%/contrib/mew-caesar.el
+%%MEW_DOCDIR%%/contrib/mew-cite-color.el
+%%MEW_DOCDIR%%/contrib/mew-f.el
+%%MEW_DOCDIR%%/contrib/mew-fake-imap.el
+%%MEW_DOCDIR%%/contrib/mew-gnus.el
+%%MEW_DOCDIR%%/contrib/mew-guess.el
+%%MEW_DOCDIR%%/contrib/mew-mailto.el
+%%MEW_DOCDIR%%/contrib/mew-ml.el
+%%MEW_DOCDIR%%/contrib/mew-nmz.el
+%%MEW_DOCDIR%%/contrib/mew-petname.el
+%%MEW_DOCDIR%%/contrib/mew-refile-misc.el
+%%MEW_DOCDIR%%/contrib/mew-refile-view.el
+%%MEW_DOCDIR%%/contrib/mew-sol.el
+%%MEW_DOCDIR%%/contrib/mew-summary-hl.el
+%%MEW_DOCDIR%%/contrib/mew-toolbar-frame.el
+%%MEW_DOCDIR%%/contrib/mew-virtual-thread.el
+%%MEW_DOCDIR%%/contrib/mew-wheel.el
+%%MEW_DOCDIR%%/contrib/mknmz-inc.pl
+%%MEW_DOCDIR%%/contrib/rfc2368.el
+%%MEW_DOCDIR%%/patches/00readme.jis
+%%MEW_DOCDIR%%/patches/canna.el-%%EMACS_VER%%.patch
+%%MEW_DOCDIR%%/patches/egg.el-%%EMACS_VER%%.patch
+%%MEW_DOCDIR%%/patches/egg.el-%%EMACS_VER%%.patch2
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/lisp/startup.el
+%%EMACS_LIBDIR%%/etc/mew/Mew.img
+%%EMACS_LIBDIR%%/etc/mew/Mew.png
+%%EMACS_LIBDIR%%/etc/mew/Mew.xbm
+%%EMACS_LIBDIR%%/etc/mew/Mew.xpm
+%%EMACS_LIBDIR%%/etc/mew/etc/COLOR
+%%EMACS_LIBDIR%%/etc/mew/etc/mew-Plain.xpm
+%%EMACS_LIBDIR%%/etc/mew/etc/mew-curr.xpm
+%%EMACS_LIBDIR%%/etc/mew/etc/mew-folder.xpm
+%%EMACS_LIBDIR%%/etc/mew/etc/mew-inc2.xpm
+%%EMACS_LIBDIR%%/etc/mew/etc/mew-kill.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Audio.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Blank.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-External.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Folder.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Image.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Octet-Stream.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Postscript.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Rfc822.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Text.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Unknown.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-Video.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-attach.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-cite.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-comp.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-forward.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-inc.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-next.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-pgp-enc.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-pgp-sigenc.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-pgp-sign.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-prev.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-refile.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-reply.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-send.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-sep.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-show.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-write.xpm
+%%EMACS_LIBDIR%%/etc/mew/mew-yank.xpm
+%%EMACS_LIBDIR%%/site-lisp/%%EMACS_SETUPEL%%
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-addrbook.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-addrbook.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-attach.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-attach.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-bq.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-bq.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-cache.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-cache.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-complete.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-complete.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-decode.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-decode.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-demo.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-demo.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-draft.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-draft.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-encode.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-encode.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-env.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-env.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-ext.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-ext.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-fib.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-fib.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-func.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-func.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-header.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-header.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-highlight.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-highlight.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-lang-jp.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-mark.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-mark.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-message.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-message.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-mime.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-mime.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-minibuf.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-minibuf.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-mule.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-mule0.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-mule2.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-mule3.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-os2.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-pgp.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-pgp.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-pick.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-pick.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-refile.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-refile.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-scan.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-scan.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-sort.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-sort.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-summary.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-summary.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-syntax.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-syntax.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-temacs.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-unix.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-vars.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-virtual.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-virtual.elc
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-win32.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew-xemacs.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew.el
+%%EMACS_LIBDIR%%/site-lisp/mew/mew.elc
+@dirrm %%EMACS_LIBDIR%%/site-lisp/mew
+@unexec rmdir %D/%%EMACS_LIBDIR%%/site-lisp 2>/dev/null || true
+@dirrm %%EMACS_LIBDIR%%/etc/mew/etc
+@dirrm %%EMACS_LIBDIR%%/etc/mew
+@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true
+@dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/lisp
+@unexec rmdir %D/%%EMACS_LIBDIR%%/%%EMACS_VER%% 2>/dev/null || true
+@dirrm %%MEW_DOCDIR%%/patches
+@dirrm %%MEW_DOCDIR%%/contrib
+@dirrm %%MEW_DOCDIR%%