Update to 2.10.0.

* Changes in 2.10.0 from 2.8.1

** You can alter the format of summary lines.
   Specify format by wl-summary-line-format. If you want to change ones
   according to folder names, use wl-folder-summary-line-format-alist.
** Save format for the draft folder has been changed. Messages are encoded
   before saved by wl-draft-save.
** elmo-split is newly established.
** Buffer prefetch works fine now. Messages of the number specified by
   wl-message-buffer-prefetch-depth are loaded into buffer in advance.
** elmo-dop-queue-flush flushes queue that concerns plugged folder.
** Starting Wanderlust on the new frame is possible now. Set as
   (autoload 'wl-other-frame "wl" "Wanderlust on new frame." t)
** In Folder mode, you can go into virtual folder which consists of messages
   with some specified condition (wl-folder-virtual). It is binded to "V".
** In Folder mode, you can search folders containing messages with some
   specified condition (wl-folder-pick). It is binded to "?".
** Now you can rename access group folders.
** Temporary marks are kept when you exit from sticky summary by q or g.
** Key bindings concerning the sticky summary have been changed.
   By C-u g, the sticky summary is destroyed as well as C-u q. In summary or
   folder mode, G opens the sticky summary.
** You can go round summary buffers by C-cC-n and C-cC-p.
** Members of the list wl-folder-hierarchy-access-folders is now some REGEXP
   for access group names instead of exact group names.
** In header part of the draft buffer C-a brings cursor to the beginning of
   the line or the beginning of the header body.
** You can send encapsulated blind carbon copies. Its default field name is
   "Ecc:".
** C-c C-y (Draft) can cite region of the message.
   It affects if transient-mark-mode (Emacs) or zmacs-regions (XEmacs) is
   Non-nil and the region is active.
** You can delete a part from multipart message.
   It is binded as "D" in message buffer.
** You can easily configure server settings to post news article.
   Set wl-nntp-posting-config-alist appropriately. See info for an example.
** You can specify some function in wl-draft-reply-with-argument-list etc.
   for setting the recipients in draft by the return value of it.
** The interface of the function wl-draft has been changed.
   The initial set of headers are handed as an association list.
** The uses of wl-generate-mailer-string-function has been changed.
   Specify a function which returns some string to appear in User-Agent header.
** Many bug fixes.

4 files changed, 107 insertions, 119 deletions

diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index d85ef35d993..d99be00f563 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2002/10/22 15:11:40 minoura Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/25 03:49:42 uebayasi Exp $
 
-DISTNAME=	wl-2.8.1
-PKGREVISION=	1
+DISTNAME=	wl-2.10.0
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ring.gr.jp/pub/text/elisp/wl/stable/
 
@@ -9,45 +8,29 @@ MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://www.gohome.org/wl/
 COMMENT=	mail/news management system with IMAP4rev1 support for Emacs
 
-DEPENDS+=	${PKGNAME_PREFIX}semi>=1.13.7:../../devel/semi
+DEPENDS+=	semi>=1.13.7:../../devel/semi
 # XXX please someone adjust paths and PLIST for XEmacs...
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs20
 
+MAKE_FLAGS+=	LISPDIR=${EMACS_LISPPREFIX}
+MAKE_FLAGS+=	PIXMAPDIR=${PREFIX}/share/wl
 INSTALL_TARGET=	install install-info
 INFO_FILES=	wl.info wl-ja.info
 
 .include "../../mk/emacs.mk"
 
-.ifdef ${EMACS_FLAVOR} == "emacs"
-ETCDIR=		share/emacs/${EMACS_VERSION}/etc/wl
-.else
-# XXX where to go?
-.endif
-ICONDIR=	${ETCDIR}/icons
-PLIST_SUBST+=	ETCDIR=${ETCDIR}
-PLIST_SUBST+=	ICONDIR=${ICONDIR}
-
 DOCDIR=		${PREFIX}/share/doc/wl
 EXAMPLESDIR=	${PREFIX}/share/examples/wl
-DOCS=		BUGS NEWS README
-DOCS_JA=	BUGS.ja NEWS.ja README.ja doc/TODO.ja
-EXAMPLES=	dot.addresses dot.folders dot.wl
 
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}/en
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/$f ${DOCDIR}/en
-.endfor
-	${INSTALL_DATA_DIR} ${DOCDIR}/ja
-.for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/$f ${DOCDIR}/ja
-.endfor
-	${INSTALL_DATA_DIR} ${EXAMPLESDIR}/en
-	${INSTALL_DATA_DIR} ${EXAMPLESDIR}/ja
-.for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/samples/en/$f ${EXAMPLESDIR}/en
-	${INSTALL_DATA} ${WRKSRC}/samples/ja/$f ${EXAMPLESDIR}/ja
-.endfor
+	@${INSTALL_DATA_DIR} ${DOCDIR}/en ${DOCDIR}/ja
+	@for f in BUGS NEWS README; do \
+		${INSTALL_DATA} ${WRKSRC}/$$f ${DOCDIR}/en; \
+		${INSTALL_DATA} ${WRKSRC}/$${f}.ja ${DOCDIR}/ja; \
+	done
+	@${INSTALL_DATA_DIR} ${EXAMPLESDIR}/en ${EXAMPLESDIR}/ja
+	@${INSTALL_DATA} ${WRKSRC}/samples/en/dot.* ${EXAMPLESDIR}/en
+	@${INSTALL_DATA} ${WRKSRC}/samples/ja/dot.* ${EXAMPLESDIR}/ja
 
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/wl/PLIST b/mail/wl/PLIST
index a331b082c86..534e0a04f0f 100644
--- a/mail/wl/PLIST
+++ b/mail/wl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/10/22 15:11:40 minoura Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/01/25 03:49:42 uebayasi Exp $
 @unexec ${INSTALL_INFO} --delete %D/info/wl.info %D/info/dir
 @unexec ${INSTALL_INFO} --delete %D/info/wl-ja.info %D/info/dir
 info/wl.info
