Update to 2.8.0pre2.

5 files changed, 140 insertions, 46 deletions

diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index 0e72bcd..be11cd9 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -6,53 +6,58 @@
 #
 
 PORTNAME=	wanderlust
-PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTVERSION=	2.8.0.p2
 CATEGORIES=	mail elisp
-MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/elisp/wl/stable/&,} \
-		ftp://ftp.jaist.ac.jp/pub/GNU/elisp/ftp.gohome.org/wl/stable/ \
-		http://www.jpl.org/elips/wl/stable/
-
+MASTER_SITES=	ftp://ftp.gohome.org/wl/beta/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/elisp/wl/beta/&,} \
+		ftp://ftp.jaist.ac.jp/pub/GNU/elisp/ftp.gohome.org/wl/beta/ \
+		http://www.jpl.org/elips/wl/beta/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	wl-${PORTVERSION}
+DISTNAME=	wl-${PORTVERSION:S/.p2/pre2/}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 
 EMACS_PORT_NAME?=	emacs21
 
+MIMEUI_PORT_NAME?=	${MIMEUI_PRODUCT}
 .if (${EMACS_PORT_NAME} == "emacs21")
-MIMEUI_PORT_NAME=	${MIMEUI_PRODUCT}
-.else
-MIMEUI_PORT_NAME=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}
+BITMAP_PORT_NAME=	bitmap
 .endif
+EMACS_W3M_PORT_NAME?=	emacs-w3m
+EMACS_W3M_LISP_FILE?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/shimbun.el
 
 MIMEUI_PRODUCT=	semi
 MIMEUI_VERSION=	1.14
 MIMEUI_COOKIE=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
 
-# depends on semi
-BUILD_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
+BUILD_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
+RUN_DEPENDS=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
 
-.if defined(EMACS_PACKAGESDIR)
-ALL_TARGET=	package
-INSTALL_TARGET=	install-package
-UTILSDIR=	${EMACS_PACKAGESDIR}/lisp/wl
-STARTUPDIR=	${EMACS_PACKAGESDIR}/lisp/wl
+.if !defined(WITHOUT_X11) && !defined(WITHOUT_BITMAP) && defined(BITMAP_PORT_NAME)
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/bitmap/bitmap.el:${PORTSDIR}/editors/${BITMAP_PORT_NAME}
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if exists(${EMACS_W3M_LISP_FILE})
+BUILD_DEPENDS+=	${EMACS_W3M_LISP_FILE}:${PORTSDIR}/www/${EMACS_W3M_PORT_NAME}
+RUN_DEPENDS+=	${EMACS_W3M_LISP_FILE}:${PORTSDIR}/www/${EMACS_W3M_PORT_NAME}
+SHIMBUN=	""
 .else
-ALL_TARGET=	all info
-INSTALL_TARGET=	install install-info
+SHIMBUN=	"@comment "
+.endif
+
+ALL_TARGET?=	all info
+INSTALL_TARGET?=	install install-info
 INFODIR=	${PREFIX}/info
-UTILSDIR=	${EMACS_VERSION_SITE_LISPDIR}/wl
+UTILSDIR?=	${EMACS_VERSION_SITE_LISPDIR}/wl
 WL_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/wl
 WL_ICONDIR=	${EMACS_LIBDIR_WITH_VER}/etc/wl/icons
-STARTUPDIR=	${EMACS_VERSION_SITE_LISPDIR}
-.endif
+STARTUPDIR?=	${EMACS_VERSION_SITE_LISPDIR}
 
 DIRSECTION=	"The Emacs editor and associated tools"
 PORTDOCDIR=	share/doc/wanderlust
-PORTDOCDIR_JA=share/doc/ja/wanderlust
+PORTDOCDIR_JA=	share/doc/ja/wanderlust
 DOCS=		README NEWS doc/wl.texi
 DOCS_JA=	README.ja NEWS.ja doc/wl-ja.texi
 SAMPLESDIR=	share/examples/wanderlust
@@ -64,7 +69,8 @@ PLIST_SUB+=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		DIRSECTION=${DIRSECTION} \
 		STARTUPDIR=${STARTUPDIR} \
 		WL_LISPDIR=${WL_LISPDIR} \
