Fix message date printing, from PR 49479; submitted upstream. >From Robert Elz. PKGREVISION++diff -r1.54 -r1.55 pkgsrc/mail/exmh/Makefile
(dholland)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.54 2014/01/11 14:42:04 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.55 2014/12/27 00:20:06 dholland Exp $ | |
2 | 2 | |||
3 | DISTNAME= exmh-2.7.2 | 3 | DISTNAME= exmh-2.7.2 | |
4 | PKGREVISION= 5 | 4 | PKGREVISION= 6 | |
5 | CATEGORIES= mail tk | 5 | CATEGORIES= mail tk | |
6 | MASTER_SITES= ftp://ftp.tcl.tk/pub/tcl/exmh/ | 6 | MASTER_SITES= ftp://ftp.tcl.tk/pub/tcl/exmh/ | |
7 | 7 | |||
8 | MAINTAINER= dsainty@NetBSD.org | 8 | MAINTAINER= dsainty@NetBSD.org | |
9 | HOMEPAGE= http://www.beedub.com/exmh/ | 9 | HOMEPAGE= http://www.beedub.com/exmh/ | |
10 | COMMENT= X11/TK based mail reader front end to MH | 10 | COMMENT= X11/TK based mail reader front end to MH | |
11 | 11 | |||
12 | DEPENDS+= nmh>=1.0:../../mail/nmh | 12 | DEPENDS+= nmh>=1.0:../../mail/nmh | |
13 | DEPENDS+= metamail>=2.7:../../mail/metamail | 13 | DEPENDS+= metamail>=2.7:../../mail/metamail | |
14 | 14 | |||
15 | USE_TOOLS+= tclsh | 15 | USE_TOOLS+= tclsh | |
16 | USE_TOOLS+= wish:run | 16 | USE_TOOLS+= wish:run | |
17 | 17 |
@@ -1,12 +1,13 @@ | @@ -1,12 +1,13 @@ | |||
1 | $NetBSD: distinfo,v 1.7 2010/09/01 09:23:18 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.8 2014/12/27 00:20:06 dholland Exp $ | |
2 | 2 | |||
3 | SHA1 (exmh-2.7.2/exmh-2.7.2.tar.gz) = 0e8e11c29c7e1b9371d5a72b4cb2bf6085f20edf | 3 | SHA1 (exmh-2.7.2/exmh-2.7.2.tar.gz) = 0e8e11c29c7e1b9371d5a72b4cb2bf6085f20edf | |
4 | RMD160 (exmh-2.7.2/exmh-2.7.2.tar.gz) = fd0d8689304cdb6dcbcd341ec5ba5f8f5b2f9712 | 4 | RMD160 (exmh-2.7.2/exmh-2.7.2.tar.gz) = fd0d8689304cdb6dcbcd341ec5ba5f8f5b2f9712 | |
5 | Size (exmh-2.7.2/exmh-2.7.2.tar.gz) = 1081601 bytes | 5 | Size (exmh-2.7.2/exmh-2.7.2.tar.gz) = 1081601 bytes | |
6 | SHA1 (patch-aw) = 396ef41611de11a9ba48f15711e20f4e44f73da9 | 6 | SHA1 (patch-aw) = 396ef41611de11a9ba48f15711e20f4e44f73da9 | |
7 | SHA1 (patch-lib_mime.tcl) = 180bef533f94eb07d46874ee06d724c0fa2c0e32 | |||
7 | SHA1 (patch-ta) = 0670c357f0317a4b4f7684425bce8f30d7ef9cd2 | 8 | SHA1 (patch-ta) = 0670c357f0317a4b4f7684425bce8f30d7ef9cd2 | |
8 | SHA1 (patch-tb) = b5f51dabf9df11420de9b50aaf7dc422eff1f3ad | 9 | SHA1 (patch-tb) = b5f51dabf9df11420de9b50aaf7dc422eff1f3ad | |
9 | SHA1 (patch-tc) = 87ed70fd2957821c2fab06c0dc33da446dffdb6f | 10 | SHA1 (patch-tc) = 87ed70fd2957821c2fab06c0dc33da446dffdb6f | |
10 | SHA1 (patch-td) = cb777e02b854f82c49e20b19c08b4746dcfe76c2 | 11 | SHA1 (patch-td) = cb777e02b854f82c49e20b19c08b4746dcfe76c2 | |
11 | SHA1 (patch-te) = 18363fc7d6d52d8301a8d53aadb0b287e2879ccc | 12 | SHA1 (patch-te) = 18363fc7d6d52d8301a8d53aadb0b287e2879ccc | |
12 | SHA1 (patch-tf) = c1d29d5712b3ba7d5248094359ca3a8d434a8228 | 13 | SHA1 (patch-tf) = c1d29d5712b3ba7d5248094359ca3a8d434a8228 |
$NetBSD: patch-lib_mime.tcl,v 1.1 2014/12/27 00:20:06 dholland Exp $
Fix message date printing, from PR 49479; submitted upstream.
--- lib/mime.tcl 2013-09-16 11:48:55.000000000 +0700
+++ lib/mime.tcl 2014-12-16 08:59:57.000000000 +0700
@@ -1302,7 +1302,12 @@
global mime
catch {
- set msgtime [clock scan $time]
+ set msgtime [regsub -all {\([^)]*\)} $time {}]
+ set msgtime [string trim $msgtime]
+ if [regexp {.* -0000$} $msgtime] {
+ return
+ }
+ set msgtime [clock scan $msgtime -format "%a, %d %b %Y %T %Z"]
set localtime [clock format $msgtime -format " %T"]
if { [string first $localtime $time] == -1 } {
Preferences_Resource mime(localTimeFormat) localTimeFormat \