@@ -11,85 +11,87 @@ share/doc/wl/en/README
 share/doc/wl/ja/BUGS.ja
 share/doc/wl/ja/NEWS.ja
 share/doc/wl/ja/README.ja
-share/doc/wl/ja/TODO.ja
-${FOR_emacs21}${ICONDIR}/archive.xpm
-${FOR_emacs21}${ICONDIR}/closed.xpm
-${FOR_emacs21}${ICONDIR}/draft.xpm
-${FOR_emacs21}${ICONDIR}/elmo.xpm
-${FOR_emacs21}${ICONDIR}/filter.xpm
-${FOR_emacs21}${ICONDIR}/imap.xpm
-${FOR_emacs21}${ICONDIR}/internal.xpm
-${FOR_emacs21}${ICONDIR}/letter.xpm
-${FOR_emacs21}${ICONDIR}/local.xpm
-${FOR_emacs21}${ICONDIR}/localnews.xpm
-${FOR_emacs21}${ICONDIR}/maildir.xpm
-${FOR_emacs21}${ICONDIR}/multi.xpm
-${FOR_emacs21}${ICONDIR}/news.xpm
-${FOR_emacs21}${ICONDIR}/nmz.xpm
-${FOR_emacs21}${ICONDIR}/no-letter.xpm
-${FOR_emacs21}${ICONDIR}/opened.xpm
-${FOR_emacs21}${ICONDIR}/pipe.xpm
-${FOR_emacs21}${ICONDIR}/plugged.xpm
-${FOR_emacs21}${ICONDIR}/pop.xpm
-${FOR_emacs21}${ICONDIR}/queue.xpm
-${FOR_emacs21}${ICONDIR}/shimbun.xpm
-${FOR_emacs21}${ICONDIR}/trash-e.xpm
-${FOR_emacs21}${ICONDIR}/trash.xpm
-${FOR_emacs21}${ICONDIR}/unplugged.xpm
-${ICONDIR}/wl-alpha-logo.img
-${ICONDIR}/wl-alpha-logo.xbm
-${FOR_emacs21}${ICONDIR}/wl-alpha-logo.xpm
-${ICONDIR}/wl-alpha-xmas-logo.img
-${ICONDIR}/wl-alpha-xmas-logo.xbm
-${FOR_emacs21}${ICONDIR}/wl-alpha-xmas-logo.xpm
-${ICONDIR}/wl-beta-logo.img
-${ICONDIR}/wl-beta-logo.xbm
-${FOR_emacs21}${ICONDIR}/wl-beta-logo.xpm
-${ICONDIR}/wl-beta-xmas-logo.img
-${ICONDIR}/wl-beta-xmas-logo.xbm
-${FOR_emacs21}${ICONDIR}/wl-beta-xmas-logo.xpm
-${FOR_emacs21}${ICONDIR}/wl-draft-insert-signature-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-draft-kill-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-draft-send-from-toolbar-down.xpm
-${FOR_emacs21}${ICONDIR}/wl-draft-send-from-toolbar-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-draft-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-draft-yank-original-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-exit-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-folder-check-current-entity-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-folder-empty-trash-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-folder-jump-to-current-entity-no-sync-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-folder-jump-to-current-entity-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-folder-next-entity-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-folder-prev-entity-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-folder-read-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-folder-select-entity-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-folder-sync-current-entity-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-folder-zoom-entity-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-message-extract-content-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-message-next-content-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-message-play-content-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-message-prev-content-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-message-quit-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-message-read-up.xpm
-${ICONDIR}/wl-stable-logo.img
-${ICONDIR}/wl-stable-logo.xbm
-${FOR_emacs21}${ICONDIR}/wl-stable-logo.xpm
-${ICONDIR}/wl-stable-xmas-logo.img
-${ICONDIR}/wl-stable-xmas-logo.xbm
-${FOR_emacs21}${ICONDIR}/wl-stable-xmas-logo.xpm
-${FOR_emacs21}${ICONDIR}/wl-summary-delete-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-summary-exit-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-summary-forward-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-summary-jump-to-current-message-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-summary-mark-as-important-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-summary-next-page-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-summary-next-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-summary-prev-page-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-summary-prev-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-summary-read-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-summary-reply-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-summary-reply-with-citation-up.xpm
-${FOR_emacs21}${ICONDIR}/wl-summary-sync-force-update-up.xpm
+${FOR_emacs21}share/wl/archive.xpm
+${FOR_emacs21}share/wl/closed.xpm
+${FOR_emacs21}share/wl/draft.xpm
+${FOR_emacs21}share/wl/elmo.xpm
+${FOR_emacs21}share/wl/filter.xpm
+${FOR_emacs21}share/wl/imap.xpm
+${FOR_emacs21}share/wl/internal.xpm
+${FOR_emacs21}share/wl/letter.xpm
+${FOR_emacs21}share/wl/local.xpm
+${FOR_emacs21}share/wl/localnews.xpm
+${FOR_emacs21}share/wl/maildir.xpm
+${FOR_emacs21}share/wl/multi.xpm
+${FOR_emacs21}share/wl/news.xpm
+${FOR_emacs21}share/wl/nmz.xpm
+${FOR_emacs21}share/wl/no-letter.xpm
+${FOR_emacs21}share/wl/opened.xpm
+${FOR_emacs21}share/wl/pipe.xpm
+${FOR_emacs21}share/wl/plugged.xpm
+${FOR_emacs21}share/wl/pop.xpm
+${FOR_emacs21}share/wl/queue.xpm
+${FOR_emacs21}share/wl/shimbun.xpm
+${FOR_emacs21}share/wl/trash-e.xpm
+${FOR_emacs21}share/wl/trash.xpm
+${FOR_emacs21}share/wl/unplugged.xpm
+${FOR_emacs21}share/wl/wl-alpha-logo.xpm
+${FOR_emacs21}share/wl/wl-alpha-xmas-logo.xpm
+${FOR_emacs21}share/wl/wl-beta-logo.xpm
+${FOR_emacs21}share/wl/wl-beta-xmas-logo.xpm
+${FOR_emacs21}share/wl/wl-draft-insert-signature-up.xpm
+${FOR_emacs21}share/wl/wl-draft-kill-up.xpm
+${FOR_emacs21}share/wl/wl-draft-save-and-exit-up.xpm
+${FOR_emacs21}share/wl/wl-draft-send-from-toolbar-down.xpm
+${FOR_emacs21}share/wl/wl-draft-send-from-toolbar-up.xpm
+${FOR_emacs21}share/wl/wl-draft-up.xpm
+${FOR_emacs21}share/wl/wl-draft-yank-original-up.xpm
+${FOR_emacs21}share/wl/wl-exit-up.xpm
+${FOR_emacs21}share/wl/wl-folder-check-current-entity-up.xpm
+${FOR_emacs21}share/wl/wl-folder-empty-trash-up.xpm
+${FOR_emacs21}share/wl/wl-folder-goto-draft-folder-up.xpm
+${FOR_emacs21}share/wl/wl-folder-jump-to-current-entity-no-sync-up.xpm
+${FOR_emacs21}share/wl/wl-folder-jump-to-current-entity-up.xpm
+${FOR_emacs21}share/wl/wl-folder-next-entity-up.xpm
+${FOR_emacs21}share/wl/wl-folder-prev-entity-up.xpm
+${FOR_emacs21}share/wl/wl-folder-read-up.xpm
+${FOR_emacs21}share/wl/wl-folder-select-entity-up.xpm
+${FOR_emacs21}share/wl/wl-folder-sync-current-entity-up.xpm
+${FOR_emacs21}share/wl/wl-folder-zoom-entity-up.xpm
+${FOR_emacs21}share/wl/wl-message-extract-content-up.xpm
+${FOR_emacs21}share/wl/wl-message-next-content-up.xpm
+${FOR_emacs21}share/wl/wl-message-play-content-up.xpm
+${FOR_emacs21}share/wl/wl-message-prev-content-up.xpm
+${FOR_emacs21}share/wl/wl-message-quit-up.xpm
+${FOR_emacs21}share/wl/wl-message-read-up.xpm
+${FOR_emacs21}share/wl/wl-stable-logo.xpm
+${FOR_emacs21}share/wl/wl-stable-xmas-logo.xpm
+${FOR_emacs21}share/wl/wl-summary-delete-up.xpm
+${FOR_emacs21}share/wl/wl-summary-exit-up.xpm
+${FOR_emacs21}share/wl/wl-summary-forward-up.xpm
+${FOR_emacs21}share/wl/wl-summary-jump-to-current-message-up.xpm
+${FOR_emacs21}share/wl/wl-summary-mark-as-important-up.xpm
+${FOR_emacs21}share/wl/wl-summary-next-page-up.xpm
+${FOR_emacs21}share/wl/wl-summary-next-up.xpm
+${FOR_emacs21}share/wl/wl-summary-prev-page-up.xpm
+${FOR_emacs21}share/wl/wl-summary-prev-up.xpm
+${FOR_emacs21}share/wl/wl-summary-read-up.xpm
+${FOR_emacs21}share/wl/wl-summary-reply-up.xpm
+${FOR_emacs21}share/wl/wl-summary-reply-with-citation-up.xpm
+${FOR_emacs21}share/wl/wl-summary-sync-force-update-up.xpm
+${FOR_emacs21}share/wl/wl-write-current-folder-up.xpm
+share/wl/wl-alpha-logo.img
+share/wl/wl-alpha-logo.xbm
+share/wl/wl-alpha-xmas-logo.img
+share/wl/wl-alpha-xmas-logo.xbm
+share/wl/wl-beta-logo.img
+share/wl/wl-beta-logo.xbm
+share/wl/wl-beta-xmas-logo.img
+share/wl/wl-beta-xmas-logo.xbm
+share/wl/wl-stable-logo.img
+share/wl/wl-stable-logo.xbm
+share/wl/wl-stable-xmas-logo.img
+share/wl/wl-stable-xmas-logo.xbm
 ${EMACS_LISPPREFIX}/wl/acap.elc
 ${EMACS_LISPPREFIX}/wl/acap.el
 ${EMACS_LISPPREFIX}/wl/elmo-archive.elc
