Updated to 19.4

  Added mew-xemacs21 (by Repository copy)
  Deleted mew-common

PR:		13391
Submitted by:	maintainer

11 files changed, 797 insertions, 19 deletions

diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index ad4e72aada5..f363fa06191 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,19 +1,211 @@
-# New ports collection makefile for: Mew (for emacs)
-# Version required:	1.93
-# Date created:		17 January 1998
+# New ports collection makefile for: Mew
+# Version required:	1.94
+# Date created:		21 November 1997
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	mew-emacs-1.93
+DISTNAME=	mew-${VERSION}
+PKGNAME=	mew-${EMACS_PORT_NAME}-${VERSION}
+CATEGORIES=	mail elisp
+MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/ \
+		ftp://ftp.kyushu-u.ac.jp/pub/Misc/mew/ \
+		ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
 
-EMACS_NAME=	Emacs-19.34b
-DIRSECTION=	The Emacs editor and associated tools
-DIRENTRY=	"* Mew: (mew).	Messaging in the Emacs World."
-INFOFILE=	mew.info
+MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
 
-MASTERDIR=	${.CURDIR}/../../mail/mew-common
-PKGDIR=		${.CURDIR}/pkg
+RESTRICTED=	"USA ITAR export restrictions (has PGP hooks)"
 
