10 files changed, 98 insertions, 136 deletions

diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile
index 5713d111199f..3d3a0dbab140 100644
--- a/mail/mew3/Makefile
+++ b/mail/mew3/Makefile
@@ -9,21 +9,20 @@ PORTNAME=	mew
 PORTVERSION=	${MEW_VER}
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/ \
-		ftp://ftp.kyushu-u.ac.jp/pub/Misc/mew/ \
 		${MASTER_SITE_PORTS_JP}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	kiri@FreeBSD.org
-COMMENT?=	Message interface to Emacs Window (version 2) for emacs21
+COMMENT?=	Message interface to Emacs Window (version 3) for emacs21
 
 # Mew major version
-MEW_MAJOR_VER?=	2
+MEW_MAJOR_VER=	3
 
 # distfile version
-MEW_VER=	${MEW_MAJOR_VER}.2
+MEW_VER=	${MEW_MAJOR_VER}.3
 
 # document install directory by install-doc target
-MEW_DOCDIR?=	share/doc/${PORTNAME}${MEW_MAJOR_VER}
+DOCSDIR=	share/doc/${PORTNAME}${MEW_MAJOR_VER}
 
 # emacs port setup
 EMACS_PORT_NAME?=	emacs21
@@ -33,75 +32,31 @@ ALL_TARGET?=	all info jinfo
 INSTALL_TARGET?=	install install-info install-jinfo install-etc
 
 # environments
+USE_REINPLACE=	yes
+REINPLACE_ARGS=
 MAKE_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} MEW_MAJOR_VER=${MEW_MAJOR_VER}
 PLIST_SUB+=	MEW_MAJOR_VER=${MEW_MAJOR_VER}
+INFO?=		mew${MEW_MAJOR_VER} mew${MEW_MAJOR_VER}.jis
 
 # manuals
 MAN1=		mewcat.1 mewdecode.1 mewencode.1 mewls.1 incm.1
 
 post-patch:
 	for f in mew-key.el info/mew.texi; do \
