From Robert Elz:

Patch from upstream cvs repository to allow exmh to function
correctly with tcl 8.5 (or any earlier version).  This patch
will not be needed after the next exmh upgrade.

No PKGREVISION bump since no uservisible changes.

7 files changed, 123 insertions, 1 deletions

diff --git a/mail/exmh/distinfo b/mail/exmh/distinfo
index 50b26359ae0..98e87eb4ba7 100644
--- a/mail/exmh/distinfo
+++ b/mail/exmh/distinfo
@@ -1,6 +1,12 @@
-$NetBSD: distinfo,v 1.6 2006/10/20 08:15:14 dsainty Exp $
+$NetBSD: distinfo,v 1.7 2010/09/01 09:23:18 wiz Exp $
 
 SHA1 (exmh-2.7.2/exmh-2.7.2.tar.gz) = 0e8e11c29c7e1b9371d5a72b4cb2bf6085f20edf
 RMD160 (exmh-2.7.2/exmh-2.7.2.tar.gz) = fd0d8689304cdb6dcbcd341ec5ba5f8f5b2f9712
 Size (exmh-2.7.2/exmh-2.7.2.tar.gz) = 1081601 bytes
 SHA1 (patch-aw) = 396ef41611de11a9ba48f15711e20f4e44f73da9
