13 files changed, 605 insertions, 305 deletions

diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index af8f7efdb4ae..00196cf430eb 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -5,24 +5,25 @@
 # $FreeBSD$
 #
 
-PORTNAME=	wanderlust-${EMACS_PORT}
-PORTVERSION=	1.0.3
+PORTNAME=	wanderlust
+PORTVERSION=	1.1.0
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
 		ftp://ftp.jaist.ac.jp/pub/GNU/elisp/wanderlust/stable/ \
 		ftp://daidai.kuis.kyoto-u.ac.jp/pub/mirror/ftp.gohome.org/pub/elisp/wl/stable/ \
 		ftp://ftp.ring.gr.jp/pub/text/elisp/wl/stable/
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	wl-${PORTVERSION}
 
 MAINTAINER=	nobutaka@nobutaka.com
 
-SEMI_VER=	1.13.4
-SEMI_COOKIE=	semi-${EMACS_PORT}-${SEMI_VER}.FreeBSD-packages
+SEMI_VER=	1.13.7
+SEMI_COOKIE=	semi-${EMACS_PORT_NAME}-${SEMI_VER}.FreeBSD-packages
 
 .if !defined (IS_SLAVE)
 # for emacs19
 EMACS_NAME=		emacs
-EMACS_PORT=		emacs
+EMACS_PORT_NAME=	emacs
 EMACS_VER=		19.34
 EMACS_LIBDIR=		share/emacs
 EMACS_LIBDIR_WITH_VER=	share/emacs/${EMACS_VER}
@@ -30,42 +31,57 @@ EMACS_LIBDIR_WITH_VER=	share/emacs/${EMACS_VER}
 
 EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
 
-BUILD_DEPENDS= 	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
+BUILD_DEPENDS= 	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT_NAME}
 
 .if !defined(HAVE_COMMON_PORT)
 HAVE_COMMON_PORT=	no
 .endif
 .if (${HAVE_COMMON_PORT} == "yes")
 # depends on common port
-RUN_DEPENDS=	${PKG_DBDIR}/${EMACS_PORT}-common-${MULE_VER}:${PORTSDIR}/editors/${EMACS_PORT}-common
+RUN_DEPENDS=	${PKG_DBDIR}/${EMACS_PORT_NAME:S/xemacs21-mule/xemacs-mule/}-common-${MULE_VER}:${PORTSDIR}/editors/${EMACS_PORT_NAME}-common
 .else
-RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
+RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT_NAME}
 .endif
 # depends on semi
-BUILD_DEPENDS+=	${PREFIX}/share/semi/${SEMI_COOKIE}:${PORTSDIR}/editors/semi-${EMACS_PORT}
-RUN_DEPENDS+=	${PREFIX}/share/semi/${SEMI_COOKIE}:${PORTSDIR}/editors/semi-${EMACS_PORT}
+BUILD_DEPENDS+=	${PREFIX}/share/semi/${SEMI_COOKIE}:${PORTSDIR}/editors/semi-${EMACS_PORT_NAME}-current
+RUN_DEPENDS+=	${PREFIX}/share/semi/${SEMI_COOKIE}:${PORTSDIR}/editors/semi-${EMACS_PORT_NAME}-current
 
-.if (${EMACS_PORT} == "xemacs21-mule")
+.if (${EMACS_PORT_NAME} == "xemacs21-mule")
 ALL_TARGET=	package
 INSTALL_TARGET=	install-package
 .endif
-.if (${EMACS_PORT} == "emacs20" || ${EMACS_PORT} == "mule")
+.if (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule")
 ALL_TARGET=	all info
 .endif
 
+.if !defined(WITH_IM) && exists(${LOCALBASE}/bin/imput)
+WITH_IM=	yes
+.endif
+
+.if defined(WITH_IM) && ${WITH_IM} == yes
+BUILD_DEPENDS+=	imput:${PORTSDIR}/mail/im
+RUN_DEPENDS+=	imput:${PORTSDIR}/mail/im
+.endif
+
 DIRSECTION=	"The Emacs editor and associated tools"
 DOCSDIR=	${PREFIX}/share/doc/wanderlust
 DOCS=		00README 00README.ja ChangeLog ChangeLog.ja
-SAMPLESDIR=	${PREFIX}/share/examples/wanderlust
-SAMPLES=	sample.addresses sample.dot.wl sample.folders
+SAMPLESDIR=	${PREFIX}/share/examples/wanderlust/en
+SAMPLESDIR_JA=	${PREFIX}/share/examples/wanderlust/ja
+SAMPLES=	dot.addresses dot.wl dot.folders
 
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} DIRSECTION=${DIRSECTION}
 
