Update to 2.6.1.

Move master port from mail/wanderlust-emacs to mail/wanderlust.
mail/wanderlust supports emacs21.
Remove mail/wanderlust-emacs and mail/wanderlust-mule.

Approved by:	knu

13 files changed, 335 insertions, 775 deletions

diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index 7b0cdb5e2313..b305f3e1a265 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	Wanderlust (for emacs)
+# New ports collection makefile for:	Wanderlust
 # Date created:		7 Apr 1999
 # Whom: 		MANTANI Nobutaka <nobutaka@nobutaka.com>
 #
@@ -6,44 +6,34 @@
 #
 
 PORTNAME=	wanderlust
-PORTVERSION=	2.4.1
+PORTVERSION=	2.6.1
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/elisp/wl/stable/&,} \
 		ftp://ftp.jaist.ac.jp/pub/GNU/elisp/ftp.gohome.org/wl/stable/ \
-		http://www.jpl.org/elips/wl/
+		http://www.jpl.org/elips/wl/stable/
 
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	wl-${PORTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 
-MIMEUI_PRODUCT?=	semi
-MIMEUI_BRANCH?=		1.13
-MIMEUI_PORT_NAME?=	${MIMEUI_PRODUCT}${MIMEUI_BRANCH:S/.//}-${EMACS_PORT_NAME}
-MIMEUI_COOKIE=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_BRANCH}.FreeBSD-packages
+EMACS_PORT_NAME?=	emacs21
 
-.if !defined (IS_SLAVE)
-# for emacs19
-EMACS_PORT_NAME=	emacs
-.endif
-
-.if (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule" || \
-     ${EMACS_PORT_NAME} == "xemacs21-mule")
-WITH_MULE=yes
+.if (${EMACS_PORT_NAME} == "emacs21")
+MIMEUI_PORT_NAME=	${MIMEUI_PRODUCT}
 .else
-WITHOUT_MULE=yes
+MIMEUI_PORT_NAME=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}
 .endif
 
+MIMEUI_PRODUCT=	semi
+MIMEUI_VERSION=	1.14
+MIMEUI_COOKIE=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
+
 # depends on semi
 BUILD_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
 RUN_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
 
-# 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
@@ -53,29 +43,31 @@ STARTUPDIR=	${EMACS_PACKAGESDIR}/lisp/wl
 ALL_TARGET=	all info
 INSTALL_TARGET=	install install-info
 INFODIR=	${PREFIX}/info
-UTILSDIR=	${EMACS_SITE_LISPDIR}/wl
-.if (${EMACS_PORT_NAME} == "xemacs20")
-STARTUPDIR=	${EMACS_SITE_LISPDIR}
-.else
+UTILSDIR=	${EMACS_VERSION_SITE_LISPDIR}/wl
+WL_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/wl
+WL_ICONDIR=	${EMACS_LIBDIR_WITH_VER}/etc/wl/icons
 STARTUPDIR=	${EMACS_VERSION_SITE_LISPDIR}
 .endif
-.endif
 
 DIRSECTION=	"The Emacs editor and associated tools"
 PORTDOCDIR=	share/doc/wanderlust
-DOCS=		README README.ja ChangeLog BUGS BUGS.ja \
-		NEWS NEWS.ja doc/wl-ja.texi doc/wl.texi
+PORTDOCDIR_JA=share/doc/ja/wanderlust
+DOCS=		README NEWS doc/wl.texi
+DOCS_JA=	README.ja NEWS.ja doc/wl-ja.texi
 SAMPLESDIR=	share/examples/wanderlust
 SAMPLESLANG=	en ja
 SAMPLES=	dot.addresses dot.folders dot.wl
 UTILS=		bbdb-wl.el im-wl.el ssl.el
 
 PLIST_SUB+=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
-		DIRSECTION=${DIRSECTION}
+		DIRSECTION=${DIRSECTION} \
+		STARTUPDIR=${STARTUPDIR} \
+		WL_LISPDIR=${WL_LISPDIR} \
+		WL_ICONDIR=${WL_ICONDIR}
 
 PLIST=		${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 MAKE_ARGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD} \
-		LISPDIR=${PREFIX}/${EMACS_SITE_LISPDIR} \
+		LISPDIR=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \
 		FLAGS="-batch -q -no-site-file -l ${WRKDIR}/wanderlust-startup.el"
 .if defined(EMACS_PACKAGESDIR)
 MAKE_ARGS+=	PACKAGEDIR=${PREFIX}/${EMACS_PACKAGESDIR}
@@ -85,11 +77,6 @@ MAKE_ARGS+=	INFODIR=${INFODIR}
 
 post-extract:
 	@${CP} ${FILESDIR}/WL-CFG ${WRKSRC}
-.if defined(WITH_MULE) && !defined(WITHOUT_MULE)
-	@${ECHO} '(setq wl-info-lang (list "en" "ja"))' >> ${WRKSRC}/WL-CFG
-.else
-	@${ECHO} '(setq wl-info-lang "en")' >> ${WRKSRC}/WL-CFG
-.endif
 
 post-configure:
 	@${SED} \
@@ -98,10 +85,6 @@ 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)
@@ -124,18 +107,18 @@ post-install:
 
 # local targets
 install-info:
-	@install-info --section=${DIRSECTION} ${WRKSRC}/doc/wl.info ${INFODIR}/dir
-.if defined(WITH_MULE) && !defined(WITHOUT_MULE)
-	@install-info --section=${DIRSECTION} ${WRKSRC}/doc/wl-ja.info ${INFODIR}/dir
-.endif
+	@install-info --section=${DIRSECTION} ${WRKSRC}/doc/wl.info ${INFODIR}/dir 2>/dev/null
+	@install-info --section=${DIRSECTION} ${WRKSRC}/doc/wl-ja.info ${INFODIR}/dir 2>/dev/null
 
 install-docs:
 	@${MKDIR} ${PREFIX}/${PORTDOCDIR}
+	@${MKDIR} ${PREFIX}/${PORTDOCDIR_JA}
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${PORTDOCDIR}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/elmo/ChangeLog ${PREFIX}/${PORTDOCDIR}/ChangeLog.elmo
-	${INSTALL_DATA} ${WRKSRC}/wl/ChangeLog ${PREFIX}/${PORTDOCDIR}/ChangeLog.wl
+.for i in ${DOCS_JA}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${PORTDOCDIR_JA}
+.endfor
 
 install-samples:
 .for l in ${SAMPLESLANG}
@@ -152,9 +135,6 @@ install-utils:
 .for i in ${UTILS}
 	${INSTALL_DATA} ${WRKSRC}/utils/${i} ${PREFIX}/${UTILSDIR}
 .endfor
-.if (${EMACS_PORT_NAME} == "emacs")
-	@${INSTALL_DATA} ${WRKSRC}/wl/wl-mule.el ${PREFIX}/${EMACS_SITE_LISPDIR}/wl
-.endif
 	@${MKDIR} ${PREFIX}/${STARTUPDIR}
 	@${INSTALL_DATA} ${WRKDIR}/wanderlust-startup.el ${PREFIX}/${STARTUPDIR}
 
diff --git a/mail/wanderlust/distinfo b/mail/wanderlust/distinfo
index c21fbc5144b1..cf4e473e2dd4 100644
--- a/mail/wanderlust/distinfo
+++ b/mail/wanderlust/distinfo
@@ -1 +1 @@
-MD5 (wl-2.4.1.tar.gz) = 528ee07fd61b05d985cd179d6cc3189d
+MD5 (wl-2.6.1.tar.gz) = 12008d4ec14be40b1a927e9a9874a191
diff --git a/mail/wanderlust/files/WL-CFG b/mail/wanderlust/files/WL-CFG
index b5e3a444ece0..d4c3de6f5acf 100644
--- a/mail/wanderlust/files/WL-CFG
+++ b/mail/wanderlust/files/WL-CFG
@@ -1,2 +1,2 @@
 (setq wl-install-utils t)