+SHA1 (patch-ta) = 0670c357f0317a4b4f7684425bce8f30d7ef9cd2
+SHA1 (patch-tb) = b5f51dabf9df11420de9b50aaf7dc422eff1f3ad
+SHA1 (patch-tc) = 87ed70fd2957821c2fab06c0dc33da446dffdb6f
+SHA1 (patch-td) = cb777e02b854f82c49e20b19c08b4746dcfe76c2
+SHA1 (patch-te) = 18363fc7d6d52d8301a8d53aadb0b287e2879ccc
+SHA1 (patch-tf) = c1d29d5712b3ba7d5248094359ca3a8d434a8228
diff --git a/mail/exmh/patches/patch-ta b/mail/exmh/patches/patch-ta
new file mode 100644
index 00000000000..030baa27b3a
--- /dev/null
+++ b/mail/exmh/patches/patch-ta
@@ -0,0 +1,18 @@
+$NetBSD: patch-ta,v 1.1 2010/09/01 09:23:18 wiz Exp $
+
+patch from upstream cvs repository to allow exmh to function
+correctly with tcl 8.5 (or any earlier version).  This patch
+will not be needed after the next exmh upgrade.
+
+
+--- exmh-2.7.2/lib/html.tcl	2004-07-28 13:21:07.000000000 +0700
++++ lib/html.tcl	2010-08-27 03:50:58.000000000 +0700
+@@ -209,7 +209,7 @@
+ }
+ proc HtmlHit {win x y} {
+     upvar #0 HM$win var
+-    lassign {href name} [UrlGetLink $win $x $y]
++    exmh_lassign {href name} [UrlGetLink $win $x $y]
+     UrlResolve $var(S_url) href
+     URI_StartViewer $href
+ }
diff --git a/mail/exmh/patches/patch-tb b/mail/exmh/patches/patch-tb
new file mode 100644
index 00000000000..bb09b1008b8
--- /dev/null
+++ b/mail/exmh/patches/patch-tb
@@ -0,0 +1,18 @@
+$NetBSD: patch-tb,v 1.1 2010/09/01 09:23:18 wiz Exp $
+
+patch from upstream cvs repository to allow exmh to function
+correctly with tcl 8.5 (or any earlier version).  This patch
+will not be needed after the next exmh upgrade.
+
+
+--- exmh-2.7.2/lib/html_formtag.tcl	1999-03-27 01:02:56.000000000 +0700
++++ lib/html_formtag.tcl	2010-08-27 03:50:58.000000000 +0700
+@@ -690,7 +690,7 @@
+     upvar #0 HM[Window_GetMaster $win] var $formVar form
+     foreach w [array names form widgets,*] {
+         regsub ^widgets, $w {} w
+-	lassign {htag param} $form(widgets,$w)
++	exmh_lassign {htag param} $form(widgets,$w)
+ 	if {"$htag" == "input"} {
+ 	    set type text
+ 	    HMextract_param $param type
diff --git a/mail/exmh/patches/patch-tc b/mail/exmh/patches/patch-tc
new file mode 100644
index 00000000000..a8286b6b2ed
--- /dev/null
+++ b/mail/exmh/patches/patch-tc
@@ -0,0 +1,18 @@
+$NetBSD: patch-tc,v 1.1 2010/09/01 09:23:18 wiz Exp $
+
+patch from upstream cvs repository to allow exmh to function
+correctly with tcl 8.5 (or any earlier version).  This patch
+will not be needed after the next exmh upgrade.
+
+
+--- exmh-2.7.2/lib/html_get_http.tcl	2002-04-23 13:04:09.000000000 +0700
++++ lib/html_get_http.tcl	2010-08-27 03:50:58.000000000 +0700
+@@ -155,7 +155,7 @@
+     }
+     if {$protocol == "http"} {
+ 	# Callback to determine if a proxy is necessary
+-	lassign {proxy pport} [Http_Proxy $host]
++	exmh_lassign {proxy pport} [Http_Proxy $host]
+ 	if [catch {
+ 	    if [string length $proxy] {
+ 		set sock [HttpConnect $proxy $pport $data(protocol) $url]
diff --git a/mail/exmh/patches/patch-td b/mail/exmh/patches/patch-td
new file mode 100644
index 00000000000..4c91a1ffeca
--- /dev/null
+++ b/mail/exmh/patches/patch-td
@@ -0,0 +1,25 @@
+$NetBSD: patch-td,v 1.1 2010/09/01 09:23:18 wiz Exp $
+
+patch from upstream cvs repository to allow exmh to function
+correctly with tcl 8.5 (or any earlier version).  This patch
+will not be needed after the next exmh upgrade.
+
+
+--- exmh-2.7.2/lib/html_links.tcl	2001-05-15 00:51:38.000000000 +0700
++++ lib/html_links.tcl	2010-08-27 03:50:58.000000000 +0700
+@@ -79,13 +81,13 @@
+ }
+ proc Url_Hit {win x y} {
+     dputs Url_Hit $x $y
+-    lassign {href name} [UrlGetLink $win $x $y]
++    exmh_lassign {href name} [UrlGetLink $win $x $y]
+     Html_HistoryAdd $win $href
+     Frame_Display $win $name $href
+ }
+ # This is like Url_Hit for regular hits, but it opens a new window.
+ proc Url_HitNew {win x y} {
+-    lassign {href target} [UrlGetLink $win $x $y]
++    exmh_lassign {href target} [UrlGetLink $win $x $y]
+     Url_DisplayNew $href $win
+ }
+ 
diff --git a/mail/exmh/patches/patch-te b/mail/exmh/patches/patch-te
new file mode 100644
index 00000000000..54defb42b31
--- /dev/null
+++ b/mail/exmh/patches/patch-te
@@ -0,0 +1,18 @@
+$NetBSD: patch-te,v 1.1 2010/09/01 09:23:18 wiz Exp $
+
+patch from upstream cvs repository to allow exmh to function
+correctly with tcl 8.5 (or any earlier version).  This patch
+will not be needed after the next exmh upgrade.
+
+
+--- exmh-2.7.2/lib/msgShow.tcl	2005-01-08 06:17:57.000000000 +0700
++++ lib/msgShow.tcl	2010-08-31 20:15:16.000000000 +0700
+@@ -496,7 +496,7 @@
+ #	    continue
+ #        }
+ 
+-	lassign {qt_cnt qt_str} [MsgHighlightQuoteLevel $txt]
++	exmh_lassign {qt_cnt qt_str} [MsgHighlightQuoteLevel $txt]
+ 	if {$qt_cnt >= 5} {
+ 	    set qt_cnt 5
+ 	}
diff --git a/mail/exmh/patches/patch-tf b/mail/exmh/patches/patch-tf
new file mode 100644
index 00000000000..d8e1ef879b0
--- /dev/null
+++ b/mail/exmh/patches/patch-tf
@@ -0,0 +1,19 @@
+$NetBSD: patch-tf,v 1.1 2010/09/01 09:23:18 wiz Exp $
+
+patch from upstream cvs repository to allow exmh to function
+correctly with tcl 8.5 (or any earlier version).  This patch
+will not be needed after the next exmh upgrade.
+
+
+--- exmh-2.7.2/lib/utils.tcl	2004-11-12 02:36:20.000000000 +0700
++++ lib/utils.tcl	2010-08-27 03:50:58.000000000 +0700
+@@ -23,7 +23,8 @@
+ # Assign a set of variables from a list of values.
+ # If there are more values than variables, they are ignored.
+ # If there are fewer values than variables, the variables get the empty string.
+-proc lassign {varList value} {
++# renamed to avoid conflicting with tcl8.5 lassign which has different calling
++proc exmh_lassign {varList value} {
+     if {[string length $value] == 0} {
+ 	foreach var $varList {
+ 	    uplevel [list set $var {}]