From 0b9a3eecfa6f45dd9f8e0c5abe979148a84db823 Mon Sep 17 00:00:00 2001
From: ryoon <ryoon>
Date: Mon, 11 Jul 2011 14:54:38 +0000
Subject: * Support stunnel-4.39, version detection is changed. * bump
 PKGREVISION.

---
 mail/mew/Makefile                 |  4 ++--
 mail/mew/distinfo                 |  5 +++--
 mail/mew/patches/patch-aa         |  4 ++--
 mail/mew/patches/patch-mew-ssl.el | 16 ++++++++++++++++
 4 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 mail/mew/patches/patch-mew-ssl.el

(limited to 'mail/mew')

diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 73211c1a87c..15f1c55b897 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2010/10/06 12:29:42 taca Exp $
+# $NetBSD: Makefile,v 1.82 2011/07/11 14:54:38 ryoon Exp $
 
 DISTNAME=	mew-6.3
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mew.org/Release/
 
diff --git a/mail/mew/distinfo b/mail/mew/distinfo
index 68e37637132..0cf441aab20 100644
--- a/mail/mew/distinfo
+++ b/mail/mew/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.38 2010/10/06 12:29:42 taca Exp $
+$NetBSD: distinfo,v 1.39 2011/07/11 14:54:38 ryoon Exp $
 
 SHA1 (mew-6.3.tar.gz) = 206709f9423c787d94e120f9bac606b975d6aab1
 RMD160 (mew-6.3.tar.gz) = da816f4c7679a968b1765192a8eda78118d179a6
 Size (mew-6.3.tar.gz) = 976352 bytes
-SHA1 (patch-aa) = 85e20cda02fa5b7551776b11b80a911e0338afbc
+SHA1 (patch-aa) = 649f3b8fb9fdbd80bfe2b324599aff9dd45c4232
 SHA1 (patch-ac) = 8f993fd86774f2ae725cbbe81338862f08dfdfbf
+SHA1 (patch-mew-ssl.el) = 2697e2f12bd4639538c1adadfc5151261c4e7381
diff --git a/mail/mew/patches/patch-aa b/mail/mew/patches/patch-aa
index bf94427490d..319b0de0efe 100644
--- a/mail/mew/patches/patch-aa
+++ b/mail/mew/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2009/08/09 12:01:18 minskim Exp $
+$NetBSD: patch-aa,v 1.7 2011/07/11 14:54:38 ryoon Exp $
 
---- mew-key.el.orig	2008-12-09 23:48:20.000000000 -0800
+--- mew-key.el.orig	2009-01-21 05:54:56.000000000 +0000
 +++ mew-key.el
 @@ -619,7 +619,7 @@
  	(if (file-exists-p (expand-file-name file path))
diff --git a/mail/mew/patches/patch-mew-ssl.el b/mail/mew/patches/patch-mew-ssl.el
new file mode 100644
index 00000000000..efafc5ffdf0
--- /dev/null
+++ b/mail/mew/patches/patch-mew-ssl.el
@@ -0,0 +1,16 @@
+$NetBSD: patch-mew-ssl.el,v 1.1 2011/07/11 14:54:38 ryoon Exp $
+
+* Support "stunnel -version" output of stunnel-4.39.
+
+--- mew-ssl.el.orig	2009-01-21 05:54:58.000000000 +0000
++++ mew-ssl.el
+@@ -260,7 +260,8 @@ A local port number can be obtained the 
+     (with-temp-buffer
+       (call-process mew-prog-ssl nil t nil "-version")
+       (goto-char (point-min))
+-      (if (looking-at "stunnel 4\\.\\([0-9]+\\)")
++      (re-search-forward "^stunnel " nil t 1)
++      (if (looking-at "4\\.\\([0-9]+\\)")
+ 	  (progn
+ 	    (setq mew-ssl-ver 4)
+ 	    (setq mew-ssl-minor-ver (string-to-number (mew-match-string 1))))
-- 
cgit v1.2.3