Update 1.94.1 -> 1.94.2. Use bsd.emacs.mk.

39 files changed, 1545 insertions, 1352 deletions

diff --git a/mail/mew-emacs20/Makefile b/mail/mew-emacs20/Makefile
index 6f2553238968..afc328768a41 100644
--- a/mail/mew-emacs20/Makefile
+++ b/mail/mew-emacs20/Makefile
@@ -5,6 +5,19 @@
 # $FreeBSD$
 #
 
-EMACS_PORT_NAME=	emacs20
+MAINTAINER=	kiri@FreeBSD.org
 
-.include "${.CURDIR}/../mew/Makefile"
+# This is a slave port.
+MASTERDIR=	${.CURDIR}/../mew
+
+# set emacs port
+EMACS_PORT_NAME=emacs20
+
+# target name for make build and install
+ALL_TARGET=	all jinfo #info
+INSTALL_TARGET=	install install-info install-jinfo install-etc
+
+# use pkg-* files in ${.CURDIR}
+PKGDIR=		${.CURDIR}
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/mew-emacs20/pkg-descr b/mail/mew-emacs20/pkg-descr
index fe588b08d305..1e369b119133 100644
--- a/mail/mew-emacs20/pkg-descr
+++ b/mail/mew-emacs20/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 emacs-20.5(mail/mew-emacs20). 
+This port is the Mew for emacs-20.7(editors/emacs20). 
 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-emacs20(mew-emacs20-1.94.1) ===> editors/emacs20(emacs-20.5) 
+mail/mew-emacs20(mew-emacs20-1.94.2) ===> editors/emacs20(emacs-20.7) 
 	Lisp directory : /usr/local/share/emacs/site-lisp/mew
 	Info directory : /usr/local/info
 	ETC directory  : /usr/local/share/emacs/etc/mew
diff --git a/mail/mew-emacs20/pkg-plist b/mail/mew-emacs20/pkg-plist
index b629793c625d..0a1465a5e396 100644
--- a/mail/mew-emacs20/pkg-plist
+++ b/mail/mew-emacs20/pkg-plist
@@ -9,120 +9,161 @@ info/mew.info
 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
-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
-%%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
-share/examples/mew/Addrbook
-share/examples/mew/dot.emacs/dot.emacs.el
-share/examples/mew/user-install
-@dirrm share/examples/mew/dot.emacs
-@dirrm share/examples/mew
-@dirrm %%EMACS_LISPDIR%%/mew
-@unexec rmdir %D/%%EMACS_LISPDIR%% 2>/dev/null || true
-@dirrm share/doc/mew/contrib
-@dirrm share/doc/mew
+%%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-19.34.patch
+%%MEW_DOCDIR%%/patches/egg.el-19.34.patch
+%%MEW_DOCDIR%%/patches/egg.el-19.34.patch2
+%%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/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 %%MEW_DOCDIR%%/patches
+@dirrm %%MEW_DOCDIR%%/contrib
+@dirrm %%MEW_DOCDIR%%
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%%
diff --git a/mail/mew-xemacs/Makefile b/mail/mew-xemacs/Makefile
index 540461dfee5a..10eacf659617 100644
--- a/mail/mew-xemacs/Makefile
+++ b/mail/mew-xemacs/Makefile
@@ -5,6 +5,15 @@
 # $FreeBSD$
 #
 
-EMACS_PORT_NAME=	xemacs
+MAINTAINER=	kiri@FreeBSD.org
 
-.include "${.CURDIR}/../mew/Makefile"
+# This is a slave port.
+MASTERDIR=	${.CURDIR}/../mew
+
+# set emacs port
+EMACS_PORT_NAME=xemacs
+
+# use pkg-* files in ${.CURDIR}
+PKGDIR=		${.CURDIR}
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/mew-xemacs/pkg-descr b/mail/mew-xemacs/pkg-descr
index 6c783f0075e3..4c5d09ed9d0d 100644
--- a/mail/mew-xemacs/pkg-descr
+++ b/mail/mew-xemacs/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 xemacs-19.16(mail/mew-xemacs). 
+This port is the Mew for xemacs-19.16(editors/xemacs). 
 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-xemacs(mew-xemacs-1.94.1) ===> editors/xemacs(xemacs-19.16) 
+mail/mew-xemacs(mew-xemacs-1.94.2) ===> editors/xemacs(xemacs-19.16) 
 	Lisp directory : /usr/local/lib/xemacs/site-lisp/mew
-	Info directory : /usr/local/lib/xemacs-19.16/info
+	Info directory : /usr/local/info
 	ETC directory  : /usr/local/lib/xemacs/etc/mew
