(mail/wl-snapshot) Update from 2.15.9+0.20110420 to 2.15.9+0.20190623

ChangLog has 300 or more lines. Sorry to omit them and Thank you

6 files changed, 46 insertions, 33 deletions

diff --git a/mail/wl-snapshot/Makefile b/mail/wl-snapshot/Makefile
index e69da32fb28..d01bb397171 100644
--- a/mail/wl-snapshot/Makefile
+++ b/mail/wl-snapshot/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2016/03/05 11:28:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2019/10/01 13:18:20 mef Exp $
 
-DISTNAME=	wl-beta_2.15.9+0.20110420.orig
+DISTNAME= 	wl-beta_2.15.9+0.20190623.orig
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/beta_//:S/+0//:S/.orig//}
-PKGREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/w/wl-beta/}
 
-MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gohome.org/wl/
 COMMENT=	Mail/news management system with IMAP4rev1 support for Emacs
 LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	patch
-WRKSRC=		${WRKDIR}/wanderlust
+WRKSRC=		${WRKDIR}/wanderlust-wanderlust-b9a529a
 
 BUILD_TARGET=	all info
 INSTALL_TARGET=	install install-info
@@ -46,8 +45,12 @@ EMACS_BUILDLINK=	# empty
 
 post-install:
 	set -e; \
-	for f in BUGS NEWS README; do \
-		${INSTALL_DATA} ${WRKSRC}/"$$f" ${DESTDIR}${DOCDIR}/en; \
+	for f in BUGS NEWS; do \
+		${INSTALL_DATA} ${WRKSRC}/"$$f"    ${DESTDIR}${DOCDIR}/en; \
+		${INSTALL_DATA} ${WRKSRC}/"$$f".ja ${DESTDIR}${DOCDIR}/ja; \
+	done
+	for f in README; do \
+		${INSTALL_DATA} ${WRKSRC}/"$$f".md ${DESTDIR}${DOCDIR}/en; \
 		${INSTALL_DATA} ${WRKSRC}/"$$f".ja ${DESTDIR}${DOCDIR}/ja; \
 	done
 	${INSTALL_DATA} ${WRKSRC}/samples/en/dot.* ${DESTDIR}${EXAMPLESDIR}/en
diff --git a/mail/wl-snapshot/PLIST b/mail/wl-snapshot/PLIST
index f86cc9d36df..cddb54bd2b0 100644
--- a/mail/wl-snapshot/PLIST
+++ b/mail/wl-snapshot/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/08/05 22:23:57 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/01 13:18:20 mef Exp $
 info/wl-ja.info
 info/wl.info
 share/doc/wl/en/BUGS
 share/doc/wl/en/NEWS
-share/doc/wl/en/README
+share/doc/wl/en/README.md
 share/doc/wl/ja/BUGS.ja
 share/doc/wl/ja/NEWS.ja
 share/doc/wl/ja/README.ja
@@ -51,10 +51,14 @@ ${EMACS_LISPPREFIX}/wl/elmo-nntp.el
 ${EMACS_LISPPREFIX}/wl/elmo-nntp.elc
 ${EMACS_LISPPREFIX}/wl/elmo-null.el
 ${EMACS_LISPPREFIX}/wl/elmo-null.elc
+${EMACS_LISPPREFIX}/wl/elmo-passwd.el
+${EMACS_LISPPREFIX}/wl/elmo-passwd.elc
 ${EMACS_LISPPREFIX}/wl/elmo-pipe.el
 ${EMACS_LISPPREFIX}/wl/elmo-pipe.elc
 ${EMACS_LISPPREFIX}/wl/elmo-pop3.el
 ${EMACS_LISPPREFIX}/wl/elmo-pop3.elc
+${EMACS_LISPPREFIX}/wl/elmo-rss.el
+${EMACS_LISPPREFIX}/wl/elmo-rss.elc
 ${EMACS_LISPPREFIX}/wl/elmo-search.el
 ${EMACS_LISPPREFIX}/wl/elmo-search.elc
 ${EMACS_LISPPREFIX}/wl/elmo-sendlog.el
@@ -103,8 +107,6 @@ ${EMACS_LISPPREFIX}/wl/slp.el
 ${EMACS_LISPPREFIX}/wl/slp.elc
 ${EMACS_LISPPREFIX}/wl/ssl.el
 ${EMACS_LISPPREFIX}/wl/ssl.elc
-${EMACS_LISPPREFIX}/wl/utf7.el
-${EMACS_LISPPREFIX}/wl/utf7.elc
 ${EMACS_LISPPREFIX}/wl/wl-acap.el
 ${EMACS_LISPPREFIX}/wl/wl-acap.elc
 ${EMACS_LISPPREFIX}/wl/wl-action.el
@@ -140,6 +142,8 @@ ${EMACS_LISPPREFIX}/wl/wl-message.elc
 ${EMACS_LISPPREFIX}/wl/wl-mime.el
 ${EMACS_LISPPREFIX}/wl/wl-mime.elc
 ${EMACS_LISPPREFIX}/wl/wl-news.el
+${EMACS_LISPPREFIX}/wl/wl-qs.el
+${EMACS_LISPPREFIX}/wl/wl-qs.elc
 ${EMACS_LISPPREFIX}/wl/wl-refile.el
 ${EMACS_LISPPREFIX}/wl/wl-refile.elc
 ${EMACS_LISPPREFIX}/wl/wl-score.el
