aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteve <steve@FreeBSD.org>2000-07-10 10:03:31 +0800
committersteve <steve@FreeBSD.org>2000-07-10 10:03:31 +0800
commitaf88f3f94d2cd1ef774175d53ff3662aa5673242 (patch)
treecaa59cb1f7fd3991b627d6d3d236c638dd366307
parent94629b33f1050bd90073fd1e6874df605e4ff137 (diff)
downloadfreebsd-ports-graphics-af88f3f94d2cd1ef774175d53ff3662aa5673242.tar.gz
freebsd-ports-graphics-af88f3f94d2cd1ef774175d53ff3662aa5673242.tar.zst
freebsd-ports-graphics-af88f3f94d2cd1ef774175d53ff3662aa5673242.zip
Update to version 1.1.1.
PR: 19308 Submitted by: maintainer
-rw-r--r--mail/wanderlust-emacs/Makefile184
-rw-r--r--mail/wanderlust-emacs/distinfo2
-rw-r--r--mail/wanderlust-emacs/files/WL-CFG2
-rw-r--r--mail/wanderlust-emacs/files/_pkg.el2
-rw-r--r--mail/wanderlust-emacs/files/wanderlust-startup.emacs.el.tmpl2
-rw-r--r--mail/wanderlust-emacs/files/wanderlust-startup.emacs20.el.tmpl2
-rw-r--r--mail/wanderlust-emacs/files/wanderlust-startup.mule.el.tmpl2
-rw-r--r--mail/wanderlust-emacs/files/wanderlust-startup.xemacs20.el.tmpl2
-rw-r--r--mail/wanderlust-emacs/files/wanderlust-startup.xemacs21-mule.el.tmpl2
-rw-r--r--mail/wanderlust-emacs/pkg-descr2
-rw-r--r--mail/wanderlust-emacs/pkg-message7
-rw-r--r--mail/wanderlust-emacs/pkg-plist.emacs61
-rw-r--r--mail/wanderlust-emacs/pkg-plist.emacs2068
-rw-r--r--mail/wanderlust-emacs/pkg-plist.mule66
-rw-r--r--mail/wanderlust-emacs/pkg-plist.xemacs2061
-rw-r--r--mail/wanderlust-emacs/pkg-plist.xemacs21-mule62
-rw-r--r--mail/wanderlust/Makefile184
-rw-r--r--mail/wanderlust/distinfo2
-rw-r--r--mail/wanderlust/files/WL-CFG2
-rw-r--r--mail/wanderlust/files/_pkg.el2
-rw-r--r--mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl2
-rw-r--r--mail/wanderlust/files/wanderlust-startup.emacs20.el.tmpl2
-rw-r--r--mail/wanderlust/files/wanderlust-startup.mule.el.tmpl2
-rw-r--r--mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl2
-rw-r--r--mail/wanderlust/files/wanderlust-startup.xemacs21-mule.el.tmpl2
-rw-r--r--mail/wanderlust/pkg-descr2
-rw-r--r--mail/wanderlust/pkg-message7
-rw-r--r--mail/wanderlust/pkg-plist.emacs61
-rw-r--r--mail/wanderlust/pkg-plist.emacs2068
-rw-r--r--mail/wanderlust/pkg-plist.mule66
-rw-r--r--mail/wanderlust/pkg-plist.xemacs2061
-rw-r--r--mail/wanderlust/pkg-plist.xemacs21-mule62
32 files changed, 700 insertions, 354 deletions
diff --git a/mail/wanderlust-emacs/Makefile b/mail/wanderlust-emacs/Makefile
index 00196cf430e..6988aa9f9ff 100644
--- a/mail/wanderlust-emacs/Makefile
+++ b/mail/wanderlust-emacs/Makefile
@@ -6,85 +6,85 @@
#
PORTNAME= wanderlust
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.1
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/
+ ftp://ftp.ring.gr.jp/pub/text/elisp/wl/stable/ \
+ ftp://ftp.jaist.ac.jp/pub/GNU/elisp/ftp.gohome.org/wl/stable/ \
+ ftp://daidai.kuis.kyoto-u.ac.jp/pub/mirror/ftp.gohome.org/pub/elisp/wl/stable/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= wl-${PORTVERSION}
MAINTAINER= nobutaka@nobutaka.com
-SEMI_VER= 1.13.7
-SEMI_COOKIE= semi-${EMACS_PORT_NAME}-${SEMI_VER}.FreeBSD-packages
+MIMEUI_PRODUCT?= semi
+MIMEUI_VERSION?= 1.13.7
+MIMEUI_PORT_NAME?= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-current
+MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
.if !defined (IS_SLAVE)
# for emacs19
-EMACS_NAME= emacs
EMACS_PORT_NAME= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/emacs
-EMACS_LIBDIR_WITH_VER= share/emacs/${EMACS_VER}
.endif
-EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-
-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_NAME:S/xemacs21-mule/xemacs-mule/}-common-${MULE_VER}:${PORTSDIR}/editors/${EMACS_PORT_NAME}-common
+.if (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule" || \
+ ${EMACS_PORT_NAME} == "xemacs21-mule")
+WITH_MULE=yes
.else
-RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT_NAME}
+WITHOUT_MULE=yes
.endif
+
# depends on semi
-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
+BUILD_DEPENDS+= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
+.if defined(EMACS_PACKAGESDIR)
ALL_TARGET= package
INSTALL_TARGET= install-package
-.endif
-.if (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule")
+UTILSDIR= ${EMACS_PACKAGESDIR}/lisp/wl
+STARTUPDIR= ${EMACS_PACKAGESDIR}/lisp/wl
+.else
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
+STARTUPDIR= ${EMACS_VERSION_SITE_LISPDIR}
.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/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}
-
-PLISTORIG= ${PKGDIR}/PLIST.${EMACS_PORT_NAME}
-PLIST= ${WRKDIR}/PLIST
-
-MAKE_ARGS= EMACS=${EMACS_CMD} LISPDIR=${PREFIX}/${EMACS_LIBDIR}/site-lisp \
+PORTDOCDIR= share/doc/wanderlust
+DOCS= README README.ja ChangeLog BUGS BUGS.ja \
+ NEWS NEWS.ja doc/wl-ja.texi doc/wl.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_LIBDIR=${EMACS_LIBDIR} \
+ EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
+ EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
+ DIRSECTION=${DIRSECTION}
+
+PLIST= ${PKGDIR}/PLIST.${EMACS_PORT_NAME}
+MAKE_ARGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD} \
+ LISPDIR=${PREFIX}/${EMACS_SITE_LISPDIR} \
FLAGS="-batch -q -no-site-file -l ${WRKDIR}/wanderlust-startup.el"
-.if (${EMACS_PORT_NAME} == "xemacs20") || (${EMACS_PORT_NAME} == "xemacs21-mule")
-MAKE_ARGS+= XEMACS=${EMACS_CMD}
-.endif
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
+.if defined(EMACS_PACKAGESDIR)
MAKE_ARGS+= PACKAGEDIR=${PREFIX}/${EMACS_PACKAGESDIR}
.else
-MAKE_ARGS+= INFODIR=${PREFIX}/info
+MAKE_ARGS+= INFODIR=${INFODIR}
+.endif
+
+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:
@@ -96,22 +96,14 @@ post-configure:
< ${FILESDIR}/wanderlust-startup.${EMACS_PORT_NAME}.el.tmpl > ${WRKDIR}/wanderlust-startup.el
pre-build:
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
+.if defined(EMACS_PACKAGESDIR)
@${CP} ${FILESDIR}/_pkg.el ${WRKSRC}
.endif
-pre-install:
-.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:
+.if !defined(EMACS_PACKAGESDIR)
@${MAKE} install-info
+.endif
.if !defined(NOPORTDOCS)
@${MAKE} install-docs
.endif
@@ -120,67 +112,51 @@ post-install:
.endif
@${MAKE} install-samples
@${MAKE} install-utils
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
+.if defined(EMACS_PACKAGESDIR)
@${MAKE} install-manifest
.endif
- @${CAT} ${PKGDIR}/MESSAGE
+ @${CAT} ${PKGMESSAGE}
# local targets
install-info:
-.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_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
+ @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-docs:
- @${MKDIR} ${DOCSDIR}
- @for i in ${DOCS} ; do \
- ${INSTALL_DATA} ${WRKSRC}/$$i ${DOCSDIR} ; \
- done
- @${INSTALL_DATA} ${WRKSRC}/doc/wl-ja.texi ${DOCSDIR}
+ @${MKDIR} ${PREFIX}/${PORTDOCDIR}
+.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
install-icons:
@${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/etc/wl
- @(cd ${WRKSRC}/etc/icons ; \
+ cd ${WRKSRC}/etc/icons ; \
for i in *.xpm ; do \
${INSTALL_DATA} $$i ${PREFIX}/${EMACS_LIBDIR}/etc/wl ; \
- done)
+ done
install-samples:
- @${MKDIR} ${SAMPLESDIR}
- @${MKDIR} ${SAMPLESDIR_JA}
- @for i in ${SAMPLES} ; do \
- ${INSTALL_DATA} ${WRKSRC}/samples/en/$$i ${SAMPLESDIR} ; \
- ${INSTALL_DATA} ${WRKSRC}/samples/ja/$$i ${SAMPLESDIR_JA} ; \
+.for l in ${SAMPLESLANG}
+ ${MKDIR} ${PREFIX}/${SAMPLESDIR}/$l
+ for i in ${SAMPLES} ; do \
+ ${INSTALL_DATA} ${WRKSRC}/samples/$l/$$i ${PREFIX}/${SAMPLESDIR}/$l; \
done
+.endfor
install-utils:
-.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/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_NAME} == "emacs" || ${EMACS_PORT_NAME} == "mule")
- @${INSTALL_DATA} ${WRKDIR}/wanderlust-startup.el ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ @${MKDIR} ${PREFIX}/${UTILSDIR}
+.for i in ${UTILS}
+ ${INSTALL_DATA} ${WRKSRC}/utils/${i} ${PREFIX}/${UTILSDIR}
+.endfor
.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/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
+ @${INSTALL_DATA} ${WRKSRC}/wl/wl-mule.el ${PREFIX}/${EMACS_SITE_LISPDIR}/wl
.endif
+ @${MKDIR} ${PREFIX}/${STARTUPDIR}
+ @${INSTALL_DATA} ${WRKDIR}/wanderlust-startup.el ${PREFIX}/${STARTUPDIR}
install-manifest:
@${CAT} ${PKGDIR}/PLIST.${EMACS_PORT_NAME} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
diff --git a/mail/wanderlust-emacs/distinfo b/mail/wanderlust-emacs/distinfo
index 38907ae3fa6..c9517e7e0a9 100644
--- a/mail/wanderlust-emacs/distinfo
+++ b/mail/wanderlust-emacs/distinfo
@@ -1 +1 @@
-MD5 (wl-1.1.0.tar.gz) = f1a3892a1adfe5333bafea827bb045ee
+MD5 (wl-1.1.1.tar.gz) = fc8ba89ad178b8e968e25bb394a71a31
diff --git a/mail/wanderlust-emacs/files/WL-CFG b/mail/wanderlust-emacs/files/WL-CFG
new file mode 100644
index 00000000000..b5e3a444ece
--- /dev/null
+++ b/mail/wanderlust-emacs/files/WL-CFG
@@ -0,0 +1,2 @@
+(setq wl-install-utils t)
+(setq wl-install-sasl t)
diff --git a/mail/wanderlust-emacs/files/_pkg.el b/mail/wanderlust-emacs/files/_pkg.el
index 0f5f6a175db..c8414973c3c 100644
--- a/mail/wanderlust-emacs/files/_pkg.el
+++ b/mail/wanderlust-emacs/files/_pkg.el
@@ -1,4 +1,4 @@
;;;###autoload
(package-provide 'wl
- :version 1.10
+ :version 1.11
:type 'regular)
diff --git a/mail/wanderlust-emacs/files/wanderlust-startup.emacs.el.tmpl b/mail/wanderlust-emacs/files/wanderlust-startup.emacs.el.tmpl
index 287822b1cec..b635021cd1f 100644
--- a/mail/wanderlust-emacs/files/wanderlust-startup.emacs.el.tmpl
+++ b/mail/wanderlust-emacs/files/wanderlust-startup.emacs.el.tmpl
@@ -1,5 +1,5 @@
(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl" "Write draft with 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)
diff --git a/mail/wanderlust-emacs/files/wanderlust-startup.emacs20.el.tmpl b/mail/wanderlust-emacs/files/wanderlust-startup.emacs20.el.tmpl
index 746d6618e1f..e9ef833c967 100644
--- a/mail/wanderlust-emacs/files/wanderlust-startup.emacs20.el.tmpl
+++ b/mail/wanderlust-emacs/files/wanderlust-startup.emacs20.el.tmpl
@@ -1,4 +1,4 @@
(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl" "Write draft with Wanderlust." t)
+(autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
(load "mime-setup")
(provide 'wanderlust-startup)
diff --git a/mail/wanderlust-emacs/files/wanderlust-startup.mule.el.tmpl b/mail/wanderlust-emacs/files/wanderlust-startup.mule.el.tmpl
index 0b2a4a7ac99..16d63384a0b 100644
--- a/mail/wanderlust-emacs/files/wanderlust-startup.mule.el.tmpl
+++ b/mail/wanderlust-emacs/files/wanderlust-startup.mule.el.tmpl
@@ -1,5 +1,5 @@
(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl" "Write draft with 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)
diff --git a/mail/wanderlust-emacs/files/wanderlust-startup.xemacs20.el.tmpl b/mail/wanderlust-emacs/files/wanderlust-startup.xemacs20.el.tmpl
index 5eb85a79ab1..423395b5a2f 100644
--- a/mail/wanderlust-emacs/files/wanderlust-startup.xemacs20.el.tmpl
+++ b/mail/wanderlust-emacs/files/wanderlust-startup.xemacs20.el.tmpl
@@ -1,5 +1,5 @@
(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl" "Write draft with 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")
diff --git a/mail/wanderlust-emacs/files/wanderlust-startup.xemacs21-mule.el.tmpl b/mail/wanderlust-emacs/files/wanderlust-startup.xemacs21-mule.el.tmpl
index 452b5673a04..169ef4c1a97 100644
--- a/mail/wanderlust-emacs/files/wanderlust-startup.xemacs21-mule.el.tmpl
+++ b/mail/wanderlust-emacs/files/wanderlust-startup.xemacs21-mule.el.tmpl
@@ -1,5 +1,5 @@
(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl" "Write draft with Wanderlust." t)
+(autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
(load "browse-url")
(load "mime-setup")
(setq wl-icon-dir "%%PREFIX%%/%%EMACS_PACKAGESDIR%%/etc/wl")
diff --git a/mail/wanderlust-emacs/pkg-descr b/mail/wanderlust-emacs/pkg-descr
index 3038586aaaf..6a4b6c65acd 100644
--- a/mail/wanderlust-emacs/pkg-descr
+++ b/mail/wanderlust-emacs/pkg-descr
@@ -13,7 +13,7 @@ The features of Wanderlust are as follows:
* Draft editing of mail and news as a same interface.
* Icon based interface for the list of Folder (XEmacs).
* Non-fetched operations for a big message part of MIME (IMAP4).
- * Server side search (IMAP4), also Japanese support.
+ * Server side search (IMAP4), also various charset support.
* Virtual Folder.
* Compression Folder.
* Automatic expiration of old messages.
diff --git a/mail/wanderlust-emacs/pkg-message b/mail/wanderlust-emacs/pkg-message
index d845a5b4576..add3dd434ba 100644
--- a/mail/wanderlust-emacs/pkg-message
+++ b/mail/wanderlust-emacs/pkg-message
@@ -5,9 +5,6 @@
* (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. *
+* ${PREFIX}/share/examples/wanderlust. Please copy to *
+* your home directory and edit them. *
************************************************************
diff --git a/mail/wanderlust-emacs/pkg-plist.emacs b/mail/wanderlust-emacs/pkg-plist.emacs
index c11cfe525aa..ae3842ae6ba 100644
--- a/mail/wanderlust-emacs/pkg-plist.emacs
+++ b/mail/wanderlust-emacs/pkg-plist.emacs
@@ -1,9 +1,19 @@
-share/doc/wanderlust/00README
-share/doc/wanderlust/00README.ja
+@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.ja
+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
@@ -41,17 +51,19 @@ share/doc/wanderlust/wl-ja.texi
%%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
+@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
%%EMACS_LIBDIR%%/site-lisp/wl/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
@@ -69,6 +81,7 @@ share/doc/wanderlust/wl-ja.texi
%%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
@@ -90,13 +103,41 @@ share/doc/wanderlust/wl-ja.texi
%%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/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/digest-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
%%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.wl
share/examples/wanderlust/ja/dot.folders
+share/examples/wanderlust/ja/dot.wl
@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
@dirrm share/doc/wanderlust
@dirrm share/examples/wanderlust/en
diff --git a/mail/wanderlust-emacs/pkg-plist.emacs20 b/mail/wanderlust-emacs/pkg-plist.emacs20
index 6987cc51558..717bf7d1735 100644
--- a/mail/wanderlust-emacs/pkg-plist.emacs20
+++ b/mail/wanderlust-emacs/pkg-plist.emacs20
@@ -1,13 +1,22 @@
-@unexec install-info --delete %D/info/wl-ja.info %D/info/dir
+@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl.info %D/info/dir
+info/wl.info
+@exec install-info --section="%%DIRSECTION%%" %D/info/wl.info %D/info/dir
+@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl-ja.info %D/info/dir
info/wl-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/wl-ja.info %D/info/dir
-share/doc/wanderlust/00README
-share/doc/wanderlust/00README.ja
+@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.ja
+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
@@ -45,17 +54,19 @@ share/doc/wanderlust/wl-ja.texi
%%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
+@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
%%EMACS_LIBDIR%%/site-lisp/wl/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
@@ -73,6 +84,7 @@ share/doc/wanderlust/wl-ja.texi
%%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
@@ -95,13 +107,41 @@ share/doc/wanderlust/wl-ja.texi
%%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
+%%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/digest-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.wl
share/examples/wanderlust/ja/dot.folders
+share/examples/wanderlust/ja/dot.wl
@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
@dirrm share/doc/wanderlust
@dirrm share/examples/wanderlust/en
diff --git a/mail/wanderlust-emacs/pkg-plist.mule b/mail/wanderlust-emacs/pkg-plist.mule
index b8a191a63fb..d75049f6019 100644
--- a/mail/wanderlust-emacs/pkg-plist.mule
+++ b/mail/wanderlust-emacs/pkg-plist.mule
@@ -1,13 +1,22 @@
-@unexec install-info --delete %D/info/wl-ja.info %D/info/dir
+@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl.info %D/info/dir
+info/wl.info
+@exec install-info --section="%%DIRSECTION%%" %D/info/wl.info %D/info/dir
+@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl-ja.info %D/info/dir
info/wl-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/wl-ja.info %D/info/dir
-share/doc/wanderlust/00README
-share/doc/wanderlust/00README.ja
+@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.ja
+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
@@ -45,17 +54,19 @@ share/doc/wanderlust/wl-ja.texi
%%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
+@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
%%EMACS_LIBDIR%%/site-lisp/wl/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
@@ -73,6 +84,7 @@ share/doc/wanderlust/wl-ja.texi
%%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
@@ -95,13 +107,41 @@ share/doc/wanderlust/wl-ja.texi
%%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/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/digest-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
%%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.wl
share/examples/wanderlust/ja/dot.folders
+share/examples/wanderlust/ja/dot.wl
@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
@dirrm share/doc/wanderlust
@dirrm share/examples/wanderlust/en
diff --git a/mail/wanderlust-emacs/pkg-plist.xemacs20 b/mail/wanderlust-emacs/pkg-plist.xemacs20
index 629ca4e26fa..ac9404f4985 100644
--- a/mail/wanderlust-emacs/pkg-plist.xemacs20
+++ b/mail/wanderlust-emacs/pkg-plist.xemacs20
@@ -56,6 +56,7 @@
%%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
+@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
@@ -95,17 +96,19 @@
%%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
+@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
%%EMACS_LIBDIR%%/site-lisp/wl/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
@@ -125,6 +128,7 @@
%%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
@@ -147,18 +151,55 @@
%%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/digest-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
%%EMACS_LIBDIR%%/site-lisp/wanderlust-startup.el
-share/doc/wanderlust/00README
-share/doc/wanderlust/00README.ja
+@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.ja
+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.wl
share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.wl
share/examples/wanderlust/ja/dot.folders
+share/examples/wanderlust/ja/dot.wl
@dirrm %%EMACS_LIBDIR%%/etc/wl
@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
@dirrm share/doc/wanderlust
diff --git a/mail/wanderlust-emacs/pkg-plist.xemacs21-mule b/mail/wanderlust-emacs/pkg-plist.xemacs21-mule
index 390fb262e1c..f6ede5eaef7 100644
--- a/mail/wanderlust-emacs/pkg-plist.xemacs21-mule
+++ b/mail/wanderlust-emacs/pkg-plist.xemacs21-mule
@@ -59,6 +59,7 @@
%%EMACS_PACKAGESDIR%%/lisp/wl/auto-autoloads.el
%%EMACS_PACKAGESDIR%%/lisp/wl/auto-autoloads.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/bbdb-wl.el
+@unexec rm -f %D/%%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
@@ -100,17 +101,19 @@
%%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
+@unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/wl/im-wl.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-2.el
%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-2.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4-2.el
%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4-2.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/rfc2368.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/rfc2368.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/ssl.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/ssl.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/utf7.el
%%EMACS_PACKAGESDIR%%/lisp/wl/utf7.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/wl-address.el
@@ -130,6 +133,7 @@
%%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-mailto.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/wl-message.el
%%EMACS_PACKAGESDIR%%/lisp/wl/wl-message.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/wl-mime.el
@@ -152,23 +156,55 @@
%%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/digest-md5.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/digest-md5.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/scram-md5.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/scram-md5.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/unique-id.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/unique-id.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
%%EMACS_PACKAGESDIR%%/info/wl-ja.info
-@exec [ -f %D/%%EMACS_PACKAGESDIR%%/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/%%EMACS_PACKAGESDIR%%/info/dir
-@exec install-info --section="%%DIRSECTION%%" %D/%%EMACS_PACKAGESDIR%%/info/wl-ja.info %D/%%EMACS_PACKAGESDIR%%/info/dir
+%%EMACS_PACKAGESDIR%%/info/wl.info
%%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.wl
-share/doc/wanderlust/00README
-share/doc/wanderlust/00README.ja
+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.ja
+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.wl
share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.wl
share/examples/wanderlust/ja/dot.folders
+share/examples/wanderlust/ja/dot.wl
@dirrm %%EMACS_PACKAGESDIR%%/etc/wl
@dirrm %%EMACS_PACKAGESDIR%%/lisp/wl
@dirrm share/doc/wanderlust
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index 00196cf430e..6988aa9f9ff 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -6,85 +6,85 @@
#
PORTNAME= wanderlust
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.1
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/
+ ftp://ftp.ring.gr.jp/pub/text/elisp/wl/stable/ \
+ ftp://ftp.jaist.ac.jp/pub/GNU/elisp/ftp.gohome.org/wl/stable/ \
+ ftp://daidai.kuis.kyoto-u.ac.jp/pub/mirror/ftp.gohome.org/pub/elisp/wl/stable/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= wl-${PORTVERSION}
MAINTAINER= nobutaka@nobutaka.com
-SEMI_VER= 1.13.7
-SEMI_COOKIE= semi-${EMACS_PORT_NAME}-${SEMI_VER}.FreeBSD-packages
+MIMEUI_PRODUCT?= semi
+MIMEUI_VERSION?= 1.13.7
+MIMEUI_PORT_NAME?= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-current
+MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
.if !defined (IS_SLAVE)
# for emacs19
-EMACS_NAME= emacs
EMACS_PORT_NAME= emacs
-EMACS_VER= 19.34
-EMACS_LIBDIR= share/emacs
-EMACS_LIBDIR_WITH_VER= share/emacs/${EMACS_VER}
.endif
-EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-
-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_NAME:S/xemacs21-mule/xemacs-mule/}-common-${MULE_VER}:${PORTSDIR}/editors/${EMACS_PORT_NAME}-common
+.if (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule" || \
+ ${EMACS_PORT_NAME} == "xemacs21-mule")
+WITH_MULE=yes
.else
-RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT_NAME}
+WITHOUT_MULE=yes
.endif
+
# depends on semi
-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
+BUILD_DEPENDS+= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
+RUN_DEPENDS+= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
+.if defined(EMACS_PACKAGESDIR)
ALL_TARGET= package
INSTALL_TARGET= install-package
-.endif
-.if (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule")
+UTILSDIR= ${EMACS_PACKAGESDIR}/lisp/wl
+STARTUPDIR= ${EMACS_PACKAGESDIR}/lisp/wl
+.else
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
+STARTUPDIR= ${EMACS_VERSION_SITE_LISPDIR}
.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/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}
-
-PLISTORIG= ${PKGDIR}/PLIST.${EMACS_PORT_NAME}
-PLIST= ${WRKDIR}/PLIST
-
-MAKE_ARGS= EMACS=${EMACS_CMD} LISPDIR=${PREFIX}/${EMACS_LIBDIR}/site-lisp \
+PORTDOCDIR= share/doc/wanderlust
+DOCS= README README.ja ChangeLog BUGS BUGS.ja \
+ NEWS NEWS.ja doc/wl-ja.texi doc/wl.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_LIBDIR=${EMACS_LIBDIR} \
+ EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
+ EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
+ DIRSECTION=${DIRSECTION}
+
+PLIST= ${PKGDIR}/PLIST.${EMACS_PORT_NAME}
+MAKE_ARGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD} \
+ LISPDIR=${PREFIX}/${EMACS_SITE_LISPDIR} \
FLAGS="-batch -q -no-site-file -l ${WRKDIR}/wanderlust-startup.el"
-.if (${EMACS_PORT_NAME} == "xemacs20") || (${EMACS_PORT_NAME} == "xemacs21-mule")
-MAKE_ARGS+= XEMACS=${EMACS_CMD}
-.endif
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
+.if defined(EMACS_PACKAGESDIR)
MAKE_ARGS+= PACKAGEDIR=${PREFIX}/${EMACS_PACKAGESDIR}
.else
-MAKE_ARGS+= INFODIR=${PREFIX}/info
+MAKE_ARGS+= INFODIR=${INFODIR}
+.endif
+
+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:
@@ -96,22 +96,14 @@ post-configure:
< ${FILESDIR}/wanderlust-startup.${EMACS_PORT_NAME}.el.tmpl > ${WRKDIR}/wanderlust-startup.el
pre-build:
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
+.if defined(EMACS_PACKAGESDIR)
@${CP} ${FILESDIR}/_pkg.el ${WRKSRC}
.endif
-pre-install:
-.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:
+.if !defined(EMACS_PACKAGESDIR)
@${MAKE} install-info
+.endif
.if !defined(NOPORTDOCS)
@${MAKE} install-docs
.endif
@@ -120,67 +112,51 @@ post-install:
.endif
@${MAKE} install-samples
@${MAKE} install-utils
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
+.if defined(EMACS_PACKAGESDIR)
@${MAKE} install-manifest
.endif
- @${CAT} ${PKGDIR}/MESSAGE
+ @${CAT} ${PKGMESSAGE}
# local targets
install-info:
-.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_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
+ @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-docs:
- @${MKDIR} ${DOCSDIR}
- @for i in ${DOCS} ; do \
- ${INSTALL_DATA} ${WRKSRC}/$$i ${DOCSDIR} ; \
- done
- @${INSTALL_DATA} ${WRKSRC}/doc/wl-ja.texi ${DOCSDIR}
+ @${MKDIR} ${PREFIX}/${PORTDOCDIR}
+.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
install-icons:
@${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/etc/wl
- @(cd ${WRKSRC}/etc/icons ; \
+ cd ${WRKSRC}/etc/icons ; \
for i in *.xpm ; do \
${INSTALL_DATA} $$i ${PREFIX}/${EMACS_LIBDIR}/etc/wl ; \
- done)
+ done
install-samples:
- @${MKDIR} ${SAMPLESDIR}
- @${MKDIR} ${SAMPLESDIR_JA}
- @for i in ${SAMPLES} ; do \
- ${INSTALL_DATA} ${WRKSRC}/samples/en/$$i ${SAMPLESDIR} ; \
- ${INSTALL_DATA} ${WRKSRC}/samples/ja/$$i ${SAMPLESDIR_JA} ; \
+.for l in ${SAMPLESLANG}
+ ${MKDIR} ${PREFIX}/${SAMPLESDIR}/$l
+ for i in ${SAMPLES} ; do \
+ ${INSTALL_DATA} ${WRKSRC}/samples/$l/$$i ${PREFIX}/${SAMPLESDIR}/$l; \
done
+.endfor
install-utils:
-.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/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_NAME} == "emacs" || ${EMACS_PORT_NAME} == "mule")
- @${INSTALL_DATA} ${WRKDIR}/wanderlust-startup.el ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+ @${MKDIR} ${PREFIX}/${UTILSDIR}
+.for i in ${UTILS}
+ ${INSTALL_DATA} ${WRKSRC}/utils/${i} ${PREFIX}/${UTILSDIR}
+.endfor
.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/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
+ @${INSTALL_DATA} ${WRKSRC}/wl/wl-mule.el ${PREFIX}/${EMACS_SITE_LISPDIR}/wl
.endif
+ @${MKDIR} ${PREFIX}/${STARTUPDIR}
+ @${INSTALL_DATA} ${WRKDIR}/wanderlust-startup.el ${PREFIX}/${STARTUPDIR}
install-manifest:
@${CAT} ${PKGDIR}/PLIST.${EMACS_PORT_NAME} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
diff --git a/mail/wanderlust/distinfo b/mail/wanderlust/distinfo
index 38907ae3fa6..c9517e7e0a9 100644
--- a/mail/wanderlust/distinfo
+++ b/mail/wanderlust/distinfo
@@ -1 +1 @@
-MD5 (wl-1.1.0.tar.gz) = f1a3892a1adfe5333bafea827bb045ee
+MD5 (wl-1.1.1.tar.gz) = fc8ba89ad178b8e968e25bb394a71a31
diff --git a/mail/wanderlust/files/WL-CFG b/mail/wanderlust/files/WL-CFG
new file mode 100644
index 00000000000..b5e3a444ece
--- /dev/null
+++ b/mail/wanderlust/files/WL-CFG
@@ -0,0 +1,2 @@
+(setq wl-install-utils t)
+(setq wl-install-sasl t)
diff --git a/mail/wanderlust/files/_pkg.el b/mail/wanderlust/files/_pkg.el
index 0f5f6a175db..c8414973c3c 100644
--- a/mail/wanderlust/files/_pkg.el
+++ b/mail/wanderlust/files/_pkg.el
@@ -1,4 +1,4 @@
;;;###autoload
(package-provide 'wl
- :version 1.10
+ :version 1.11
:type 'regular)
diff --git a/mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl b/mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl
index 287822b1cec..b635021cd1f 100644
--- a/mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl
+++ b/mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl
@@ -1,5 +1,5 @@
(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl" "Write draft with 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)
diff --git a/mail/wanderlust/files/wanderlust-startup.emacs20.el.tmpl b/mail/wanderlust/files/wanderlust-startup.emacs20.el.tmpl
index 746d6618e1f..e9ef833c967 100644
--- a/mail/wanderlust/files/wanderlust-startup.emacs20.el.tmpl
+++ b/mail/wanderlust/files/wanderlust-startup.emacs20.el.tmpl
@@ -1,4 +1,4 @@
(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl" "Write draft with 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
index 0b2a4a7ac99..16d63384a0b 100644
--- a/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl
+++ b/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl
@@ -1,5 +1,5 @@
(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl" "Write draft with 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)
diff --git a/mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl b/mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl
index 5eb85a79ab1..423395b5a2f 100644
--- a/mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl
+++ b/mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl
@@ -1,5 +1,5 @@
(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl" "Write draft with 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")
diff --git a/mail/wanderlust/files/wanderlust-startup.xemacs21-mule.el.tmpl b/mail/wanderlust/files/wanderlust-startup.xemacs21-mule.el.tmpl
index 452b5673a04..169ef4c1a97 100644
--- a/mail/wanderlust/files/wanderlust-startup.xemacs21-mule.el.tmpl
+++ b/mail/wanderlust/files/wanderlust-startup.xemacs21-mule.el.tmpl
@@ -1,5 +1,5 @@
(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl" "Write draft with Wanderlust." t)
+(autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
(load "browse-url")
(load "mime-setup")
(setq wl-icon-dir "%%PREFIX%%/%%EMACS_PACKAGESDIR%%/etc/wl")
diff --git a/mail/wanderlust/pkg-descr b/mail/wanderlust/pkg-descr
index 3038586aaaf..6a4b6c65acd 100644
--- a/mail/wanderlust/pkg-descr
+++ b/mail/wanderlust/pkg-descr
@@ -13,7 +13,7 @@ The features of Wanderlust are as follows:
* Draft editing of mail and news as a same interface.
* Icon based interface for the list of Folder (XEmacs).
* Non-fetched operations for a big message part of MIME (IMAP4).
- * Server side search (IMAP4), also Japanese support.
+ * Server side search (IMAP4), also various charset support.
* Virtual Folder.
* Compression Folder.
* Automatic expiration of old messages.
diff --git a/mail/wanderlust/pkg-message b/mail/wanderlust/pkg-message
index d845a5b4576..add3dd434ba 100644
--- a/mail/wanderlust/pkg-message
+++ b/mail/wanderlust/pkg-message
@@ -5,9 +5,6 @@
* (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. *
+* ${PREFIX}/share/examples/wanderlust. Please copy to *
+* your home directory and edit them. *
************************************************************
diff --git a/mail/wanderlust/pkg-plist.emacs b/mail/wanderlust/pkg-plist.emacs
index c11cfe525aa..ae3842ae6ba 100644
--- a/mail/wanderlust/pkg-plist.emacs
+++ b/mail/wanderlust/pkg-plist.emacs
@@ -1,9 +1,19 @@
-share/doc/wanderlust/00README
-share/doc/wanderlust/00README.ja
+@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.ja
+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
@@ -41,17 +51,19 @@ share/doc/wanderlust/wl-ja.texi
%%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
+@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
%%EMACS_LIBDIR%%/site-lisp/wl/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
@@ -69,6 +81,7 @@ share/doc/wanderlust/wl-ja.texi
%%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
@@ -90,13 +103,41 @@ share/doc/wanderlust/wl-ja.texi
%%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/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/digest-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
%%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.wl
share/examples/wanderlust/ja/dot.folders
+share/examples/wanderlust/ja/dot.wl
@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
@dirrm share/doc/wanderlust
@dirrm share/examples/wanderlust/en
diff --git a/mail/wanderlust/pkg-plist.emacs20 b/mail/wanderlust/pkg-plist.emacs20
index 6987cc51558..717bf7d1735 100644
--- a/mail/wanderlust/pkg-plist.emacs20
+++ b/mail/wanderlust/pkg-plist.emacs20
@@ -1,13 +1,22 @@
-@unexec install-info --delete %D/info/wl-ja.info %D/info/dir
+@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl.info %D/info/dir
+info/wl.info
+@exec install-info --section="%%DIRSECTION%%" %D/info/wl.info %D/info/dir
+@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl-ja.info %D/info/dir
info/wl-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/wl-ja.info %D/info/dir
-share/doc/wanderlust/00README
-share/doc/wanderlust/00README.ja
+@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.ja
+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
@@ -45,17 +54,19 @@ share/doc/wanderlust/wl-ja.texi
%%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
+@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
%%EMACS_LIBDIR%%/site-lisp/wl/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
@@ -73,6 +84,7 @@ share/doc/wanderlust/wl-ja.texi
%%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
@@ -95,13 +107,41 @@ share/doc/wanderlust/wl-ja.texi
%%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
+%%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/digest-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.wl
share/examples/wanderlust/ja/dot.folders
+share/examples/wanderlust/ja/dot.wl
@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
@dirrm share/doc/wanderlust
@dirrm share/examples/wanderlust/en
diff --git a/mail/wanderlust/pkg-plist.mule b/mail/wanderlust/pkg-plist.mule
index b8a191a63fb..d75049f6019 100644
--- a/mail/wanderlust/pkg-plist.mule
+++ b/mail/wanderlust/pkg-plist.mule
@@ -1,13 +1,22 @@
-@unexec install-info --delete %D/info/wl-ja.info %D/info/dir
+@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl.info %D/info/dir
+info/wl.info
+@exec install-info --section="%%DIRSECTION%%" %D/info/wl.info %D/info/dir
+@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl-ja.info %D/info/dir
info/wl-ja.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/wl-ja.info %D/info/dir
-share/doc/wanderlust/00README
-share/doc/wanderlust/00README.ja
+@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.ja
+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
@@ -45,17 +54,19 @@ share/doc/wanderlust/wl-ja.texi
%%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
+@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
%%EMACS_LIBDIR%%/site-lisp/wl/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
@@ -73,6 +84,7 @@ share/doc/wanderlust/wl-ja.texi
%%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
@@ -95,13 +107,41 @@ share/doc/wanderlust/wl-ja.texi
%%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/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/digest-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
%%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.wl
share/examples/wanderlust/ja/dot.folders
+share/examples/wanderlust/ja/dot.wl
@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
@dirrm share/doc/wanderlust
@dirrm share/examples/wanderlust/en
diff --git a/mail/wanderlust/pkg-plist.xemacs20 b/mail/wanderlust/pkg-plist.xemacs20
index 629ca4e26fa..ac9404f4985 100644
--- a/mail/wanderlust/pkg-plist.xemacs20
+++ b/mail/wanderlust/pkg-plist.xemacs20
@@ -56,6 +56,7 @@
%%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
+@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
@@ -95,17 +96,19 @@
%%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
+@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
+%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
%%EMACS_LIBDIR%%/site-lisp/wl/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
@@ -125,6 +128,7 @@
%%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
@@ -147,18 +151,55 @@
%%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/digest-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
+%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
+%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
%%EMACS_LIBDIR%%/site-lisp/wanderlust-startup.el
-share/doc/wanderlust/00README
-share/doc/wanderlust/00README.ja
+@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.ja
+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.wl
share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.wl
share/examples/wanderlust/ja/dot.folders
+share/examples/wanderlust/ja/dot.wl
@dirrm %%EMACS_LIBDIR%%/etc/wl
@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
@dirrm share/doc/wanderlust
diff --git a/mail/wanderlust/pkg-plist.xemacs21-mule b/mail/wanderlust/pkg-plist.xemacs21-mule
index 390fb262e1c..f6ede5eaef7 100644
--- a/mail/wanderlust/pkg-plist.xemacs21-mule
+++ b/mail/wanderlust/pkg-plist.xemacs21-mule
@@ -59,6 +59,7 @@
%%EMACS_PACKAGESDIR%%/lisp/wl/auto-autoloads.el
%%EMACS_PACKAGESDIR%%/lisp/wl/auto-autoloads.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/bbdb-wl.el
+@unexec rm -f %D/%%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
@@ -100,17 +101,19 @@
%%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
+@unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/wl/im-wl.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-2.el
%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-2.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4-2.el
%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4-2.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/rfc2368.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/rfc2368.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/ssl.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/ssl.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/utf7.el
%%EMACS_PACKAGESDIR%%/lisp/wl/utf7.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/wl-address.el
@@ -130,6 +133,7 @@
%%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-mailto.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/wl-message.el
%%EMACS_PACKAGESDIR%%/lisp/wl/wl-message.elc
%%EMACS_PACKAGESDIR%%/lisp/wl/wl-mime.el
@@ -152,23 +156,55 @@
%%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/digest-md5.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/digest-md5.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/scram-md5.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/scram-md5.elc
+%%EMACS_PACKAGESDIR%%/lisp/wl/unique-id.el
+%%EMACS_PACKAGESDIR%%/lisp/wl/unique-id.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
%%EMACS_PACKAGESDIR%%/info/wl-ja.info
-@exec [ -f %D/%%EMACS_PACKAGESDIR%%/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/%%EMACS_PACKAGESDIR%%/info/dir
-@exec install-info --section="%%DIRSECTION%%" %D/%%EMACS_PACKAGESDIR%%/info/wl-ja.info %D/%%EMACS_PACKAGESDIR%%/info/dir
+%%EMACS_PACKAGESDIR%%/info/wl.info
%%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.wl
-share/doc/wanderlust/00README
-share/doc/wanderlust/00README.ja
+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.ja
+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.wl
share/examples/wanderlust/en/dot.folders
+share/examples/wanderlust/en/dot.wl
share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.wl
share/examples/wanderlust/ja/dot.folders
+share/examples/wanderlust/ja/dot.wl
@dirrm %%EMACS_PACKAGESDIR%%/etc/wl
@dirrm %%EMACS_PACKAGESDIR%%/lisp/wl
@dirrm share/doc/wanderlust