-		WL_ICONDIR=${WL_ICONDIR}
+		WL_ICONDIR=${WL_ICONDIR} \
+		SHIMBUN=${SHIMBUN}
 
 PLIST=		${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 MAKE_ARGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD} \
@@ -145,4 +151,4 @@ install-manifest:
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
 	@${INSTALL_DATA} ${FILESDIR}/_pkg.el ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/wl
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/wanderlust/distinfo b/mail/wanderlust/distinfo
index 851876b..ef38323 100644
--- a/mail/wanderlust/distinfo
+++ b/mail/wanderlust/distinfo
@@ -1 +1 @@
-MD5 (wl-2.6.1.tar.gz) = 720746a899fc7ae50a136f0c7e2f938d
+MD5 (wl-2.8.0pre2.tar.gz) = c3621874b5dcabf03697cc680e038343
diff --git a/mail/wanderlust/pkg-plist.emacs20 b/mail/wanderlust/pkg-plist.emacs20
index 02ea0b4..42e5c0f 100644
--- a/mail/wanderlust/pkg-plist.emacs20
+++ b/mail/wanderlust/pkg-plist.emacs20
@@ -10,6 +10,8 @@ share/doc/ja/wanderlust/wl-ja.texi
 share/doc/wanderlust/NEWS
 share/doc/wanderlust/README
 share/doc/wanderlust/wl.texi
+%%WL_LISPDIR%%/acap.el
+%%WL_LISPDIR%%/acap.elc
 %%WL_LISPDIR%%/bbdb-wl.el
 @unexec rm -f %D/%%WL_LISPDIR%%/bbdb-wl.elc
 %%WL_LISPDIR%%/elmo-archive.el
@@ -32,42 +34,62 @@ share/doc/wanderlust/wl.texi
 %%WL_LISPDIR%%/elmo-localnews.elc
 %%WL_LISPDIR%%/elmo-maildir.el
 %%WL_LISPDIR%%/elmo-maildir.elc
+%%WL_LISPDIR%%/elmo-map.el
+%%WL_LISPDIR%%/elmo-map.elc
+%%WL_LISPDIR%%/elmo-mark.el
+%%WL_LISPDIR%%/elmo-mark.elc
+%%WL_LISPDIR%%/elmo-mime.el
+%%WL_LISPDIR%%/elmo-mime.elc
 %%WL_LISPDIR%%/elmo-msgdb.el
 %%WL_LISPDIR%%/elmo-msgdb.elc
 %%WL_LISPDIR%%/elmo-multi.el
 %%WL_LISPDIR%%/elmo-multi.elc
 %%WL_LISPDIR%%/elmo-net.el
 %%WL_LISPDIR%%/elmo-net.elc
+%%WL_LISPDIR%%/elmo-nmz.el
+%%WL_LISPDIR%%/elmo-nmz.elc
 %%WL_LISPDIR%%/elmo-nntp.el
 %%WL_LISPDIR%%/elmo-nntp.elc
 %%WL_LISPDIR%%/elmo-pipe.el
 %%WL_LISPDIR%%/elmo-pipe.elc
 %%WL_LISPDIR%%/elmo-pop3.el
 %%WL_LISPDIR%%/elmo-pop3.elc
+%%WL_LISPDIR%%/elmo-sendlog.el
+%%WL_LISPDIR%%/elmo-sendlog.elc
+%%SHIMBUN%%%%WL_LISPDIR%%/elmo-shimbun.el
+%%SHIMBUN%%%%WL_LISPDIR%%/elmo-shimbun.elc
 %%WL_LISPDIR%%/elmo-util.el
 %%WL_LISPDIR%%/elmo-util.elc
 %%WL_LISPDIR%%/elmo-vars.el
 %%WL_LISPDIR%%/elmo-vars.elc
 %%WL_LISPDIR%%/elmo-version.el
 %%WL_LISPDIR%%/elmo-version.elc
-%%WL_LISPDIR%%/elmo2.el
-%%WL_LISPDIR%%/elmo2.elc
+%%WL_LISPDIR%%/elmo.el
+%%WL_LISPDIR%%/elmo.elc
 %%WL_LISPDIR%%/im-wl.el
 @unexec rm -f %%WL_LISPDIR%%/im-wl.elc