diff --git a/mail/mew-xemacs/pkg-message b/mail/mew-xemacs/pkg-message
index 3b272ddc04fd..c76c1f700c2a 100644
--- a/mail/mew-xemacs/pkg-message
+++ b/mail/mew-xemacs/pkg-message
@@ -1,7 +1,6 @@
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
-*       (require 'mew-xemacs-startup)                                  *
 *       (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-xemacs/pkg-plist b/mail/mew-xemacs/pkg-plist
index 17f97cc5a5f9..e11f4c28c8ad 100644
--- a/mail/mew-xemacs/pkg-plist
+++ b/mail/mew-xemacs/pkg-plist
@@ -2,167 +2,162 @@ bin/mewcat
 bin/mewdecode
 bin/mewencode
 bin/uumerge
-@exec [ -f %D/lib/xemacs-19.16/info/dir ] || sed -ne 1,/Menu:/p /usr/share/info/dir > %D/lib/xemacs-19.16/info/dir
-@unexec install-info --delete %D/lib/xemacs-19.16/info/mew.info %D/lib/xemacs-19.16/info/dir
-lib/xemacs-19.16/info/mew.info
-@exec install-info %D/lib/xemacs-19.16/info/mew.info %D/lib/xemacs-19.16/info/dir
-lib/xemacs-19.16/info/mew.info-1
-lib/xemacs-19.16/info/mew.info-2
-lib/xemacs-19.16/info/mew.info-3
-%%EMACS_ETCDIR%%/mew/Mew.img
-%%EMACS_ETCDIR%%/mew/Mew.png
-%%EMACS_ETCDIR%%/mew/Mew.xbm
-%%EMACS_ETCDIR%%/mew/Mew.xpm
-%%EMACS_ETCDIR%%/mew/etc/COLOR
-%%EMACS_ETCDIR%%/mew/etc/mew-Plain.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-curr.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-folder.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-inc2.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-kill.xpm
-%%EMACS_ETCDIR%%/mew/mew-Audio.xpm
-%%EMACS_ETCDIR%%/mew/mew-Blank.xpm
-%%EMACS_ETCDIR%%/mew/mew-External.xpm
-%%EMACS_ETCDIR%%/mew/mew-Folder.xpm
-%%EMACS_ETCDIR%%/mew/mew-Image.xpm
-%%EMACS_ETCDIR%%/mew/mew-Octet-Stream.xpm
-%%EMACS_ETCDIR%%/mew/mew-Postscript.xpm
-%%EMACS_ETCDIR%%/mew/mew-Rfc822.xpm
-%%EMACS_ETCDIR%%/mew/mew-Text.xpm
-%%EMACS_ETCDIR%%/mew/mew-Unknown.xpm
-%%EMACS_ETCDIR%%/mew/mew-Video.xpm
-%%EMACS_ETCDIR%%/mew/mew-attach.xpm
-%%EMACS_ETCDIR%%/mew/mew-cite.xpm
-%%EMACS_ETCDIR%%/mew/mew-comp.xpm
-%%EMACS_ETCDIR%%/mew/mew-forward.xpm
-%%EMACS_ETCDIR%%/mew/mew-inc.xpm
-%%EMACS_ETCDIR%%/mew/mew-next.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-enc.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-sigenc.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-sign.xpm
-%%EMACS_ETCDIR%%/mew/mew-prev.xpm
-%%EMACS_ETCDIR%%/mew/mew-refile.xpm
-%%EMACS_ETCDIR%%/mew/mew-reply.xpm
-%%EMACS_ETCDIR%%/mew/mew-send.xpm
-%%EMACS_ETCDIR%%/mew/mew-sep.xpm
-%%EMACS_ETCDIR%%/mew/mew-show.xpm
-%%EMACS_ETCDIR%%/mew/mew-write.xpm
-%%EMACS_ETCDIR%%/mew/mew-yank.xpm
-%%EMACS_LISPDIR%%/mew-xemacs-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
-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
-@dirrm share/examples/mew/dot.emacs
-@dirrm share/examples/mew
-@dirrm share/doc/mew/contrib
-@dirrm share/doc/mew
-@dirrm %%EMACS_LISPDIR%%/mew
-@unexec rmdir %D/%%EMACS_LISPDIR%% 2>/dev/null || true
-@dirrm %%EMACS_ETCDIR%%/mew/etc
-@dirrm %%EMACS_ETCDIR%%/mew
-@unexec rmdir %D/%%EMACS_ETCDIR%% 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs-19.16/info 2>/dev/null || true
+@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
+%%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/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
+%%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-19.34.patch
+%%MEW_DOCDIR%%/patches/egg.el-19.34.patch
+%%MEW_DOCDIR%%/patches/egg.el-19.34.patch2
+@dirrm %%MEW_DOCDIR%%/patches
+@dirrm %%MEW_DOCDIR%%/contrib
+@dirrm %%MEW_DOCDIR%%
+@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
diff --git a/mail/mew-xemacs20/Makefile b/mail/mew-xemacs20/Makefile
index 00d7d23e3f14..e0fb4382fb4b 100644
--- a/mail/mew-xemacs20/Makefile
+++ b/mail/mew-xemacs20/Makefile
@@ -5,6 +5,15 @@
 # $FreeBSD$
 #
 
-EMACS_PORT_NAME=	xemacs20
+MAINTAINER=	kiri@FreeBSD.org
 
-.include "${.CURDIR}/../mew/Makefile"
+# This is a slave port.
+MASTERDIR=	${.CURDIR}/../mew
+
+# set emacs port
+EMACS_PORT_NAME=xemacs20
+
+# use pkg-* files in ${.CURDIR}
+PKGDIR=		${.CURDIR}
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/mew-xemacs20/pkg-descr b/mail/mew-xemacs20/pkg-descr
index 5db5feb5c069..614cf047a0f5 100644
--- a/mail/mew-xemacs20/pkg-descr
+++ b/mail/mew-xemacs20/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 xemacs-20.4(mail/mew-xemacs20). 
+This port is the Mew for xemacs-20.4(editors/xemacs20). 
 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-xemacs20(mew-xemacs20-1.94.1) ===> editors/xemacs20(xemacs-20.4) 
+mail/mew-xemacs20(mew-xemacs20-1.94.2) ===> editors/xemacs20(xemacs-20.4) 
 	Lisp directory : /usr/local/lib/xemacs/site-lisp/mew
-	Info directory : /usr/local/lib/xemacs/info
+	Info directory : /usr/local/info
 	ETC directory  : /usr/local/lib/xemacs/etc/mew
diff --git a/mail/mew-xemacs20/pkg-message b/mail/mew-xemacs20/pkg-message
index 2af4762abbca..c76c1f700c2a 100644
--- a/mail/mew-xemacs20/pkg-message
+++ b/mail/mew-xemacs20/pkg-message
@@ -1,7 +1,6 @@
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
-*       (require 'mew-xemacs20-startup)                                  *
 *       (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-xemacs20/pkg-plist b/mail/mew-xemacs20/pkg-plist
index 53104a77504f..e11f4c28c8ad 100644
--- a/mail/mew-xemacs20/pkg-plist
+++ b/mail/mew-xemacs20/pkg-plist
@@ -2,167 +2,162 @@ bin/mewcat
 bin/mewdecode
 bin/mewencode
 bin/uumerge
-%%EMACS_ETCDIR%%/mew/Mew.img
-%%EMACS_ETCDIR%%/mew/Mew.png
-%%EMACS_ETCDIR%%/mew/Mew.xbm
-%%EMACS_ETCDIR%%/mew/Mew.xpm
-%%EMACS_ETCDIR%%/mew/etc/COLOR
-%%EMACS_ETCDIR%%/mew/etc/mew-Plain.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-curr.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-folder.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-inc2.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-kill.xpm
-%%EMACS_ETCDIR%%/mew/mew-Audio.xpm
-%%EMACS_ETCDIR%%/mew/mew-Blank.xpm
-%%EMACS_ETCDIR%%/mew/mew-External.xpm
-%%EMACS_ETCDIR%%/mew/mew-Folder.xpm
-%%EMACS_ETCDIR%%/mew/mew-Image.xpm
-%%EMACS_ETCDIR%%/mew/mew-Octet-Stream.xpm
-%%EMACS_ETCDIR%%/mew/mew-Postscript.xpm
-%%EMACS_ETCDIR%%/mew/mew-Rfc822.xpm
-%%EMACS_ETCDIR%%/mew/mew-Text.xpm
-%%EMACS_ETCDIR%%/mew/mew-Unknown.xpm
-%%EMACS_ETCDIR%%/mew/mew-Video.xpm
-%%EMACS_ETCDIR%%/mew/mew-attach.xpm
-%%EMACS_ETCDIR%%/mew/mew-cite.xpm
-%%EMACS_ETCDIR%%/mew/mew-comp.xpm
-%%EMACS_ETCDIR%%/mew/mew-forward.xpm
-%%EMACS_ETCDIR%%/mew/mew-inc.xpm
-%%EMACS_ETCDIR%%/mew/mew-next.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-enc.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-sigenc.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-sign.xpm
-%%EMACS_ETCDIR%%/mew/mew-prev.xpm
-%%EMACS_ETCDIR%%/mew/mew-refile.xpm
-%%EMACS_ETCDIR%%/mew/mew-reply.xpm
-%%EMACS_ETCDIR%%/mew/mew-send.xpm
-%%EMACS_ETCDIR%%/mew/mew-sep.xpm
-%%EMACS_ETCDIR%%/mew/mew-show.xpm
-%%EMACS_ETCDIR%%/mew/mew-write.xpm
-%%EMACS_ETCDIR%%/mew/mew-yank.xpm
-@exec [ -f %D/lib/xemacs/info/dir ] || sed -ne 1,/Menu:/p /usr/share/info/dir > %D/lib/xemacs/info/dir
-@unexec install-info --delete %D/lib/xemacs/info/mew.info %D/lib/xemacs/info/dir
-lib/xemacs/info/mew.info
-@exec install-info %D/lib/xemacs/info/mew.info %D/lib/xemacs/info/dir
-lib/xemacs/info/mew.info-1
-lib/xemacs/info/mew.info-2
-lib/xemacs/info/mew.info-3
-%%EMACS_LISPDIR%%/mew-xemacs20-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
-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
-@dirrm share/examples/mew/dot.emacs
-@dirrm share/examples/mew
-@dirrm share/doc/mew/contrib
-@dirrm share/doc/mew
-@dirrm %%EMACS_LISPDIR%%/mew
-@unexec rmdir %D/%%EMACS_LISPDIR%% 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/info 2>/dev/null || true
-@dirrm %%EMACS_ETCDIR%%/mew/etc
-@dirrm %%EMACS_ETCDIR%%/mew
-@unexec rmdir %D/%%EMACS_ETCDIR%% 2>/dev/null || true
+@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
+%%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/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
+%%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-19.34.patch
+%%MEW_DOCDIR%%/patches/egg.el-19.34.patch
+%%MEW_DOCDIR%%/patches/egg.el-19.34.patch2
+@dirrm %%MEW_DOCDIR%%/patches
+@dirrm %%MEW_DOCDIR%%/contrib
+@dirrm %%MEW_DOCDIR%%
+@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
diff --git a/mail/mew-xemacs21-mule/Makefile b/mail/mew-xemacs21-mule/Makefile
index 6dca61906fa2..dac7ec94d899 100644
--- a/mail/mew-xemacs21-mule/Makefile
+++ b/mail/mew-xemacs21-mule/Makefile
@@ -5,6 +5,34 @@
 # $FreeBSD$
 #
 
+MAINTAINER=	kiri@FreeBSD.org
+
+# This is a slave port.
+MASTERDIR=	${.CURDIR}/../mew
+
+# Set emacs port
 EMACS_PORT_NAME=	xemacs21-mule
+EMACS_PACKAGESDIR=	${EMACS_LIBDIR}/site-packages
+
+# Has common part
+EMACS_COMMON_PORT=	YES
+
+SCRIPTS_ENV=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
+MAKE_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} XEMACS_PKGNAME=${XEMACS_PKGNAME} \
+		XEMACS_PKGVER=${XEMACS_PKGVER} \
+		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
+PLIST_SUB=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
+
+# use pkg-* files in ${.CURDIR}
+PKGDIR=		${.CURDIR}
+
+# how to install
+ALL_TARGET=	package info jinfo
+INSTALL_TARGET=	install-mule-package
+
+# for xemacs package
+XEMACS_PKGNAME=	mew
+XEMACS_PKGVER=	1.16
+MEW_DOCDIR=	${EMACS_PACKAGESDIR}/etc/${XEMACS_PKGNAME}
 
-.include "${.CURDIR}/../mew/Makefile"
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/mew-xemacs21-mule/pkg-descr b/mail/mew-xemacs21-mule/pkg-descr
index edc4f74198c6..51a0cc6ab29d 100644
--- a/mail/mew-xemacs21-mule/pkg-descr
+++ b/mail/mew-xemacs21-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 xemacs-21.1.8(mail/mew-xemacs21-mule). 
+This port is the Mew for xemacs-21.1.14(editors/xemacs21-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-xemacs21-mule(mew-xemacs21-mule-1.94.1) ===> editors/xemacs21-mule(xemacs-21.1.8) 
+mail/mew-xemacs21-mule(mew-xemacs21-mule-1.94.2) ===> editors/xemacs21-mule(xemacs-21.1.14) 
 	Lisp directory : /usr/local/lib/xemacs/site-packages/lisp/mew
 	Info directory : /usr/local/lib/xemacs/site-packages/info
 	ETC directory  : /usr/local/lib/xemacs/site-packages/etc/mew
diff --git a/mail/mew-xemacs21-mule/pkg-plist b/mail/mew-xemacs21-mule/pkg-plist
index 52f12a14be9e..d7f70b94b97a 100644
--- a/mail/mew-xemacs21-mule/pkg-plist
+++ b/mail/mew-xemacs21-mule/pkg-plist
@@ -2,172 +2,174 @@ bin/mewcat
 bin/mewdecode
 bin/mewencode
 bin/uumerge
-%%EMACS_ETCDIR%%/mew/Mew.img
-%%EMACS_ETCDIR%%/mew/Mew.png
-%%EMACS_ETCDIR%%/mew/Mew.xbm
-%%EMACS_ETCDIR%%/mew/Mew.xpm
-%%EMACS_ETCDIR%%/mew/etc/COLOR
-%%EMACS_ETCDIR%%/mew/etc/mew-Plain.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-curr.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-folder.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-inc2.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-kill.xpm
-%%EMACS_ETCDIR%%/mew/mew-Audio.xpm
-%%EMACS_ETCDIR%%/mew/mew-Blank.xpm
-%%EMACS_ETCDIR%%/mew/mew-External.xpm
-%%EMACS_ETCDIR%%/mew/mew-Folder.xpm
-%%EMACS_ETCDIR%%/mew/mew-Image.xpm
-%%EMACS_ETCDIR%%/mew/mew-Octet-Stream.xpm
-%%EMACS_ETCDIR%%/mew/mew-Postscript.xpm
-%%EMACS_ETCDIR%%/mew/mew-Rfc822.xpm
-%%EMACS_ETCDIR%%/mew/mew-Text.xpm
-%%EMACS_ETCDIR%%/mew/mew-Unknown.xpm
-%%EMACS_ETCDIR%%/mew/mew-Video.xpm
-%%EMACS_ETCDIR%%/mew/mew-attach.xpm
-%%EMACS_ETCDIR%%/mew/mew-cite.xpm
-%%EMACS_ETCDIR%%/mew/mew-comp.xpm
-%%EMACS_ETCDIR%%/mew/mew-forward.xpm
-%%EMACS_ETCDIR%%/mew/mew-inc.xpm
-%%EMACS_ETCDIR%%/mew/mew-next.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-enc.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-sigenc.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-sign.xpm
-%%EMACS_ETCDIR%%/mew/mew-prev.xpm
-%%EMACS_ETCDIR%%/mew/mew-refile.xpm
-%%EMACS_ETCDIR%%/mew/mew-reply.xpm
-%%EMACS_ETCDIR%%/mew/mew-send.xpm
-%%EMACS_ETCDIR%%/mew/mew-sep.xpm
-%%EMACS_ETCDIR%%/mew/mew-show.xpm
-%%EMACS_ETCDIR%%/mew/mew-write.xpm
-%%EMACS_ETCDIR%%/mew/mew-yank.xpm
-%%EMACS_PKGDIR%%/info/mew.info
-%%EMACS_PKGDIR%%/info/mew.info-1
-%%EMACS_PKGDIR%%/info/mew.info-2
-%%EMACS_PKGDIR%%/info/mew.info-3
-%%EMACS_PKGDIR%%/info/mew.jis.info
-%%EMACS_PKGDIR%%/info/mew.jis.info-1
-%%EMACS_PKGDIR%%/info/mew.jis.info-2
-%%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
-%%EMACS_PKGDIR%%/man/mew/00readme
-%%EMACS_PKGDIR%%/man/mew/mew.texi
-%%EMACS_PKGDIR%%/pkginfo/MANIFEST.mew
-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/examples/mew/Addrbook
-share/examples/mew/dot.emacs/dot.emacs.el
-share/examples/mew/user-install
-@dirrm share/examples/mew/dot.emacs
-@dirrm share/examples/mew
-@dirrm share/doc/mew/contrib
-@dirrm share/doc/mew
-@unexec rmdir %D/%%EMACS_PKGDIR%%/pkginfo 2>/dev/null || true
-@dirrm %%EMACS_PKGDIR%%/man/mew
-@unexec rmdir %D/%%EMACS_PKGDIR%%/man 2>/dev/null || true
-@dirrm %%EMACS_LISPDIR%%/mew
-@unexec rmdir %D/%%EMACS_LISPDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%EMACS_PKGDIR%%/info 2>/dev/null || true
-@dirrm %%EMACS_ETCDIR%%/mew/etc
-@dirrm %%EMACS_ETCDIR%%/mew
-@unexec rmdir %D/%%EMACS_ETCDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%EMACS_PKGDIR%% 2>/dev/null || true
+%%EMACS_PACKAGESDIR%%/etc/mew/00changes
+%%EMACS_PACKAGESDIR%%/etc/mew/00copyright
+%%EMACS_PACKAGESDIR%%/etc/mew/00copyright.jis
+%%EMACS_PACKAGESDIR%%/etc/mew/00diff
+%%EMACS_PACKAGESDIR%%/etc/mew/00readme
+%%EMACS_PACKAGESDIR%%/etc/mew/Mew.img
+%%EMACS_PACKAGESDIR%%/etc/mew/Mew.png
+%%EMACS_PACKAGESDIR%%/etc/mew/Mew.xbm
+%%EMACS_PACKAGESDIR%%/etc/mew/Mew.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/00readme
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/00readme-namazu.jis
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/im+.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/im+.readme.jis
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/imget.sh
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/imls.sh
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/imput.sh
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/ja.Emacs
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mailto.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-browse.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-caesar.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-cite-color.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-f.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-fake-imap.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-gnus.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-guess.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-mailto.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-ml.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-nmz.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-petname.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-refile-misc.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-refile-view.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-sol.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-summary-hl.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-toolbar-frame.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-virtual-thread.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-wheel.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mknmz-inc.pl
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/rfc2368.el
+%%EMACS_PACKAGESDIR%%/etc/mew/etc/COLOR
+%%EMACS_PACKAGESDIR%%/etc/mew/etc/mew-Plain.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/etc/mew-curr.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/etc/mew-folder.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/etc/mew-inc2.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/etc/mew-kill.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Audio.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Blank.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-External.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Folder.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Image.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Octet-Stream.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Postscript.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Rfc822.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Text.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Unknown.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Video.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-attach.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-cite.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-comp.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-forward.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-inc.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-next.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-pgp-enc.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-pgp-sigenc.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-pgp-sign.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-prev.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-refile.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-reply.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-send.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-sep.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-show.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-write.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-yank.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/patches/00readme.jis
+%%EMACS_PACKAGESDIR%%/etc/mew/patches/canna.el-19.34.patch
+%%EMACS_PACKAGESDIR%%/etc/mew/patches/egg.el-19.34.patch
+%%EMACS_PACKAGESDIR%%/etc/mew/patches/egg.el-19.34.patch2
+%%EMACS_PACKAGESDIR%%/info/mew.info
+%%EMACS_PACKAGESDIR%%/info/mew.info-1
+%%EMACS_PACKAGESDIR%%/info/mew.info-2
+%%EMACS_PACKAGESDIR%%/info/mew.info-3
+%%EMACS_PACKAGESDIR%%/info/mew.jis.info
+%%EMACS_PACKAGESDIR%%/info/mew.jis.info-1
+%%EMACS_PACKAGESDIR%%/info/mew.jis.info-2
+%%EMACS_PACKAGESDIR%%/lisp/mew/_pkg.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/auto-autoloads.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/auto-autoloads.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/custom-load.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/custom-load.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-addrbook.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-addrbook.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-attach.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-attach.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-bq.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-bq.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-cache.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-cache.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-complete.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-complete.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-decode.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-decode.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-demo.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-demo.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-draft.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-draft.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-encode.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-encode.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-env.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-env.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-ext.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-ext.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-fib.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-fib.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-func.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-func.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-header.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-header.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-highlight.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-highlight.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-lang-jp.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mark.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mark.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-message.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-message.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mime.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mime.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-minibuf.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-minibuf.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mule.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mule0.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mule2.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mule3.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-os2.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-pgp.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-pgp.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-pick.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-pick.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-refile.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-refile.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-scan.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-scan.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-sort.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-sort.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-summary.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-summary.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-syntax.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-syntax.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-temacs.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-unix.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-vars.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-vars.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-virtual.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-virtual.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-win32.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-xemacs.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew.elc
+%%EMACS_PACKAGESDIR%%/man/mew/00readme
+%%EMACS_PACKAGESDIR%%/man/mew/mew.texi
+%%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.mew
+@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/pkginfo 2>/dev/null || true
+@dirrm %%EMACS_PACKAGESDIR%%/man/mew
+@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/man 2>/dev/null || true
+@dirrm %%EMACS_PACKAGESDIR%%/lisp/mew
+@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/lisp 2>/dev/null || true
+@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/info 2>/dev/null || true
+@dirrm %%EMACS_PACKAGESDIR%%/etc/mew/patches
+@dirrm %%EMACS_PACKAGESDIR%%/etc/mew/etc
+@dirrm %%EMACS_PACKAGESDIR%%/etc/mew/contrib
+@dirrm %%EMACS_PACKAGESDIR%%/etc/mew
+@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/etc 2>/dev/null || true
+@unexec rmdir %D/%%EMACS_PACKAGESDIR%% 2>/dev/null || true
diff --git a/mail/mew-xemacs21/Makefile b/mail/mew-xemacs21/Makefile
index 8a6426b9c6c9..70b210ec27ef 100644
--- a/mail/mew-xemacs21/Makefile
+++ b/mail/mew-xemacs21/Makefile
@@ -5,6 +5,31 @@
 # $FreeBSD$
 #
 
+MAINTAINER=	kiri@FreeBSD.org
+
+# This is a slave port.
+MASTERDIR=	${.CURDIR}/../mew
+
+# set emacs port
 EMACS_PORT_NAME=	xemacs21
+EMACS_PACKAGESDIR=	${EMACS_LIBDIR}/site-packages
+
+SCRIPTS_ENV=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
+MAKE_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} XEMACS_PKGNAME=${XEMACS_PKGNAME} \
+		XEMACS_PKGVER=${XEMACS_PKGVER} \
+		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
+PLIST_SUB=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
+
+# use pkg-* files in ${.CURDIR}
+PKGDIR=		${.CURDIR}
+
+# how to install
+ALL_TARGET=	package info
+INSTALL_TARGET=	install-package
+
+# for xemacs package
+XEMACS_PKGNAME=	mew
+XEMACS_PKGVER=	1.16
+MEW_DOCDIR=	${EMACS_PACKAGESDIR}/etc/${XEMACS_PKGNAME}
 
-.include "${.CURDIR}/../mew/Makefile"
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/mew-xemacs21/pkg-descr b/mail/mew-xemacs21/pkg-descr
index bb2509d7d295..2c9c17a7b401 100644
--- a/mail/mew-xemacs21/pkg-descr
+++ b/mail/mew-xemacs21/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 xemacs-21.1.8(mail/mew-xemacs21). 
+This port is the Mew for xemacs-21.1.14(editors/xemacs21). 
 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-xemacs21(mew-xemacs21-1.94.1) ===> editors/xemacs21(xemacs-21.1.8) 
+mail/mew-xemacs21(mew-xemacs21-1.94.2) ===> editors/xemacs21(xemacs-21.1.14) 
 	Lisp directory : /usr/local/lib/xemacs/site-packages/lisp/mew
 	Info directory : /usr/local/lib/xemacs/site-packages/info
 	ETC directory  : /usr/local/lib/xemacs/site-packages/etc/mew
diff --git a/mail/mew-xemacs21/pkg-plist b/mail/mew-xemacs21/pkg-plist
index 00d2e1fc5716..118adbb31428 100644
--- a/mail/mew-xemacs21/pkg-plist
+++ b/mail/mew-xemacs21/pkg-plist
@@ -2,169 +2,171 @@ bin/mewcat
 bin/mewdecode
 bin/mewencode
 bin/uumerge
-%%EMACS_ETCDIR%%/mew/Mew.img
-%%EMACS_ETCDIR%%/mew/Mew.png
-%%EMACS_ETCDIR%%/mew/Mew.xbm
-%%EMACS_ETCDIR%%/mew/Mew.xpm
-%%EMACS_ETCDIR%%/mew/etc/COLOR
-%%EMACS_ETCDIR%%/mew/etc/mew-Plain.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-curr.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-folder.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-inc2.xpm
-%%EMACS_ETCDIR%%/mew/etc/mew-kill.xpm
-%%EMACS_ETCDIR%%/mew/mew-Audio.xpm
-%%EMACS_ETCDIR%%/mew/mew-Blank.xpm
-%%EMACS_ETCDIR%%/mew/mew-External.xpm
-%%EMACS_ETCDIR%%/mew/mew-Folder.xpm
-%%EMACS_ETCDIR%%/mew/mew-Image.xpm
-%%EMACS_ETCDIR%%/mew/mew-Octet-Stream.xpm
-%%EMACS_ETCDIR%%/mew/mew-Postscript.xpm
-%%EMACS_ETCDIR%%/mew/mew-Rfc822.xpm
-%%EMACS_ETCDIR%%/mew/mew-Text.xpm
-%%EMACS_ETCDIR%%/mew/mew-Unknown.xpm
-%%EMACS_ETCDIR%%/mew/mew-Video.xpm
-%%EMACS_ETCDIR%%/mew/mew-attach.xpm
-%%EMACS_ETCDIR%%/mew/mew-cite.xpm
-%%EMACS_ETCDIR%%/mew/mew-comp.xpm
-%%EMACS_ETCDIR%%/mew/mew-forward.xpm
-%%EMACS_ETCDIR%%/mew/mew-inc.xpm
-%%EMACS_ETCDIR%%/mew/mew-next.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-enc.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-sigenc.xpm
-%%EMACS_ETCDIR%%/mew/mew-pgp-sign.xpm
-%%EMACS_ETCDIR%%/mew/mew-prev.xpm
-%%EMACS_ETCDIR%%/mew/mew-refile.xpm
-%%EMACS_ETCDIR%%/mew/mew-reply.xpm
-%%EMACS_ETCDIR%%/mew/mew-send.xpm
-%%EMACS_ETCDIR%%/mew/mew-sep.xpm
-%%EMACS_ETCDIR%%/mew/mew-show.xpm
-%%EMACS_ETCDIR%%/mew/mew-write.xpm
-%%EMACS_ETCDIR%%/mew/mew-yank.xpm
-%%EMACS_PKGDIR%%/info/mew.info
-%%EMACS_PKGDIR%%/info/mew.info-1
-%%EMACS_PKGDIR%%/info/mew.info-2
-%%EMACS_PKGDIR%%/info/mew.info-3
-%%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
-%%EMACS_PKGDIR%%/man/mew/00readme
-%%EMACS_PKGDIR%%/man/mew/mew.texi
-%%EMACS_PKGDIR%%/pkginfo/MANIFEST.mew
-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/examples/mew/Addrbook
-share/examples/mew/dot.emacs/dot.emacs.el
-share/examples/mew/user-install
-@dirrm share/examples/mew/dot.emacs
-@dirrm share/examples/mew
-@dirrm share/doc/mew/contrib
-@dirrm share/doc/mew
-@unexec rmdir %D/%%EMACS_PKGDIR%%/pkginfo 2>/dev/null || true
-@dirrm %%EMACS_PKGDIR%%/man/mew
-@unexec rmdir %D/%%EMACS_PKGDIR%%/man 2>/dev/null || true
-@dirrm %%EMACS_LISPDIR%%/mew
-@unexec rmdir %D/%%EMACS_LISPDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%EMACS_PKGDIR%%/info 2>/dev/null || true
-@dirrm %%EMACS_ETCDIR%%/mew/etc
-@dirrm %%EMACS_ETCDIR%%/mew
-@unexec rmdir %D/%%EMACS_ETCDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%EMACS_PKGDIR%% 2>/dev/null || true
+%%EMACS_PACKAGESDIR%%/etc/mew/00changes
+%%EMACS_PACKAGESDIR%%/etc/mew/00copyright
+%%EMACS_PACKAGESDIR%%/etc/mew/00copyright.jis
+%%EMACS_PACKAGESDIR%%/etc/mew/00diff
+%%EMACS_PACKAGESDIR%%/etc/mew/00readme
+%%EMACS_PACKAGESDIR%%/etc/mew/Mew.img
+%%EMACS_PACKAGESDIR%%/etc/mew/Mew.png
+%%EMACS_PACKAGESDIR%%/etc/mew/Mew.xbm
+%%EMACS_PACKAGESDIR%%/etc/mew/Mew.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/00readme
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/00readme-namazu.jis
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/im+.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/im+.readme.jis
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/imget.sh
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/imls.sh
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/imput.sh
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/ja.Emacs
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mailto.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-browse.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-caesar.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-cite-color.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-f.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-fake-imap.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-gnus.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-guess.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-mailto.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-ml.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-nmz.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-petname.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-refile-misc.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-refile-view.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-sol.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-summary-hl.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-toolbar-frame.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-virtual-thread.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mew-wheel.el
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/mknmz-inc.pl
+%%EMACS_PACKAGESDIR%%/etc/mew/contrib/rfc2368.el
+%%EMACS_PACKAGESDIR%%/etc/mew/etc/COLOR
+%%EMACS_PACKAGESDIR%%/etc/mew/etc/mew-Plain.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/etc/mew-curr.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/etc/mew-folder.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/etc/mew-inc2.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/etc/mew-kill.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Audio.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Blank.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-External.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Folder.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Image.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Octet-Stream.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Postscript.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Rfc822.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Text.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Unknown.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-Video.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-attach.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-cite.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-comp.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-forward.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-inc.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-next.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-pgp-enc.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-pgp-sigenc.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-pgp-sign.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-prev.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-refile.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-reply.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-send.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-sep.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-show.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-write.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/mew-yank.xpm
+%%EMACS_PACKAGESDIR%%/etc/mew/patches/00readme.jis
+%%EMACS_PACKAGESDIR%%/etc/mew/patches/canna.el-19.34.patch
+%%EMACS_PACKAGESDIR%%/etc/mew/patches/egg.el-19.34.patch
+%%EMACS_PACKAGESDIR%%/etc/mew/patches/egg.el-19.34.patch2
+%%EMACS_PACKAGESDIR%%/info/mew.info
+%%EMACS_PACKAGESDIR%%/info/mew.info-1
+%%EMACS_PACKAGESDIR%%/info/mew.info-2
+%%EMACS_PACKAGESDIR%%/info/mew.info-3
+%%EMACS_PACKAGESDIR%%/lisp/mew/_pkg.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/auto-autoloads.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/auto-autoloads.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/custom-load.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/custom-load.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-addrbook.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-addrbook.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-attach.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-attach.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-bq.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-bq.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-cache.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-cache.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-complete.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-complete.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-decode.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-decode.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-demo.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-demo.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-draft.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-draft.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-encode.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-encode.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-env.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-env.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-ext.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-ext.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-fib.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-fib.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-func.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-func.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-header.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-header.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-highlight.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-highlight.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-lang-jp.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mark.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mark.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-message.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-message.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mime.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mime.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-minibuf.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-minibuf.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mule.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mule0.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mule2.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-mule3.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-os2.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-pgp.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-pgp.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-pick.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-pick.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-refile.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-refile.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-scan.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-scan.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-sort.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-sort.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-summary.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-summary.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-syntax.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-syntax.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-temacs.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-unix.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-vars.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-vars.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-virtual.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-virtual.elc
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-win32.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew-xemacs.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew.el
+%%EMACS_PACKAGESDIR%%/lisp/mew/mew.elc
+%%EMACS_PACKAGESDIR%%/man/mew/00readme
+%%EMACS_PACKAGESDIR%%/man/mew/mew.texi
+%%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.mew
+@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/pkginfo 2>/dev/null || true
+@dirrm %%EMACS_PACKAGESDIR%%/man/mew
+@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/man 2>/dev/null || true
+@dirrm %%EMACS_PACKAGESDIR%%/lisp/mew
+@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/lisp 2>/dev/null || true
+@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/info 2>/dev/null || true
+@dirrm %%EMACS_PACKAGESDIR%%/etc/mew/patches
+@dirrm %%EMACS_PACKAGESDIR%%/etc/mew/etc
+@dirrm %%EMACS_PACKAGESDIR%%/etc/mew/contrib
+@dirrm %%EMACS_PACKAGESDIR%%/etc/mew
+@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/etc 2>/dev/null || true
+@unexec rmdir %D/%%EMACS_PACKAGESDIR%% 2>/dev/null || true
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index e2b97ff34b36..367320308534 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -5,238 +5,108 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mew-${EMACS_PORT_NAME}
-PORTVERSION=	1.94.1
-CATEGORIES=	mail elisp
+PORTNAME=	mew
+PORTVERSION=	${MEW_VER}
+CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/ \
 		ftp://ftp.kyushu-u.ac.jp/pub/Misc/mew/ \
 		${MASTER_SITE_PORTS_JP}
-DISTNAME=	mew-${PORTVERSION}
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
+MAINTAINER?=	kiri@FreeBSD.org
 
-### crypto
-#RESTRICTED=	"USA ITAR export restrictions (has PGP hooks)"
+# distfile version
+MEW_VER=	1.94.2
 
-RUN_DEPENDS=	imali:${PORTSDIR}/mail/im
+.if !defined(EMACS_PORT_NAME)
+# setup.el filename
+EMACS_SETUPEL=	${PORTNAME}-setup.el
+.endif
 
-SCRIPTS_ENV=	AWK=${AWK} CAT=${CAT} CP=${CP} ECHO=${ECHO} MKDIR="${MKDIR}" \
-		RM=${RM} TOUCH=${TOUCH} SED=${SED} \
-		EMACSDIR=${EMACSDIR} ELISPDIR=${ELISPDIR} INFODIR=${INFODIR} \
-		ETCDIR=${ETCDIR} SAMPLEDIR=${SAMPLEDIR} WRKTMPDIR=${WRKTMPDIR} \
-		PORTDIR=${.CURDIR:S!^${PORTSDIR}/!!} \
-		EMACS_CMD=${EMACS_CMD} EMACS_PORT_NAME=${EMACS_PORT_NAME} \
-		PKGNAME=${PKGNAME} TMPL_FILES="${TMPL_FILES}" \
-		VERSION=${PORTVERSION} \
-		SITE_STARTUP_FILE=${SITE_STARTUP_FILE} REQUIRE="${REQUIRE}"
-MAKE_ARGS=	PREFIX=${PREFIX} EMACS=${EMACS_CMD} ELISPDIR=${ELISPDIR} \
-		INFODIR=${INFODIR} ETCDIR=${ETCDIR}
-MAKE_ENV=	EMACSPKGDIR=${EMACSPKGDIR} MANDIR=${PKGMANDIR} \
-		PKG_PKGINFODIR=${PKG_PKGINFODIR} XEMACS_VER_OVER20=${XEMACS_VER_OVER20} \
-		MKDIR="${MKDIR}" PERL=${PERL5} PERL_BADLANG=0
-INSTALL_TARGET=	${INST_TARGET_LIST}
-PLIST_SUB=	EMACS_LISPDIR=${EMACS_LISPDIR} \
-		EMACS_ETCDIR=${EMACS_ETCDIR} \
-		EMACS_INFODIR=${EMACS_INFODIR} \
-		EMACS_PKGDIR=${EMACS_PKGDIR}
-PATCHDIR=	${.CURDIR}/../mew/files
-SCRIPTDIR=	${.CURDIR}/../mew/scripts
-FILESDIR=	${.CURDIR}/../mew/files
+# document install directory by install-doc target
+MEW_DOCDIR?=	share/doc/${PORTNAME}
 
+# emacs port setup
 EMACS_PORT_NAME?=	emacs
-SAMPLEFILES=		Addrbook
-SAMPLEDOTEMACS=		dot.emacs.el
-PORTDOCS=		00changes 00copyright 00copyright.jis 00diff 00readme
-TMPL_FILES=		user-install ${SITE_STARTUP_FILE} ${SAMPLEDOTEMACS}
-EMACSDIR=		${PREFIX}/${EMACS_LIBDIR_WITH_VER}
-ELISPDIR=		${PREFIX}/${EMACS_LISPDIR}/mew
-INFODIR=		${PREFIX}/${EMACS_INFODIR}
-ETCDIR=			${PREFIX}/${EMACS_ETCDIR}/mew
-EMACSPKGDIR=		${PREFIX}/${EMACS_PKGDIR}
-PKGELISPDIR=		${PREFIX}/${EMACS_PKG_LISPDIR}/mew
-PKGINFODIR=		${PREFIX}/${EMACS_PKG_INFODIR}
-PKGMANDIR=		${PREFIX}/${EMACS_PKG_MANDIR}/mew
-PKGETCDIR=		${PREFIX}/${EMACS_PKG_ETCDIR}/mew
-PKG_PKGINFODIR=		${PREFIX}/${EMACS_PKG_PKGINFODIR}
-WRKTMPDIR=		${WRKDIR}/tmp
-SAMPLEDIR=		${PREFIX}/share/examples/mew
-PORTDOCDIR=		${PREFIX}/share/doc/mew
-COMMENT_TEXT=		Message interface to Emacs Window for ${EMACS_PORT_NAME}
 
-.if (${EMACS_PORT_NAME} == "emacs")
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/emacs
-EMACS_NAME=		emacs
-EMACS_VER=		19.34
-EMACS_MAJOR_VER=	19
-EMACS_CMD=		${EMACS_NAME}-${EMACS_VER}
-EMACS_LIBDIR=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
-EMACS_ETCDIR=		${EMACS_LIBDIR}/etc
-EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
-EMACS_INFODIR=		info
-EMACS_SITELISPDIR=	${EMACS_LIBDIR}/site-lisp
-SITE_STARTUP_FILE=	mew-startup.el
-.elif (${EMACS_PORT_NAME} == "emacs20")
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/emacs20
-EMACS_NAME=		emacs
-EMACS_VER=		20.6
-EMACS_MAJOR_VER=	20
-EMACS_CMD=		${EMACS_NAME}-${EMACS_VER}
-EMACS_LIBDIR=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
-EMACS_ETCDIR=		${EMACS_LIBDIR}/etc
-EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
-EMACS_INFODIR=		info
-.elif (${EMACS_PORT_NAME} == "mule")
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/mule
-EMACS_NAME=		mule
-EMACS_VER=		19.34
-EMACS_MAJOR_VER=	19
-EMACS_CMD=		${EMACS_NAME}-${EMACS_VER}
-EMACS_LIBDIR=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
-EMACS_ETCDIR=		${EMACS_LIBDIR}/etc
-EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
-EMACS_INFODIR=		${EMACS_LIBDIR}/info
-EMACS_SITELISPDIR=	${EMACS_LIBDIR}/site-lisp
-SITE_STARTUP_FILE=	mew-startup.el
-.elif (${EMACS_PORT_NAME} == "xemacs")
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/xemacs
-EMACS_NAME=		xemacs
-EMACS_VER=		19.16
-EMACS_MAJOR_VER=	19
-EMACS_CMD=		${EMACS_NAME}-${EMACS_VER}
-EMACS_LIBDIR=		lib/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	lib/${EMACS_NAME}-${EMACS_VER}
-EMACS_ETCDIR=		${EMACS_LIBDIR}/etc
-EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
-EMACS_INFODIR=		${EMACS_LIBDIR_WITH_VER}/info
-EMACS_SITELISPDIR=	${EMACS_LISPDIR}
-SITE_STARTUP_FILE=	mew-xemacs-startup.el
-.elif (${EMACS_PORT_NAME} == "xemacs20")
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/xemacs20
-EMACS_NAME=		xemacs
-EMACS_VER=		20.4
-EMACS_MAJOR_VER=	20
-EMACS_CMD=		${EMACS_NAME}-${EMACS_VER}
-EMACS_LIBDIR=		lib/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	lib/${EMACS_NAME}-${EMACS_VER}
-EMACS_ETCDIR=		${EMACS_LIBDIR}/etc
-EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
-EMACS_INFODIR=		${EMACS_LIBDIR}/info
-EMACS_SITELISPDIR=	${EMACS_LISPDIR}
-SITE_STARTUP_FILE=	mew-xemacs-startup.el
-.elif (${EMACS_PORT_NAME} == "xemacs21")
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/xemacs21
-EMACS_NAME=		xemacs
-EMACS_VER=		21.1.12
-EMACS_MAJOR_VER=	21
-EMACS_CMD=		${EMACS_NAME}${EMACS_MAJOR_VER}
-EMACS_LIBDIR=		lib/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	lib/${EMACS_NAME}-${EMACS_VER}
-EMACS_PKGDIR=		${EMACS_LIBDIR}/site-packages
-EMACS_PKG_LISPDIR=	${EMACS_PKGDIR}/lisp
-EMACS_PKG_INFODIR=	${EMACS_PKGDIR}/info
-EMACS_PKG_MANDIR=	${EMACS_PKGDIR}/man
-EMACS_PKG_ETCDIR=	${EMACS_PKGDIR}/etc
-EMACS_PKG_PKGINFODIR=	${EMACS_PKGDIR}/pkginfo
-EMACS_ETCDIR=		${EMACS_PKG_ETCDIR}
-EMACS_LISPDIR=		${EMACS_PKG_LISPDIR}
-EMACS_INFODIR=		${EMACS_PKG_INFODIR}
-.elif (${EMACS_PORT_NAME} == "xemacs21-mule")
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/xemacs21-mule
-EMACS_NAME=		xemacs
-EMACS_VER=		21.1.9
-EMACS_MAJOR_VER=	21
-EMACS_CMD=		${EMACS_NAME}${EMACS_MAJOR_VER}-mule
-EMACS_LIBDIR=		lib/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	lib/${EMACS_NAME}-${EMACS_VER}
-EMACS_PKGDIR=		${EMACS_LIBDIR}/site-packages
-EMACS_PKG_LISPDIR=	${EMACS_PKGDIR}/lisp
-EMACS_PKG_INFODIR=	${EMACS_PKGDIR}/info
-EMACS_PKG_MANDIR=	${EMACS_PKGDIR}/man
-EMACS_PKG_ETCDIR=	${EMACS_PKGDIR}/etc
-EMACS_PKG_PKGINFODIR=	${EMACS_PKGDIR}/pkginfo
-EMACS_ETCDIR=		${EMACS_PKG_ETCDIR}
-EMACS_LISPDIR=		${EMACS_PKG_LISPDIR}
-EMACS_INFODIR=		${EMACS_PKG_INFODIR}
-.else
-NO_BUILD=	yes
-NO_INSTALL=	yes
-.endif
-.if (${EMACS_NAME} == "xemacs") && ${EMACS_MAJOR_VER} > 20
-INST_TARGET_LIST=	install-package
-XEMACS_VER_OVER20=	yes
-.else
-INST_TARGET_LIST=	install install-info
-REQUIRE=		(require \'${SITE_STARTUP_FILE:S/^mew-/&${EMACS_PORT_NAME}-/:S/.el$//})
-.endif
-.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "mule") || \
-	(${EMACS_PORT_NAME} == "xemacs21-mule")
-INST_TARGET_LIST+=	install-jinfo
-.endif
+# target name for make build and install
+ALL_TARGET?=	all # info
+INSTALL_TARGET?=install install-info install-etc
 
-post-configure:
-	@${MKDIR} ${WRKTMPDIR}
-	@cd ${FILESDIR}; \
-	${CP} ${SAMPLEFILES} ${WRKTMPDIR}
+# depends
+RUN_DEPENDS=	imali:${PORTSDIR}/mail/im
+
+# environments
+MAKE_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR}
+SCRIPTS_ENV+=	TARGETS="${EMACS_SETUPEL}" EMACS_SETUPEL=${EMACS_SETUPEL:S/.el$//}
+PLIST_SUB+=	MEW_DOCDIR=${MEW_DOCDIR} EMACS_SETUPEL=${EMACS_SETUPEL}
 
-pre-install:
-	${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/tmpl2file.sh
-	@${MKDIR} ${ELISPDIR} ${INFODIR}
-.if (${EMACS_NAME} == "xemacs")
-	@${MKDIR} ${ETCDIR}/etc
+pre-configure:
+.if defined(EMACS_SETUPEL)
+	@${CP} ${FILESDIR}/${EMACS_SETUPEL}.in ${WRKDIR}
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PORTDOCDIR}/contrib
-	@cd ${WRKSRC}; \
-	${INSTALL_DATA} ${PORTDOCS} ${PORTDOCDIR}; \
-	${INSTALL_DATA} contrib/* ${PORTDOCDIR}/contrib
-	@${MKDIR} ${SAMPLEDIR}/dot.emacs
-	@cd ${WRKTMPDIR}; \
-	${INSTALL_DATA} ${SAMPLEFILES} ${SAMPLEDIR}; \
-	${INSTALL_DATA} ${SAMPLEDOTEMACS} ${SAMPLEDIR}/dot.emacs; \
-	${INSTALL_SCRIPT} user-install ${SAMPLEDIR}
-.if (${EMACS_NAME} == "xemacs") && ${EMACS_MAJOR_VER} <= 20
-	@cd ${WRKSRC}/etc; \
-	${INSTALL_DATA} *.xpm Mew.* ${PREFIX}/${EMACS_ETCDIR}/mew; \
-	${INSTALL_DATA} etc/* ${PREFIX}/${EMACS_ETCDIR}/mew/etc
-	@${INSTALL_DATA} ${WRKSRC}/info/*.texi ${PORTDOCDIR}
-.elif (${EMACS_NAME} != "xemacs")
-	@${INSTALL_DATA} ${WRKSRC}/info/*.texi ${PORTDOCDIR}
-.endif
-.endif
-.if (${EMACS_NAME} != "xemacs") || ${EMACS_MAJOR_VER} <= 20
-	@install-info ${WRKSRC}/info/mew.info ${INFODIR}/dir
-.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "mule")
-	@install-info ${WRKSRC}/info/mew.jis.info ${INFODIR}/dir
+.if defined(EMACS_SETUPEL)
+	${INSTALL_DATA} ${WRKDIR}/${EMACS_SETUPEL} \
+			${PREFIX}/${EMACS_LIBDIR}/site-lisp
 .endif
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/${MEW_DOCDIR}
+	(cd ${WRKSRC} ; \
+		${INSTALL_DATA} 00* ${PREFIX}/${MEW_DOCDIR}/ ; \
+		for dir in contrib patches; do \
+			${CP} -R $${dir} ${PREFIX}/${MEW_DOCDIR}/ ; \
+		done)
+	${CHOWN} -R ${SHAREOWN}.${SHAREGRP} ${PREFIX}/${MEW_DOCDIR}
 .endif
-.if defined(SITE_STARTUP_FILE)
-	@${MKDIR} ${PREFIX}/${EMACS_SITELISPDIR}
-	@${INSTALL_DATA} ${WRKTMPDIR}/${SITE_STARTUP_FILE} \
-		${PREFIX}/${EMACS_SITELISPDIR}/mew-${EMACS_PORT_NAME}-startup.el
-.endif
-	@${CAT} ${PKGMESSAGE}
 
-## for make DESCR,COMMENT and PLIST (only maintainer use)
-#arrange:
-#	${MKDIR} ${PKGDIR}
-#	${ECHO} ${COMMENT_TEXT} > ${PKGDIR}/COMMENT
-#	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=DESCR \
+############################################################
+## Make DESCR,COMMENT and PLIST (only for MAINTAINER use)
+############################################################
+#COMMENT_TEXT=	Message interface to Emacs Window for ${EMACS_PORT_NAME}
+#.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
+#ELISPDIR=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${PORTNAME}
+#INFODIR=	${PREFIX}/${EMACS_PACKAGESDIR}/info
+#ETCDIR=		${PREFIX}/${EMACS_PACKAGESDIR}/etc/${PORTNAME}
+#.else
+#ELISPDIR=	${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
+#INFODIR=	${PREFIX}/info
+#ETCDIR=		${PREFIX}/${EMACS_LIBDIR}/etc/${PORTNAME}
+#REQUIRE=	(require \'${EMACS_SETUPEL:S/^mew-/&${EMACS_PORT_NAME}-/:S/.el$//})
+#.endif
+#SCRIPTS_ENV+=	EMACS_PORTSDIR=${EMACS_PORTSDIR:S,^${PORTSDIR}/,,} \
+#		PKGNAME=${PKGNAME} ELISPDIR=${ELISPDIR} INFODIR=${INFODIR} \
+#		ETCDIR=${ETCDIR} EMACS_CMD=${EMACS_CMD:S,${PREFIX}/bin/,,} \
+#		PORTNAME=${PORTNAME} EMACS_PORT_NAME=${EMACS_PORT_NAME}
+#
+#pre-plist:
+#	mkdir -p ${ELISPDIR} ${INFODIR} ${ETCDIR} \
+#		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+#
+#pre-arrange:
+#	${ECHO} ${COMMENT_TEXT} > ${PKGDIR}/pkg-comment
+#	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=pkg-descr \
 #		${SH} ${FILESDIR}/tmpl2file.sh
 #	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} ${SH} ${FILESDIR}/message.sh
-#	${CHOWN} kiri:staff ${PKGDIR} ${PKGDIR}/COMMENT ${PKGDIR}/DESCR ${PKGDIR}/MESSAGE
-#.if (${EMACS_NAME} == "xemacs") && ${EMACS_MAJOR_VER} > 20
-#	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS} EMACS_INFODIR=${EMACS_INFODIR}" \
-#		DIRRM2RMDIRS="${EMACS_ETCDIR} ${EMACS_LISPDIR} ${EMACS_INFODIR} ${EMACS_PKGDIR} ${EMACS_PKG_MANDIR} ${EMACS_PKG_PKGINFODIR}" \
+#	${CHOWN} kiri:staff ${PKGDIR}/pkg-comment ${PKGDIR}/pkg-descr ${PKGDIR}/pkg-message
+#
+#arrange:
+#.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
+#	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS}" \
+#		DIRRM2RMDIRS="${ETCDIR:S,^${PREFIX}/,,:S,/${PORTNAME}$,,} \
+#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}$,,} \
+#			${EMACS_PACKAGESDIR} ${EMACS_PACKAGESDIR}/lisp \
+#			${EMACS_PACKAGESDIR}/info ${EMACS_PACKAGESDIR}/etc \
+#			${EMACS_PACKAGESDIR}/man ${EMACS_PACKAGESDIR}/pkginfo" \
 #		DIRRMDEPTH=2 plist
 #.else
-#	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS} EMACS_INFODIR=${EMACS_INFODIR}" \
-#		DIRRM2RMDIRS="${EMACS_ETCDIR} ${EMACS_LISPDIR} ${EMACS_INFODIR} ${EMACS_PKGDIR} ${EMACS_PKG_MANDIR} ${EMACS_PKG_PKGINFODIR}" \
-#		INFOFILES=mew.info DIRRMDEPTH=2 plist
+#	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS}" \
+#		DIRRM2RMDIRS="${ETCDIR:S,^${PREFIX}/,,:S,/${PORTNAME}$,,} \
+#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}$,,} \
+#			${EMACS_LIBDIR}/${EMACS_VER}/site-lisp \
+#			${EMACS_LIBDIR}/${EMACS_VER}" \
+#		INFOFILES="mew.info mew.jis.info" DIRRMDEPTH=2 plist
 #.endif
 #	${INSTALL} -c -m 644 -o kiri -g staff ${WRKPLIST} ${PLIST}
 
diff --git a/mail/mew/distinfo b/mail/mew/distinfo
index 41d137c6db3d..2f0dd6333b65 100644
--- a/mail/mew/distinfo
+++ b/mail/mew/distinfo
@@ -1 +1 @@
-MD5 (mew-1.94.1.tar.gz) = 35e300b57fadfddb1c1782af13e00cfa
+MD5 (mew-1.94.2.tar.gz) = 8b86e26586c07e9425e470706734a35d
diff --git a/mail/mew/files/dot.emacs.el.tmpl b/mail/mew/files/dot.emacs.el.in
index 8cfe348595fa..8cfe348595fa 100644
--- a/mail/mew/files/dot.emacs.el.tmpl
+++ b/mail/mew/files/dot.emacs.el.in
diff --git a/mail/mew/files/message.sh b/mail/mew/files/message.sh
index c2720cc73d73..a709991a5b4f 100644
--- a/mail/mew/files/message.sh
+++ b/mail/mew/files/message.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
  
-if [ -z "${SITE_STARTUP_FILE}" ]; then
-    ${CAT} <<EOF > ${WRKTMPDIR}/MESSAGE
+if [ -z "${EMACS_SETUPEL}" ]; then
+    cat <<EOF > ${WRKTMPDIR}/pkg-message
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
@@ -12,11 +12,11 @@ if [ -z "${SITE_STARTUP_FILE}" ]; then
 *************************************************************************
 EOF
 else
-    ${CAT} <<EOF > ${WRKTMPDIR}/MESSAGE
+    cat <<EOF > ${WRKTMPDIR}/pkg-message
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
-*       (require 'mew-${EMACS_PORT_NAME}-startup)                                  *
+*       (require '`basename ${EMACS_SETUPEL} .el`)                                  *
 *       (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/files/mew-setup.el.in b/mail/mew/files/mew-setup.el.in
new file mode 100644
index 000000000000..e408ef6eb6e7
--- /dev/null
+++ b/mail/mew/files/mew-setup.el.in
@@ -0,0 +1,4 @@
+(setq load-path (append '(
+	"%%LOCALBASE%%/%%EMACS_LIBDIR%%/site-lisp/mew"
+ ) load-path))
+(provide '%%EMACS_SETUPEL%%)
diff --git a/mail/mew/files/mew-startup.el.tmpl b/mail/mew/files/mew-startup.el.tmpl
deleted file mode 100644
index e0c7a1db42d3..000000000000
--- a/mail/mew/files/mew-startup.el.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-(setq load-path (cons "%%ELISPDIR%%" load-path))
-(provide 'mew-%%EMACS_PORT_NAME%%-startup)
diff --git a/mail/mew/files/mew-xemacs-setup.el.in b/mail/mew/files/mew-xemacs-setup.el.in
new file mode 100644
index 000000000000..feb0d538d7d5
--- /dev/null
+++ b/mail/mew/files/mew-xemacs-setup.el.in
@@ -0,0 +1,5 @@
+(setq load-path (append '(
+	"%%LOCALBASE%%/%%EMACS_LIBDIR%%/site-lisp/mew"
+ ) load-path))
+(setq mew-icon-directory "%%LOCALBASE%%/%%EMACS_LIBDIR%%/etc/mew")
+(provide '%%EMACS_SETUPEL%%)
diff --git a/mail/mew/files/mew-xemacs-startup.el.tmpl b/mail/mew/files/mew-xemacs-startup.el.tmpl
deleted file mode 100644
index a78dc54520e9..000000000000
--- a/mail/mew/files/mew-xemacs-startup.el.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-(setq load-path (cons "%%ELISPDIR%%" load-path))
-(setq mew-icon-directory "%%ETCDIR%%")
-(provide 'mew-%%EMACS_PORT_NAME%%-startup)
diff --git a/mail/mew/files/patch-aa b/mail/mew/files/patch-aa
index cd5eb362c550..07d51807b839 100644
--- a/mail/mew/files/patch-aa
+++ b/mail/mew/files/patch-aa
@@ -1,80 +1,172 @@
---- Makefile~	Wed Oct 20 20:20:51 1999
-+++ Makefile	Fri Dec 10 22:42:06 1999
-@@ -88,12 +88,29 @@
+--- Makefile.orig	Wed Oct 20 20:20:51 1999
++++ Makefile	Tue Jul 10 23:35:24 2001
+@@ -19,8 +19,8 @@
+ ## EDIT THE FOLLOWINGS
+ ##
+ 
+-PREFIX = /usr/local
+-INFODIR = $(PREFIX)/info
++PREFIX?= /usr/local
++INFODIR= $(PREFIX)/info
+ 
+ ##
+ ## Compile engines
+@@ -30,10 +30,10 @@
+ CFLAGS = -O
+ 
+ #EMACS = emacs
+-EMACS = xemacs
++EMACS=	${EMACS_CMD}
+ #EMACS = mule
+ 
+-PERL=`which perl`
++PERL?=`which perl`
+ #PERL=/usr/local/bin/perl
+ 
+ ##
+@@ -46,7 +46,7 @@
+ ## A directory where mew*.el[c] will be installed.
+ ##
+ 
+-ELISPDIR  = $(PREFIX)/lib/$(EMACS)/site-lisp
++ELISPDIR= ${PREFIX}/${EMACS_LIBDIR}/site-lisp/mew
+ #ELISPDIR = $(PREFIX)/share/emacs/site-lisp
+ #ELISPDIR = $(PREFIX)/lib/emacs
+ 
+@@ -54,7 +54,10 @@
+ ## A directory where etc file will be installed.
+ ##
+ 
+-ETCDIR = $(PREFIX)/lib/$(EMACS)/etc/Mew
++ETCDIR=	${PREFIX}/${EMACS_LIBDIR}/etc/mew
++
++# For XEmacs packages
++XPKGDIR=	${PREFIX}/${EMACS_PACKAGESDIR}
+ 
+ ################################################################
+ ##
+@@ -72,6 +75,8 @@
+ 	mew-virtual.elc  mew-highlight.elc mew-vars.elc  \
+ 	mew-addrbook.elc mew.elc
+ 
++OBJS_PKG=	 auto-autoloads.elc custom-load.elc
++
+ SRCS =  mew-attach.el   mew-bq.el      mew-cache.el   \
+ 	mew-complete.el mew-decode.el  mew-demo.el    \
+ 	mew-draft.el    mew-encode.el  mew-env.el     \
+@@ -88,6 +93,8 @@
  	mew-temacs.el   mew-xemacs.el  mew-addrbook.el \
  	mew.el
  
-+PIXMAPS=Mew.img	Mew.png	Mew.xbm	\
-+	Mew.xpm	mew-Audio.xpm	mew-Blank.xpm	\
-+	mew-External.xpm	mew-Folder.xpm	mew-Image.xpm	\
-+	mew-Octet-Stream.xpm	mew-Postscript.xpm	mew-Rfc822.xpm	\
-+	mew-Text.xpm	mew-Unknown.xpm	mew-Video.xpm	\
-+	mew-attach.xpm	mew-cite.xpm	mew-comp.xpm	\
-+	mew-forward.xpm	mew-inc.xpm	mew-next.xpm	\
-+	mew-pgp-enc.xpm	mew-pgp-sigenc.xpm	mew-pgp-sign.xpm	\
-+	mew-prev.xpm	mew-refile.xpm	mew-reply.xpm	\
-+	mew-send.xpm	mew-sep.xpm	mew-show.xpm	\
-+	mew-write.xpm	mew-yank.xpm
-+PIXMAPSETC=etc/COLOR	etc/mew-Plain.xpm	\
-+	etc/mew-curr.xpm	etc/mew-folder.xpm	etc/mew-inc2.xpm	\
-+	etc/mew-kill.xpm
-+
++SRCS_PKG=	auto-autoloads.el custom-load.el
 +
  TEMPFILE = temp.el
  
  CP = cp
- RM = rm -f
- MKDIR = mkdir -p
+@@ -96,14 +103,14 @@
  BIN = bin
-+ETC=	etc
  
  all: $(OBJS)
++
++$(OBJS): $(TEMPFILE) mew.el
  	@echo 'Compiling EL files of Mew ... '
-@@ -114,8 +131,8 @@
- 	-@if [ ! -d $(ELISPDIR) ]; then \
+ 	@echo 'PLEASE IGNORE WARNINGS IF DISPLAYED. TAKE IT EASY!'
+ 	$(EMACS) -batch -q -no-site-file -l ./$(TEMPFILE) -f mew-compile
+ 	cd $(BIN); $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" PERL="$(PERL)"
+ 	@echo 'Compiling EL files of Mew ... done'
+ 
+-$(OBJS): $(TEMPFILE) mew.el
+-
+ $(TEMPFILE):
+ 	@echo '(setq load-path (cons "." load-path))' > $(TEMPFILE)
+ 	@echo '(defun mew-compile () (mapcar (function (lambda (x) (byte-compile-file x))) (list ' >> $(TEMPFILE)
+@@ -111,11 +118,11 @@
+ 	@echo ')))' >> $(TEMPFILE)
+ 
+ install: $(OBJS)
+-	-@if [ ! -d $(ELISPDIR) ]; then \
++	if [ ! -d $(ELISPDIR) ]; then \
  		$(MKDIR) $(ELISPDIR); \
- 	fi; \
+-	fi; \
 -	$(CP) $(SRCS) $(ELISPDIR)
 -	$(CP) $(OBJS) $(ELISPDIR)
++	fi
 +	${BSD_INSTALL_DATA} $(SRCS) $(ELISPDIR)
 +	${BSD_INSTALL_DATA} $(OBJS) $(ELISPDIR)
  	cd $(BIN); $(MAKE) install CFLAGS="$(CFLAGS)" CC="$(CC)" BINDIR="$(BINDIR)"
  
  clean:
-@@ -126,19 +143,32 @@
+@@ -126,19 +133,69 @@
  	cd info; $(MAKE) info EMACS=$(EMACS)
  
  install-info:
 -	cd info; $(MAKE) install-info INFODIR=$(INFODIR)
-+	cd info; $(MAKE) install-info INFODIR=$(INFODIR) XEMACS_VER_OVER20=${XEMACS_VER_OVER20}
++	${MKDIR} ${INFODIR}
++	cd info; $(MAKE) install-info INFODIR=$(INFODIR) \
++		XEMACS_VER_OVER20="${XEMACS_VER_OVER20}"
  
  jinfo::
  	cd info; $(MAKE) jinfo EMACS=$(EMACS)
  
  install-jinfo:
 -	cd info; $(MAKE) install-jinfo INFODIR=$(INFODIR)
-+	cd info; $(MAKE) install-jinfo INFODIR=$(INFODIR) XEMACS_VER_OVER20=${XEMACS_VER_OVER20}
++	${MKDIR} ${INFODIR}
++	cd info; $(MAKE) install-jinfo INFODIR=$(INFODIR) \
++		XEMACS_VER_OVER20="${XEMACS_VER_OVER20}"
 +
 +install-man:
++	${MKDIR} ${MANDIR}
 +	cd info; $(MAKE) install-man MANDIR=$(MANDIR)
  
  install-etc:
- 	-@if [ ! -d $(ETCDIR) ]; then \
--		$(MKDIR) $(ETCDIR); \
-+		$(MKDIR) $(ETCDIR)/etc; \
+-	-@if [ ! -d $(ETCDIR) ]; then \
++	if [ ! -d $(ETCDIR) ]; then \
+ 		$(MKDIR) $(ETCDIR); \
  	fi; \
 -	cd etc; $(CP) -r * $(ETCDIR)/
-+	cd etc; \
-+	${BSD_INSTALL_DATA} ${PIXMAPS} ${ETCDIR}; \
-+	${BSD_INSTALL_DATA} ${PIXMAPSETC} ${ETCDIR}/etc
++	cd etc; $(CP) -R * $(ETCDIR)/
++
++package: ${OBJS} ${OBJS_PKG}
++
++${OBJS_PKG}: ${SRCS_PKG}
++	${EMACS} -vanilla -batch -eval "(push \"./\" load-path)" -l bytecomp \
++		-f batch-byte-compile ${.ALLSRC}
++
++auto-autoloads.el : ${OBJS} _pkg.el
++	${EMACS} -vanilla -batch \
++		-eval "(setq autoload-package-name \"${XEMACS_PKGNAME}\")" \
++		-l autoload -f batch-update-directory .
++	${RM} -f auto-autoloads.el~
++
++custom-load.el : ${OBJS}
++	${EMACS} -vanilla -batch -l cus-dep -f Custom-make-dependencies .
++	if [ ! -f ${.TARGET} ]; then \
++		touch ${.TARGET}; \
++	fi
++
++_pkg.el:
++	@echo Creating _pkg.el
++	@echo ";;;###autoload" 				>  _pkg.el
++	@echo "(package-provide '${XEMACS_PKGNAME}" 	>> _pkg.el
++	@echo "		 :version $(XEMACS_PKGVER)"	>> _pkg.el
++	@echo "		 :type 'regular)" 		>> _pkg.el
 +
++install-package:
++	${MKDIR} ${XPKGDIR}/pkginfo
++	${MAKE} ELISPDIR=${XPKGDIR}/lisp/mew  	install
++	${BSD_INSTALL_DATA} _pkg.el ${OBJS_PKG} ${SRCS_PKG} ${XPKGDIR}/lisp/mew
++	${MAKE} INFODIR=${XPKGDIR}/info XEMACS_VER_OVER20="yes" \
++						install-info
++	${MAKE} MANDIR=${XPKGDIR}/man/mew    	install-man
++	${MAKE} ETCDIR=${XPKGDIR}/etc/mew    	install-etc
++	(cd ${XPKGDIR}; \
++		ls -d1 lisp/mew/* info/mew.* man/mew/* etc/mew/* \
++			> ${XPKGDIR}/pkginfo/MANIFEST.mew)
++	${ECHO} "pkginfo/MANIFEST.mew" >> ${XPKGDIR}/pkginfo/MANIFEST.mew
 +
-+install-package: install install-info install-man install-etc
-+	${MKDIR} ${EMACSPKGDIR} ${PKG_PKGINFODIR}
-+	${ECHO} "pkginfo/MANIFEST.mew" > ${PKG_PKGINFODIR}/MANIFEST.mew
-+	find ${EMACSPKGDIR} -type f | sed -e "s,^${EMACSPKGDIR}/,," | \
-+		grep '^etc/mew/\|^info/mew\.\|^lisp/mew/\|^man/mew/' | \
-+		grep -v "pkginfo/MANIFEST.mew" >> ${PKG_PKGINFODIR}/MANIFEST.mew
++install-mule-package: install-package
++	${MAKE} INFODIR=${XPKGDIR}/info XEMACS_VER_OVER20="yes" \
++						install-jinfo
  
  ##
  ## End of Makefile
diff --git a/mail/mew/files/patch-ab b/mail/mew/files/patch-ab
index 1524e237e0cc..2dac86223770 100644
--- a/mail/mew/files/patch-ab
+++ b/mail/mew/files/patch-ab
@@ -1,6 +1,6 @@
---- bin/Makefile.orig	Tue Mar  2 12:05:21 1999
-+++ bin/Makefile	Mon Aug 30 22:50:21 1999
-@@ -21,16 +21,16 @@
+--- bin/Makefile~	Wed Oct 27 08:55:11 1999
++++ bin/Makefile	Tue Jul 10 01:06:02 2001
+@@ -22,7 +22,7 @@
  	$(CC) -o $@ $(OBJS)
  	$(RM) $(ALT)
  	for f in $(ALT); do \
@@ -9,8 +9,10 @@
  
  uumerge: uumerge.in
  	sed -e "s|@PERL@|${PERL}|" < uumerge.in > uumerge
- 
- install: $(PRG) $(OTH)
+@@ -32,10 +32,10 @@
+ 	-@if [ ! -d $(BINDIR) ]; then \
+ 		$(MKDIR) $(BINDIR); \
+ 	fi; \
 -	cp $(PRG) $(BINDIR)
 +	${BSD_INSTALL_PROGRAM} $(PRG) $(BINDIR)
  	for f in $(ALT); do \
diff --git a/mail/mew/files/patch-ac b/mail/mew/files/patch-ac
index ee8b3c4d73a8..3efb03c40dd8 100644
--- a/mail/mew/files/patch-ac
+++ b/mail/mew/files/patch-ac
@@ -1,6 +1,6 @@
---- info/Makefile.orig	Wed Oct 20 20:20:56 1999
-+++ info/Makefile	Fri Dec 10 22:45:46 1999
-@@ -32,6 +32,7 @@
+--- info/Makefile~	Wed Oct 27 08:55:12 1999
++++ info/Makefile	Tue Jul 10 01:25:05 2001
+@@ -33,6 +33,7 @@
  
  INFO  = mew.info mew.info-1 mew.info-2 mew.info-3
  JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2
@@ -8,28 +8,39 @@
  
  info::
  	sed -e 's/@setfilename mew.jis.info/@setfilename mew.info/' \
-@@ -55,8 +56,8 @@
- 	-@if [ ! -d $(INFODIR) ]; then \
+@@ -57,22 +58,32 @@
  		$(MKDIR) $(INFODIR); \
  	fi; \
--	cp $(INFO) $(INFODIR)
+ 	cp $(INFO) $(INFODIR)
 -	-@if [ -x "$(INSTALLINFO)" ]; then \
+-		$(INSTALLINFO) mew.info $(INFODIR)/dir; \
+-	else \
+-		echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
 +	${BSD_INSTALL_DATA} $(INFO) $(INFODIR)
-+	-@if [ -x "$(INSTALLINFO)" -a -z "${XEMACS_VER_OVER20}" ]; then \
- 		$(INSTALLINFO) mew.info $(INFODIR)/dir; \
- 	else \
- 		echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
-@@ -66,12 +67,17 @@
++	-@if [ -z "${XEMACS_VER_OVER20}" ]; then \
++		if [ -x "$(INSTALLINFO)" ]; then \
++			$(INSTALLINFO) mew.info $(INFODIR)/dir; \
++		else \
++			echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
++		fi; \
+ 	fi
+ 
+ install-jinfo:
  	-@if [ ! -d $(INFODIR) ]; then \
  		$(MKDIR) $(INFODIR); \
  	fi; \
 -	cp $(JINFO) $(INFODIR)
 -	-@if [ -x "$(INSTALLINFO)" ]; then \
+-		$(INSTALLINFO) mew.jis.info $(INFODIR)/dir; \
+-	else \
+-		echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
 +	${BSD_INSTALL_DATA} $(JINFO) $(INFODIR)
-+	-@if [ -x "$(INSTALLINFO)" -a -z "${XEMACS_VER_OVER20}" ]; then \
- 		$(INSTALLINFO) mew.jis.info $(INFODIR)/dir; \
- 	else \
- 		echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
++	-@if [ -z "${XEMACS_VER_OVER20}" ]; then \
++		if [ -x "$(INSTALLINFO)" ]; then \
++			$(INSTALLINFO) mew.jis.info $(INFODIR)/dir; \
++		else \
++			echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
++		fi; \
  	fi
 +
 +install-man:
diff --git a/mail/mew/files/DESCR.tmpl b/mail/mew/files/pkg-descr.tmpl
index 2590a86452bb..72644327fddb 100644
--- a/mail/mew/files/DESCR.tmpl
+++ b/mail/mew/files/pkg-descr.tmpl
@@ -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 %%EMACS_CMD%%(%%PORTDIR%%). 
+This port is the Mew for %%EMACS_CMD%%(%%EMACS_PORTSDIR%%). 
 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. 
 
-%%PORTDIR%%(%%PKGNAME%%) ===> editors/%%EMACS_PORT_NAME%%(%%EMACS_CMD%%) 
+mail/%%PORTNAME%%-%%EMACS_PORT_NAME%%(%%PKGNAME%%) ===> %%EMACS_PORTSDIR%%(%%EMACS_CMD%%) 
 	Lisp directory : %%ELISPDIR%%
 	Info directory : %%INFODIR%%
 	ETC directory  : %%ETCDIR%%
diff --git a/mail/mew/files/tmpl2file.sh b/mail/mew/files/tmpl2file.sh
index 3a61fbc90014..ca169ce248c2 100644
--- a/mail/mew/files/tmpl2file.sh
+++ b/mail/mew/files/tmpl2file.sh
@@ -1,26 +1,14 @@
 #!/bin/sh
 
 for f in ${TMPL_FILES}; do
-	${SED} \
-		-e "s,%%PREFIX%%,${PREFIX},g" \
-		-e "s,%%EMACSDIR%%,${EMACSDIR},g" \
-		-e "s,%%ELISPDIR%%,${ELISPDIR},g" \
-		-e "s,%%INFODIR%%,${INFODIR},g" \
-		-e "s,%%ETCDIR%%,${ETCDIR},g" \
-		-e "s,%%PORTDIR%%,${PORTDIR},g" \
-		-e "s,%%SAMPLEDIR%%,${SAMPLEDIR},g" \
-		-e "s,%%REQUIRE%%,${REQUIRE},g" \
-		-e "s,%%AWK%%,${AWK},g" \
-		-e "s,%%CAT%%,${CAT},g" \
-		-e "s,%%CP%%,${CP},g" \
-		-e "s,%%ECHO%%,${ECHO},g" \
-		-e "s,%%MKDIR%%,${MKDIR},g" \
-		-e "s,%%RM%%,${RM},g" \
-		-e "s,%%SED%%,${SED},g" \
-		-e "s,%%TOUCH%%,${TOUCH},g" \
+	sed \
 		-e "s,%%EMACS_CMD%%,${EMACS_CMD},g" \
+		-e "s,%%EMACS_PORTSDIR%%,${EMACS_PORTSDIR},g" \
 		-e "s,%%PKGNAME%%,${PKGNAME},g" \
 		-e "s,%%EMACS_PORT_NAME%%,${EMACS_PORT_NAME},g" \
-		-e "s,%%VERSION%%,${VERSION},g" \
+		-e "s,%%PORTNAME%%,${PORTNAME},g" \
+		-e "s,%%ELISPDIR%%,${ELISPDIR},g" \
+		-e "s,%%INFODIR%%,${INFODIR},g" \
+		-e "s,%%ETCDIR%%,${ETCDIR},g" \
 		< ${FILESDIR}/${f}.tmpl > ${WRKTMPDIR}/${f}
 done
diff --git a/mail/mew/files/user-install.tmpl b/mail/mew/files/user-install.in
index ee1a7ad4d9f4..ee1a7ad4d9f4 100644
--- a/mail/mew/files/user-install.tmpl
+++ b/mail/mew/files/user-install.in
diff --git a/mail/mew/pkg-descr b/mail/mew/pkg-descr
index f9ffbc8e17c7..c47a87be1498 100644
--- a/mail/mew/pkg-descr
+++ b/mail/mew/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 emacs-19.34(mail/mew).
+This port is the Mew for emacs-19.34(editors/emacs). 
 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.
+effective for xemacs ports) are shown as well. 
 
-mail/mew(mew-emacs-1.94.1) ===> editors/emacs(emacs-19.34)
-       Lisp directory : /usr/local/share/emacs/site-lisp/mew
-       Info directory : /usr/local/info
-       ETC directory  : /usr/local/share/emacs/etc/mew
+mail/mew-emacs(mew-emacs-1.94.2) ===> editors/emacs(emacs-19.34) 
+	Lisp directory : /usr/local/share/emacs/site-lisp/mew
+	Info directory : /usr/local/info
+	ETC directory  : /usr/local/share/emacs/etc/mew
diff --git a/mail/mew/pkg-message b/mail/mew/pkg-message
index 448d471d35cb..a57d221f353e 100644
--- a/mail/mew/pkg-message
+++ b/mail/mew/pkg-message
@@ -1,7 +1,7 @@
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
-*       (require 'mew-emacs-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/pkg-plist b/mail/mew/pkg-plist
index 8b6e2d4a7494..ccaf1f844565 100644
--- a/mail/mew/pkg-plist
+++ b/mail/mew/pkg-plist
@@ -9,118 +9,156 @@ info/mew.info
 info/mew.info-1
 info/mew.info-2
 info/mew.info-3
-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
-%%EMACS_LISPDIR%%/mew-emacs-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
-share/examples/mew/Addrbook
-share/examples/mew/dot.emacs/dot.emacs.el
-share/examples/mew/user-install
-@dirrm share/examples/mew/dot.emacs
-@dirrm share/examples/mew
-@dirrm %%EMACS_LISPDIR%%/mew
-@unexec rmdir %D/%%EMACS_LISPDIR%% 2>/dev/null || true
-@dirrm share/doc/mew/contrib
-@dirrm share/doc/mew
+%%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%%/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 %%MEW_DOCDIR%%/patches
+@dirrm %%MEW_DOCDIR%%/contrib
+@dirrm %%MEW_DOCDIR%%
diff --git a/mail/mew/scripts/configure b/mail/mew/scripts/configure
new file mode 100644
index 000000000000..f82ebf02a074
--- /dev/null
+++ b/mail/mew/scripts/configure
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+for i in ${TARGETS}; do
+    if [ -f ${WRKDIR}/${i}.in ]; then
+	cat ${WRKDIR}/${i}.in | \
+	    sed \
+		-e "s;%%LOCALBASE%%;${LOCALBASE};g" \
+		-e "s;%%EMACS_LIBDIR%%;${EMACS_LIBDIR};g" \
+		-e "s;%%EMACS_SETUPEL%%;${EMACS_SETUPEL};g" \
+	    > ${WRKDIR}/${i}
+    fi
+done