6 files changed, 18 insertions, 6 deletions
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index fbc0a960f065..23acc9d76b08 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wanderlust
-PORTVERSION=	2.8.1
+PORTVERSION=	2.10.0
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/elisp/wl/stable/&,} \
diff --git a/mail/wanderlust/distinfo b/mail/wanderlust/distinfo
index 977a864b5f88..cc81d3369e78 100644
--- a/mail/wanderlust/distinfo
+++ b/mail/wanderlust/distinfo
@@ -1 +1 @@
-MD5 (wl-2.8.1.tar.gz) = 8a11da5eb8b5990c0c0d99216e29e1ac
+MD5 (wl-2.10.0.tar.gz) = 5bf3ce1e17bad6cdd41e5f91ce78544e
diff --git a/mail/wanderlust/files/_pkg.el b/mail/wanderlust/files/_pkg.el
index c8414973c3c3..42a24b5b3740 100644
--- a/mail/wanderlust/files/_pkg.el
+++ b/mail/wanderlust/files/_pkg.el
@@ -1,4 +1,4 @@
 ;;;###autoload
 (package-provide 'wl
-                 :version 1.11
+                 :version 2.10
                  :type 'regular)
diff --git a/mail/wanderlust/pkg-plist.emacs20 b/mail/wanderlust/pkg-plist.emacs20
index 42e5c0f99fc8..86f1d71200d9 100644
--- a/mail/wanderlust/pkg-plist.emacs20
+++ b/mail/wanderlust/pkg-plist.emacs20
@@ -58,6 +58,8 @@ share/doc/wanderlust/wl.texi
 %%WL_LISPDIR%%/elmo-sendlog.elc
 %%SHIMBUN%%%%WL_LISPDIR%%/elmo-shimbun.el
 %%SHIMBUN%%%%WL_LISPDIR%%/elmo-shimbun.elc
+%%WL_LISPDIR%%/elmo-split.el
+%%WL_LISPDIR%%/elmo-split.elc
 %%WL_LISPDIR%%/elmo-util.el
 %%WL_LISPDIR%%/elmo-util.elc
 %%WL_LISPDIR%%/elmo-vars.el
@@ -128,7 +130,7 @@ share/doc/wanderlust/wl.texi
 %%WL_LISPDIR%%/wl-version.elc
 %%WL_LISPDIR%%/wl.el
 %%WL_LISPDIR%%/wl.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
+%%STARTUPDIR%%/wanderlust-startup.el
 share/examples/wanderlust/en/dot.addresses
 share/examples/wanderlust/en/dot.folders
 share/examples/wanderlust/en/dot.wl
diff --git a/mail/wanderlust/pkg-plist.emacs21 b/mail/wanderlust/pkg-plist.emacs21
index 05b2aaa7bb03..1896a124757f 100644
--- a/mail/wanderlust/pkg-plist.emacs21
+++ b/mail/wanderlust/pkg-plist.emacs21
@@ -4,11 +4,11 @@ info/wl.info
 @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/ja/wanderlust/README.ja
 share/doc/ja/wanderlust/NEWS.ja
+share/doc/ja/wanderlust/README.ja
 share/doc/ja/wanderlust/wl-ja.texi
-share/doc/wanderlust/README
 share/doc/wanderlust/NEWS
+share/doc/wanderlust/README
 share/doc/wanderlust/wl.texi
 %%WL_LISPDIR%%/acap.el
 %%WL_LISPDIR%%/acap.elc
@@ -58,6 +58,8 @@ share/doc/wanderlust/wl.texi
 %%WL_LISPDIR%%/elmo-sendlog.elc
 %%SHIMBUN%%%%WL_LISPDIR%%/elmo-shimbun.el
 %%SHIMBUN%%%%WL_LISPDIR%%/elmo-shimbun.elc
+%%WL_LISPDIR%%/elmo-split.el
+%%WL_LISPDIR%%/elmo-split.elc
 %%WL_LISPDIR%%/elmo-util.el
 %%WL_LISPDIR%%/elmo-util.elc
 %%WL_LISPDIR%%/elmo-vars.el
@@ -167,6 +169,7 @@ share/doc/wanderlust/wl.texi
 %%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-save-and-exit-up.xpm
 %%WL_ICONDIR%%/wl-draft-send-from-toolbar-down.xpm
 %%WL_ICONDIR%%/wl-draft-send-from-toolbar-up.xpm
 %%WL_ICONDIR%%/wl-draft-up.xpm
@@ -174,6 +177,7 @@ share/doc/wanderlust/wl.texi
 %%WL_ICONDIR%%/wl-exit-up.xpm
 %%WL_ICONDIR%%/wl-folder-check-current-entity-up.xpm
 %%WL_ICONDIR%%/wl-folder-empty-trash-up.xpm
+%%WL_ICONDIR%%/wl-folder-goto-draft-folder-up.xpm
 %%WL_ICONDIR%%/wl-folder-jump-to-current-entity-no-sync-up.xpm
 %%WL_ICONDIR%%/wl-folder-jump-to-current-entity-up.xpm
 %%WL_ICONDIR%%/wl-folder-next-entity-up.xpm
@@ -207,6 +211,7 @@ share/doc/wanderlust/wl.texi
 %%WL_ICONDIR%%/wl-summary-reply-up.xpm
 %%WL_ICONDIR%%/wl-summary-reply-with-citation-up.xpm
 %%WL_ICONDIR%%/wl-summary-sync-force-update-up.xpm
+%%WL_ICONDIR%%/wl-write-current-folder-up.xpm
 share/examples/wanderlust/en/dot.addresses
 share/examples/wanderlust/en/dot.folders
 share/examples/wanderlust/en/dot.wl
diff --git a/mail/wanderlust/pkg-plist.xemacs21-mule b/mail/wanderlust/pkg-plist.xemacs21-mule
index b56ebb320ee3..b6636410047a 100644
--- a/mail/wanderlust/pkg-plist.xemacs21-mule
+++ b/mail/wanderlust/pkg-plist.xemacs21-mule
@@ -32,6 +32,7 @@
 %%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-save-and-exit-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-draft-send-from-toolbar-down.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-draft-send-from-toolbar-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-draft-up.xpm
@@ -39,6 +40,7 @@
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-exit-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-check-current-entity-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-empty-trash-up.xpm
+%%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-goto-draft-folder-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-jump-to-current-entity-no-sync-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-jump-to-current-entity-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-next-entity-up.xpm
@@ -70,6 +72,7 @@
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-reply-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-reply-with-citation-up.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-sync-force-update-up.xpm
+%%EMACS_PACKAGESDIR%%/etc/wl/wl-write-current-folder-up.xpm
 %%EMACS_PACKAGESDIR%%/lisp/wl/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/acap.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/acap.elc
@@ -125,6 +128,8 @@
 %%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-split.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-split.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-util.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-util.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-vars.el