1 files changed, 106 insertions, 136 deletions

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