diff --git a/mail/wl-snapshot/distinfo b/mail/wl-snapshot/distinfo
index 2864d653279..f8ba46ac99f 100644
--- a/mail/wl-snapshot/distinfo
+++ b/mail/wl-snapshot/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 23:27:24 agc Exp $
+$NetBSD: distinfo,v 1.4 2019/10/01 13:18:20 mef Exp $
 
-SHA1 (wl-beta_2.15.9+0.20110420.orig.tar.gz) = af84474cf776847837886d86732d9eac79731fee
-RMD160 (wl-beta_2.15.9+0.20110420.orig.tar.gz) = 760cfc41f1da8e1edc48b6721fa69ecc35408b12
-SHA512 (wl-beta_2.15.9+0.20110420.orig.tar.gz) = 9b0bb50fb993a03635fc8e13166b1cb46eb55b5d06e77d0bf6f42034b48216180663ec9cb0a8af80d00555e2dd6918955d9d7c9f13506a7e414a16d03bca9429
-Size (wl-beta_2.15.9+0.20110420.orig.tar.gz) = 1156180 bytes
-SHA1 (patch-aa) = ede97cce8b2574737a91941a905e067c940fb50a
-SHA1 (patch-ab) = b68648a7e9a9fba1d3d204d12a3fe647edb30f41
-SHA1 (patch-ac) = e161bbf1d5034c28b5376075a0173bd8cf967a39
+SHA1 (wl-beta_2.15.9+0.20190623.orig.tar.gz) = 477b641c2ddbf048d7f24967a7f323595a020b44
+RMD160 (wl-beta_2.15.9+0.20190623.orig.tar.gz) = 44ee04f823620b7782c4f334ddac76ee08fd7925
+SHA512 (wl-beta_2.15.9+0.20190623.orig.tar.gz) = c32884cd851fbcc341dc7dca7abbb9e54a526e62cb4f2b9a98d77068970902579528f1384a5681269582c049d135ac8f9bb02a69fed975b5a7d544fd1c9e4c72
+Size (wl-beta_2.15.9+0.20190623.orig.tar.gz) = 1209034 bytes
+SHA1 (patch-aa) = 954cd9662e89f41bad999d99e0f9e30b5279869f
+SHA1 (patch-ab) = caf907d44ad10d776807e1bc44fa12f8efc7eed7
+SHA1 (patch-ac) = 46192487a61f6f6793adf1e5c4a28b68076159d1
diff --git a/mail/wl-snapshot/patches/patch-aa b/mail/wl-snapshot/patches/patch-aa
index 052d61064d4..f431fc87184 100644
--- a/mail/wl-snapshot/patches/patch-aa
+++ b/mail/wl-snapshot/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/08/05 22:23:57 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2019/10/01 13:18:20 mef Exp $
+
+Set to install utils
 
 --- WL-CFG.orig	Tue Oct 23 20:44:04 2001
 +++ WL-CFG
diff --git a/mail/wl-snapshot/patches/patch-ab b/mail/wl-snapshot/patches/patch-ab
index 49074cc82c3..dd11ac34d91 100644
--- a/mail/wl-snapshot/patches/patch-ab
+++ b/mail/wl-snapshot/patches/patch-ab
@@ -1,15 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/08/05 22:23:57 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2019/10/01 13:18:20 mef Exp $
 
---- wanderlust/wl/wl-vars.el.orig	2008-02-15 23:10:39.000000000 +0900
-+++ wl/wl-vars.el	2008-11-19 08:56:50.000000000 +0900
-@@ -172,8 +172,8 @@
- 
- (defcustom wl-icon-directory (if (fboundp 'locate-data-directory)
- 				 (locate-data-directory "wl")
--			       (let ((icons (expand-file-name "wl/icons/"
+Adjust icon directory for pkgsrc
+
+--- wl/wl-vars.el.orig	2019-06-23 22:32:26.000000000 +0900
++++ wl/wl-vars.el	2019-10-01 22:08:02.781369277 +0900
+@@ -173,8 +173,8 @@ Supersede `wl-user-mail-address-list'."
+ (defcustom wl-icon-directory (or
+                               (and (fboundp 'locate-data-directory)
+                                    (locate-data-directory "wl"))
+-                              (let ((icons (expand-file-name "wl/icons/"
 -							      data-directory)))
-+			       (let ((icons (expand-file-name "share/wl"
++                              (let ((icons (expand-file-name "share/wl/"
 +							      "%%PREFIX%%")))
- 				 (if (file-directory-p icons)
- 				     icons)))
-   "*Directory to load the icon files from, or nil if none."
+                                 (if (file-directory-p icons)
+                                     icons))
+                               (if load-file-name
diff --git a/mail/wl-snapshot/patches/patch-ac b/mail/wl-snapshot/patches/patch-ac
index 2de65755413..efc55d95932 100644
--- a/mail/wl-snapshot/patches/patch-ac
+++ b/mail/wl-snapshot/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/08/05 22:23:57 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2019/10/01 13:18:20 mef Exp $
+
+Adapt to modern utf-8
 
 --- WL-MK.orig	2008-02-14 19:12:35.000000000 -0800
 +++ WL-MK