-.include	"${MASTERDIR}/Makefile"
+BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT_NAME}
+RUN_DEPENDS=	imali:${PORTSDIR}/mail/im
+
+SCRIPTS_ENV=	AWK=${AWK} CAT=${CAT} CP=${CP} ECHO=${ECHO} \
+		MKDIR="${MKDIR}" RM=${RM} SED=${SED} TOUCH=${TOUCH} \
+		EMACSDIR=${EMACSDIR} ELISPDIR=${ELISPDIR} \
+		SAMPLEDIR=${SAMPLEDIR} WRKTMPDIR=${WRKTMPDIR} \
+		TMPL_FILES="${TMPL_FILES}" VERSION=${VERSION}
+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_LST}
+PLIST=		${PKGDIR}/PLIST.${EMACS_PORT_NAME}
+PLIST_SUB=	EMACS_LISPDIR=${EMACS_LISPDIR} \
+		EMACS_ETCDIR=${EMACS_ETCDIR} \
+		EMACS_INFODIR=${EMACS_INFODIR} \
+		EMACS_PKGDIR=${EMACS_PKGDIR}
+
+VERSION=		1.94
+EMACS_PORT_NAME?=	emacs
+SAMPLEFILES=		Addrbook
+SAMPLEDOTEMACS=		dot.emacs.el
+TMPL_FILES=		user-install
+PORTDOCS=		00changes 00copyright 00copyright.jis 00diff 00readme
+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
+.if (${EMACS_PORT_NAME} == "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=		${EMACS_LIBDIR}/info
+.elif (${EMACS_PORT_NAME} == "emacs20")
+EMACS_NAME=		emacs
+EMACS_VER=		20.4
+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=		${EMACS_LIBDIR}/info
+.elif (${EMACS_PORT_NAME} == "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
+.elif (${EMACS_PORT_NAME} == "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}/lisp
+EMACS_INFODIR=		${EMACS_LIBDIR}/info
+.elif (${EMACS_PORT_NAME} == "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}/lisp
+EMACS_INFODIR=		${EMACS_LIBDIR}/info
+.elif (${EMACS_PORT_NAME} == "xemacs21")
+EMACS_NAME=		xemacs
+EMACS_VER=		21.1-p2
+EMACS_MAJOR_VER=	21
+EMACS_CMD=		${EMACS_NAME}-${EMACS_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} == "xemacs-mule")
+EMACS_NAME=		xemacs
+EMACS_VER=		21.1.6
+EMACS_MAJOR_VER=	21
+EMACS_CMD=		${EMACS_NAME}-${EMACS_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}
+.else
+NO_BUILD=   yes
+NO_INSTALL= yes
+.endif
+.if (${EMACS_NAME} == "xemacs")
+.if ${EMACS_MAJOR_VER} <= 20
+INST_TARGET_LST=	install install-info
+.elif ${EMACS_MAJOR_VER} > 20
+INST_TARGET_LST=	install-package
+XEMACS_VER_OVER20=	yes
+.endif
+.else
+INST_TARGET_LST=	install install-info
+.endif
+.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "mule") || \
+    (${EMACS_PORT_NAME} == "xemacs-mule")
+INST_TARGET_LST+=	install-jinfo
+.endif
+
+pre-configure:
+	${MKDIR} ${WRKTMPDIR}
+
+post-configure:
+	@cd ${FILESDIR}; \
+	${CP} ${SAMPLEFILES} ${SAMPLEDOTEMACS} ${WRKTMPDIR}
+
+pre-install:
+	@${MKDIR} ${ELISPDIR} ${INFODIR}
+.if (${EMACS_NAME} == "xemacs")
+	@${MKDIR} ${PREFIX}/${EMACS_ETCDIR}/mew/etc
+.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")
+.if ${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}
+.endif
+.else
+	${INSTALL_DATA} ${WRKSRC}/info/*.texi ${PORTDOCDIR}
+.endif
+.endif
+	@if [ ! -f ${INFODIR}/info/dir ]; then \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${INFODIR}/dir; \
+	fi
+.if (${EMACS_NAME} == "xemacs")
+.if ${EMACS_MAJOR_VER} > 20
+.else
+	install-info ${WRKSRC}/info/mew.info ${INFODIR}/dir
+.endif
+.else
+	install-info ${WRKSRC}/info/mew.info ${INFODIR}/dir
+.endif
+.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "mule")
+	install-info ${WRKSRC}/info/mew.jis.info ${INFODIR}/dir
+.endif
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/mail/mew/distinfo b/mail/mew/distinfo
new file mode 100644
index 00000000000..19b67645093
--- /dev/null
+++ b/mail/mew/distinfo
@@ -0,0 +1 @@
+MD5 (mew-1.94.tar.gz) = c23ca80800ff703b6d5db71a54984c16
diff --git a/mail/mew/files/Addrbook b/mail/mew/files/Addrbook
new file mode 100644
index 00000000000..45ad31e9223
--- /dev/null
+++ b/mail/mew/files/Addrbook
@@ -0,0 +1,25 @@
+; See comments at end of this file
+; This file is almost empty as MH now supports personal aliases.
+
+;everyone: *
+
+; Blank lines and lines beginning with a ; are ignored.
+; < file	-> read more aliases from "file"
+; foo: fum      -> simple replacement
+; foo: fum, fie -> list replacement
+; foo: < file   -> list replacement from "file"
+; foo: = group  -> list replacement from UNIX group
+; foo: + group  -> list replacement by ALL users in /etc/passwd
+;		      with gid == group
+; foo: *        -> list replacement by ALL users in /etc/passwd
+;                     with uid >= 200
+; foo*: fum     -> matches foo<string> (including the empty string)
+;
+; using a ';' instead of a ':' indicates that the alias should be displayed
+; along with the addresses used (normally, the addresses replace the alias
+; completely)
+ML-FreeBSD: FreeBSD-users-jp@jp.freebsd.org
+ML-fvwm:    fvwm-users-jp@skylark.ics.es.osaka-u.ac.jp
+ML-SKK:     skk@sato.kuis.kyoto-u.ac.jp
+ML-infotalk:infotalk-request@square.brl.ntt.jp
+ML-skkfep:  skkfep@chanchan.suri.co.jp
diff --git a/mail/mew/files/patch-aa b/mail/mew/files/patch-aa
new file mode 100644
index 00000000000..63a688d7472
--- /dev/null
+++ b/mail/mew/files/patch-aa
@@ -0,0 +1,79 @@
+--- Makefile.orig	Fri Aug 27 12:23:59 1999
++++ Makefile	Mon Aug 30 23:09:10 1999
+@@ -88,12 +88,28 @@
+ 	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
++
+ TEMPFILE = temp.el
+ 
+ CP = cp
+ RM = rm -f
+ MKDIR = mkdir -p
+ BIN = bin
++ETC=	etc
+ 
+ all: $(OBJS)
+ 	@echo 'Compiling EL files of Mew ... '
+@@ -111,8 +127,8 @@
+ 	@echo ')))' >> $(TEMPFILE)
+ 
+ install: $(OBJS)
+-	$(CP) $(SRCS) $(ELISPDIR)
+-	$(CP) $(OBJS) $(ELISPDIR)
++	${BSD_INSTALL_DATA} $(SRCS) $(ELISPDIR)
++	${BSD_INSTALL_DATA} $(OBJS) $(ELISPDIR)
+ 	cd $(BIN); $(MAKE) install CFLAGS="$(CFLAGS)" CC="$(CC)" BINDIR="$(BINDIR)"
+ 
+ clean:
+@@ -123,19 +139,32 @@
+ 	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}
+ 
+ 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}
++
++install-man:
++	cd info; $(MAKE) install-man MANDIR=$(MANDIR)
+ 
+ install-etc:
+ 	-@if [ ! -d $(ETCDIR) ]; then \
+-		$(MKDIR) $(ETCDIR); \
++		$(MKDIR) $(ETCDIR)/etc; \
+ 	fi; \
+-	cd etc; $(CP) -r * $(ETCDIR)/
++	cd etc; \
++	${BSD_INSTALL_DATA} ${PIXMAPS} ${ETCDIR}; \
++	${BSD_INSTALL_DATA} ${PIXMAPSETC} ${ETCDIR}/etc
++
++
++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
+ 
+ ##
+ ## End of Makefile
diff --git a/mail/mew/files/patch-ab b/mail/mew/files/patch-ab
new file mode 100644
index 00000000000..1524e237e0c
--- /dev/null
+++ b/mail/mew/files/patch-ab
@@ -0,0 +1,23 @@
+--- bin/Makefile.orig	Tue Mar  2 12:05:21 1999
++++ bin/Makefile	Mon Aug 30 22:50:21 1999
+@@ -21,16 +21,16 @@
+ 	$(CC) -o $@ $(OBJS)
+ 	$(RM) $(ALT)
+ 	for f in $(ALT); do \
+-	  ln $(PRG) $${f}; done
++	  ln -sf $(PRG) $${f}; done
+ 
+ uumerge: uumerge.in
+ 	sed -e "s|@PERL@|${PERL}|" < uumerge.in > uumerge
+ 
+ install: $(PRG) $(OTH)
+-	cp $(PRG) $(BINDIR)
++	${BSD_INSTALL_PROGRAM} $(PRG) $(BINDIR)
+ 	for f in $(ALT); do \
+-	  $(RM) $(BINDIR)/$${f}; ln $(BINDIR)/$(PRG) $(BINDIR)/$${f}; done
+-	cp $(OTH) $(BINDIR)
++	  $(RM) $(BINDIR)/$${f}; ln -sf $(BINDIR)/$(PRG) $(BINDIR)/$${f}; done
++	${BSD_INSTALL_SCRIPT} $(OTH) $(BINDIR)
+ 
+ clean:
+ 	$(RM) $(OBJS) $(PRG) $(ALT) $(OTH)
diff --git a/mail/mew/files/patch-ac b/mail/mew/files/patch-ac
new file mode 100644
index 00000000000..63afdc7bac4
--- /dev/null
+++ b/mail/mew/files/patch-ac
@@ -0,0 +1,40 @@
+--- info/Makefile.orig	Wed Aug 25 17:56:29 1999
++++ info/Makefile	Mon Aug 30 23:14:43 1999
+@@ -32,6 +32,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
++MANUALS= 00readme mew.texi
+ 
+ info::
+ 	sed -e 's/@setfilename mew.jis.info/@setfilename mew.info/' \
+@@ -52,20 +53,25 @@
+ 		-f batch-texinfo-format mew.texi
+ 
+ install-info:
+-	cp $(INFO) $(INFODIR)
+-	-@if [ -x "$(INSTALLINFO)" ]; then \
++	${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."; \
+ 	fi
+ 
+ install-jinfo:
+-	cp $(JINFO) $(INFODIR)
+-	-@if [ -x "$(INSTALLINFO)" ]; then \
++	${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."; \
+ 	fi
++
++install-man:
++	${MKDIR} ${MANDIR}
++	${BSD_INSTALL_DATA} ${MANUALS} ${MANDIR}
++
+ ##
+ ## End of Makefile
+ ##
diff --git a/mail/mew/files/patch-ad b/mail/mew/files/patch-ad
new file mode 100644
index 00000000000..4a2dedb620c
--- /dev/null
+++ b/mail/mew/files/patch-ad
@@ -0,0 +1,13 @@
+--- mew-xemacs.el~	Mon Aug 30 12:43:16 1999
++++ mew-xemacs.el	Mon Aug 30 20:58:26 1999
+@@ -30,8 +30,8 @@
+   (defvar mew-summary-toolbar nil)
+   (defvar mew-draft-toolbar nil))
+  (t
+-  (defvar mew-icon-directory nil)
+-
++  (defvar mew-icon-directory (if (fboundp 'locate-data-directory)
++				 (locate-data-directory "mew")))
+   (defvar mew-icon-separate
+     (toolbar-make-button-list
+      (expand-file-name "mew-sep.xpm" mew-icon-directory)))
diff --git a/mail/mew/files/user-install.tmpl b/mail/mew/files/user-install.tmpl
new file mode 100644
index 00000000000..ee1a7ad4d9f
--- /dev/null
+++ b/mail/mew/files/user-install.tmpl
@@ -0,0 +1,374 @@
+#!/bin/sh
+
+PREFIX=%%PREFIX%%
+EMACSDIR=%%EMACSDIR%%
+ELISPDIR=%%ELISPDIR%%
+SAMPLEDIR=%%SAMPLEDIR%%
+
+AWK=%%AWK%%
+CAT=%%CAT%%
+CP=%%CP%%
+ECHO=%%ECHO%%
+MKDIR="%%MKDIR%%"
+RM=%%RM%%
+SED=%%SED%%
+TOUCH=%%TOUCH%%
+DIALOG=/usr/bin/dialog
+
+select()
+{
+	local Language key
+	Language="\
+Choose a language when you write mails.\n\
+    (Now is \"${language}\" selected.)"
+	${DIALOG} --title "Choose the Language" \
+	--hline "Select Items and Quit when finished" \
+	--menu "${Language}" -1 -1 2 \
+	English		"English" \
+	Japanese	"japanese" \
+		2>	/tmp/menu.$$
+	retval=$?
+	key=`${CAT} /tmp/menu.$$|${SED} -e 's/\"//g'`
+	${RM} -f /tmp/menu.$$
+	case $retval in
+		0) if [ -z ${key} ]; then return; fi ;;
+		1) return ;;
+		255) return ;;
+	esac
+	language=${key}
+#	echo citation:key=${key},dot_emacs=${dot_emacs}>>/tmp/temp
+}
+
+input_data()
+# argument No.1 ($1) : Key words (string)
+# argument No.2 ($2) : Variable for the Key words (string)
+# argument No.3 ($3) : unit for the variable (string)
+{
+	local key
+#	echo '$1='$1
+#	echo '$2='$2
+#	echo '$3='$3
+#	exit 1
+#	echo '${nameserver}='${mail_address}
+#	eval echo '${'$2'}'
+	eval key='${'$2'}'
+#	echo key=${key}
+#	exit 1
+	if [ ! -z ${key} ]; then
+		${DIALOG} --title "Confirm $1" \
+		--hline "Press Yes/No" \
+		--yesno "$1 $3 has set \"${key}\". Is this OK?" -1 -1
+		retval=$?
+		if [ X"${retval}" = "X0" -o X"${retval}" = "X255" ]; then  return; fi
+	fi
+	${DIALOG} --title "Set $1 $3" \
+	--hline "Write $1 $3" \
+	--inputbox "Specify $1 $3" -1 -1 \
+		2>  /tmp/input.$$
+	eval $2=`${CAT} /tmp/input.$$`
+	${RM} -f /tmp/input.$$
+}
+
+options()
+{
+	local Options keys del_keys
+	Options="\
+Please select Mew functions that you want to. To select a function, \n\
+use the arrow keys to move to it and press [SPACE]. To de-select it, \n\
+press [SPACE] again.  Select OK or Cancel to leave this menu."
+	del_keys="Highlight Citation Cite_Change Sign_Change"
+	${DIALOG} --title "Select Mew functions" \
+	--hline "" \
+	--checklist "${Options}" -1 -1 4 \
+	Highlight	"highlight body for Mew(Japanese)" ${options_Highlight} \
+	Citation	"Citation with the mail." ${options_Citation} \
+	Cite_Change	"Change citation English <--> Japanese." ${options_Cite_Change} \
+	Sign_Change	"Change signature English <--> Japanese." ${options_Sign_Change} \
+		2> /tmp/checklist.$$
+	retval=$?
+	keys=`${CAT} /tmp/checklist.$$|${SED} -e 's/\"//g'`
+	${RM} -f /tmp/checklist.$$
+	case $retval in
+		1)   return ;;
+		255) return ;;
+	esac
+	dot_emacs=""
+#	echo keys=$keys
+	for k in ${keys}; do
+		del_keys=`${ECHO} ${del_keys}|${SED} -e "s/ *${k}//g"`
+#		echo del_keys=${del_keys}
+#		echo k=$k
+		case ${k} in
+		Highlight)
+			dot_emacs="${dot_emacs} dot.emacs-highlight-body.el"
+			options_Highlight=ON
+			;;
+		Citation)
+			citation
+#			echo options:key=${k},dot_emacs=${dot_emacs}>>/tmp/temp
+			options_Citation=ON
+			;;
+		Cite_Change)
+			dot_emacs="${dot_emacs} dot.emacs-cite-change.el"
+			options_Cite_Change=ON
+			;;
+		Sign_Change)
+			dot_emacs="${dot_emacs} dot.emacs-signature-change.el"
+			options_Sign_Change=ON
+			;;
+		esac
+	done
+#	exit 1
+	for k in ${del_keys}; do
+#		echo k=$k
+		case ${k} in
+		Highlight)
+			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-highlight-body\.el//"`
+			options_Highlight=OFF
+			;;
+		Citation)
+			options_Citation=OFF
+			;;
+		Cite_Change)
+			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-cite-change\.el//"`
+			options_Cite_Change=OFF
+			;;
+		Sign_Change)
+			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-signature-change\.el//"`
+			options_Sign_Change=OFF
+			;;
+		esac
+	done
+#	echo dot_emacs=${dot_emacs}
+#	echo del_keys=${del_keys}
+#	exit 1
+}
+
+citation()
+{
+	dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-cite.[a-z]*//g"`
+	case ${language} in
+	English)
+		dot_emacs="${dot_emacs} dot.emacs-cite.el"
+		;;
+	Japanese)
+		dot_emacs="${dot_emacs} dot.emacs-cite.ja.el"
+		;;
+	esac
+#	echo citation:key=${key},dot_emacs=${dot_emacs}>>/tmp/temp
+}
+
+case ${TERM} in
+emacs)
+	${ECHO} "Here is \"Emacs\" shell. Try on other terminal."
+	exit 1
+	;;
+esac
+
+version="%%VERSION%%"
+#version="1.92"
+
+SEDCMD='${SED}
+	-e "s,%%prefix%%,${PREFIX},g"
+	-e "s,%%emacsdir%%,${EMACSDIR},g"
+	-e "s,%%elispdir%%,${ELISPDIR},g"
+	-e "s,%%version%%,${version},g"
+	-e "s,%%nameserver%%,${nameserver},g"
+	-e "s,%%mail_address%%,${mail_address},g"
+	-e "s,%%domain_name%%,${domain_name},g"
+	-e "s,%%default_domain_name%%,${default_domain_name},g"
+	-e "s,%%signature%%,${signature},g"'
+
+###
+# Check ~/.backup directory exist.
+#
+${MKDIR} ${HOME}/.backup
+
+###
+# Backup all files.
+#
+${CP} ${HOME}/${dot_emacs_file} ${HOME}/.backup/${dot_emacs_file}.$$
+${CP} ${HOME}/.im/Config ${HOME}/.backup/Config.$$
+
+###
+# Check ~/.im/Config file exist.
+#
+if [ ! -f ${HOME}/.im/Config ]; then
+	${ECHO} "${HOME}/.im/Config: Not found. Do imsetup first."
+	exit 1
+else
+	mail_address=`${AWK} '/^Address=/{sub(/^Address=/,"");print}' ${HOME}/.im/Config`
+	domain_name=`${AWK} '/^FromDomain=/{sub(/^FromDomain=/,"");print}' ${HOME}/.im/Config`
+	default_domain_name=`${AWK} '/^ToDomain=/{sub(/^ToDomain=/,"");print}' ${HOME}/.im/Config`
+	if [ X"${mail_address}" = "X%%mail_address%%" ]; then
+		mail_address=""
+	else
+		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
+		${SED} -e 's/^\(Address=\).*$/\1%%mail_address%%/' \
+			< ${HOME}/.backup/Config > ${HOME}/.im/Config
+	fi
+	if [ X"${domain_name}" = "X%%domain_name%%" ]; then
+		domain_name=""
+	else
+		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
+		${SED} -e 's/^\(FromDomain=\).*$/\1%%domain_name%%/' \
+			< ${HOME}/.backup/Config > ${HOME}/.im/Config
+	fi
+	if [ X"${default_domain_name}" = "X%%default_domain_name%%" ]; then
+		default_domain_name=""
+	else
+		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
+		${SED} -e 's/^\(ToDomain=\).*$/\1%%default_domain_name%%/' \
+			< ${HOME}/.backup/Config > ${HOME}/.im/Config
+	fi
+fi
+
+###
+# Copy "aliases" if none
+#
+if [ ! -f ${HOME}/.im/Aliases ]; then	
+	${CP} ${SAMPLEDIR}/Aliases ${HOME}/.im
+fi
+
+###
+# Set user environment : nameserver, signature
+#
+options_Highlight=OFF
+options_Citation=OFF
+options_Cite_Change=OFF
+options_Sign_Change=OFF
+language=English
+dot_emacs_file=.emacs
+
+PreSet="\
+This is the main menu of the Mew configuration pre-settings. Please \n\
+select one of the options below by using the arrow keys or typing the \n\
+first character of the option name you intend to set. Invoke an option \n\
+by pressing [ENTER] or [TAB-ENTER] to exit the settings."
+
+answer=None
+while [ ! X"${answer}" = "XQuit" ]; do
+	${DIALOG} --title "Pre-set Mew configurations" \
+	--hline "To select an item press [Enter] on the item" \
+	--menu "${PreSet}" -1 -1 3 \
+	Language	"Determine language in use on Mew" \
+	DotEmacs	"Choose dot.emacs files being to use" \
+	Quit		"Quit this menu" \
+		2>	/tmp/menu.$$
+	retval=$?
+	answer=`${CAT} /tmp/menu.$$|${SED} -e 's/\"//g'`
+	${RM} -f /tmp/menu.$$
+	case $retval in
+		0) if [ -z ${answer} ]; then ${ECHO} "Nothing selected"; contiue; fi ;;
+		1) break ;;
+		255) break ;;
+	esac
+	case ${answer} in
+		Language)
+			select
+			;;
+		DotEmacs)
+			input_data "Emacs dot.emacs file name" "dot_emacs_file" ""
+			;;
+		Quit)
+			answer=Quit
+			;;
+	esac
+done
+
+#echo language=${language}
+#echo dot_emacs_file=${dot_emacs_file}
+#exit 1
+
+MainMenu="\
+This is the main menu of the Mew configuration settings. Please select \n\
+one of the options below by using the arrow keys or typing the first \n\
+character of the option name you intend to set. Invoke an option by \n\
+pressing [ENTER] or [TAB-ENTER] to exit the settings."
+
+answer=None
+while [ ! X"${answer}" = "XQuit" ]; do
+	${DIALOG} --title "Set Mew configurations" \
+	--hline "Select Items and Quit when finished" \
+	--menu "${MainMenu}" -1 -1 6 \
+	NameServer	"Name server Domain name" \
+	MailAddress	"Your mail address (with FQDN)" \
+	DomainName	"Your domain name" \
+	DefaultDomain	"Default domain name in abbrivation" \
+	Options		"Various options on using Mew" \
+	Quit		"Quit this menu" \
+		2>	/tmp/menu.$$
+	retval=$?
+	answer=`${CAT} /tmp/menu.$$`
+	${RM} -f /tmp/menu.$$
+	case $retval in
+		0)	if [ -z ${answer} ]; then
+				${ECHO} "Nothing selected"
+				exit 1
+			fi
+			;;
+		1)	${ECHO} "Cancel pressed."
+			exit 1
+			;;
+		255)	${ECHO} "ESC pressed."
+			exit 1
+			;;
+	esac
+	case ${answer} in
+		NameServer)
+			input_data "Name Server" "nameserver" ""
+			;;
+		MailAddress)
+			input_data "Mail Address" "mail_address" ""
+			;;
+		DomainName)
+			input_data "Domain Name" "domain_name" ""
+			;;
+		DefaultDomain)
+			input_data "Default Domain Name" "default_domain_name" ""
+			;;
+		Options)
+#			options
+			;;
+		Quit)
+			answer=Quit
+			;;
+	esac
+done
+
+#echo 'nameserver='${nameserver}
+#echo 'mail_address='${mail_address}
+#echo 'domain_name='${domain_name}
+#echo 'defaut_domain_name='${default_domain_name}
+
+#exit 1
+
+###
+# Custumize startup files with selected options.
+#
+dot_emacs="dot.emacs.el ${dot_emacs}"
+eval ${SEDCMD} < ${HOME}/.im/Config > ${HOME}/.backup/Config
+
+###
+# Add Mew startup setting to ~/.emacs
+#
+if [ -f ${dot_emacs_file} ]; then
+    ${SED} -e '/^;;;* Mew ;*$/,/^;;; *Mew end$/d' < ${HOME}/${dot_emacs_file} \
+	> ${HOME}/.backup/${dot_emacs_file}
+else
+    ${ECHO} "Create new \"dot.emacs\" file: ${dot_emacs_file}"
+fi
+
+#echo 'dot_emacs='${dot_emacs}
+for f in ${dot_emacs}; do
+	${CAT} ${SAMPLEDIR}/dot.emacs/${f} |\
+		eval ${SEDCMD} >> ${HOME}/.backup/${dot_emacs_file}
+done
+${ECHO} ";;;                                                       Mew end" \
+	>> ${HOME}/.backup/${dot_emacs_file}
+${CP} ${HOME}/.backup/${dot_emacs_file} ${HOME}/${dot_emacs_file}
+
+###
+# Copy im Config file  to ~/.im
+#
+${CP} ${HOME}/.backup/Config ${HOME}/.im/Config
diff --git a/mail/mew/pkg-comment b/mail/mew/pkg-comment
index 179d602ccb1..be2f7df1cff 100644
--- a/mail/mew/pkg-comment
+++ b/mail/mew/pkg-comment
@@ -1 +1 @@
-Message interface to Emacs Window(for emacs)
+Message interface to Emacs Window.
diff --git a/mail/mew/pkg-descr b/mail/mew/pkg-descr
index 8db24bdf905..f9352004984 100644
--- a/mail/mew/pkg-descr
+++ b/mail/mew/pkg-descr
@@ -9,13 +9,34 @@ 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.
 
