Update to 1.94.1.

PR:		ports/15627
Submitted by:	KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>

14 files changed, 405 insertions, 103 deletions

diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index d11b19ff5fa5..c9754ca79464 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for: Mew
-# Version required:	1.94
+# Version required:	1.94.1
 # Date created:		21 November 1997
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
@@ -20,29 +20,34 @@ RESTRICTED=	"USA ITAR export restrictions (has PGP hooks)"
 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}
+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=${VERSION} \
+		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_LST}
-PLIST=		${PKGDIR}/PLIST.${EMACS_PORT_NAME}
+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/patches
+SCRIPTDIR=	${.CURDIR}/../mew/scripts
+FILESDIR=	${.CURDIR}/../mew/files
 
-VERSION=		1.94
+VERSION=		1.94.1
 EMACS_PORT_NAME?=	emacs
 SAMPLEFILES=		Addrbook
 SAMPLEDOTEMACS=		dot.emacs.el
-TMPL_FILES=		user-install
 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}
@@ -56,6 +61,8 @@ 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")
 EMACS_NAME=		emacs
 EMACS_VER=		19.34
@@ -65,7 +72,9 @@ 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_INFODIR=		info
+EMACS_SITELISPDIR=	${EMACS_LIBDIR}/site-lisp
+SITE_STARTUP_FILE=	mew-startup.el
 .elif (${EMACS_PORT_NAME} == "emacs20")
 EMACS_NAME=		emacs
 EMACS_VER=		20.5
@@ -75,7 +84,7 @@ 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_INFODIR=		info
 .elif (${EMACS_PORT_NAME} == "mule")
 EMACS_NAME=		mule
 EMACS_VER=		19.34
@@ -86,6 +95,8 @@ 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")
 EMACS_NAME=		xemacs
 EMACS_VER=		19.16
@@ -94,8 +105,10 @@ 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
+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")
 EMACS_NAME=		xemacs
 EMACS_VER=		20.4
@@ -104,8 +117,10 @@ 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_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")
 EMACS_NAME=		xemacs
 EMACS_VER=		21.1.7
@@ -124,7 +139,7 @@ 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_VER=		21.1.8
 EMACS_MAJOR_VER=	21
 EMACS_CMD=		${EMACS_NAME}-${EMACS_VER}
 EMACS_LIBDIR=		lib/${EMACS_NAME}
@@ -142,70 +157,80 @@ EMACS_INFODIR=		${EMACS_PKG_INFODIR}
 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
+.if (${EMACS_NAME} == "xemacs") && ${EMACS_MAJOR_VER} > 20
+INST_TARGET_LIST=	install-package
 XEMACS_VER_OVER20=	yes
-.endif
 .else
-INST_TARGET_LST=	install install-info
+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} == "xemacs-mule")
-INST_TARGET_LST+=	install-jinfo
+INST_TARGET_LIST+=	install-jinfo
 .endif
 
-pre-configure:
-	${MKDIR} ${WRKTMPDIR}
-
 post-configure:
+	@${MKDIR} ${WRKTMPDIR}
 	@cd ${FILESDIR}; \
-	${CP} ${SAMPLEFILES} ${SAMPLEDOTEMACS} ${WRKTMPDIR}
+	${CP} ${SAMPLEFILES} ${WRKTMPDIR}
 
 pre-install:
+	${ENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/tmpl2file.sh
 	@${MKDIR} ${ELISPDIR} ${INFODIR}
 .if (${EMACS_NAME} == "xemacs")
-	@${MKDIR} ${PREFIX}/${EMACS_ETCDIR}/mew/etc
+	@${MKDIR} ${ETCDIR}/etc
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PORTDOCDIR}/contrib
-	cd ${WRKSRC}; \
+	@${MKDIR} ${PORTDOCDIR}/contrib
+	@cd ${WRKSRC}; \
 	${INSTALL_DATA} ${PORTDOCS} ${PORTDOCDIR}; \
 	${INSTALL_DATA} contrib/* ${PORTDOCDIR}/contrib
-	${MKDIR} ${SAMPLEDIR}/dot.emacs
-	cd ${WRKTMPDIR}; \
+	@${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; \
+.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}
-.endif
-.else
-	${INSTALL_DATA} ${WRKSRC}/info/*.texi ${PORTDOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/info/*.texi ${PORTDOCDIR}
+.elif (${EMACS_NAME} != "xemacs")
+	@${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
+.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
 .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
+.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
+	${ENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=DESCR \
+		${SH} ${FILESDIR}/tmpl2file.sh
+	${ENV} ${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}" \
+		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
+.endif
+	${INSTALL} -c -m 644 -o kiri -g staff ${WRKPLIST} ${PLIST}
+
 .include <bsd.port.mk>
diff --git a/mail/mew/distinfo b/mail/mew/distinfo
index 19b676450930..41d137c6db3d 100644
--- a/mail/mew/distinfo
+++ b/mail/mew/distinfo
@@ -1 +1 @@
-MD5 (mew-1.94.tar.gz) = c23ca80800ff703b6d5db71a54984c16
+MD5 (mew-1.94.1.tar.gz) = 35e300b57fadfddb1c1782af13e00cfa
diff --git a/mail/mew/files/DESCR.tmpl b/mail/mew/files/DESCR.tmpl
new file mode 100644
index 000000000000..2590a86452bb
--- /dev/null
+++ b/mail/mew/files/DESCR.tmpl
@@ -0,0 +1,20 @@
+Mew is a "Message interface to Emacs Window" to integrate
+
+   - Email
+   - NetNews
+   - MIME(Multipurpose Internet Mail Extensions)
+   - PGP(Pretty Good Privacy)
+
+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%%). 
+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%%) 
+	Lisp directory : %%ELISPDIR%%
+	Info directory : %%INFODIR%%
+	ETC directory  : %%ETCDIR%%
diff --git a/mail/mew/files/dot.emacs.el.tmpl b/mail/mew/files/dot.emacs.el.tmpl
new file mode 100644
index 000000000000..8cfe348595fa
--- /dev/null
+++ b/mail/mew/files/dot.emacs.el.tmpl
@@ -0,0 +1,95 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Mew ;;;;;;;;;
+;;;       Mew (Ver.%%version%%)                                             ;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;
+;;; Site configuration
+;;;
+%%REQUIRE%%
+(autoload 'mew "mew" nil t)
+(autoload 'mew-send "mew" nil t)
+(setq mew-mail-domain-list '("%%nameserver%%"))
+(setq mew-icon-directory "%%emacsdir%%/etc/mew")
+;;;
+;;; Window tips
+;;;
+;; If you use XEmacs and your video chip provides only limited
+;; color map(e.g. 256), put the following line to avoid exhaustion
+;; of colors.
+;(setq mew-demo-picture nil)
+(cond
+ ((string-match "XEmacs" emacs-version)
+;  (setq url-be-asynchronous t)
+;  (setq-default buffer-file-coding-system 'iso-2022-jp)
+;  (setq keyboard-coding-system    'iso-2022-jp)
+;  (setq terminal-coding-system    'iso-2022-jp)
+  (add-menu-item '("Apps") "Read Mail (Mew)" 'mew t "Read Mail (VM)...")
+  (add-menu-item '("Apps") "Send Mail (Mew)" 'mew-send t "Read Mail (VM)...")
+;  (delete-menu-item '("Apps" "Read Mail (VM)..."))
+;  (delete-menu-item '("Apps" "Read Mail (MH)..."))
+;  (delete-menu-item '("Apps" "Send mail..."))
+  (setq toolbar-mail-reader 'Mew)
+  (setq toolbar-mail-commands-alist
+	(cons '(Mew . mew) toolbar-mail-commands-alist))
+  )
+ ((string< "20" emacs-version)
+;  (setq standard-fontset-spec14
+;	"-*-fixed-medium-r-normal-*-14-*-*-*-*-*-fontset-standard")
+;  (create-fontset-from-fontset-spec standard-fontset-spec14 nil 'noerror)
+;  (set-default-font standard-fontset-spec14)
+  (setup-japanese-environment)
+  )
+ (t ;; Mule 2.3 or Emacs 19
+  )
+ )
+;;;
+;;; Citation tip
+;;;
+(setq mew-cite-fields '("From:" "Subject:" "Date:" "Message-ID:"))
+(setq mew-cite-format "From: %s\nSubject: %s\nDate: %s\nMessage-ID: %s\n\n")
+(setq mew-cite-prefix-function 'mew-cite-prefix-username)
+;(setq mew-cite-fields '("Message-ID:" "From:"))
+;(setq mew-cite-format "Message-ID: %s の記事にて\n%s さんは書かれました :\n\n")
+;; Change citation according to the message body language.
+;(setq mew-cite-fields '("Message-ID:" "From:"))
+;(defadvice mew-draft-cite (before my-add activate)
+;  (save-excursion
+;    (set-buffer (or mew-message-citation-buffer (mew-buffer-message)))
+;    (if (string= (mew-charset-guess-region (point-min) (point-max))
+;                 "us-ascii" )
+;        ;; us-ascii
+;        (setq mew-cite-format "In Message-ID: %s\n%s wrote  :\n\n")
+;      ;; others
+;      (setq mew-cite-format "Message-ID: %s の記事にて\n%s さんは書かれました :\n\n") )))
+;;;
+;;; Signature tip
+;;;
+;; Change signature according to the message body language.
+;(setq mew-signature-file "~/.signature")
+;(make-local-variable 'mew-signature-file)
+;(defadvice mew-draft-insert-signature (before my-add activate)
+;  ;; 本文が英語なら mew-signature-file に ~/.signature.eng を代入する。
+;  ;; 本文が英語以外なら mew-signature-file に ~/.signature を代入する。
+;  ;; ~/.signature.eng に英語用の署名を書いておくこと。
+;  (save-match-data
+;    (let ((eng (string-match "\\.eng$" mew-signature-file)))
+;      (if (string= (mew-charset-guess-region (point-min) (point-max))
+;                   "us-ascii" )
+;          (if (not eng)
+;              (setq mew-signature-file (concat mew-signature-file ".eng")) )
+;        (if eng
+;            (setq mew-signature-file (substring mew-signature-file 0 -4)) )))))
+;
+(setq mew-signature-insert-last t)
+(add-hook 'mew-send-hook 'mew-draft-insert-signature)
+;;;
+;;; Thread tip
+;;;
+;; Now threading is insufficient,but partially makes enough by comment out following line.
+;(setq mew-prog-imls-arg-list '("--thread=yes" "--indent=2"))
+;;;
+;;; Miscellaneous
+;;;
+(setq mew-underline-lines-use t)
+(setq mew-use-highlight-body t)
+;; If you use Wnn4/6,sj3 or Canna, comment out following line.
+;(setq mew-use-overlay-keymap nil)
diff --git a/mail/mew/files/message.sh b/mail/mew/files/message.sh
new file mode 100644
index 000000000000..c2720cc73d73
--- /dev/null
+++ b/mail/mew/files/message.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+ 
+if [ -z "${SITE_STARTUP_FILE}" ]; then
+    ${CAT} <<EOF > ${WRKTMPDIR}/MESSAGE
+*************************************************************************
+* You must set at least following elisps 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"))        *
+*                                                                       *
+*************************************************************************
+EOF
+else
+    ${CAT} <<EOF > ${WRKTMPDIR}/MESSAGE
+*************************************************************************
+* You must set at least following elisps to your own dot.emacs file:    *
+*                                                                       *
+*       (require 'mew-${EMACS_PORT_NAME}-startup)                                  *
+*       (autoload 'mew "mew" nil t)                                     *
+*       (autoload 'mew-send "mew" nil t)                                *
+*       (setq mew-mail-domain-list '("Name_Server_Domain_Name"))        *
+*                                                                       *
+*************************************************************************
+EOF
+fi    
diff --git a/mail/mew/files/mew-startup.el.tmpl b/mail/mew/files/mew-startup.el.tmpl
new file mode 100644
index 000000000000..e0c7a1db42d3
--- /dev/null
+++ b/mail/mew/files/mew-startup.el.tmpl
@@ -0,0 +1,2 @@
+(setq load-path (cons "%%ELISPDIR%%" load-path))
+(provide 'mew-%%EMACS_PORT_NAME%%-startup)
diff --git a/mail/mew/files/mew-xemacs-startup.el.tmpl b/mail/mew/files/mew-xemacs-startup.el.tmpl
new file mode 100644
index 000000000000..a78dc54520e9
--- /dev/null
+++ b/mail/mew/files/mew-xemacs-startup.el.tmpl
@@ -0,0 +1,3 @@
+(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 63a688d7472f..cd5eb362c550 100644
--- a/mail/mew/files/patch-aa
+++ b/mail/mew/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Fri Aug 27 12:23:59 1999
-+++ Makefile	Mon Aug 30 23:09:10 1999
-@@ -88,12 +88,28 @@
+--- Makefile~	Wed Oct 20 20:20:51 1999
++++ Makefile	Fri Dec 10 22:42:06 1999
+@@ -88,12 +88,29 @@
  	mew-temacs.el   mew-xemacs.el  mew-addrbook.el \
  	mew.el
  
@@ -19,6 +19,7 @@
 +	etc/mew-curr.xpm	etc/mew-folder.xpm	etc/mew-inc2.xpm	\
 +	etc/mew-kill.xpm
 +
++
  TEMPFILE = temp.el
  
  CP = cp
@@ -29,10 +30,10 @@
  
  all: $(OBJS)
  	@echo 'Compiling EL files of Mew ... '
-@@ -111,8 +127,8 @@
- 	@echo ')))' >> $(TEMPFILE)
- 
- install: $(OBJS)
+@@ -114,8 +131,8 @@
+ 	-@if [ ! -d $(ELISPDIR) ]; then \
+ 		$(MKDIR) $(ELISPDIR); \
+ 	fi; \
 -	$(CP) $(SRCS) $(ELISPDIR)
 -	$(CP) $(OBJS) $(ELISPDIR)
 +	${BSD_INSTALL_DATA} $(SRCS) $(ELISPDIR)
@@ -40,7 +41,7 @@
  	cd $(BIN); $(MAKE) install CFLAGS="$(CFLAGS)" CC="$(CC)" BINDIR="$(BINDIR)"
  
  clean:
-@@ -123,19 +139,32 @@
+@@ -126,19 +143,32 @@
  	cd info; $(MAKE) info EMACS=$(EMACS)
  
  install-info:
diff --git a/mail/mew/files/patch-ac b/mail/mew/files/patch-ac
index 63afdc7bac4d..ee8b3c4d73a8 100644
--- a/mail/mew/files/patch-ac
+++ b/mail/mew/files/patch-ac
@@ -1,5 +1,5 @@
---- info/Makefile.orig	Wed Aug 25 17:56:29 1999
-+++ info/Makefile	Mon Aug 30 23:14:43 1999
+--- info/Makefile.orig	Wed Oct 20 20:20:56 1999
++++ info/Makefile	Fri Dec 10 22:45:46 1999
 @@ -32,6 +32,7 @@
  
  INFO  = mew.info mew.info-1 mew.info-2 mew.info-3
@@ -8,10 +8,10 @@
  
  info::
  	sed -e 's/@setfilename mew.jis.info/@setfilename mew.info/' \
-@@ -52,20 +53,25 @@
- 		-f batch-texinfo-format mew.texi
- 
- install-info:
+@@ -55,8 +56,8 @@
+ 	-@if [ ! -d $(INFODIR) ]; then \
+ 		$(MKDIR) $(INFODIR); \
+ 	fi; \
 -	cp $(INFO) $(INFODIR)
 -	-@if [ -x "$(INSTALLINFO)" ]; then \
 +	${BSD_INSTALL_DATA} $(INFO) $(INFODIR)
@@ -19,9 +19,10 @@
  		$(INSTALLINFO) mew.info $(INFODIR)/dir; \
  	else \
  		echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
- 	fi
- 
- install-jinfo:
+@@ -66,12 +67,17 @@
+ 	-@if [ ! -d $(INFODIR) ]; then \
+ 		$(MKDIR) $(INFODIR); \
+ 	fi; \
 -	cp $(JINFO) $(INFODIR)
 -	-@if [ -x "$(INSTALLINFO)" ]; then \
 +	${BSD_INSTALL_DATA} $(JINFO) $(INFODIR)
diff --git a/mail/mew/files/tmpl2file.sh b/mail/mew/files/tmpl2file.sh
new file mode 100644
index 000000000000..3a61fbc90014
--- /dev/null
+++ b/mail/mew/files/tmpl2file.sh
@@ -0,0 +1,26 @@
+#!/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" \
+		-e "s,%%EMACS_CMD%%,${EMACS_CMD},g" \
+		-e "s,%%PKGNAME%%,${PKGNAME},g" \
+		-e "s,%%EMACS_PORT_NAME%%,${EMACS_PORT_NAME},g" \
+		-e "s,%%VERSION%%,${VERSION},g" \
+		< ${FILESDIR}/${f}.tmpl > ${WRKTMPDIR}/${f}
+done
diff --git a/mail/mew/pkg-comment b/mail/mew/pkg-comment
index 9d32cbf36953..a949d8cbc02d 100644
--- a/mail/mew/pkg-comment
+++ b/mail/mew/pkg-comment
@@ -1 +1 @@
-Message interface to Emacs Window
+Message interface to Emacs Window for emacs
diff --git a/mail/mew/pkg-descr b/mail/mew/pkg-descr
index e8ff24b9f0aa..f9ffbc8e17c7 100644
--- a/mail/mew/pkg-descr
+++ b/mail/mew/pkg-descr
@@ -9,34 +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 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. 
+This port is the Mew for emacs-19.34(mail/mew).
+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.
 
-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.5
-    ${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)
-
-- KIRIYAMA Kazuhiko
-kiri@kiri.toba-cmt.ac.jp
+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
diff --git a/mail/mew/pkg-message b/mail/mew/pkg-message
index 138202f65021..448d471d35cb 100644
--- a/mail/mew/pkg-message
+++ b/mail/mew/pkg-message
@@ -1,10 +1,9 @@
 *************************************************************************
-* You must set at least following elisp to your own dot.emacs file:     *
+* You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
+*       (require 'mew-emacs-startup)                                  *
 *       (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.                                    *
 *************************************************************************
diff --git a/mail/mew/pkg-plist b/mail/mew/pkg-plist
new file mode 100644
index 000000000000..8b6e2d4a7494
--- /dev/null
+++ b/mail/mew/pkg-plist
@@ -0,0 +1,126 @@
+bin/mewcat
+bin/mewdecode
+bin/mewencode
+bin/uumerge
+@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
+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