-(setq wl-install-sasl t)
+(setq wl-info-lang (list "en" "ja"))
diff --git a/mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl b/mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl
deleted file mode 100644
index b635021cd1f5..000000000000
--- a/mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
-(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))
-(require 'semi-setupel)
-(require 'flim-setupel)
-(require 'apel-setupel)
-(load "mime-setup")
-(setq wl-summary-weekday-name-lang "en")
-(setq wl-thread-indent-level 2)
-(setq wl-thread-have-younger-brother-str "+")
-(setq wl-thread-youngest-child-str       "+")
-(setq wl-thread-vertical-str             "|")
-(setq wl-thread-horizontal-str           "-")
-(setq wl-thread-space-str                " ")
-(provide 'wanderlust-startup)
diff --git a/mail/wanderlust/files/wanderlust-startup.emacs21.el.tmpl b/mail/wanderlust/files/wanderlust-startup.emacs21.el.tmpl
new file mode 100644
index 000000000000..e9ef833c9671
--- /dev/null
+++ b/mail/wanderlust/files/wanderlust-startup.emacs21.el.tmpl
@@ -0,0 +1,4 @@
+(autoload 'wl "wl" "Wanderlust" t)
+(autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
+(load "mime-setup")
+(provide 'wanderlust-startup)
diff --git a/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl b/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl
deleted file mode 100644
index 7032cd33a2ab..000000000000
--- a/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl
+++ /dev/null
@@ -1,9 +0,0 @@
-(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)
-(load "mime-setup")
-(provide 'wanderlust-startup)
diff --git a/mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl b/mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl
deleted file mode 100644
index 423395b5a2f1..000000000000
--- a/mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl-draft" "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/wl")
-(setq wl-summary-weekday-name-lang "en")
-(setq wl-thread-indent-level 2)
-(setq wl-thread-have-younger-brother-str "+")
-(setq wl-thread-youngest-child-str       "+")
-(setq wl-thread-vertical-str             "|")
-(setq wl-thread-horizontal-str           "-")
-(setq wl-thread-space-str                " ")
-(provide 'wanderlust-startup)
diff --git a/mail/wanderlust/pkg-plist.emacs b/mail/wanderlust/pkg-plist.emacs
deleted file mode 100644
index 23ca97ee4121..000000000000
--- a/mail/wanderlust/pkg-plist.emacs
+++ /dev/null
@@ -1,149 +0,0 @@
-@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
-share/doc/wanderlust/BUGS
-share/doc/wanderlust/BUGS.ja
-share/doc/wanderlust/README
-share/doc/wanderlust/README.ja
-share/doc/wanderlust/ChangeLog
-share/doc/wanderlust/ChangeLog.elmo
-share/doc/wanderlust/ChangeLog.wl
-share/doc/wanderlust/NEWS
-share/doc/wanderlust/NEWS.ja
-share/doc/wanderlust/wl-ja.texi
-share/doc/wanderlust/wl.texi
-%%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
-%%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-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
-%%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/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-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
-@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/ssl.elc
-%%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-mailto.elc
-%%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-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
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
-share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.folders
-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 2ea98a853197..ed8cbd887ab4 100644
--- a/mail/wanderlust/pkg-plist.emacs20
+++ b/mail/wanderlust/pkg-plist.emacs20
@@ -1,142 +1,111 @@
-@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl.info %D/info/dir
+@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl.info %D/info/dir 2>/dev/null
 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
+@exec install-info --section="%%DIRSECTION%%" %D/info/wl.info %D/info/dir 2>/dev/null
+@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl-ja.info %D/info/dir 2>/dev/null
 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
-share/doc/wanderlust/README.ja
-share/doc/wanderlust/ChangeLog
-share/doc/wanderlust/ChangeLog.elmo
-share/doc/wanderlust/ChangeLog.wl
+@exec install-info --section="%%DIRSECTION%%" %D/info/wl-ja.info %D/info/dir 2>/dev/null
+share/doc/ja/wanderlust/NEWS.ja
+share/doc/ja/wanderlust/README.ja
+share/doc/ja/wanderlust/wl-ja.texi
 share/doc/wanderlust/NEWS
-share/doc/wanderlust/NEWS.ja
-share/doc/wanderlust/wl-ja.texi
+share/doc/wanderlust/README
 share/doc/wanderlust/wl.texi
-%%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
-%%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-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
-%%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/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-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
-%%EMACS_LIBDIR%%/site-lisp/wl/ssl.elc
-%%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-mailto.elc
-%%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-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
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.elc
+%%WL_LISPDIR%%/bbdb-wl.el
+@unexec rm -f %D/%%WL_LISPDIR%%/bbdb-wl.elc
+%%WL_LISPDIR%%/elmo-archive.el
+%%WL_LISPDIR%%/elmo-archive.elc
+%%WL_LISPDIR%%/elmo-cache.el
+%%WL_LISPDIR%%/elmo-cache.elc
+%%WL_LISPDIR%%/elmo-date.el
+%%WL_LISPDIR%%/elmo-date.elc
+%%WL_LISPDIR%%/elmo-dop.el
+%%WL_LISPDIR%%/elmo-dop.elc
+%%WL_LISPDIR%%/elmo-filter.el
+%%WL_LISPDIR%%/elmo-filter.elc
+%%WL_LISPDIR%%/elmo-imap4.el
+%%WL_LISPDIR%%/elmo-imap4.elc
+%%WL_LISPDIR%%/elmo-internal.el
+%%WL_LISPDIR%%/elmo-internal.elc
+%%WL_LISPDIR%%/elmo-localdir.el
+%%WL_LISPDIR%%/elmo-localdir.elc
+%%WL_LISPDIR%%/elmo-localnews.el
+%%WL_LISPDIR%%/elmo-localnews.elc
+%%WL_LISPDIR%%/elmo-maildir.el
+%%WL_LISPDIR%%/elmo-maildir.elc
+%%WL_LISPDIR%%/elmo-msgdb.el
+%%WL_LISPDIR%%/elmo-msgdb.elc
+%%WL_LISPDIR%%/elmo-multi.el
+%%WL_LISPDIR%%/elmo-multi.elc
+%%WL_LISPDIR%%/elmo-net.el
+%%WL_LISPDIR%%/elmo-net.elc
+%%WL_LISPDIR%%/elmo-nntp.el
+%%WL_LISPDIR%%/elmo-nntp.elc
+%%WL_LISPDIR%%/elmo-pipe.el
+%%WL_LISPDIR%%/elmo-pipe.elc
+%%WL_LISPDIR%%/elmo-pop3.el
+%%WL_LISPDIR%%/elmo-pop3.elc
+%%WL_LISPDIR%%/elmo-util.el
+%%WL_LISPDIR%%/elmo-util.elc
+%%WL_LISPDIR%%/elmo-vars.el
+%%WL_LISPDIR%%/elmo-vars.elc
+%%WL_LISPDIR%%/elmo-version.el
+%%WL_LISPDIR%%/elmo-version.elc
+%%WL_LISPDIR%%/elmo2.el
+%%WL_LISPDIR%%/elmo2.elc
+%%WL_LISPDIR%%/im-wl.el
+@unexec rm -f %%WL_LISPDIR%%/im-wl.elc
+%%WL_LISPDIR%%/mmelmo-imap4.el
+%%WL_LISPDIR%%/mmelmo-imap4.elc
+%%WL_LISPDIR%%/mmelmo.el
+%%WL_LISPDIR%%/mmelmo.elc
+%%WL_LISPDIR%%/pldap.el
+%%WL_LISPDIR%%/pldap.elc
+%%WL_LISPDIR%%/rfc2368.el
+%%WL_LISPDIR%%/rfc2368.elc
+%%WL_LISPDIR%%/ssl.el
+%%WL_LISPDIR%%/ssl.elc
+%%WL_LISPDIR%%/utf7.el
+%%WL_LISPDIR%%/utf7.elc
+%%WL_LISPDIR%%/wl-address.el
+%%WL_LISPDIR%%/wl-address.elc
+%%WL_LISPDIR%%/wl-demo.el
+%%WL_LISPDIR%%/wl-demo.elc
+%%WL_LISPDIR%%/wl-draft.el
+%%WL_LISPDIR%%/wl-draft.elc
+%%WL_LISPDIR%%/wl-expire.el
+%%WL_LISPDIR%%/wl-expire.elc
+%%WL_LISPDIR%%/wl-fldmgr.el
+%%WL_LISPDIR%%/wl-fldmgr.elc
+%%WL_LISPDIR%%/wl-folder.el
+%%WL_LISPDIR%%/wl-folder.elc
+%%WL_LISPDIR%%/wl-highlight.el
+%%WL_LISPDIR%%/wl-highlight.elc
+%%WL_LISPDIR%%/wl-mailto.el
+%%WL_LISPDIR%%/wl-mailto.elc
+%%WL_LISPDIR%%/wl-message.el
+%%WL_LISPDIR%%/wl-message.elc
+%%WL_LISPDIR%%/wl-mime.el
+%%WL_LISPDIR%%/wl-mime.elc
+%%WL_LISPDIR%%/wl-mule.el
+%%WL_LISPDIR%%/wl-mule.elc
+%%WL_LISPDIR%%/wl-refile.el
+%%WL_LISPDIR%%/wl-refile.elc
+%%WL_LISPDIR%%/wl-score.el
+%%WL_LISPDIR%%/wl-score.elc
+%%WL_LISPDIR%%/wl-summary.el
+%%WL_LISPDIR%%/wl-summary.elc
+%%WL_LISPDIR%%/wl-template.el
+%%WL_LISPDIR%%/wl-template.elc
+%%WL_LISPDIR%%/wl-thread.el
+%%WL_LISPDIR%%/wl-thread.elc
+%%WL_LISPDIR%%/wl-util.el
+%%WL_LISPDIR%%/wl-util.elc
+%%WL_LISPDIR%%/wl-vars.el
+%%WL_LISPDIR%%/wl-vars.elc
+%%WL_LISPDIR%%/wl-version.el
+%%WL_LISPDIR%%/wl-version.elc
+%%WL_LISPDIR%%/wl.el
+%%WL_LISPDIR%%/wl.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
 share/examples/wanderlust/en/dot.addresses
 share/examples/wanderlust/en/dot.folders
@@ -145,7 +114,8 @@ 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 %%WL_LISPDIR%%
+@dirrm share/doc/ja/wanderlust
 @dirrm share/doc/wanderlust
 @dirrm share/examples/wanderlust/en
 @dirrm share/examples/wanderlust/ja
diff --git a/mail/wanderlust/pkg-plist.emacs21 b/mail/wanderlust/pkg-plist.emacs21
new file mode 100644
index 000000000000..b8a6de68ee82
--- /dev/null
+++ b/mail/wanderlust/pkg-plist.emacs21
@@ -0,0 +1,189 @@
+@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl.info %D/info/dir 2>/dev/null
+info/wl.info
+@exec install-info --section="%%DIRSECTION%%" %D/info/wl.info %D/info/dir 2>/dev/null
+@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl-ja.info %D/info/dir 2>/dev/null
+info/wl-ja.info
+@exec install-info --section="%%DIRSECTION%%" %D/info/wl-ja.info %D/info/dir 2>/dev/null
+share/doc/ja/wanderlust/README.ja
+share/doc/ja/wanderlust/NEWS.ja
+share/doc/ja/wanderlust/wl-ja.texi
+share/doc/wanderlust/README
+share/doc/wanderlust/NEWS
+share/doc/wanderlust/wl.texi
+%%WL_LISPDIR%%/bbdb-wl.el
+@unexec rm -f %D/%%WL_LISPDIR%%/bbdb-wl.elc
+%%WL_LISPDIR%%/elmo-archive.el
+%%WL_LISPDIR%%/elmo-archive.elc
+%%WL_LISPDIR%%/elmo-cache.el
+%%WL_LISPDIR%%/elmo-cache.elc
+%%WL_LISPDIR%%/elmo-date.el
+%%WL_LISPDIR%%/elmo-date.elc
+%%WL_LISPDIR%%/elmo-dop.el
+%%WL_LISPDIR%%/elmo-dop.elc
+%%WL_LISPDIR%%/elmo-filter.el
+%%WL_LISPDIR%%/elmo-filter.elc
+%%WL_LISPDIR%%/elmo-imap4.el
+%%WL_LISPDIR%%/elmo-imap4.elc
+%%WL_LISPDIR%%/elmo-internal.el
+%%WL_LISPDIR%%/elmo-internal.elc
+%%WL_LISPDIR%%/elmo-localdir.el
+%%WL_LISPDIR%%/elmo-localdir.elc
+%%WL_LISPDIR%%/elmo-localnews.el
+%%WL_LISPDIR%%/elmo-localnews.elc
+%%WL_LISPDIR%%/elmo-maildir.el
+%%WL_LISPDIR%%/elmo-maildir.elc
+%%WL_LISPDIR%%/elmo-msgdb.el
+%%WL_LISPDIR%%/elmo-msgdb.elc
+%%WL_LISPDIR%%/elmo-multi.el
+%%WL_LISPDIR%%/elmo-multi.elc
+%%WL_LISPDIR%%/elmo-net.el
+%%WL_LISPDIR%%/elmo-net.elc
+%%WL_LISPDIR%%/elmo-nntp.el
+%%WL_LISPDIR%%/elmo-nntp.elc
+%%WL_LISPDIR%%/elmo-pipe.el
+%%WL_LISPDIR%%/elmo-pipe.elc
+%%WL_LISPDIR%%/elmo-pop3.el
+%%WL_LISPDIR%%/elmo-pop3.elc
+%%WL_LISPDIR%%/elmo-util.el
+%%WL_LISPDIR%%/elmo-util.elc
+%%WL_LISPDIR%%/elmo-vars.el
+%%WL_LISPDIR%%/elmo-vars.elc
+%%WL_LISPDIR%%/elmo-version.el
+%%WL_LISPDIR%%/elmo-version.elc
+%%WL_LISPDIR%%/elmo2.el
+%%WL_LISPDIR%%/elmo2.elc
+%%WL_LISPDIR%%/im-wl.el
+@unexec rm -f %%WL_LISPDIR%%/im-wl.elc
+%%WL_LISPDIR%%/mmelmo-imap4.el
+%%WL_LISPDIR%%/mmelmo-imap4.elc
+%%WL_LISPDIR%%/mmelmo.el
+%%WL_LISPDIR%%/mmelmo.elc
+%%WL_LISPDIR%%/pldap.el
+%%WL_LISPDIR%%/pldap.elc
+%%WL_LISPDIR%%/rfc2368.el
+%%WL_LISPDIR%%/rfc2368.elc
+%%WL_LISPDIR%%/ssl.el
+%%WL_LISPDIR%%/ssl.elc
+%%WL_LISPDIR%%/utf7.el
+%%WL_LISPDIR%%/utf7.elc
+%%WL_LISPDIR%%/wl-address.el
+%%WL_LISPDIR%%/wl-address.elc
+%%WL_LISPDIR%%/wl-demo.el
+%%WL_LISPDIR%%/wl-demo.elc
+%%WL_LISPDIR%%/wl-draft.el
+%%WL_LISPDIR%%/wl-draft.elc
+%%WL_LISPDIR%%/wl-e21.el
+%%WL_LISPDIR%%/wl-e21.elc
+%%WL_LISPDIR%%/wl-expire.el
+%%WL_LISPDIR%%/wl-expire.elc
+%%WL_LISPDIR%%/wl-fldmgr.el
+%%WL_LISPDIR%%/wl-fldmgr.elc
+%%WL_LISPDIR%%/wl-folder.el
+%%WL_LISPDIR%%/wl-folder.elc
+%%WL_LISPDIR%%/wl-highlight.el
+%%WL_LISPDIR%%/wl-highlight.elc
+%%WL_LISPDIR%%/wl-mailto.el
+%%WL_LISPDIR%%/wl-mailto.elc
+%%WL_LISPDIR%%/wl-message.el
+%%WL_LISPDIR%%/wl-message.elc
+%%WL_LISPDIR%%/wl-mime.el
+%%WL_LISPDIR%%/wl-mime.elc
+%%WL_LISPDIR%%/wl-refile.el
+%%WL_LISPDIR%%/wl-refile.elc
+%%WL_LISPDIR%%/wl-score.el
+%%WL_LISPDIR%%/wl-score.elc
+%%WL_LISPDIR%%/wl-summary.el
+%%WL_LISPDIR%%/wl-summary.elc
+%%WL_LISPDIR%%/wl-template.el
+%%WL_LISPDIR%%/wl-template.elc
+%%WL_LISPDIR%%/wl-thread.el
+%%WL_LISPDIR%%/wl-thread.elc
+%%WL_LISPDIR%%/wl-util.el
+%%WL_LISPDIR%%/wl-util.elc
+%%WL_LISPDIR%%/wl-vars.el
+%%WL_LISPDIR%%/wl-vars.elc
+%%WL_LISPDIR%%/wl-version.el
+%%WL_LISPDIR%%/wl-version.elc
+%%WL_LISPDIR%%/wl.el
+%%WL_LISPDIR%%/wl.elc
+%%STARTUPDIR%%/wanderlust-startup.el
+%%WL_ICONDIR%%/archive.xpm
+%%WL_ICONDIR%%/closed.xpm
+%%WL_ICONDIR%%/draft.xpm
+%%WL_ICONDIR%%/elmo.xpm
+%%WL_ICONDIR%%/filter.xpm
+%%WL_ICONDIR%%/imap.xpm
+%%WL_ICONDIR%%/internal.xpm
+%%WL_ICONDIR%%/letter.xpm
+%%WL_ICONDIR%%/local.xpm
+%%WL_ICONDIR%%/localnews.xpm
+%%WL_ICONDIR%%/maildir.xpm
+%%WL_ICONDIR%%/multi.xpm
+%%WL_ICONDIR%%/news.xpm
+%%WL_ICONDIR%%/no-letter.xpm
+%%WL_ICONDIR%%/opened.xpm
+%%WL_ICONDIR%%/pipe.xpm
+%%WL_ICONDIR%%/plugged.xpm
+%%WL_ICONDIR%%/pop.xpm
+%%WL_ICONDIR%%/queue.xpm
+%%WL_ICONDIR%%/trash-e.xpm
+%%WL_ICONDIR%%/trash.xpm
+%%WL_ICONDIR%%/unplugged.xpm
+%%WL_ICONDIR%%/wl-alpha-logo.xbm
+%%WL_ICONDIR%%/wl-alpha-logo.xpm
+%%WL_ICONDIR%%/wl-beta-logo.xbm
+%%WL_ICONDIR%%/wl-beta-logo.xpm
+%%WL_ICONDIR%%/wl-draft-insert-signature-up.xpm
+%%WL_ICONDIR%%/wl-draft-kill-up.xpm
+%%WL_ICONDIR%%/wl-draft-send-from-toolbar-down.xpm
+%%WL_ICONDIR%%/wl-draft-send-from-toolbar-up.xpm
+%%WL_ICONDIR%%/wl-draft-up.xpm
+%%WL_ICONDIR%%/wl-draft-yank-original-up.xpm
+%%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-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
+%%WL_ICONDIR%%/wl-folder-prev-entity-up.xpm
+%%WL_ICONDIR%%/wl-folder-read-up.xpm
+%%WL_ICONDIR%%/wl-folder-select-entity-up.xpm
+%%WL_ICONDIR%%/wl-folder-sync-current-entity-up.xpm
+%%WL_ICONDIR%%/wl-folder-zoom-entity-up.xpm
+%%WL_ICONDIR%%/wl-message-extract-content-up.xpm
+%%WL_ICONDIR%%/wl-message-next-content-up.xpm
+%%WL_ICONDIR%%/wl-message-play-content-up.xpm
+%%WL_ICONDIR%%/wl-message-prev-content-up.xpm
+%%WL_ICONDIR%%/wl-message-quit-up.xpm
+%%WL_ICONDIR%%/wl-message-read-up.xpm
+%%WL_ICONDIR%%/wl-stable-logo.xbm
+%%WL_ICONDIR%%/wl-stable-logo.xpm
+%%WL_ICONDIR%%/wl-summary-delete-up.xpm
+%%WL_ICONDIR%%/wl-summary-exit-up.xpm
+%%WL_ICONDIR%%/wl-summary-forward-up.xpm
+%%WL_ICONDIR%%/wl-summary-jump-to-current-message-up.xpm
+%%WL_ICONDIR%%/wl-summary-mark-as-important-up.xpm
+%%WL_ICONDIR%%/wl-summary-next-page-up.xpm
+%%WL_ICONDIR%%/wl-summary-next-up.xpm
+%%WL_ICONDIR%%/wl-summary-prev-page-up.xpm
+%%WL_ICONDIR%%/wl-summary-prev-up.xpm
+%%WL_ICONDIR%%/wl-summary-read-up.xpm
+%%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
+share/examples/wanderlust/en/dot.addresses
+share/examples/wanderlust/en/dot.folders
+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 %%WL_LISPDIR%%
+@dirrm share/doc/ja/wanderlust
+@dirrm share/doc/wanderlust
+@dirrm %%WL_ICONDIR%%
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/wl
+@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
deleted file mode 100644
index 34edc28fcd34..000000000000
--- a/mail/wanderlust/pkg-plist.mule
+++ /dev/null
@@ -1,150 +0,0 @@
-@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
-share/doc/wanderlust/BUGS
-share/doc/wanderlust/BUGS.ja
-share/doc/wanderlust/README
-share/doc/wanderlust/README.ja
-share/doc/wanderlust/ChangeLog
-share/doc/wanderlust/ChangeLog.elmo
-share/doc/wanderlust/ChangeLog.wl
-share/doc/wanderlust/NEWS
-share/doc/wanderlust/NEWS.ja
-share/doc/wanderlust/wl-ja.texi
-share/doc/wanderlust/wl.texi
-%%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
-%%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-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
-%%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/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-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
-@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/ssl.elc
-%%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-mailto.elc
-%%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-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
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
-share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.folders
-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
deleted file mode 100644
index a10143b2358a..000000000000
--- a/mail/wanderlust/pkg-plist.xemacs20
+++ /dev/null
@@ -1,218 +0,0 @@
-%%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
-%%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-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
-%%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/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-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
-%%EMACS_LIBDIR%%/site-lisp/wl/ssl.elc
-%%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-mailto.elc
-%%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-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
-%%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-cram.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl-digest.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust-startup.el
-@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
-share/doc/wanderlust/BUGS
-share/doc/wanderlust/BUGS.ja
-share/doc/wanderlust/README
-share/doc/wanderlust/README.ja
-share/doc/wanderlust/ChangeLog
-share/doc/wanderlust/ChangeLog.elmo
-share/doc/wanderlust/ChangeLog.wl
-share/doc/wanderlust/NEWS
-share/doc/wanderlust/NEWS.ja
-share/doc/wanderlust/wl-ja.texi
-share/doc/wanderlust/wl.texi
-share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.folders
-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_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 47ca4bf2227e..76f649971ee4 100644
--- a/mail/wanderlust/pkg-plist.xemacs21-mule
+++ b/mail/wanderlust/pkg-plist.xemacs21-mule
@@ -20,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-alpha-logo.xbm
+%%EMACS_PACKAGESDIR%%/etc/wl/wl-alpha-logo.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
@@ -165,46 +167,15 @@
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl-xmas.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl.el
 %%EMACS_PACKAGESDIR%%/lisp/wl/wl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/hmac-def.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/hmac-def.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/hmac-md5.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/hmac-md5.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/hmac-sha1.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/hmac-sha1.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/hex-util.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/hex-util.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/md5-dl.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/md5-dl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/md5-el.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/md5-el.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/md5.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/md5.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/sha1-dl.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/sha1-dl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/sha1-el.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/sha1-el.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/sha1.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/sha1.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/sasl.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/sasl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/sasl-cram.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/sasl-cram.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/sasl-digest.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/sasl-digest.elc
 %%EMACS_PACKAGESDIR%%/lisp/wl/wanderlust-startup.el
 %%EMACS_PACKAGESDIR%%/info/wl-ja.info
 %%EMACS_PACKAGESDIR%%/info/wl.info
 %%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.wl
-share/doc/wanderlust/BUGS
-share/doc/wanderlust/BUGS.ja
+share/doc/ja/wanderlust/README.ja
+share/doc/ja/wanderlust/NEWS.ja
+share/doc/ja/wanderlust/wl-ja.texi
 share/doc/wanderlust/README
-share/doc/wanderlust/README.ja
-share/doc/wanderlust/ChangeLog
-share/doc/wanderlust/ChangeLog.elmo
-share/doc/wanderlust/ChangeLog.wl
 share/doc/wanderlust/NEWS
-share/doc/wanderlust/NEWS.ja
-share/doc/wanderlust/wl-ja.texi
 share/doc/wanderlust/wl.texi
 share/examples/wanderlust/en/dot.addresses
 share/examples/wanderlust/en/dot.folders
@@ -215,6 +186,7 @@ share/examples/wanderlust/ja/dot.wl
 share/wanderlust/ja.Emacs
 @dirrm %%EMACS_PACKAGESDIR%%/etc/wl
 @dirrm %%EMACS_PACKAGESDIR%%/lisp/wl
+@dirrm share/doc/ja/wanderlust
 @dirrm share/doc/wanderlust
 @dirrm share/examples/wanderlust/en
 @dirrm share/examples/wanderlust/ja