Update to claws-mail 3.4.0:

* 3.4.0
-------

* Added support for /dev/mem_notify. This Linux kernel feature
  will allow applications to be notified that memory has to be
  freed before getting OOM-killed.
  For more information: http://lwn.net/Articles/267013/

* Enabled moving/copying folders to root folders when using the
  folder selection dialogue.

* Global and per-folder templates can now override the From name.

* Added a tooltip with extended folder stats. (Hover the cursor over
  the short stats on the right, below the message list.)

* Implemented 2-line items in the message list when in three column
  mode.

* Added support for png themes.

* Added an icon for attached patches (text/x-patch and text/x-diff).

* When viewing a message that has a large amount of text, show a
  maximum of 1MB of text and add a noticeview to show optionally show
  the whole message.

* Added a button to the templates preferences to restore defaults for
  current language.

* Added search in filtering rules list.

* Bogofilter Plugin:
  Added a "learn from whitelist" preference.

* MAEMO:
  Added information when fetching large messages.

* tools/csv2addressbook.pl
  Added support for Kmail/Kaddressbook.

* 3.3.1
-------

* Forbid attaching anything containing "../" or ".ssh/" in mailto:
  URIs.

* Add a hidden preference, 'use_networkmanager', to disable
  NetworkManager handling

* 3.3.0
-------

* Due to licensing problems, the ClamAV plugin has been removed from
  the Claws Mail core distribution and can now been found packaged
  separately or with the 'extra plugins' package.

* Added NetworkManager support
  This is built by default if the dependencies are satisfied; it can
  be specifically disabled with '--disable-networkmanager-support'.
  This enables Claws Mail to track changes to the network status.

* Added DIGEST-MD5 support for IMAP authentication

* Added Folder Properties option, 'Run processing rules when opening'
  to the General page.

* Added sub-sorting to the Message List; when the Sort type is either
  Subject, From, To or Tags, sub-sorting by Date will be active.

* Added from=address to the mailto sequence
  The 'from' will try to select the first matching account in the
  Accounts list, otherwise it will use the usual account selection
  mechanism but will override it with the given 'from' address.

* Added insert=FILE  to the mailto sequence (stands for 'insert file')
  This adds the ability to create a new message from the command-line,
  with the body set from the contents of an existing file.

* Added mailto with NNTP accounts
  This comes into play if mailto is used when an NNTP account is the
  default account or if an NNTP account address is used with 'from'.

* Added several GUI improvements to the Filtering, Processing, Tags,
  Actions, Templates, Logging and Address Book dialogues

* Added a tooltip to the 'replied' icon in the Message List which
  indicates 'click to see your reply' feature.

* Added 'claws-mail --version-full' to display the version and a list
  of the compiled-in features

* Implemented speed-ups to list operations, deletions and cache
  updates.

* Updated the man page

* The Trayicon plugin icons are now themable.

* text/calendar message parts are now automatically displayed if a
  plugin handling text/calendar is loaded, e.g. vCalendar.

* Maemo: connect HW status change signal for shutdown

* Maemo: identify mmc1 and mmc2 more clearly in the GUI

* Maemo: Make dnd threshold higher

6 files changed, 15 insertions, 44 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index eedfa1578b0..0b4be61cbcf 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/01/21 19:09:42 smb Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/12 02:25:39 smb Exp $
 
 .include "Makefile.common"
 
@@ -6,7 +6,6 @@ PKGNAME=	claws-mail-${CLAWS_VERSION}
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	X based e-mail and netnews client
-PKGREVISION=	4
 
 CONFLICTS+=	sylpheed-claws-[0-9]*
 
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index d451868cbb2..24ca34e2b0b 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.4 2008/01/09 03:55:09 smb Exp $
+# $NetBSD: Makefile.vers,v 1.5 2008/05/12 02:25:39 smb Exp $
 #
-CLAWS_VERSION=	3.2.0
+CLAWS_VERSION=	3.4.0
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index e6bdce7c132..f6eaa621afe 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.7 2008/01/10 01:57:27 smb Exp $
+$NetBSD: distinfo,v 1.8 2008/05/12 02:25:39 smb Exp $
 