@@ -134,6 +136,10 @@ ${EMACS_LISPPREFIX}/wl/elmo-pop3.elc
 ${EMACS_LISPPREFIX}/wl/elmo-pop3.el
 ${EMACS_LISPPREFIX}/wl/elmo-sendlog.elc
 ${EMACS_LISPPREFIX}/wl/elmo-sendlog.el
+${EMACS_LISPPREFIX}/wl/elmo-shimbun.el
+${EMACS_LISPPREFIX}/wl/elmo-shimbun.elc
+${EMACS_LISPPREFIX}/wl/elmo-split.el
+${EMACS_LISPPREFIX}/wl/elmo-split.elc
 ${EMACS_LISPPREFIX}/wl/elmo-util.elc
 ${EMACS_LISPPREFIX}/wl/elmo-util.el
 ${EMACS_LISPPREFIX}/wl/elmo-vars.elc
@@ -210,12 +216,11 @@ share/examples/wl/en/dot.wl
 share/examples/wl/ja/dot.addresses
 share/examples/wl/ja/dot.folders
 share/examples/wl/ja/dot.wl
-@dirrm ${ICONDIR}
-@dirrm ${ETCDIR}
 @dirrm ${EMACS_LISPPREFIX}/wl
 @dirrm share/examples/wl/ja
 @dirrm share/examples/wl/en
 @dirrm share/examples/wl