-%%WL_LISPDIR%%/mmelmo-imap4.el
-%%WL_LISPDIR%%/mmelmo-imap4.elc
-%%WL_LISPDIR%%/mmelmo.el
-%%WL_LISPDIR%%/mmelmo.elc
+%%WL_LISPDIR%%/mmimap.el
+%%WL_LISPDIR%%/mmimap.elc
 %%WL_LISPDIR%%/pldap.el
 %%WL_LISPDIR%%/pldap.elc
 %%WL_LISPDIR%%/rfc2368.el
 %%WL_LISPDIR%%/rfc2368.elc
+%%WL_LISPDIR%%/slp.el
+%%WL_LISPDIR%%/slp.elc
 %%WL_LISPDIR%%/ssl.el
 %%WL_LISPDIR%%/ssl.elc
 %%WL_LISPDIR%%/utf7.el
 %%WL_LISPDIR%%/utf7.elc
+%%WL_LISPDIR%%/wl-acap.el
+%%WL_LISPDIR%%/wl-acap.elc
+%%WL_LISPDIR%%/wl-addrbook.el
+%%WL_LISPDIR%%/wl-addrbook.elc
 %%WL_LISPDIR%%/wl-address.el
 %%WL_LISPDIR%%/wl-address.elc
+%%WL_LISPDIR%%/wl-addrmgr.el
+%%WL_LISPDIR%%/wl-addrmgr.elc
+%%WL_LISPDIR%%/wl-complete.el
+%%WL_LISPDIR%%/wl-complete.elc
 %%WL_LISPDIR%%/wl-demo.el
 %%WL_LISPDIR%%/wl-demo.elc
 %%WL_LISPDIR%%/wl-draft.el
diff --git a/mail/wanderlust/pkg-plist.emacs21 b/mail/wanderlust/pkg-plist.emacs21
index 7be6ecf..05b2aaa 100644
--- a/mail/wanderlust/pkg-plist.emacs21
+++ b/mail/wanderlust/pkg-plist.emacs21
@@ -10,6 +10,8 @@ share/doc/ja/wanderlust/wl-ja.texi
 share/doc/wanderlust/README
 share/doc/wanderlust/NEWS
 share/doc/wanderlust/wl.texi
+%%WL_LISPDIR%%/acap.el
+%%WL_LISPDIR%%/acap.elc
 %%WL_LISPDIR%%/bbdb-wl.el
 @unexec rm -f %D/%%WL_LISPDIR%%/bbdb-wl.elc
 %%WL_LISPDIR%%/elmo-archive.el
@@ -32,42 +34,62 @@ share/doc/wanderlust/wl.texi
 %%WL_LISPDIR%%/elmo-localnews.elc
 %%WL_LISPDIR%%/elmo-maildir.el
 %%WL_LISPDIR%%/elmo-maildir.elc
+%%WL_LISPDIR%%/elmo-map.el
+%%WL_LISPDIR%%/elmo-map.elc
+%%WL_LISPDIR%%/elmo-mark.el
+%%WL_LISPDIR%%/elmo-mark.elc
+%%WL_LISPDIR%%/elmo-mime.el
+%%WL_LISPDIR%%/elmo-mime.elc
 %%WL_LISPDIR%%/elmo-msgdb.el
 %%WL_LISPDIR%%/elmo-msgdb.elc
 %%WL_LISPDIR%%/elmo-multi.el
 %%WL_LISPDIR%%/elmo-multi.elc
 %%WL_LISPDIR%%/elmo-net.el
 %%WL_LISPDIR%%/elmo-net.elc
+%%WL_LISPDIR%%/elmo-nmz.el
+%%WL_LISPDIR%%/elmo-nmz.elc
 %%WL_LISPDIR%%/elmo-nntp.el
 %%WL_LISPDIR%%/elmo-nntp.elc
 %%WL_LISPDIR%%/elmo-pipe.el
 %%WL_LISPDIR%%/elmo-pipe.elc
 %%WL_LISPDIR%%/elmo-pop3.el
 %%WL_LISPDIR%%/elmo-pop3.elc