-PLIST=		${PKGDIR}/PLIST.${EMACS_PORT}
-MAKE_ARGS=	EMACS=${EMACS_CMD} ELISPDIR=${PREFIX}/${EMACS_LIBDIR}/site-lisp/wanderlust \
+PLISTORIG=	${PKGDIR}/PLIST.${EMACS_PORT_NAME}
+PLIST=		${WRKDIR}/PLIST
+
+MAKE_ARGS=	EMACS=${EMACS_CMD} LISPDIR=${PREFIX}/${EMACS_LIBDIR}/site-lisp \
 		FLAGS="-batch -q -no-site-file -l ${WRKDIR}/wanderlust-startup.el"
-.if (${EMACS_PORT} == "xemacs21-mule")
+.if (${EMACS_PORT_NAME} == "xemacs20") || (${EMACS_PORT_NAME} == "xemacs21-mule")
+MAKE_ARGS+=	XEMACS=${EMACS_CMD}
+.endif
+.if (${EMACS_PORT_NAME} == "xemacs21-mule")
 MAKE_ARGS+=	PACKAGEDIR=${PREFIX}/${EMACS_PACKAGESDIR}
 .else
 MAKE_ARGS+=	INFODIR=${PREFIX}/info
@@ -77,16 +93,21 @@ post-configure:
 		-e "s,%%EMACS_LIBDIR%%,${EMACS_LIBDIR},g" \
 		-e "s,%%EMACS_LIBDIR_WITH_VER%%,${EMACS_LIBDIR_WITH_VER},g" \
 		-e "s,%%EMACS_PACKAGESDIR%%,${EMACS_PACKAGESDIR},g" \
-		< ${FILESDIR}/wanderlust-startup.${EMACS_PORT}.el.tmpl > ${WRKDIR}/wanderlust-startup.el
+		< ${FILESDIR}/wanderlust-startup.${EMACS_PORT_NAME}.el.tmpl > ${WRKDIR}/wanderlust-startup.el
 
 pre-build:
-.if (${EMACS_PORT} == "xemacs21-mule")
-	@${CP} ${FILESDIR}/_pkg.el ${WRKSRC}/
+.if (${EMACS_PORT_NAME} == "xemacs21-mule")
+	@${CP} ${FILESDIR}/_pkg.el ${WRKSRC}
 .endif
 
 pre-install:
