Update to 2.4.0.

PR:		ports/23394
Submitted by:	MANTANI Nobutaka <nobutaka@nobutaka.com>

16 files changed, 270 insertions, 194 deletions

diff --git a/mail/wanderlust-emacs/Makefile b/mail/wanderlust-emacs/Makefile
index 946f666e33a..b4490817add 100644
--- a/mail/wanderlust-emacs/Makefile
+++ b/mail/wanderlust-emacs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wanderlust
-PORTVERSION=	1.1.1
+PORTVERSION=	2.4.0
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
 		ftp://ftp.ring.gr.jp/pub/text/elisp/wl/stable/ \
@@ -38,6 +38,11 @@ WITHOUT_MULE=yes
 BUILD_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
 RUN_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
 
+# depends on nkf
+.if (${EMACS_PORT_NAME} == "emacs" || ${EMACS_PORT_NAME} == "xemacs20")
+BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
+.endif
+
 .if defined(EMACS_PACKAGESDIR)
 ALL_TARGET=	package
 INSTALL_TARGET=	install-package
@@ -64,9 +69,7 @@ SAMPLESLANG=	en ja
 SAMPLES=	dot.addresses dot.folders dot.wl
 UTILS=		bbdb-wl.el im-wl.el ssl.el
 
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} \
-		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
-		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
+PLIST_SUB+=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		DIRSECTION=${DIRSECTION}
 
 PLIST=		${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
@@ -94,6 +97,10 @@ post-configure:
 		-e "s,%%EMACS_LIBDIR_WITH_VER%%,${EMACS_LIBDIR_WITH_VER},g" \
 		-e "s,%%EMACS_PACKAGESDIR%%,${EMACS_PACKAGESDIR},g" \
 		< ${FILESDIR}/wanderlust-startup.${EMACS_PORT_NAME}.el.tmpl > ${WRKDIR}/wanderlust-startup.el
+	@${CP} ${WRKSRC}/wl/wl-vars.el ${WRKSRC}/wl/wl-vars.el.temp
+.if (${EMACS_PORT_NAME} == "emacs" || ${EMACS_PORT_NAME} == "xemacs20")
+	@nkf -e ${WRKSRC}/wl/wl-vars.el.temp > ${WRKSRC}/wl/wl-vars.el
+.endif
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR)
@@ -107,9 +114,6 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MAKE} install-docs
 .endif
-.if (${EMACS_PORT_NAME} == "xemacs20")
-	@${MAKE} install-icons
-.endif
 	@${MAKE} install-samples
 	@${MAKE} install-utils
 .if defined(EMACS_PACKAGESDIR)
@@ -132,13 +136,6 @@ install-docs:
 	${INSTALL_DATA} ${WRKSRC}/elmo/ChangeLog ${PREFIX}/${PORTDOCDIR}/ChangeLog.elmo
 	${INSTALL_DATA} ${WRKSRC}/wl/ChangeLog ${PREFIX}/${PORTDOCDIR}/ChangeLog.wl
 