+%%WL_LISPDIR%%/elmo-sendlog.el
+%%WL_LISPDIR%%/elmo-sendlog.elc
+%%SHIMBUN%%%%WL_LISPDIR%%/elmo-shimbun.el
+%%SHIMBUN%%%%WL_LISPDIR%%/elmo-shimbun.elc
 %%WL_LISPDIR%%/elmo-util.el
 %%WL_LISPDIR%%/elmo-util.elc
 %%WL_LISPDIR%%/elmo-vars.el
 %%WL_LISPDIR%%/elmo-vars.elc
 %%WL_LISPDIR%%/elmo-version.el
 %%WL_LISPDIR%%/elmo-version.elc
-%%WL_LISPDIR%%/elmo2.el
-%%WL_LISPDIR%%/elmo2.elc
+%%WL_LISPDIR%%/elmo.el
+%%WL_LISPDIR%%/elmo.elc
 %%WL_LISPDIR%%/im-wl.el
 @unexec rm -f %%WL_LISPDIR%%/im-wl.elc
-%%WL_LISPDIR%%/mmelmo-imap4.el
-%%WL_LISPDIR%%/mmelmo-imap4.elc
-%%WL_LISPDIR%%/mmelmo.el
-%%WL_LISPDIR%%/mmelmo.elc
+%%WL_LISPDIR%%/mmimap.el
+%%WL_LISPDIR%%/mmimap.elc
 %%WL_LISPDIR%%/pldap.el
 %%WL_LISPDIR%%/pldap.elc
 %%WL_LISPDIR%%/rfc2368.el
 %%WL_LISPDIR%%/rfc2368.elc
+%%WL_LISPDIR%%/slp.el
+%%WL_LISPDIR%%/slp.elc
 %%WL_LISPDIR%%/ssl.el
 %%WL_LISPDIR%%/ssl.elc
 %%WL_LISPDIR%%/utf7.el
 %%WL_LISPDIR%%/utf7.elc
+%%WL_LISPDIR%%/wl-acap.el
+%%WL_LISPDIR%%/wl-acap.elc
+%%WL_LISPDIR%%/wl-addrbook.el
+%%WL_LISPDIR%%/wl-addrbook.elc
 %%WL_LISPDIR%%/wl-address.el
 %%WL_LISPDIR%%/wl-address.elc
+%%WL_LISPDIR%%/wl-addrmgr.el
+%%WL_LISPDIR%%/wl-addrmgr.elc
+%%WL_LISPDIR%%/wl-complete.el
+%%WL_LISPDIR%%/wl-complete.elc
 %%WL_LISPDIR%%/wl-demo.el
 %%WL_LISPDIR%%/wl-demo.elc
 %%WL_LISPDIR%%/wl-draft.el
@@ -120,19 +142,29 @@ share/doc/wanderlust/wl.texi
 %%WL_ICONDIR%%/maildir.xpm
 %%WL_ICONDIR%%/multi.xpm
 %%WL_ICONDIR%%/news.xpm
+%%WL_ICONDIR%%/nmz.xpm
 %%WL_ICONDIR%%/no-letter.xpm
 %%WL_ICONDIR%%/opened.xpm
 %%WL_ICONDIR%%/pipe.xpm
 %%WL_ICONDIR%%/plugged.xpm
 %%WL_ICONDIR%%/pop.xpm
 %%WL_ICONDIR%%/queue.xpm
+%%WL_ICONDIR%%/shimbun.xpm
 %%WL_ICONDIR%%/trash-e.xpm
 %%WL_ICONDIR%%/trash.xpm
 %%WL_ICONDIR%%/unplugged.xpm
+%%WL_ICONDIR%%/wl-alpha-logo.img
 %%WL_ICONDIR%%/wl-alpha-logo.xbm
 %%WL_ICONDIR%%/wl-alpha-logo.xpm
+%%WL_ICONDIR%%/wl-alpha-xmas-logo.img
+%%WL_ICONDIR%%/wl-alpha-xmas-logo.xbm
+%%WL_ICONDIR%%/wl-alpha-xmas-logo.xpm
+%%WL_ICONDIR%%/wl-beta-logo.img
 %%WL_ICONDIR%%/wl-beta-logo.xbm
 %%WL_ICONDIR%%/wl-beta-logo.xpm
+%%WL_ICONDIR%%/wl-beta-xmas-logo.img
+%%WL_ICONDIR%%/wl-beta-xmas-logo.xbm
+%%WL_ICONDIR%%/wl-beta-xmas-logo.xpm
 %%WL_ICONDIR%%/wl-draft-insert-signature-up.xpm
 %%WL_ICONDIR%%/wl-draft-kill-up.xpm
 %%WL_ICONDIR%%/wl-draft-send-from-toolbar-down.xpm