-		${PERL} -i -pe 's,%%MEW_MAJOR_VER%%,${MEW_MAJOR_VER},g' ${WRKSRC}/$${f}; \
+		${REINPLACE_CMD} -i "" -E \
+			-e 's,%%MEW_MAJOR_VER%%,${MEW_MAJOR_VER},g' \
+			${WRKSRC}/$${f}; \
 	done
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${MEW_DOCDIR}
+	${MKDIR} ${PREFIX}/${DOCSDIR}
 	(cd ${WRKSRC} ; \
-		${INSTALL_DATA} 00* ${PREFIX}/${MEW_DOCDIR}/ ; \
+		${INSTALL_DATA} 00* ${PREFIX}/${DOCSDIR}/ ; \
 		for dir in contrib; do \
-			${CP} -R $${dir} ${PREFIX}/${MEW_DOCDIR}/ ; \
+			${CP} -R $${dir} ${PREFIX}/${DOCSDIR}/ ; \
 		done)
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${MEW_DOCDIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${DOCSDIR}
 .endif
 
-############################################################
-## Make DESCR and PLIST (only for MAINTAINER use)
-############################################################
-#.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
-#ELISPDIR=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${PORTNAME}${MEW_MAJOR_VER}
-#INFODIR=	${PREFIX}/${EMACS_PACKAGESDIR}/info
-#ETCDIR=		${PREFIX}/${EMACS_PACKAGESDIR}/etc/${PORTNAME}${MEW_MAJOR_VER}
-#.else
-#ELISPDIR=	${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}${MEW_MAJOR_VER}
-#INFODIR=	${PREFIX}/info
-#ETCDIR=		${PREFIX}/${EMACS_LIBDIR}/etc/${PORTNAME}${MEW_MAJOR_VER}
-#.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:
-#	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=pkg-descr \
-#		MEW_MAJOR_VER=${MEW_MAJOR_VER} \
-#		${SH} ${FILESDIR}/tmpl2file.sh
-#	${SETENV} EMACS_PORT_NAME=${EMACS_PORT_NAME} WRKTMPDIR=${PKGDIR} \
-#		${SH} ${FILESDIR}/message.sh
-#	${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}${MEW_MAJOR_VER}$,,} \
-#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${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}" \
-#		DIRRM2RMDIRS="${ETCDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${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}
-#	${PERL} -i -pe 's@((?!mew)...|^.{0,2})%%MEW_MAJOR_VER%%@$$1\x32@g' ${PLIST}
-
 .include <bsd.port.mk>
diff --git a/mail/mew3/distinfo b/mail/mew3/distinfo
index 268e0c1cdc02..b9cd01df757e 100644
--- a/mail/mew3/distinfo
+++ b/mail/mew3/distinfo
@@ -1 +1 @@
-MD5 (mew-2.2.tar.gz) = 2758098d970f253fa5bb8cf86244c0d7
+MD5 (mew-3.3.tar.gz) = 81b986698d5d356df19442546a6c993e
diff --git a/mail/mew3/files/patch-aa b/mail/mew3/files/patch-aa
index ba398cffa9ea..776865c2458a 100644
--- a/mail/mew3/files/patch-aa
+++ b/mail/mew3/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Wed Jul 18 08:20:40 2001
-+++ Makefile	Fri Aug  3 22:18:35 2001
+--- Makefile.orig	Wed Dec 11 23:48:41 2002
++++ Makefile	Fri Aug 22 16:01:05 2003
 @@ -19,14 +19,14 @@
  ## EDIT THE FOLLOWINGS
  ##
@@ -38,25 +38,25 @@
  
  ################################################################
  ##
-@@ -67,6 +70,8 @@
- 	mew-key.elc     mew-thread.elc  mew-smime.elc	\
- 	mew-theme.elc	mew.elc
+@@ -70,6 +73,8 @@
+ 	mew-vars.elc		mew-vars2.elc		mew-virtual.elc	\
+ 	mew-exec.elc					mew.elc
  
-+OBJS_PKG=	 auto-autoloads.elc custom-load.elc
++OBJS_PKG=	auto-autoloads.elc custom-load.elc
 +
- SRCS =	mew-addrbook.el	mew-attach.el	mew-blvs.el	\
- 	mew-bq.el	mew-cache.el	mew-complete.el	\
- 	mew-config.el	mew-const.el	mew-decode.el	\
-@@ -87,6 +92,8 @@
- 	mew-thread.el	mew-smime.el	mew-theme.el	\
- 	mew.el
+ SRCS =	mew-addrbook.el	mew-attach.el	mew-auth.el	\
+ 	mew-blvs.el	mew-bq.el	mew-cache.el	\
+ 	mew-complete.el	mew-config.el	mew-const.el	\
+@@ -94,6 +99,8 @@
+ 	mew-win32.el	mew-xemacs.el	mew-exec.el	\
+ 	mew-darwin.el	mew.el
  
 +SRCS_PKG=	auto-autoloads.el custom-load.el
 +
  TEMPFILE = temp.el
  
  CP = cp
-@@ -103,7 +110,9 @@
+@@ -110,7 +117,9 @@
  
  ################################################################
  
@@ -67,7 +67,7 @@
  	@echo 'Compiling EL files of Mew ... '
  	@echo 'PLEASE IGNORE WARNINGS IF DISPLAYED. TAKE IT EASY!'
  	$(EMACS) -batch -q -no-site-file -l ./$(TEMPFILE) -f mew-compile
-@@ -116,11 +125,11 @@
+@@ -123,11 +132,11 @@
  	@echo ')))' >> $(TEMPFILE)
  
  install-el: $(OBJS)
@@ -82,7 +82,7 @@
  
  ################################################################
  
-@@ -136,7 +145,9 @@
+@@ -143,7 +152,9 @@
  	cd info; $(MAKE) info EMACS=$(EMACS)
  
  install-info:
@@ -93,7 +93,7 @@
  
  ################################################################
  
-@@ -144,15 +155,72 @@
+@@ -151,15 +162,72 @@
  	cd info; $(MAKE) jinfo EMACS=$(EMACS)
  
  install-jinfo:
diff --git a/mail/mew3/files/patch-ab b/mail/mew3/files/patch-ab
index c62db0f83d4a..e06cb0a7b7de 100644
--- a/mail/mew3/files/patch-ab
+++ b/mail/mew3/files/patch-ab
@@ -1,15 +1,15 @@
---- bin/Makefile.in.orig	Thu Jan 17 20:26:55 2002
-+++ bin/Makefile.in	Sun Feb  3 18:19:20 2002
-@@ -69,7 +69,7 @@
- 	$(CC) $(COFLAG) $(OBJ1) $(LIBS)
+--- bin/Makefile.in.orig	Wed Nov 13 18:01:51 2002
++++ bin/Makefile.in	Fri Aug 22 16:02:01 2003
+@@ -71,7 +71,7 @@
+ 	$(CC) $(COFLAG) $(LDFLAGS) $(OBJ1) $(LIBS)
  	$(RM) $(ALT)
  	for f in $(ALT); do \
 -	  $(LN) $(PRG1) $${f}; done
 +	  $(LN) -sf $(PRG1) $${f}; done
  
  $(PRG2): $(OBJ2)
- 	$(CC) $(COFLAG) $(CFLAGS) $(OBJ2)
-@@ -95,7 +95,7 @@
+ 	$(CC) $(COFLAG) $(LDFLAGS) $(OBJ2)
+@@ -97,7 +97,7 @@
  	fi
  	$(INSTALL) -m 555 $(PRG1) $(bindir)
  	for f in $(ALT); do \
@@ -18,7 +18,7 @@
  	$(INSTALL) -m 555 $(PRG2) $(bindir)
  	$(INSTALL) -m 555 $(PRG3) $(bindir)
  	-@if [ ! -d $(mandir) ]; then \
-@@ -103,7 +103,7 @@
+@@ -105,7 +105,7 @@
  	fi
  	$(INSTALL) -m 444 $(MAN1) $(mandir)
  	for f in $(MALT); do \
diff --git a/mail/mew3/files/patch-ac b/mail/mew3/files/patch-ac
index 6f0863d8ccd4..f6d247a6d378 100644
--- a/mail/mew3/files/patch-ac
+++ b/mail/mew3/files/patch-ac
@@ -1,5 +1,5 @@
---- info/Makefile.orig	Fri Aug 17 21:26:00 2001
-+++ info/Makefile	Tue Nov 20 10:18:58 2001
+--- info/Makefile.orig	Wed Dec  4 17:07:50 2002
++++ info/Makefile	Fri Aug 22 16:17:02 2003
 @@ -28,9 +28,9 @@
  #INSTALLINFO_OPTIONS = --section Emacs Emacs
  #INSTALLINFO_JOPTIONS =
@@ -16,7 +16,7 @@
  ## DO NOT EDIT THE FOLLOWINGS
  ##
  
--INFO  = mew.info mew.info-1 mew.info-2 mew.info-3
+-INFO  = mew.info mew.info-1 mew.info-2 mew.info-3 mew.info-4
 -JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2 mew.jis.info-3
 +INFO  = mew${MEW_MAJOR_VER}.info mew${MEW_MAJOR_VER}.info-1 mew${MEW_MAJOR_VER}.info-2 mew${MEW_MAJOR_VER}.info-3
 +JINFO = mew${MEW_MAJOR_VER}.jis.info mew${MEW_MAJOR_VER}.jis.info-1 mew${MEW_MAJOR_VER}.jis.info-2 mew${MEW_MAJOR_VER}.jis.info-3
diff --git a/mail/mew3/files/patch-ad b/mail/mew3/files/patch-ad
index 933ef45d9e73..086548e71f94 100644
--- a/mail/mew3/files/patch-ad
+++ b/mail/mew3/files/patch-ad
@@ -1,5 +1,5 @@
---- info/mew.texi~	Thu Aug  2 22:31:28 2001
-+++ info/mew.texi	Fri Aug  3 11:01:40 2001
+--- info/mew.texi.orig	Thu Jun 19 14:58:18 2003
++++ info/mew.texi	Fri Aug 22 16:17:16 2003
 @@ -1,6 +1,6 @@
  \input texinfo  @c -*-texinfo-*-
  @c %**start of header
diff --git a/mail/mew3/files/patch-ae b/mail/mew3/files/patch-ae
index d1647a30fb9c..dcf4b05b6dbd 100644
--- a/mail/mew3/files/patch-ae
+++ b/mail/mew3/files/patch-ae
@@ -1,6 +1,6 @@
---- mew-key.el~	Wed Jul 18 08:19:11 2001
-+++ mew-key.el	Fri Aug  3 11:30:10 2001
-@@ -507,7 +507,7 @@
+--- mew-key.el.orig	Thu Jun 19 14:58:14 2003
++++ mew-key.el	Fri Aug 22 16:17:21 2003
+@@ -562,7 +562,7 @@
  ;;;
  
  (defvar mew-icon-directory (if (fboundp 'locate-data-directory)
diff --git a/mail/mew3/pkg-descr b/mail/mew3/pkg-descr
index a1ee92480f9b..5dd52e6034e6 100644
--- a/mail/mew3/pkg-descr
+++ b/mail/mew3/pkg-descr
@@ -1,19 +1,12 @@
-Mew is a "Message interface to Emacs Window" to integrate
+Mew is a user interface for text messages, multimedia messages(MIME),
+news articles and security functionality including PGP, SSH and SSL.
 
-   - Email
-   - 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 Mew2(Mew with version 2) for emacs-21.x (editors/emacs21). 
-The Mew2 port and corresponding Emacs port are listed bellow and elisp
+This port is the Mew3(Mew with version 3) for emacs-21.x (editors/emacs21). 
+The Mew3 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/mew2 (mew-emacs21-2.x) ===> editors/emacs21 (emacs-21.x) 
+mail/mew3 (mew-emacs21-3.x) ===> editors/emacs21 (emacs-21.x) 
 	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/mew3/pkg-message b/mail/mew3/pkg-message
index 7e59eb498790..575fbc4093d6 100644
--- a/mail/mew3/pkg-message
+++ b/mail/mew3/pkg-message
@@ -4,8 +4,9 @@
 *       (autoload 'mew "mew" nil t)                                     *
 *       (autoload 'mew-send "mew" nil t)                                *
 *       (setq mew-mail-domain "domain of e-mail address")               *
-*       (setq mew-pop-server "your POP server")     ;; if not localhost *
-*       (setq mew-smtp-server "your SMTP server")   ;; if not localhost *
+*       (setq mew-pop-server "your POP server")    ;; if not localhost  *
+*       (setq mew-smtp-server "your SMTP server")  ;; if not localhost  *
+*       (setq mew-icon-directory "icon directory") ;; if using XEmacs   *
 *       (setq mew-prog-pgpkey      "fetch")         ;; for PGP use      *
 *       (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"));; for PGP use      *
 *                                                                       *
diff --git a/mail/mew3/pkg-plist b/mail/mew3/pkg-plist
index 2e7a38b4494e..3d969bc5ab29 100644
--- a/mail/mew3/pkg-plist
+++ b/mail/mew3/pkg-plist
@@ -3,35 +3,27 @@ bin/mewcat
 bin/mewdecode
 bin/mewencode
 bin/mewls
-@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
-@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
-info/mew%%MEW_MAJOR_VER%%.info
-info/mew%%MEW_MAJOR_VER%%.info-1
-info/mew%%MEW_MAJOR_VER%%.info-2
-info/mew%%MEW_MAJOR_VER%%.info-3
-info/mew%%MEW_MAJOR_VER%%.jis.info
-info/mew%%MEW_MAJOR_VER%%.jis.info-1
-info/mew%%MEW_MAJOR_VER%%.jis.info-2
-info/mew%%MEW_MAJOR_VER%%.jis.info-3
-@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
-@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
-share/doc/mew%%MEW_MAJOR_VER%%/00api
-share/doc/mew%%MEW_MAJOR_VER%%/00changes
-share/doc/mew%%MEW_MAJOR_VER%%/00copyright
-share/doc/mew%%MEW_MAJOR_VER%%/00copyright.jis
-share/doc/mew%%MEW_MAJOR_VER%%/00diff
-share/doc/mew%%MEW_MAJOR_VER%%/00readme
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme-namazu.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-browse.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-caesar.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-fancy-summary.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-gnus.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz-fixer.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-refile-view.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-smime-ja.texi
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
+%%DOCSDIR%%/00api
+%%DOCSDIR%%/00changes
+%%DOCSDIR%%/00changes.0
+%%DOCSDIR%%/00changes.1
+%%DOCSDIR%%/00changes.2
+%%DOCSDIR%%/00copyright
+%%DOCSDIR%%/00copyright.jis
+%%DOCSDIR%%/00diff
+%%DOCSDIR%%/00readme
+%%DOCSDIR%%/00roadmap
+%%DOCSDIR%%/contrib/00readme
+%%DOCSDIR%%/contrib/00readme-namazu.jis
+%%DOCSDIR%%/contrib/mew-browse.el
+%%DOCSDIR%%/contrib/mew-caesar.el
+%%DOCSDIR%%/contrib/mew-edebug.el
+%%DOCSDIR%%/contrib/mew-fancy-summary.el
+%%DOCSDIR%%/contrib/mew-nmz-fixer.el
+%%DOCSDIR%%/contrib/mew-nmz.el
+%%DOCSDIR%%/contrib/mew-refile-view.el
+%%DOCSDIR%%/contrib/mew-smime-ja.texi
+%%DOCSDIR%%/contrib/mew-toolbar-frame.el
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.img
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.png
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.xbm
@@ -58,6 +50,7 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-comp.xpm
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-forward.xpm
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-inc.xpm
+%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-lock.xpm
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-next.xpm
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-pgp-enc.xpm
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-pgp-sigenc.xpm
@@ -89,6 +82,7 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-config.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-const.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-const.elc
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-darwin.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-decode.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-decode.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-demo.el
@@ -101,6 +95,8 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-encode.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-env.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-env.elc
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-exec.el
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-exec.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-ext.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-ext.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-fib.el
@@ -112,9 +108,14 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-header.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-highlight.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-highlight.elc
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-imap.el
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-imap.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-key.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-key.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-lang-jp.el
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-lang-latin.el
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-local.el
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-local.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mark.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mark.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-md5.el
@@ -128,8 +129,12 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mule.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mule0.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mule3.el
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-net.el
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-net.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-nntp.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-nntp.elc
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-nntp2.el
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-nntp2.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pgp.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pgp.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pick.el
@@ -148,8 +153,16 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-sort.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-ssh.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-ssh.elc
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-ssl.el
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-ssl.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-summary.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-summary.elc
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-summary2.el
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-summary2.elc
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-summary3.el
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-summary3.elc
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-summary4.el
+%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-summary4.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-syntax.el
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-syntax.elc
 %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-temacs.el
@@ -173,5 +186,5 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
 @dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc
 @dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%
 @unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true
-@dirrm share/doc/mew%%MEW_MAJOR_VER%%/contrib
-@dirrm share/doc/mew%%MEW_MAJOR_VER%%
+@dirrm %%DOCSDIR%%/contrib
+@dirrm %%DOCSDIR%%