-SHA1 (claws-mail-3.2.0.tar.bz2) = 23e093afb9cae541f4ace74f41178a551aec3921
-RMD160 (claws-mail-3.2.0.tar.bz2) = 31af404393bfd15b26b20ec2c056de1f82ad3e31
-Size (claws-mail-3.2.0.tar.bz2) = 5880889 bytes
+SHA1 (claws-mail-3.4.0.tar.bz2) = 67cf9bc9b9fe917fb4c2b895e6bc9291e5e6497c
+RMD160 (claws-mail-3.4.0.tar.bz2) = 5c1d3a5ca95b5d61948791170ac547ead764a27f
+Size (claws-mail-3.4.0.tar.bz2) = 5999033 bytes
 SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
-SHA1 (patch-ac) = cb1b427cf2bcd810cc1bd05324fdb9d40c695bfc
+SHA1 (patch-ac) = 6410910bc47784294f508f579891190e19c98402
 SHA1 (patch-ad) = e37162dbbf335bef2b418722cd55c2e19f79e0a6
-SHA1 (patch-af) = a24836beb156bf28921bc7606e8a5224d536b0b4
-SHA1 (patch-ag) = e8de39b62ae7de37a40929e4fa2f17cdb6a082c7
diff --git a/mail/claws-mail/patches/patch-ac b/mail/claws-mail/patches/patch-ac
index f002f77f737..3707a574366 100644
--- a/mail/claws-mail/patches/patch-ac
+++ b/mail/claws-mail/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2007/09/18 03:17:25 smb Exp $
+$NetBSD: patch-ac,v 1.4 2008/05/12 02:25:39 smb Exp $
 
---- src/prefs_common.h.orig	2007-08-16 22:50:08.000000000 -0400
-+++ src/prefs_common.h	2007-08-16 22:50:33.000000000 -0400
-@@ -153,7 +153,6 @@
+--- src/prefs_common.h.orig	2008-05-11 17:01:21.000000000 -0400
++++ src/prefs_common.h	2008-05-11 17:02:01.000000000 -0400
+@@ -157,7 +157,6 @@
  	gboolean block_cursor;
  	gchar *quote_chars;
  	
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.3 2007/09/18 03:17:25 smb Exp $
  	gboolean enable_aspell;
  	gchar *aspell_path;
  	gchar *dictionary;
-@@ -164,7 +163,6 @@
+@@ -168,7 +167,6 @@
  	gboolean recheck_when_changing_dict;
  	gboolean use_alternate;
  	gboolean use_both_dicts;
@@ -18,7 +18,7 @@ $NetBSD: patch-ac,v 1.3 2007/09/18 03:17:25 smb Exp $
          
  	/* Display */
  	/* obsolete fonts */
-@@ -313,7 +311,6 @@
+@@ -322,7 +320,6 @@
  
  	GList *mime_open_cmd_history;
  
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.3 2007/09/18 03:17:25 smb Exp $
  	/* Privacy */
  	gboolean auto_check_signatures;
  	gboolean gpg_signature_popup;
-@@ -321,7 +318,6 @@
+@@ -330,7 +327,6 @@
  	gint store_passphrase_timeout;
  	gboolean passphrase_grab;
  	gboolean gpg_warning;
diff --git a/mail/claws-mail/patches/patch-af b/mail/claws-mail/patches/patch-af
deleted file mode 100644
index 17fdbf031cb..00000000000
--- a/mail/claws-mail/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2008/01/09 03:55:09 smb Exp $
-
---- src/common/ssl_certificate.c.orig	2007-12-26 22:47:33.000000000 -0500
-+++ src/common/ssl_certificate.c	2007-12-26 22:48:25.000000000 -0500
-@@ -34,6 +34,8 @@
- #include <unistd.h>
- #include <string.h>
- #endif
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- #include <glib.h>
- #include <glib/gi18n.h>
- 
diff --git a/mail/claws-mail/patches/patch-ag b/mail/claws-mail/patches/patch-ag
deleted file mode 100644
index f185e1d7927..00000000000
--- a/mail/claws-mail/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2008/01/10 01:57:27 smb Exp $
-
---- src/common/passcrypt.c.orig	2008-01-09 19:59:19.000000000 -0500
-+++ src/common/passcrypt.c	2008-01-09 19:59:41.000000000 -0500
-@@ -17,7 +17,7 @@
-  * 
-  */
- 
--#define _XOPEN_SOURCE
-+#define _XOPEN_SOURCE	600
- 
- #include <sys/types.h>
- #include <stdio.h>