(mail/wl-git) Fix broken patches and blk3 path. Not packaged yet

[Makoto Fujiwara (CF-SX3) <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara (CF-SX3) <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Sat Oct 17 14:42:43 2020 +0900
Changeset:	dfee0ef1b4e771e604433b657dcbd286a7b0d86d

Modified Files:
	wl-git/Makefile
	wl-git/distinfo
	wl-git/options.mk
	wl-git/patches/patch-ab
	wl-git/patches/patch-wl_wl-summary_el

Log Message:
(mail/wl-git) Fix broken patches and blk3 path. Not packaged yet

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dfee0ef1b4e771e604433b657dcbd286a7b0d86d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wl-git/Makefile                       |  2 +-
 wl-git/distinfo                       |  4 ++--
 wl-git/options.mk                     |  2 +-
 wl-git/patches/patch-ab               | 31 ++++++++++++++++++-------------
 wl-git/patches/patch-wl_wl-summary_el | 13 ++++++-------
 5 files changed, 28 insertions(+), 24 deletions(-)

diffs:
diff --git a/wl-git/Makefile b/wl-git/Makefile
index 3366c6b8dd..e56e5c6091 100644
--- a/wl-git/Makefile
+++ b/wl-git/Makefile
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	PIXMAPDIR=${DESTDIR:Q}${PREFIX:Q}/share/wl
 INFO_FILES=	YES
 
 	# Change default wl-icon-directory for PIXMAP.
-	# Why not just use patch-ab ?  $PREFIX is to be embedded.
+	# Why not just use patch-ab ?  ${PREFIX} is to be embedded.
 
 SUBST_CLASSES+=			icon_directory
 SUBST_STAGE.icon_directory=	pre-configure
diff --git a/wl-git/distinfo b/wl-git/distinfo
index 2d9119c053..524347057b 100644
--- a/wl-git/distinfo
+++ b/wl-git/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.10 2015/01/29 07:15:12 jgoamakf Exp $
 
 SHA1 (patch-aa) = 5c27e70a747e4ace03991e7d361c83aa844d4d13
-SHA1 (patch-ab) = f86e07bd6737541ee2f1d6a9fd239c752b3303de
-SHA1 (patch-wl_wl-summary_el) = 1b5003dc2cfccafeca01258e824f50bdacc7acd8
+SHA1 (patch-ab) = 94d52fa4a3adef42d89bc32e1ea5252483ad6637
+SHA1 (patch-wl_wl-summary_el) = 940a7632c6e417cde24e2a0ca84f33f7e4ad5eaf
diff --git a/wl-git/options.mk b/wl-git/options.mk
index 4569195486..d6cfcfec7f 100644
--- a/wl-git/options.mk
+++ b/wl-git/options.mk
@@ -9,6 +9,6 @@ PKG_SUPPORTED_OPTIONS=	emacs-w3m-current
 PLIST_VARS+=			emacs-w3m-current
 
 .if !empty(PKG_OPTIONS:Memacs-w3m-current)
-.include "../../wip/emacs-w3m-current/buildlink3.mk"
+.include "../../wip/emacs-w3m-cvs/buildlink3.mk"
 PLIST.emacs-w3m-current=	yes
 .endif
diff --git a/wl-git/patches/patch-ab b/wl-git/patches/patch-ab
index 2ae31b675e..6454ba673f 100644
--- a/wl-git/patches/patch-ab
+++ b/wl-git/patches/patch-ab
@@ -3,16 +3,21 @@ $NetBSD: patch-ab,v 1.3 2015/01/29 07:15:12 jgoamakf Exp $
 Without this patch, user needs to say where the icons installed,
 and the icons won't be displayed such setup.
 
---- wl/wl-vars.el.orig	2015-01-29 15:47:43.000000000 +0900
-+++ wl/wl-vars.el	2015-01-29 15:48:32.000000000 +0900
-@@ -173,8 +173,8 @@
- (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"
-+							      "%%PREFIX%%")))
-                                 (if (file-directory-p icons)
-                                     icons))
-                               (if load-file-name
+--- wl/wl-vars.el.orig	2020-10-16 12:33:17.000000000 +0000
++++ wl/wl-vars.el
+@@ -162,9 +162,13 @@ Supersede `wl-user-mail-address-list'."
+   :type 'directory
+   :group 'wl)
+ 
++
+ (defcustom wl-icon-directory
+-  (or (let ((icons (expand-file-name "wl/icons/"
+-				     data-directory)))
++
++								+                                                            
++				    
++  (or (let ((icons (expand-file-name "share/wl"
++                                       "%%PREFIX%%")))
+ 	(if (file-directory-p icons)
+             icons))
+       (if load-file-name
diff --git a/wl-git/patches/patch-wl_wl-summary_el b/wl-git/patches/patch-wl_wl-summary_el
index c4b0053ccb..7398a89de2 100644
--- a/wl-git/patches/patch-wl_wl-summary_el
+++ b/wl-git/patches/patch-wl_wl-summary_el
@@ -14,17 +14,17 @@ your setup, for example, in ~/.wl.
 ;(setq wl-summary-line-format "%n%T%P%@%M/%D(%W)%h:%m %t%[%17(%c %f%) %] %#%~%s")
  (setq wl-summary-line-format "%n%T%P%@%M/%D(%W)%h:%m %t%[%17(%c %f%) %] %~%s")
 
---- wl/wl-summary.el.orig	2013-01-25 11:39:09.000000000 +0900
-+++ wl/wl-summary.el	2013-01-25 12:26:38.000000000 +0900
-@@ -38,6 +38,7 @@
+--- wl/wl-summary.el.orig	2020-10-16 12:33:17.000000000 +0000
++++ wl/wl-summary.el
+@@ -39,6 +39,7 @@
+ (require 'timezone nil t)
  (require 'elmo)
- (require 'elmo-multi)
- (eval-when-compile (require 'elmo-filter))
+ (require 'elmo-date)
 +(eval-when-compile (require 'wl-folder))
  (require 'wl-message)
  (require 'wl-vars)
  (require 'wl-highlight)
-@@ -3541,11 +3542,15 @@ Return non-nil if the mark is updated"
+@@ -3535,11 +3536,15 @@ Return non-nil if the mark is updated"
    (let ((content-type (elmo-message-entity-field
  		       wl-message-entity 'content-type))
  	(case-fold-search t))
@@ -45,4 +45,3 @@ your setup, for example, in ~/.wl.
  ;;; For future use.
  ;;;(defun wl-summary-line-cached ()
  ;;;  (if (elmo-message-cached-p wl-summary-buffer-elmo-folder
-