+@dirrm share/wl
 @dirrm share/doc/wl/ja
 @dirrm share/doc/wl/en
 @dirrm share/doc/wl
diff --git a/mail/wl/distinfo b/mail/wl/distinfo
index f13cde79d88..598d566e79d 100644
--- a/mail/wl/distinfo
+++ b/mail/wl/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2002/01/08 11:47:16 jun Exp $
+$NetBSD: distinfo,v 1.8 2003/01/25 03:49:42 uebayasi Exp $
 
-SHA1 (wl-2.8.1.tar.gz) = 35b5e29f7e9064276a1b59a312345f6dd66ab818
-Size (wl-2.8.1.tar.gz) = 1040012 bytes
+SHA1 (wl-2.10.0.tar.gz) = a7730ac483d60ae8be25e173ae3aa8144970e50d
+Size (wl-2.10.0.tar.gz) = 959695 bytes
 SHA1 (patch-aa) = ede97cce8b2574737a91941a905e067c940fb50a
-SHA1 (patch-ab) = ecea6164aa1787234a7c9b7e85390116dc68f2e5
+SHA1 (patch-ab) = 6e476198c3a0d5c7b8cb6939e4bbe046f69066c2
 SHA1 (patch-ac) = c30b711db7b73a2d2bd7d6025bc394ecf7c35aad
diff --git a/mail/wl/patches/patch-ab b/mail/wl/patches/patch-ab
index 7cc42dcea2b..19b8d876a42 100644
--- a/mail/wl/patches/patch-ab
+++ b/mail/wl/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2001/07/24 07:47:18 taca Exp $
+$NetBSD: patch-ab,v 1.2 2003/01/25 03:49:43 uebayasi Exp $
 
---- WL-ELS.orig	Tue Nov 21 01:36:15 2000
+--- WL-ELS.orig	Tue Jan 14 12:44:20 2003
 +++ WL-ELS
-@@ -78,7 +78,7 @@
+@@ -71,7 +71,7 @@
     (cons WLDIR WL-MODULES)
     (if (module-installed-p 'bbdb)
         (cons UTILSDIR (list 'bbdb-wl)))