From 5d9bbf9a2b71052cdea94c4485fc0d4bf8e5ff8d Mon Sep 17 00:00:00 2001
From: landry <landry@openbsd.org>
Date: Wed, 23 Apr 2008 21:11:29 +0000
Subject: [PATCH] Update to claws-mail 3.4.0 from maintainer Ulrich Kahl Add a
 temporary patch from brad@ to fix upstream bug #1566, see
 http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=1566 (it's
 already fixed in upstream cvs, but slightly differently)

ok ajacoutot@, 'ok ok ok ok' pyr@
---
 mail/claws-mail/Makefile                         | 16 +++++++++-------
 mail/claws-mail/distinfo                         | 10 +++++-----
 .../claws-mail/patches/patch-src_common_socket_c | 12 ++++++++++++
 3 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 mail/claws-mail/patches/patch-src_common_socket_c

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index b3d67c3cda3..88d97eddada 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2008/04/17 08:10:10 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2008/04/23 21:11:29 landry Exp $
 
 COMMENT-main=		mail and news client
 COMMENT-docs=		documentation
@@ -7,9 +7,9 @@ COMMENT-clamav=		clamav plugin
 COMMENT-dillo=		dillo plugin
 COMMENT-spamassassin=	spamassassin plugin
 
-V=			3.3.1
+V=			3.4.0
 DISTNAME=		claws-mail-${V}
-PKGNAME-main=			${DISTNAME}p0
+PKGNAME-main=			${DISTNAME}
 FULLPKGNAME-docs=		claws-mail-docs-${V}
 FULLPKGNAME-bogofilter=		claws-mail-bogofilter-${V}
 FULLPKGNAME-dillo=		claws-mail-dillo-${V}
@@ -47,11 +47,13 @@ RUN_DEPENDS-spamassassin=::${BUILD_PKGPATH} \
 			::mail/p5-Mail-SpamAssassin 
 
 WANTLIB=		X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
-			Xi Xinerama Xrandr Xrender atk-1.0 cairo crypto expat \
-			fontconfig freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \
-			m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre png ssl z
+			Xi Xinerama Xrandr Xrender atk-1.0 cairo crypto curl \
+			expat fontconfig freetype glib-2.0 glitz gmodule-2.0 \
+			gobject-2.0 idn m pango-1.0 pangocairo-1.0 \
+			pangoft2-1.0 pcre png ssl z
 
-WANTLIB-main=		${WANTLIB} ICE SM c dbus-1 gthread-2.0 gpg-error pthread stdc++
+WANTLIB-main=		${WANTLIB} ICE SM c dbus-1 gthread-2.0 gpg-error \
+			pthread stdc++
 
 WANTLIB-docs=		
 
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 944df07cd5b..b76fdf21057 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,5 +1,5 @@
-MD5 (claws/claws-mail-3.3.1.tar.bz2) = 9L+hdM8ea9qG7F/ydr6dmg==
-RMD160 (claws/claws-mail-3.3.1.tar.bz2) = 4favhTsxy9TucemdFF27UK1NkCw=
-SHA1 (claws/claws-mail-3.3.1.tar.bz2) = u93cdLHsiA4ptdr0EIHEEkEJUH0=
-SHA256 (claws/claws-mail-3.3.1.tar.bz2) = xY8BnQGyYJOfe/Nl2r/31scr961Fwb/vC0gW0nhitBo=
-SIZE (claws/claws-mail-3.3.1.tar.bz2) = 5965308
+MD5 (claws/claws-mail-3.4.0.tar.bz2) = 7F7nQ7qhmMf9cHsEYbbGig==
+RMD160 (claws/claws-mail-3.4.0.tar.bz2) = XB06XKlbXWGUh5EXCsVH6tdkon8=
+SHA1 (claws/claws-mail-3.4.0.tar.bz2) = Z8+bybn+kX+0wriV5rySkeXmSXw=
+SHA256 (claws/claws-mail-3.4.0.tar.bz2) = GTS/LFUhbjUCKNi6UABCahpvEyDOBLK4KRahhHKdnOg=
+SIZE (claws/claws-mail-3.4.0.tar.bz2) = 5999033
diff --git a/mail/claws-mail/patches/patch-src_common_socket_c b/mail/claws-mail/patches/patch-src_common_socket_c
new file mode 100644
index 00000000000..985c1f46635
--- /dev/null
+++ b/mail/claws-mail/patches/patch-src_common_socket_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_common_socket_c,v 1.1 2008/04/23 21:11:29 landry Exp $
+--- src/common/socket.c.orig	Wed Apr 23 23:03:12 2008
++++ src/common/socket.c	Wed Apr 23 23:03:21 2008
+@@ -124,7 +124,7 @@ struct _SockSource {
+ 	SockInfo *sock;
+ };
+ 
+-static guint io_timeout = 60;
++static guint io_timeout = 76;
+ 
+ static GList *sock_connect_data_list = NULL;
+