-.if (${EMACS_PORT} != "xemacs21-mule")
-	@${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/site-lisp/wanderlust
+.if (${EMACS_PORT_NAME} != "xemacs21-mule")
+	@${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/site-lisp/wl
+.endif
+.if defined(WITH_IM) && ${WITH_IM} == yes
+	@${CAT} ${PLISTORIG} > ${PLIST}
+.else
+	@${GREP} -vw 'im-wl\.elc\?' ${PLISTORIG} > ${PLIST}
 .endif
 
 post-install:
@@ -94,25 +115,25 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MAKE} install-docs
 .endif
-.if (${EMACS_PORT} == "xemacs20")
+.if (${EMACS_PORT_NAME} == "xemacs20")
 	@${MAKE} install-icons
 .endif
 	@${MAKE} install-samples
 	@${MAKE} install-utils
-.if (${EMACS_PORT} == "xemacs21-mule")
+.if (${EMACS_PORT_NAME} == "xemacs21-mule")
 	@${MAKE} install-manifest
 .endif
 	@${CAT} ${PKGDIR}/MESSAGE
 
 # local targets
 install-info:
-.if (${EMACS_PORT} == "xemacs21-mule")
+.if (${EMACS_PORT_NAME} == "xemacs21-mule")
 	@if [ ! -f ${PREFIX}/${EMACS_PACKAGESDIR}/info/dir ]; then \
 		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/${EMACS_PACKAGESDIR}/info/dir; \
 	fi
 	@install-info --section=${DIRSECTION} ${PREFIX}/${EMACS_PACKAGESDIR}/info/wl-ja.info ${PREFIX}/${EMACS_PACKAGESDIR}/info/dir
 .endif
-.if (${EMACS_PORT} == "emacs20" || ${EMACS_PORT} == "mule")
+.if (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule")
 	@${INSTALL_DATA} ${WRKSRC}/doc/wl-ja.info ${PREFIX}/info
 	@install-info --section=${DIRSECTION} ${PREFIX}/info/wl-ja.info ${PREFIX}/info/dir
 .endif
@@ -125,38 +146,46 @@ install-docs:
 	@${INSTALL_DATA} ${WRKSRC}/doc/wl-ja.texi ${DOCSDIR}
 
 install-icons:
-	@${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/etc/wanderlust
-	@for i in *.xpm ; do \
-		${INSTALL_DATA} ${WRKSRC}/etc/$$i ${PREFIX}/${EMACS_LIBDIR}/etc/wanderlust ; \
-	done
+	@${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:
 	@${MKDIR} ${SAMPLESDIR}
+	@${MKDIR} ${SAMPLESDIR_JA}
 	@for i in ${SAMPLES} ; do \
-	${INSTALL_DATA} ${WRKSRC}/$$i ${SAMPLESDIR} ; \
+	${INSTALL_DATA} ${WRKSRC}/samples/en/$$i ${SAMPLESDIR} ; \
+	${INSTALL_DATA} ${WRKSRC}/samples/ja/$$i ${SAMPLESDIR_JA} ; \
 	done
 
 install-utils:
-.if (${EMACS_PORT} == "xemacs21-mule")
+.if (${EMACS_PORT_NAME} == "xemacs21-mule")
 	@${INSTALL_DATA} ${WRKDIR}/wanderlust-startup.el ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/wl
 	@${INSTALL_DATA} ${WRKSRC}/utils/bbdb-wl.el ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/wl
-	@${INSTALL_DATA} ${WRKSRC}/utils/im-wl.el ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/wl
-	@${INSTALL_DATA} ${WRKSRC}/utils/wl-user-agent.el ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/wl
+	@${INSTALL_DATA} ${WRKSRC}/utils/rfc2368.el ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/wl
+	@${INSTALL_DATA} ${WRKSRC}/utils/ssl.el ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/wl
+	@${INSTALL_DATA} ${WRKSRC}/utils/wl-mailto.el ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/wl
 .else
-.if (${EMACS_PORT} == "emacs" || ${EMACS_PORT} == "mule")
+.if (${EMACS_PORT_NAME} == "emacs" || ${EMACS_PORT_NAME} == "mule")
 	@${INSTALL_DATA} ${WRKDIR}/wanderlust-startup.el ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+.if (${EMACS_PORT_NAME} == "emacs")
+	@${INSTALL_DATA} ${WRKDIR}/wl-${PORTVERSION}/wl-mule.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp/wl
+.endif
 .else
 	@${INSTALL_DATA} ${WRKDIR}/wanderlust-startup.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp
 .endif
-	@${INSTALL_DATA} ${WRKSRC}/utils/bbdb-wl.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp/wanderlust
-	@${INSTALL_DATA} ${WRKSRC}/utils/im-wl.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp/wanderlust
-	@${INSTALL_DATA} ${WRKSRC}/utils/wl-user-agent.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp/wanderlust
+	@${INSTALL_DATA} ${WRKSRC}/utils/bbdb-wl.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp/wl
+	@${INSTALL_DATA} ${WRKSRC}/utils/rfc2368.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp/wl
+	@${INSTALL_DATA} ${WRKSRC}/utils/ssl.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp/wl
+	@${INSTALL_DATA} ${WRKSRC}/utils/wl-mailto.el ${PREFIX}/${EMACS_LIBDIR}/site-lisp/wl
 .endif
 
 install-manifest:
-	@${CAT} ${PKGDIR}/PLIST.${EMACS_PORT} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
+	@${CAT} ${PKGDIR}/PLIST.${EMACS_PORT_NAME} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s!^%%EMACS_PACKAGESDIR%%!!" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
-	@${INSTALL_DATA} ${FILESDIR}/_pkg.el ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/wl/
+	@${INSTALL_DATA} ${FILESDIR}/_pkg.el ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/wl
 
 .include <bsd.port.mk>
diff --git a/mail/wanderlust/distinfo b/mail/wanderlust/distinfo
index 9345ba48e1a9..38907ae3fa67 100644
--- a/mail/wanderlust/distinfo
+++ b/mail/wanderlust/distinfo
@@ -1 +1 @@
-MD5 (wl-1.0.3.tar.gz) = b11bb7e555620fe9a961413a392be053
+MD5 (wl-1.1.0.tar.gz) = f1a3892a1adfe5333bafea827bb045ee
diff --git a/mail/wanderlust/files/_pkg.el b/mail/wanderlust/files/_pkg.el
index c7cec28f1480..0f5f6a175db3 100644
--- a/mail/wanderlust/files/_pkg.el
+++ b/mail/wanderlust/files/_pkg.el
@@ -1,4 +1,4 @@
 ;;;###autoload
 (package-provide 'wl
-                 :version 1.03
+                 :version 1.10
                  :type 'regular)
diff --git a/mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl b/mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl
index 19dbd53753ac..287822b1cec4 100644
--- a/mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl
+++ b/mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl
@@ -1,6 +1,6 @@
 (autoload 'wl "wl" "Wanderlust" t)
 (autoload 'wl-draft "wl" "Write draft with Wanderlust." t)
-(setq load-path (cons "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/wanderlust" load-path))
+(setq load-path (cons "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/wl" load-path))
 (require 'semi-setupel)
 (require 'flim-setupel)
 (require 'apel-setupel)
diff --git a/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl b/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl
index d827fe9f88c2..0b2a4a7ac994 100644
--- a/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl
+++ b/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl
@@ -1,6 +1,6 @@
 (autoload 'wl "wl" "Wanderlust" t)
 (autoload 'wl-draft "wl" "Write draft with Wanderlust." t)
-(setq load-path (cons "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/wanderlust" load-path))
+(setq load-path (cons "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/wl" load-path))
 (require 'semi-setupel)
 (require 'flim-setupel)
 (require 'apel-setupel)
diff --git a/mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl b/mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl
index 63565c1bea6f..5eb85a79ab16 100644
--- a/mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl
+++ b/mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl
@@ -1,8 +1,9 @@
 (autoload 'wl "wl" "Wanderlust" t)
 (autoload 'wl-draft "wl" "Write draft with Wanderlust." t)
+(setq load-path (cons "%%PREFIX%%/%%EMACS_VER_LIBDIR%%/site-lisp/emu" load-path))
 (load "browse-url")
 (load "mime-setup")
-(setq wl-icon-dir "%%PREFIX%%/%%EMACS_LIBDIR%%/etc/wanderlust")
+(setq wl-icon-dir "%%PREFIX%%/%%EMACS_LIBDIR%%/etc/wl")
 (setq wl-summary-weekday-name-lang "en")
 (setq wl-thread-indent-level 2)
 (setq wl-thread-have-younger-brother-str "+")
diff --git a/mail/wanderlust/pkg-descr b/mail/wanderlust/pkg-descr
index a9bc1e5e0ebc..3038586aaaf3 100644
--- a/mail/wanderlust/pkg-descr
+++ b/mail/wanderlust/pkg-descr
@@ -1,7 +1,6 @@
-Wanderlust is a mail/news agent on Emacs/XEmacs .
+Wanderlust is a mail/news agent on Emacs/XEmacs.
 
 The features of Wanderlust are as follows:
-
  * Implementation in elisp only.
  * Support of IMAP4rev1, NNTP, POP(POP3/APOP) and MH format.
  * Integrated access to messages based on Folder Specifications like Mew.
@@ -19,20 +18,6 @@ The features of Wanderlust are as follows:
  * Compression Folder.
  * Automatic expiration of old messages.
 
-Before using Wanderlust, you must set following elisp
-to your own .emacs file.
-
-(require 'wanderlust-startup)
-(load "mime-setup")
-(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl" "Write draft with Wanderlust." t)
-
-And sample configuration files are installed into
-${PREFIX}/share/wanderlust. Please copy to your home
-directory and edit them.
-
-The homepage of Wanderlust is http://www.gohome.org/wl/ 
-(in Japanese).
-
+WWW:	http://www.gohome.org/wl/index-e.html
 --
 MANTANI Nobutaka <nobutaka@nobutaka.com>
diff --git a/mail/wanderlust/pkg-message b/mail/wanderlust/pkg-message
index 1f0aadfa37f5..d845a5b45761 100644
--- a/mail/wanderlust/pkg-message
+++ b/mail/wanderlust/pkg-message
@@ -1,10 +1,13 @@
-***************************************************************
-* Before using Wanderlust, you must set following elisp       *
-* to your own .emacs file.                                    *
-*                                                             *
-* (require 'wanderlust-startup)                               *
-*                                                             *
-* And if you use APOP authentication, Wanderlust requires     *
-* md5.el. md5.el is contained in Emacs/W3 package. Please get *
-* it from ftp://ftp.cs.indiana.edu/pub/elisp/w3/w3.tar.gz.    *
-***************************************************************
+************************************************************
+* Before using Wanderlust, you must set following elisp    *
+* to your own .emacs file.                                 *
+*                                                          *
+* (require 'wanderlust-startup)                            *
+*                                                          *
+* Sample configuration files are installed into            *
+* ${PREFIX}/share/wanderlust.  Please copy to your home    *
+* directory and edit them.                                 *
+*                                                          *
+* If you are to use APOP authentication, Wanderlust will   *
+* require md5.el, which is included in Emacs/W3 package.   *
+************************************************************
diff --git a/mail/wanderlust/pkg-plist.emacs b/mail/wanderlust/pkg-plist.emacs
index b7754d6e5812..c11cfe525aa7 100644
--- a/mail/wanderlust/pkg-plist.emacs
+++ b/mail/wanderlust/pkg-plist.emacs
@@ -3,49 +3,102 @@ share/doc/wanderlust/00README.ja
 share/doc/wanderlust/ChangeLog
 share/doc/wanderlust/ChangeLog.ja
 share/doc/wanderlust/wl-ja.texi
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/bbdb-wl.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-archive.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-cache.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-date.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-dop.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-filter.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-internal.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-localdir.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-localnews.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-maildir.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-msgdb.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-multi.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-nntp.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-pop3.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo2.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/im-wl.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/mmelmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/mmelmo.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-address.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-demo.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-draft.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-expire.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-fldmgr.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-folder.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-highlight.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-message.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-mime.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-mule.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-refile.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-summary.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-template.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-thread.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-user-agent.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.el
+%%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-nntp.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.el
+%%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/elmo2.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
+%%EMACS_LIBDIR%%/site-lisp/wl/im-wl.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/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/rfc2368.el
+%%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
+%%EMACS_LIBDIR%%/site-lisp/wl/utf7.el
+%%EMACS_LIBDIR%%/site-lisp/wl/utf7.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mailto.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mule.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-util.el
+%%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.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
-share/examples/wanderlust/sample.addresses
-share/examples/wanderlust/sample.dot.wl
-share/examples/wanderlust/sample.folders
-@dirrm %%EMACS_LIBDIR%%/site-lisp/wanderlust
+share/examples/wanderlust/en/dot.addresses
+share/examples/wanderlust/en/dot.wl
+share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/ja/dot.addresses
+share/examples/wanderlust/ja/dot.wl
+share/examples/wanderlust/ja/dot.folders
+@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
 @dirrm share/doc/wanderlust
+@dirrm share/examples/wanderlust/en
+@dirrm share/examples/wanderlust/ja
 @dirrm share/examples/wanderlust
diff --git a/mail/wanderlust/pkg-plist.emacs20 b/mail/wanderlust/pkg-plist.emacs20
index b693eb90d736..6987cc515583 100644
--- a/mail/wanderlust/pkg-plist.emacs20
+++ b/mail/wanderlust/pkg-plist.emacs20
@@ -7,49 +7,103 @@ share/doc/wanderlust/00README.ja
 share/doc/wanderlust/ChangeLog
 share/doc/wanderlust/ChangeLog.ja
 share/doc/wanderlust/wl-ja.texi
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/bbdb-wl.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-archive.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-cache.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-date.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-dop.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-filter.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-internal.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-localdir.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-localnews.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-maildir.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-msgdb.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-multi.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-nntp.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-pop3.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo2.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/im-wl.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/mmelmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/mmelmo.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-address.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-demo.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-draft.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-expire.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-fldmgr.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-folder.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-highlight.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-message.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-mime.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-mule.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-refile.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-summary.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-template.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-thread.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-user-agent.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.el
+%%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-nntp.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.el
+%%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/elmo2.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
+%%EMACS_LIBDIR%%/site-lisp/wl/im-wl.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/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/rfc2368.el
+%%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
+%%EMACS_LIBDIR%%/site-lisp/wl/utf7.el
+%%EMACS_LIBDIR%%/site-lisp/wl/utf7.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mailto.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mule.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mule.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-util.el
+%%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.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
 %%EMACS_LIBDIR%%/site-lisp/wanderlust-startup.el
-share/examples/wanderlust/sample.addresses
-share/examples/wanderlust/sample.dot.wl
-share/examples/wanderlust/sample.folders
-@dirrm %%EMACS_LIBDIR%%/site-lisp/wanderlust
+share/examples/wanderlust/en/dot.addresses
+share/examples/wanderlust/en/dot.wl
+share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/ja/dot.addresses
+share/examples/wanderlust/ja/dot.wl
+share/examples/wanderlust/ja/dot.folders
+@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
 @dirrm share/doc/wanderlust
+@dirrm share/examples/wanderlust/en
+@dirrm share/examples/wanderlust/ja
 @dirrm share/examples/wanderlust
diff --git a/mail/wanderlust/pkg-plist.mule b/mail/wanderlust/pkg-plist.mule
index 5748d52a1ffa..b8a191a63fbf 100644
--- a/mail/wanderlust/pkg-plist.mule
+++ b/mail/wanderlust/pkg-plist.mule
@@ -7,49 +7,103 @@ share/doc/wanderlust/00README.ja
 share/doc/wanderlust/ChangeLog
 share/doc/wanderlust/ChangeLog.ja
 share/doc/wanderlust/wl-ja.texi
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/bbdb-wl.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-archive.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-cache.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-date.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-dop.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-filter.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-internal.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-localdir.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-localnews.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-maildir.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-msgdb.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-multi.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-nntp.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-pop3.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo2.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/im-wl.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/mmelmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/mmelmo.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-address.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-demo.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-draft.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-expire.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-fldmgr.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-folder.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-highlight.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-message.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-mime.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-mule.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-refile.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-summary.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-template.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-thread.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-user-agent.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.el
+%%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-nntp.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.el
+%%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/elmo2.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
+%%EMACS_LIBDIR%%/site-lisp/wl/im-wl.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/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/rfc2368.el
+%%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
+%%EMACS_LIBDIR%%/site-lisp/wl/utf7.el
+%%EMACS_LIBDIR%%/site-lisp/wl/utf7.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mailto.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mule.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mule.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-util.el
+%%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.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
-share/examples/wanderlust/sample.addresses
-share/examples/wanderlust/sample.dot.wl
-share/examples/wanderlust/sample.folders
-@dirrm %%EMACS_LIBDIR%%/site-lisp/wanderlust
+share/examples/wanderlust/en/dot.addresses
+share/examples/wanderlust/en/dot.wl
+share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/ja/dot.addresses
+share/examples/wanderlust/ja/dot.wl
+share/examples/wanderlust/ja/dot.folders
+@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
 @dirrm share/doc/wanderlust
+@dirrm share/examples/wanderlust/en
+@dirrm share/examples/wanderlust/ja
 @dirrm share/examples/wanderlust
diff --git a/mail/wanderlust/pkg-plist.xemacs20 b/mail/wanderlust/pkg-plist.xemacs20
index 16f2af5fbee8..629ca4e26fad 100644
--- a/mail/wanderlust/pkg-plist.xemacs20
+++ b/mail/wanderlust/pkg-plist.xemacs20
@@ -1,107 +1,167 @@
-%%EMACS_LIBDIR%%/etc/wanderlust/archive.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/closed.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/draft.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/elmo.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/filter.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/imap.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/internal.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/local.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/localnews.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/multi.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/news.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/opened.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/pop.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/queue.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/trash-e.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/trash.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-draft-insert-signature-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-draft-kill-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-draft-send-from-toolbar-down.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-draft-send-from-toolbar-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-draft-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-draft-yank-original-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-exit-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-check-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-empty-trash-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-jump-to-current-entity-no-sync-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-jump-to-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-next-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-prev-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-select-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-sync-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-folder-zoom-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-logo.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-message-extract-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-message-next-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-message-play-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-message-prev-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-message-quit-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-message-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-delete-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-exit-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-forward-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-jump-to-current-message-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-mark-as-important-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-next-page-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-next-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-prev-page-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-prev-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-reply-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-reply-with-citation-up.xpm
-%%EMACS_LIBDIR%%/etc/wanderlust/wl-summary-sync-force-update-up.xpm
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/bbdb-wl.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-archive.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-cache.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-database.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-date.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-dop.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-filter.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-internal.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-localdir.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-localnews.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-maildir.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-msgdb.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-multi.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-nntp.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-pop3.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/elmo2.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/im-wl.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/mmelmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/mmelmo.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-address.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-demo.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-dnd.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-draft.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-expire.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-fldmgr.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-folder.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-highlight.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-message.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-mime.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-refile.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-summary.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-template.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-thread.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-user-agent.el
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl-xmas.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust/wl.elc
+%%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%%/site-lisp/wl/bbdb-wl.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-database.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-database.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.el
+%%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-nntp.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.el
+%%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/elmo2.el
+%%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
+%%EMACS_LIBDIR%%/site-lisp/wl/im-wl.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/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/rfc2368.el
+%%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
+%%EMACS_LIBDIR%%/site-lisp/wl/utf7.el
+%%EMACS_LIBDIR%%/site-lisp/wl/utf7.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-dnd.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-dnd.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mailto.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-util.el
+%%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-xmas.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl-xmas.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/wl.el
+%%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
 %%EMACS_LIBDIR%%/site-lisp/wanderlust-startup.el
 share/doc/wanderlust/00README
 share/doc/wanderlust/00README.ja
 share/doc/wanderlust/ChangeLog
 share/doc/wanderlust/ChangeLog.ja
 share/doc/wanderlust/wl-ja.texi
-share/examples/wanderlust/sample.addresses
-share/examples/wanderlust/sample.dot.wl
-share/examples/wanderlust/sample.folders
-@dirrm %%EMACS_LIBDIR%%/etc/wanderlust
-@dirrm %%EMACS_LIBDIR%%/site-lisp/wanderlust
+share/examples/wanderlust/en/dot.addresses
+share/examples/wanderlust/en/dot.wl
+share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/ja/dot.addresses
+share/examples/wanderlust/ja/dot.wl
+share/examples/wanderlust/ja/dot.folders
+@dirrm %%EMACS_LIBDIR%%/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
diff --git a/mail/wanderlust/pkg-plist.xemacs21-mule b/mail/wanderlust/pkg-plist.xemacs21-mule
index 8022b753b913..390fb262e1cd 100644
--- a/mail/wanderlust/pkg-plist.xemacs21-mule
+++ b/mail/wanderlust/pkg-plist.xemacs21-mule
@@ -7,13 +7,17 @@
 %%EMACS_PACKAGESDIR%%/etc/wl/internal.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/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/trash-e.xpm
 %%EMACS_PACKAGESDIR%%/etc/wl/trash.xpm
+%%EMACS_PACKAGESDIR%%/etc/wl/unplugged.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
@@ -52,49 +56,101 @@
 %%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/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/auto-autoloads.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/bbdb-wl.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/bbdb-wl.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/custom-load.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/custom-load.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-archive.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-archive.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-cache.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-cache.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-database.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-database.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-date.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-date.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-dop.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-dop.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-filter.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-filter.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-imap4.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-imap4.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-internal.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-internal.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-localdir.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo-localdir.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-localnews.el
 %%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-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-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-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/elmo2.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/elmo2.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/im-wl.el
+%%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/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/rfc2368.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/ssl.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/utf7.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/utf7.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-address.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-address.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-demo.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-demo.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-dnd.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-dnd.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-draft.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-draft.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-expire.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-expire.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-fldmgr.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-fldmgr.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-folder.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-folder.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-highlight.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-highlight.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-mailto.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-message.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-message.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-mime.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-mime.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-refile.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-refile.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-score.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-score.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-summary.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-summary.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-template.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-template.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-thread.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-thread.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-user-agent.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl-util.el
 %%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-xmas.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-xmas.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/wl.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/wanderlust-startup.el
 @unexec install-info --section="%%DIRSECTION%%" --delete %D/%%EMACS_PACKAGESDIR%%/info/wl-ja.info %D/%%EMACS_PACKAGESDIR%%/info/dir
@@ -107,10 +163,15 @@ share/doc/wanderlust/00README.ja
 share/doc/wanderlust/ChangeLog
 share/doc/wanderlust/ChangeLog.ja
 share/doc/wanderlust/wl-ja.texi
-share/examples/wanderlust/sample.addresses
-share/examples/wanderlust/sample.dot.wl
-share/examples/wanderlust/sample.folders
+share/examples/wanderlust/en/dot.addresses
+share/examples/wanderlust/en/dot.wl
+share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/ja/dot.addresses
+share/examples/wanderlust/ja/dot.wl
+share/examples/wanderlust/ja/dot.folders
 @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