-install-icons:
-	@${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/etc/wl
-	cd ${WRKSRC}/etc/icons ; \
-	for i in *.xpm ; do \
-		${INSTALL_DATA} $$i ${PREFIX}/${EMACS_LIBDIR}/etc/wl ; \
-	done
-
 install-samples:
 .for l in ${SAMPLESLANG}
 	${MKDIR} ${PREFIX}/${SAMPLESDIR}/$l
@@ -146,6 +143,8 @@ install-samples:
 		${INSTALL_DATA} ${WRKSRC}/samples/$l/$$i ${PREFIX}/${SAMPLESDIR}/$l; \
 	done
 .endfor
+	${MKDIR} ${PREFIX}/share/wanderlust
+	${INSTALL_DATA} ${WRKSRC}/etc/ja.Emacs ${PREFIX}/share/wanderlust
 
 install-utils:
 	@${MKDIR} ${PREFIX}/${UTILSDIR}
diff --git a/mail/wanderlust-emacs/distinfo b/mail/wanderlust-emacs/distinfo
index c9517e7e0a9..524535e149d 100644
--- a/mail/wanderlust-emacs/distinfo
+++ b/mail/wanderlust-emacs/distinfo
@@ -1 +1 @@
-MD5 (wl-1.1.1.tar.gz) = fc8ba89ad178b8e968e25bb394a71a31
+MD5 (wl-2.4.0.tar.gz) = 5754b06b87aba82d9e8acf3f1721ab76
diff --git a/mail/wanderlust-emacs/files/wanderlust-startup.mule.el.tmpl b/mail/wanderlust-emacs/files/wanderlust-startup.mule.el.tmpl
index 16d63384a0b..7032cd33a2a 100644
--- a/mail/wanderlust-emacs/files/wanderlust-startup.mule.el.tmpl
+++ b/mail/wanderlust-emacs/files/wanderlust-startup.mule.el.tmpl
@@ -1,6 +1,7 @@
 (autoload 'wl "wl" "Wanderlust" t)
 (autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
 (setq load-path (cons "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/wl" load-path))
+(setq load-path (cons "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/bitmap" load-path))
 (require 'semi-setupel)
 (require 'flim-setupel)
 (require 'apel-setupel)
diff --git a/mail/wanderlust-emacs/pkg-plist.emacs b/mail/wanderlust-emacs/pkg-plist.emacs
index ae3842ae6ba..24aa2bc4931 100644
--- a/mail/wanderlust-emacs/pkg-plist.emacs
+++ b/mail/wanderlust-emacs/pkg-plist.emacs
@@ -38,6 +38,8 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
@@ -48,18 +50,18 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
 @unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.el
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.el
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
@@ -101,6 +103,8 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.el
@@ -138,8 +142,10 @@ share/examples/wanderlust/en/dot.wl
 share/examples/wanderlust/ja/dot.addresses
 share/examples/wanderlust/ja/dot.folders
 share/examples/wanderlust/ja/dot.wl
+share/wanderlust/ja.Emacs
 @dirrm %%EMACS_LIBDIR%%/site-lisp/wl
 @dirrm share/doc/wanderlust
 @dirrm share/examples/wanderlust/en
 @dirrm share/examples/wanderlust/ja
 @dirrm share/examples/wanderlust
+@dirrm share/wanderlust
diff --git a/mail/wanderlust-emacs/pkg-plist.emacs20 b/mail/wanderlust-emacs/pkg-plist.emacs20
index 717bf7d1735..ddec0f6e261 100644
--- a/mail/wanderlust-emacs/pkg-plist.emacs20
+++ b/mail/wanderlust-emacs/pkg-plist.emacs20
@@ -41,6 +41,8 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
@@ -51,18 +53,18 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
 @unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.el
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.el
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
@@ -105,6 +107,8 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.el
@@ -142,8 +146,10 @@ share/examples/wanderlust/en/dot.wl
 share/examples/wanderlust/ja/dot.addresses
 share/examples/wanderlust/ja/dot.folders
 share/examples/wanderlust/ja/dot.wl
+share/wanderlust/ja.Emacs
 @dirrm %%EMACS_LIBDIR%%/site-lisp/wl
 @dirrm share/doc/wanderlust
 @dirrm share/examples/wanderlust/en
 @dirrm share/examples/wanderlust/ja
 @dirrm share/examples/wanderlust
+@dirrm share/wanderlust
diff --git a/mail/wanderlust-emacs/pkg-plist.mule b/mail/wanderlust-emacs/pkg-plist.mule
index d75049f6019..d0560a4602c 100644
--- a/mail/wanderlust-emacs/pkg-plist.mule
+++ b/mail/wanderlust-emacs/pkg-plist.mule
@@ -1,9 +1,6 @@
 @unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl.info %D/info/dir
 info/wl.info
 @exec install-info --section="%%DIRSECTION%%" %D/info/wl.info %D/info/dir
-@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl-ja.info %D/info/dir
-info/wl-ja.info
-@exec install-info --section="%%DIRSECTION%%" %D/info/wl-ja.info %D/info/dir
 share/doc/wanderlust/BUGS
 share/doc/wanderlust/BUGS.ja
 share/doc/wanderlust/README
@@ -41,6 +38,8 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
@@ -51,18 +50,18 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
 @unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.el
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.el
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
@@ -105,6 +104,8 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.el
@@ -142,8 +143,10 @@ share/examples/wanderlust/en/dot.wl
 share/examples/wanderlust/ja/dot.addresses
 share/examples/wanderlust/ja/dot.folders
 share/examples/wanderlust/ja/dot.wl
+share/wanderlust/ja.Emacs
 @dirrm %%EMACS_LIBDIR%%/site-lisp/wl
 @dirrm share/doc/wanderlust
 @dirrm share/examples/wanderlust/en
 @dirrm share/examples/wanderlust/ja
 @dirrm share/examples/wanderlust
+@dirrm share/wanderlust
diff --git a/mail/wanderlust-emacs/pkg-plist.xemacs20 b/mail/wanderlust-emacs/pkg-plist.xemacs20
index ac9404f4985..2e3e5361630 100644
--- a/mail/wanderlust-emacs/pkg-plist.xemacs20
+++ b/mail/wanderlust-emacs/pkg-plist.xemacs20
@@ -1,60 +1,65 @@
-%%EMACS_LIBDIR%%/etc/wl/archive.xpm
-%%EMACS_LIBDIR%%/etc/wl/closed.xpm
-%%EMACS_LIBDIR%%/etc/wl/draft.xpm
-%%EMACS_LIBDIR%%/etc/wl/elmo.xpm
-%%EMACS_LIBDIR%%/etc/wl/filter.xpm
-%%EMACS_LIBDIR%%/etc/wl/imap.xpm
-%%EMACS_LIBDIR%%/etc/wl/internal.xpm
-%%EMACS_LIBDIR%%/etc/wl/local.xpm
-%%EMACS_LIBDIR%%/etc/wl/localnews.xpm
-%%EMACS_LIBDIR%%/etc/wl/maildir.xpm
-%%EMACS_LIBDIR%%/etc/wl/multi.xpm
-%%EMACS_LIBDIR%%/etc/wl/news.xpm
-%%EMACS_LIBDIR%%/etc/wl/opened.xpm
-%%EMACS_LIBDIR%%/etc/wl/pipe.xpm
-%%EMACS_LIBDIR%%/etc/wl/plugged.xpm
-%%EMACS_LIBDIR%%/etc/wl/pop.xpm
-%%EMACS_LIBDIR%%/etc/wl/queue.xpm
-%%EMACS_LIBDIR%%/etc/wl/trash-e.xpm
-%%EMACS_LIBDIR%%/etc/wl/trash.xpm
-%%EMACS_LIBDIR%%/etc/wl/unplugged.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-insert-signature-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-kill-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-send-from-toolbar-down.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-send-from-toolbar-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-yank-original-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-exit-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-check-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-empty-trash-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-jump-to-current-entity-no-sync-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-jump-to-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-next-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-prev-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-select-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-sync-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-zoom-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-logo.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-extract-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-next-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-play-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-prev-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-quit-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-delete-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-exit-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-forward-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-jump-to-current-message-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-mark-as-important-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-next-page-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-next-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-prev-page-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-prev-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-reply-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-reply-with-citation-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-sync-force-update-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/archive.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/closed.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/draft.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/elmo.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/filter.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/imap.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/internal.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/letter.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/local.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/localnews.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/maildir.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/multi.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/news.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/no-letter.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/opened.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/pipe.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/plugged.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/pop.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/queue.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/trash-e.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/trash.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/unplugged.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-beta-logo.xbm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-beta-logo.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-draft-insert-signature-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-draft-kill-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-draft-send-from-toolbar-down.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-draft-send-from-toolbar-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-draft-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-draft-yank-original-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-exit-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-check-current-entity-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-empty-trash-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-jump-to-current-entity-no-sync-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-jump-to-current-entity-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-next-entity-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-prev-entity-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-read-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-select-entity-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-sync-current-entity-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-zoom-entity-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-message-extract-content-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-message-next-content-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-message-play-content-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-message-prev-content-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-message-quit-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-message-read-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-stable-logo.xbm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-stable-logo.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-delete-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-exit-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-forward-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-jump-to-current-message-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-mark-as-important-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-next-page-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-next-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-prev-page-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-prev-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-read-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-reply-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-reply-with-citation-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-sync-force-update-up.xpm
 %%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.el
 @unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.el
@@ -83,6 +88,8 @@
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
@@ -93,18 +100,18 @@
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
 @unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.el
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.el
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
@@ -147,6 +154,8 @@
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-xmas.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-xmas.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl.el
@@ -200,9 +209,12 @@ share/examples/wanderlust/en/dot.wl
 share/examples/wanderlust/ja/dot.addresses
 share/examples/wanderlust/ja/dot.folders
 share/examples/wanderlust/ja/dot.wl
-@dirrm %%EMACS_LIBDIR%%/etc/wl
+share/wanderlust/ja.Emacs
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/wl
 @dirrm %%EMACS_LIBDIR%%/site-lisp/wl
 @dirrm share/doc/wanderlust
 @dirrm share/examples/wanderlust/en
 @dirrm share/examples/wanderlust/ja
 @dirrm share/examples/wanderlust
+@dirrm share/wanderlust
diff --git a/mail/wanderlust-emacs/pkg-plist.xemacs21-mule b/mail/wanderlust-emacs/pkg-plist.xemacs21-mule
index f6ede5eaef7..fb3331e495e 100644
--- a/mail/wanderlust-emacs/pkg-plist.xemacs21-mule
+++ b/mail/wanderlust-emacs/pkg-plist.xemacs21-mule
@@ -5,11 +5,13 @@
 %%EMACS_PACKAGESDIR%%/etc/wl/filter.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/imap.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/internal.xpm
+%%EMACS_PACKAGESDIR%%/etc/wl/letter.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/local.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/localnews.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/maildir.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/multi.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/news.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
@@ -18,6 +20,8 @@
 %%EMACS_PACKAGESDIR%%/etc/wl/trash-e.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/trash.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/unplugged.xpm
+%%EMACS_PACKAGESDIR%%/etc/wl/wl-beta-logo.xbm
+%%EMACS_PACKAGESDIR%%/etc/wl/wl-beta-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
@@ -35,13 +39,14 @@
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-select-entity-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-sync-current-entity-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-zoom-entity-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-logo.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-message-extract-content-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-message-next-content-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-message-play-content-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-message-prev-content-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-message-quit-up.xpm
 %%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-summary-delete-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-exit-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-forward-up.xpm
@@ -88,6 +93,8 @@
 %%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-nntp.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-nntp.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-pipe.el
@@ -98,18 +105,18 @@
 %%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/im-wl.el
 @unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/wl/im-wl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-2.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-2.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4-2.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4-2.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/pldap.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/pldap.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/rfc2368.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/rfc2368.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/ssl.el
@@ -152,6 +159,8 @@
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-util.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-vars.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-vars.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-version.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-version.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-xmas.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-xmas.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl.el
@@ -205,9 +214,11 @@ share/examples/wanderlust/en/dot.wl
 share/examples/wanderlust/ja/dot.addresses
 share/examples/wanderlust/ja/dot.folders
 share/examples/wanderlust/ja/dot.wl
+share/wanderlust/ja.Emacs
 @dirrm %%EMACS_PACKAGESDIR%%/etc/wl
 @dirrm %%EMACS_PACKAGESDIR%%/lisp/wl
 @dirrm share/doc/wanderlust
 @dirrm share/examples/wanderlust/en
 @dirrm share/examples/wanderlust/ja
 @dirrm share/examples/wanderlust
+@dirrm share/wanderlust
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index 946f666e33a..b4490817add 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wanderlust
-PORTVERSION=	1.1.1
+PORTVERSION=	2.4.0
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
 		ftp://ftp.ring.gr.jp/pub/text/elisp/wl/stable/ \
@@ -38,6 +38,11 @@ WITHOUT_MULE=yes
 BUILD_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
 RUN_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
 
+# depends on nkf
+.if (${EMACS_PORT_NAME} == "emacs" || ${EMACS_PORT_NAME} == "xemacs20")
+BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
+.endif
+
 .if defined(EMACS_PACKAGESDIR)
 ALL_TARGET=	package
 INSTALL_TARGET=	install-package
@@ -64,9 +69,7 @@ SAMPLESLANG=	en ja
 SAMPLES=	dot.addresses dot.folders dot.wl
 UTILS=		bbdb-wl.el im-wl.el ssl.el
 
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} \
-		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
-		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
+PLIST_SUB+=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		DIRSECTION=${DIRSECTION}
 
 PLIST=		${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
@@ -94,6 +97,10 @@ post-configure:
 		-e "s,%%EMACS_LIBDIR_WITH_VER%%,${EMACS_LIBDIR_WITH_VER},g" \
 		-e "s,%%EMACS_PACKAGESDIR%%,${EMACS_PACKAGESDIR},g" \
 		< ${FILESDIR}/wanderlust-startup.${EMACS_PORT_NAME}.el.tmpl > ${WRKDIR}/wanderlust-startup.el
+	@${CP} ${WRKSRC}/wl/wl-vars.el ${WRKSRC}/wl/wl-vars.el.temp
+.if (${EMACS_PORT_NAME} == "emacs" || ${EMACS_PORT_NAME} == "xemacs20")
+	@nkf -e ${WRKSRC}/wl/wl-vars.el.temp > ${WRKSRC}/wl/wl-vars.el
+.endif
 
 pre-build:
 .if defined(EMACS_PACKAGESDIR)
@@ -107,9 +114,6 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MAKE} install-docs
 .endif
-.if (${EMACS_PORT_NAME} == "xemacs20")
-	@${MAKE} install-icons
-.endif
 	@${MAKE} install-samples
 	@${MAKE} install-utils
 .if defined(EMACS_PACKAGESDIR)
@@ -132,13 +136,6 @@ install-docs:
 	${INSTALL_DATA} ${WRKSRC}/elmo/ChangeLog ${PREFIX}/${PORTDOCDIR}/ChangeLog.elmo
 	${INSTALL_DATA} ${WRKSRC}/wl/ChangeLog ${PREFIX}/${PORTDOCDIR}/ChangeLog.wl
 
-install-icons:
-	@${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/etc/wl
-	cd ${WRKSRC}/etc/icons ; \
-	for i in *.xpm ; do \
-		${INSTALL_DATA} $$i ${PREFIX}/${EMACS_LIBDIR}/etc/wl ; \
-	done
-
 install-samples:
 .for l in ${SAMPLESLANG}
 	${MKDIR} ${PREFIX}/${SAMPLESDIR}/$l
@@ -146,6 +143,8 @@ install-samples:
 		${INSTALL_DATA} ${WRKSRC}/samples/$l/$$i ${PREFIX}/${SAMPLESDIR}/$l; \
 	done
 .endfor
+	${MKDIR} ${PREFIX}/share/wanderlust
+	${INSTALL_DATA} ${WRKSRC}/etc/ja.Emacs ${PREFIX}/share/wanderlust
 
 install-utils:
 	@${MKDIR} ${PREFIX}/${UTILSDIR}
diff --git a/mail/wanderlust/distinfo b/mail/wanderlust/distinfo
index c9517e7e0a9..524535e149d 100644
--- a/mail/wanderlust/distinfo
+++ b/mail/wanderlust/distinfo
@@ -1 +1 @@
-MD5 (wl-1.1.1.tar.gz) = fc8ba89ad178b8e968e25bb394a71a31
+MD5 (wl-2.4.0.tar.gz) = 5754b06b87aba82d9e8acf3f1721ab76
diff --git a/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl b/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl
index 16d63384a0b..7032cd33a2a 100644
--- a/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl
+++ b/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl
@@ -1,6 +1,7 @@
 (autoload 'wl "wl" "Wanderlust" t)
 (autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
 (setq load-path (cons "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/wl" load-path))
+(setq load-path (cons "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/bitmap" load-path))
 (require 'semi-setupel)
 (require 'flim-setupel)
 (require 'apel-setupel)
diff --git a/mail/wanderlust/pkg-plist.emacs b/mail/wanderlust/pkg-plist.emacs
index ae3842ae6ba..24aa2bc4931 100644
--- a/mail/wanderlust/pkg-plist.emacs
+++ b/mail/wanderlust/pkg-plist.emacs
@@ -38,6 +38,8 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
@@ -48,18 +50,18 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
 @unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.el
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.el
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
@@ -101,6 +103,8 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.el
@@ -138,8 +142,10 @@ share/examples/wanderlust/en/dot.wl
 share/examples/wanderlust/ja/dot.addresses
 share/examples/wanderlust/ja/dot.folders
 share/examples/wanderlust/ja/dot.wl
+share/wanderlust/ja.Emacs
 @dirrm %%EMACS_LIBDIR%%/site-lisp/wl
 @dirrm share/doc/wanderlust
 @dirrm share/examples/wanderlust/en
 @dirrm share/examples/wanderlust/ja
 @dirrm share/examples/wanderlust
+@dirrm share/wanderlust
diff --git a/mail/wanderlust/pkg-plist.emacs20 b/mail/wanderlust/pkg-plist.emacs20
index 717bf7d1735..ddec0f6e261 100644
--- a/mail/wanderlust/pkg-plist.emacs20
+++ b/mail/wanderlust/pkg-plist.emacs20
@@ -41,6 +41,8 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
@@ -51,18 +53,18 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
 @unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.el
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.el
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
@@ -105,6 +107,8 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.el
@@ -142,8 +146,10 @@ share/examples/wanderlust/en/dot.wl
 share/examples/wanderlust/ja/dot.addresses
 share/examples/wanderlust/ja/dot.folders
 share/examples/wanderlust/ja/dot.wl
+share/wanderlust/ja.Emacs
 @dirrm %%EMACS_LIBDIR%%/site-lisp/wl
 @dirrm share/doc/wanderlust
 @dirrm share/examples/wanderlust/en
 @dirrm share/examples/wanderlust/ja
 @dirrm share/examples/wanderlust
+@dirrm share/wanderlust
diff --git a/mail/wanderlust/pkg-plist.mule b/mail/wanderlust/pkg-plist.mule
index d75049f6019..d0560a4602c 100644
--- a/mail/wanderlust/pkg-plist.mule
+++ b/mail/wanderlust/pkg-plist.mule
@@ -1,9 +1,6 @@
 @unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl.info %D/info/dir
 info/wl.info
 @exec install-info --section="%%DIRSECTION%%" %D/info/wl.info %D/info/dir
-@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl-ja.info %D/info/dir
-info/wl-ja.info
-@exec install-info --section="%%DIRSECTION%%" %D/info/wl-ja.info %D/info/dir
 share/doc/wanderlust/BUGS
 share/doc/wanderlust/BUGS.ja
 share/doc/wanderlust/README
@@ -41,6 +38,8 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
@@ -51,18 +50,18 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
 @unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.el
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.el
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
@@ -105,6 +104,8 @@ share/doc/wanderlust/wl.texi
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.el
@@ -142,8 +143,10 @@ share/examples/wanderlust/en/dot.wl
 share/examples/wanderlust/ja/dot.addresses
 share/examples/wanderlust/ja/dot.folders
 share/examples/wanderlust/ja/dot.wl
+share/wanderlust/ja.Emacs
 @dirrm %%EMACS_LIBDIR%%/site-lisp/wl
 @dirrm share/doc/wanderlust
 @dirrm share/examples/wanderlust/en
 @dirrm share/examples/wanderlust/ja
 @dirrm share/examples/wanderlust
+@dirrm share/wanderlust
diff --git a/mail/wanderlust/pkg-plist.xemacs20 b/mail/wanderlust/pkg-plist.xemacs20
index ac9404f4985..2e3e5361630 100644
--- a/mail/wanderlust/pkg-plist.xemacs20
+++ b/mail/wanderlust/pkg-plist.xemacs20
@@ -1,60 +1,65 @@
-%%EMACS_LIBDIR%%/etc/wl/archive.xpm
-%%EMACS_LIBDIR%%/etc/wl/closed.xpm
-%%EMACS_LIBDIR%%/etc/wl/draft.xpm
-%%EMACS_LIBDIR%%/etc/wl/elmo.xpm
-%%EMACS_LIBDIR%%/etc/wl/filter.xpm
-%%EMACS_LIBDIR%%/etc/wl/imap.xpm
-%%EMACS_LIBDIR%%/etc/wl/internal.xpm
-%%EMACS_LIBDIR%%/etc/wl/local.xpm
-%%EMACS_LIBDIR%%/etc/wl/localnews.xpm
-%%EMACS_LIBDIR%%/etc/wl/maildir.xpm
-%%EMACS_LIBDIR%%/etc/wl/multi.xpm
-%%EMACS_LIBDIR%%/etc/wl/news.xpm
-%%EMACS_LIBDIR%%/etc/wl/opened.xpm
-%%EMACS_LIBDIR%%/etc/wl/pipe.xpm
-%%EMACS_LIBDIR%%/etc/wl/plugged.xpm
-%%EMACS_LIBDIR%%/etc/wl/pop.xpm
-%%EMACS_LIBDIR%%/etc/wl/queue.xpm
-%%EMACS_LIBDIR%%/etc/wl/trash-e.xpm
-%%EMACS_LIBDIR%%/etc/wl/trash.xpm
-%%EMACS_LIBDIR%%/etc/wl/unplugged.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-insert-signature-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-kill-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-send-from-toolbar-down.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-send-from-toolbar-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-yank-original-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-exit-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-check-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-empty-trash-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-jump-to-current-entity-no-sync-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-jump-to-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-next-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-prev-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-select-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-sync-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-zoom-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-logo.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-extract-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-next-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-play-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-prev-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-quit-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-delete-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-exit-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-forward-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-jump-to-current-message-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-mark-as-important-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-next-page-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-next-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-prev-page-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-prev-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-reply-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-reply-with-citation-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-sync-force-update-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/archive.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/closed.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/draft.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/elmo.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/filter.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/imap.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/internal.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/letter.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/local.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/localnews.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/maildir.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/multi.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/news.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/no-letter.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/opened.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/pipe.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/plugged.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/pop.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/queue.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/trash-e.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/trash.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/unplugged.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-beta-logo.xbm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-beta-logo.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-draft-insert-signature-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-draft-kill-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-draft-send-from-toolbar-down.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-draft-send-from-toolbar-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-draft-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-draft-yank-original-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-exit-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-check-current-entity-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-empty-trash-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-jump-to-current-entity-no-sync-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-jump-to-current-entity-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-next-entity-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-prev-entity-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-read-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-select-entity-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-sync-current-entity-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-folder-zoom-entity-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-message-extract-content-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-message-next-content-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-message-play-content-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-message-prev-content-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-message-quit-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-message-read-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-stable-logo.xbm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-stable-logo.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-delete-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-exit-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-forward-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-jump-to-current-message-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-mark-as-important-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-next-page-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-next-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-prev-page-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-prev-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-read-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-reply-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-reply-with-citation-up.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons/wl-summary-sync-force-update-up.xpm
 %%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.el
 @unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.el
@@ -83,6 +88,8 @@
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-net.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
@@ -93,18 +100,18 @@
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.el
 %%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
 @unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
 %%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.el
+%%EMACS_LIBDIR%%/site-lisp/wl/pldap.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.el
 %%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
@@ -147,6 +154,8 @@
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-util.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-version.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-xmas.el
 %%EMACS_LIBDIR%%/site-lisp/wl/wl-xmas.elc
 %%EMACS_LIBDIR%%/site-lisp/wl/wl.el
@@ -200,9 +209,12 @@ share/examples/wanderlust/en/dot.wl
 share/examples/wanderlust/ja/dot.addresses
 share/examples/wanderlust/ja/dot.folders
 share/examples/wanderlust/ja/dot.wl
-@dirrm %%EMACS_LIBDIR%%/etc/wl
+share/wanderlust/ja.Emacs
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/wl/icons
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/wl
 @dirrm %%EMACS_LIBDIR%%/site-lisp/wl
 @dirrm share/doc/wanderlust
 @dirrm share/examples/wanderlust/en
 @dirrm share/examples/wanderlust/ja
 @dirrm share/examples/wanderlust
+@dirrm share/wanderlust
diff --git a/mail/wanderlust/pkg-plist.xemacs21-mule b/mail/wanderlust/pkg-plist.xemacs21-mule
index f6ede5eaef7..fb3331e495e 100644
--- a/mail/wanderlust/pkg-plist.xemacs21-mule
+++ b/mail/wanderlust/pkg-plist.xemacs21-mule
@@ -5,11 +5,13 @@
 %%EMACS_PACKAGESDIR%%/etc/wl/filter.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/imap.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/internal.xpm
+%%EMACS_PACKAGESDIR%%/etc/wl/letter.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/local.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/localnews.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/maildir.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/multi.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/news.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
@@ -18,6 +20,8 @@
 %%EMACS_PACKAGESDIR%%/etc/wl/trash-e.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/trash.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/unplugged.xpm
+%%EMACS_PACKAGESDIR%%/etc/wl/wl-beta-logo.xbm
+%%EMACS_PACKAGESDIR%%/etc/wl/wl-beta-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
@@ -35,13 +39,14 @@
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-select-entity-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-sync-current-entity-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-zoom-entity-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-logo.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-message-extract-content-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-message-next-content-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-message-play-content-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-message-prev-content-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-message-quit-up.xpm
 %%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-summary-delete-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-exit-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-forward-up.xpm
@@ -88,6 +93,8 @@
 %%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-nntp.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-nntp.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-pipe.el
@@ -98,18 +105,18 @@
 %%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/im-wl.el
 @unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/wl/im-wl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-2.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-2.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4-2.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4-2.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/pldap.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/pldap.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/rfc2368.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/rfc2368.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/ssl.el
@@ -152,6 +159,8 @@
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-util.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-vars.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-vars.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-version.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-version.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-xmas.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-xmas.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl.el
@@ -205,9 +214,11 @@ share/examples/wanderlust/en/dot.wl
 share/examples/wanderlust/ja/dot.addresses
 share/examples/wanderlust/ja/dot.folders
 share/examples/wanderlust/ja/dot.wl
+share/wanderlust/ja.Emacs
 @dirrm %%EMACS_PACKAGESDIR%%/etc/wl
 @dirrm %%EMACS_PACKAGESDIR%%/lisp/wl
 @dirrm share/doc/wanderlust
 @dirrm share/examples/wanderlust/en
 @dirrm share/examples/wanderlust/ja
 @dirrm share/examples/wanderlust
+@dirrm share/wanderlust