-Info path and elisp load path would be set as follows :
+This port is for a commonly installed files in every other mew ports
+and DO NOT BUILD IN THIS PORT. Mew ports family consists of 7 ports
+corresponding to each "emacs" ports. Followings are those whose
+"emacs" is shown in a manner "category_name/emacs_port_name :
+emacs_pkgname" and corresponding Mew elisp site-lisp directory(elisp
+load path) and info path as well. 
 
-    Info path - ${PREFIX}/share/emacs/19.34/site-lisp/mew   
-    load path - ${PREFIX}/share/emacs/19.34/info
+editors/emacs : emacs-19.34b
+    ${PREFIX}/share/emacs/site-lisp/mew          -> mail/mew         (mew-emacs-1.94)
+    ${PREFIX}/share/emacs/info (info path)
+editors/emacs20 : emacs-20.3
+    ${PREFIX}/share/emacs/site-lisp/mew          -> mail/mew-emacs20(mew-emacs20-1.94)
+    ${PREFIX}/share/emacs/info (info path)
+editors/mule,mule-common;japanese/mule-*;korean/mule-wnn4;chinese/mule-wnn4 : mule-2.3
+    ${PREFIX}/share/mule/site-lisp/mew           -> mail/mew-mule      (mew-mule-1.94)
+    ${PREFIX}/share/mule/info (info path)
+editors/xemacs : xemacs-19.16
+    ${PREFIX}/lib/xemacs/site-lisp/mew           -> mail/mew-xemacs   (mew-xemacs-1.94)
+    ${PREFIX}/lib/xemacs/info (info path)
+editors/xemacs20 : xemacs-20.4
+    ${PREFIX}/lib/xemacs/site-lisp/mew           -> mail/mew-xemacs20
+    ${PREFIX}/lib/xemacs/info (info path)                           (mew-xemacs20-1.94)
+editors/xemacs21 : xemacs-21.1.4
+    ${PREFIX}/lib/xemacs/site-packages/lisp/mew  -> mail/mew-xemacs21
+    ${PREFIX}/lib/xemacs/site-packages/info (info path)          (mew-xemacs21-1.94)
+editors/xemacs-mule,xemacs-mule-common;japanese/xemacs-*, : xemacs-mule-21.1.6
+    ${PREFIX}/lib/xemacs/site-packages/lisp/mew  -> mail/mew-xemacs-mule 
+    ${PREFIX}/lib/xemacs/site-packages/info (info path)          (mew-xemacs-mule-1.94)
 
-Before build this port, You must be prepared Mew-common-port
-(mail/mew-common). 
-
-- Kiriyama Kazuhiko
+- KIRIYAMA Kazuhiko
 kiri@kiri.toba-cmt.ac.jp
diff --git a/mail/mew/pkg-message b/mail/mew/pkg-message
new file mode 100644
index 00000000000..138202f6502
--- /dev/null
+++ b/mail/mew/pkg-message
@@ -0,0 +1,10 @@
+*************************************************************************
+* You must set at least following elisp to your own dot.emacs file:     *
+*                                                                       *
+*       (autoload 'mew "mew" nil t)                                     *
+*       (autoload 'mew-send "mew" nil t)                                *
+*       (setq mew-mail-domain-list '("Name_Server_Domain_Name"))        *
+*                                                                       *
+* Most easy way for setting dot.emacs is to use "user-install" script   *
+* in "/usr/local/share/examples/mew.                                    *
+*************************************************************************