@@ -156,8 +188,12 @@ share/doc/wanderlust/wl.texi
 %%WL_ICONDIR%%/wl-message-prev-content-up.xpm
 %%WL_ICONDIR%%/wl-message-quit-up.xpm
 %%WL_ICONDIR%%/wl-message-read-up.xpm
+%%WL_ICONDIR%%/wl-stable-logo.img
 %%WL_ICONDIR%%/wl-stable-logo.xbm
 %%WL_ICONDIR%%/wl-stable-logo.xpm
+%%WL_ICONDIR%%/wl-stable-xmas-logo.img
+%%WL_ICONDIR%%/wl-stable-xmas-logo.xbm
+%%WL_ICONDIR%%/wl-stable-xmas-logo.xpm
 %%WL_ICONDIR%%/wl-summary-delete-up.xpm
 %%WL_ICONDIR%%/wl-summary-exit-up.xpm
 %%WL_ICONDIR%%/wl-summary-forward-up.xpm
diff --git a/mail/wanderlust/pkg-plist.xemacs21-mule b/mail/wanderlust/pkg-plist.xemacs21-mule
index 76f6499..b56ebb3 100644
--- a/mail/wanderlust/pkg-plist.xemacs21-mule
+++ b/mail/wanderlust/pkg-plist.xemacs21-mule
@@ -11,19 +11,25 @@
 %%EMACS_PACKAGESDIR%%/etc/wl/maildir.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/multi.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/news.xpm
+%%EMACS_PACKAGESDIR%%/etc/wl/nmz.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/no-letter.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/opened.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/pipe.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/plugged.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/pop.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/queue.xpm
+%%EMACS_PACKAGESDIR%%/etc/wl/shimbun.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/trash-e.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/trash.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/unplugged.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-alpha-logo.xbm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-alpha-logo.xpm
+%%EMACS_PACKAGESDIR%%/etc/wl/wl-alpha-xmas-logo.xbm
+%%EMACS_PACKAGESDIR%%/etc/wl/wl-alpha-xmas-logo.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-beta-logo.xbm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-beta-logo.xpm
+%%EMACS_PACKAGESDIR%%/etc/wl/wl-beta-xmas-logo.xbm
+%%EMACS_PACKAGESDIR%%/etc/wl/wl-beta-xmas-logo.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-draft-insert-signature-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-draft-kill-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-draft-send-from-toolbar-down.xpm
@@ -49,6 +55,8 @@
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-message-read-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-stable-logo.xbm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-stable-logo.xpm
+%%EMACS_PACKAGESDIR%%/etc/wl/wl-stable-xmas-logo.xbm
+%%EMACS_PACKAGESDIR%%/etc/wl/wl-stable-xmas-logo.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-delete-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-exit-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-forward-up.xpm
@@ -63,6 +71,8 @@
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-reply-with-citation-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-sync-force-update-up.xpm
 %%EMACS_PACKAGESDIR%%/lisp/wl/_pkg.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/acap.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/acap.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/auto-autoloads.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/bbdb-wl.el
@@ -91,42 +101,62 @@
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-localnews.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-maildir.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-maildir.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-map.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-map.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-mark.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-mark.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-mime.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-mime.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-msgdb.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-msgdb.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-multi.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-multi.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-net.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-net.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-nmz.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-nmz.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-nntp.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-nntp.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-pipe.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-pipe.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-pop3.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-pop3.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-sendlog.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-sendlog.elc
+%%SHIMBUN%%%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-shimbun.el
+%%SHIMBUN%%%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-shimbun.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-util.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-util.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-vars.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-vars.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-version.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-version.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo2.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo2.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/im-wl.el
 @unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/wl/im-wl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/mmimap.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/mmimap.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/pldap.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/pldap.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/rfc2368.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/rfc2368.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/slp.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/slp.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/ssl.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/ssl.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/utf7.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/utf7.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-acap.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-acap.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-addrbook.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-addrbook.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-address.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-address.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-addrmgr.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-addrmgr.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-complete.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-complete.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-demo.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-demo.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-dnd.el