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

46 files changed, 185 insertions, 210 deletions

diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile
index 3e28a1e9fd8..1bf465ce9cd 100644
--- a/mail/claws-mail-attachwarner/Makefile
+++ b/mail/claws-mail-attachwarner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2008/01/09 03:55:09 smb Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/12 02:25:39 smb Exp $
 #
 
-DISTNAME=	attachwarner-0.2.10
-PKGNAME=	claws-mail-attachwarner-0.2.10
+DISTNAME=	attachwarner-0.2.12
+PKGNAME=	claws-mail-attachwarner-0.2.12
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -11,7 +11,7 @@ COMMENT=	Warns if a message mentions an attachment without attaching files
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-attachwarner/distinfo b/mail/claws-mail-attachwarner/distinfo
index 3c0f6223794..d37343fd61e 100644
--- a/mail/claws-mail-attachwarner/distinfo
+++ b/mail/claws-mail-attachwarner/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/01/09 03:55:09 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/05/12 02:25:39 smb Exp $
 
-SHA1 (attachwarner-0.2.10.tar.gz) = c7ab16e31da263addef67a7a39d6d353a22bab7d
-RMD160 (attachwarner-0.2.10.tar.gz) = 55b5c56ffcb597c0d877c60c23d98f9b746ead40
-Size (attachwarner-0.2.10.tar.gz) = 391358 bytes
+SHA1 (attachwarner-0.2.12.tar.gz) = 28006c6f913c3a27c9ab78280b046a77a7d00446
+RMD160 (attachwarner-0.2.12.tar.gz) = 651568f959a194c17c343ceab3df175a0032977b
+Size (attachwarner-0.2.12.tar.gz) = 395871 bytes
diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile
index f1e8a83477b..5c7bd13c84a 100644
--- a/mail/claws-mail-attremover/Makefile
+++ b/mail/claws-mail-attremover/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:09 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/12 02:25:39 smb Exp $
 #
 
-DISTNAME=	att_remover-1.0.7
-PKGNAME=	claws-mail-att_remover-1.0.7
+DISTNAME=	att_remover-1.0.8
+PKGNAME=	claws-mail-att_remover-1.0.8
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Permanently deletes attachments from mail
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-attremover/distinfo b/mail/claws-mail-attremover/distinfo
index 142a7615603..c889493f712 100644
--- a/mail/claws-mail-attremover/distinfo
+++ b/mail/claws-mail-attremover/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/09/18 03:17:26 smb Exp $
+$NetBSD: distinfo,v 1.3 2008/05/12 02:25:39 smb Exp $
 
-SHA1 (att_remover-1.0.7.tar.gz) = cd14301814f25875f3ff02907b612fd303b10fec
-RMD160 (att_remover-1.0.7.tar.gz) = 1bfaa456bf8e482773088b6442b9def83f889eb4
-Size (att_remover-1.0.7.tar.gz) = 322799 bytes
+SHA1 (att_remover-1.0.8.tar.gz) = cae9924036369544c56a16f2b4b5288a420cdb95
+RMD160 (att_remover-1.0.8.tar.gz) = b780787a314a2d46a99c4d4a431dc0d49ed364c0
+Size (att_remover-1.0.8.tar.gz) = 327021 bytes
diff --git a/mail/claws-mail-bogofilter/Makefile b/mail/claws-mail-bogofilter/Makefile
index 0a0db87f7c7..8d26462689b 100644
--- a/mail/claws-mail-bogofilter/Makefile
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:10 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/12 02:25:39 smb Exp $
 #
 
 PLUGIN_NAME=	bogofilter
-PLUG_VER=	3.2.0
+PLUG_VER=	3.4.0
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -10,7 +10,7 @@ COMMENT=	Enables the scanning of incoming mail using Bogofilter
 
 CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 DEPENDS+=	bogofilter>=1.0.3nb1:../../mail/bogofilter
 
 .include "../../mail/claws-mail/Makefile.vers"
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index fe18f1e8a5a..2261eeaca0f 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:10 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/12 02:25:39 smb Exp $
 #
 
-DISTNAME=	cachesaver-0.10.6
-PKGNAME=	claws-mail-cachesaver-0.10.6
+DISTNAME=	cachesaver-0.10.7
+PKGNAME=	claws-mail-cachesaver-0.10.7
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Saves Claws-Mail metadata every 60 seconds
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-cachesaver/distinfo b/mail/claws-mail-cachesaver/distinfo
index 4100b53955f..053e0322845 100644
--- a/mail/claws-mail-cachesaver/distinfo
+++ b/mail/claws-mail-cachesaver/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/09/18 03:17:26 smb Exp $
+$NetBSD: distinfo,v 1.3 2008/05/12 02:25:39 smb Exp $
 
-SHA1 (cachesaver-0.10.6.tar.gz) = 9075cb231567478a995cdb4477c0f3a039940b9b
-RMD160 (cachesaver-0.10.6.tar.gz) = 85396643711e0d8353c9d80a9c40f9501795cb56
-Size (cachesaver-0.10.6.tar.gz) = 329371 bytes
+SHA1 (cachesaver-0.10.7.tar.gz) = 1dcbf089a158d20669bca5639b2abe64bf7c5af1
+RMD160 (cachesaver-0.10.7.tar.gz) = f1a192678eaae7baa23a29569e0b79ba322eb67c
+Size (cachesaver-0.10.7.tar.gz) = 333790 bytes
diff --git a/mail/claws-mail-dillo-viewer/Makefile b/mail/claws-mail-dillo-viewer/Makefile
index c600564453c..f5a2f19c319 100644
--- a/mail/claws-mail-dillo-viewer/Makefile
+++ b/mail/claws-mail-dillo-viewer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:10 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/12 02:25:39 smb Exp $
 #
 
 PLUGIN_NAME=	dillo_viewer
-PLUG_VER=	3.2.0
+PLUG_VER=	3.4.0
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -10,7 +10,7 @@ COMMENT=	Plugin to use the Dillo web browser for html rendering
 
 CONFIGURE_ARGS+=	--enable-dillo_viewer-plugin
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 DEPENDS+=	dillo>=0.8.6nb2:../../www/dillo
 
 .include "../../mail/claws-mail/Makefile.vers"
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index b17c61082f8..486f435fee6 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:10 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/12 02:25:39 smb Exp $
 #
 
-DISTNAME=	fetchinfo-plugin-0.4.22
-PKGNAME=	claws-mail-fetchinfo-plugin-0.4.22
+DISTNAME=	fetchinfo-plugin-0.4.23
+PKGNAME=	claws-mail-fetchinfo-plugin-0.4.23
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Inserts headers containing some download information
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-fetchinfo/distinfo b/mail/claws-mail-fetchinfo/distinfo
index 24bfcd8b90a..30ca82fac7b 100644
--- a/mail/claws-mail-fetchinfo/distinfo
+++ b/mail/claws-mail-fetchinfo/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/01/09 03:55:10 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/05/12 02:25:39 smb Exp $
 
-SHA1 (fetchinfo-plugin-0.4.22.tar.gz) = 1d2bb89dc916ebf15b43d0931c4268ee2c1daf6f
-RMD160 (fetchinfo-plugin-0.4.22.tar.gz) = 639a22169f9398b57854013cd293a0c4438a54f7
-Size (fetchinfo-plugin-0.4.22.tar.gz) = 329852 bytes
+SHA1 (fetchinfo-plugin-0.4.23.tar.gz) = 24fea1a1e5d24a4aa9a5e84ae51c857db376deec
+RMD160 (fetchinfo-plugin-0.4.23.tar.gz) = 47dd337b7cfccdd6091267bccf46992fe82e0b5b
+Size (fetchinfo-plugin-0.4.23.tar.gz) = 334692 bytes
diff --git a/mail/claws-mail-gtkhtml/Makefile b/mail/claws-mail-gtkhtml/Makefile
index 916dfa29964..b8be5de3947 100644
--- a/mail/claws-mail-gtkhtml/Makefile
+++ b/mail/claws-mail-gtkhtml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2008/03/06 14:53:51 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/12 02:25:39 smb Exp $
 #
 
-DISTNAME=	gtkhtml2_viewer-0.17
-PKGNAME=	claws-mail-gtkhtml2_viewer-0.17
-PKGREVISION=	2
+DISTNAME=	gtkhtml2_viewer-0.18
+PKGNAME=	claws-mail-gtkhtml2_viewer-0.18
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -12,7 +11,7 @@ COMMENT=	Renders HTML mail using the gtkhtml2 rendering widget
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-gtkhtml/distinfo b/mail/claws-mail-gtkhtml/distinfo
index 8c1072fb1fe..8e1b33d2e99 100644
--- a/mail/claws-mail-gtkhtml/distinfo
+++ b/mail/claws-mail-gtkhtml/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/01/09 03:55:10 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/05/12 02:25:39 smb Exp $
 
-SHA1 (gtkhtml2_viewer-0.17.tar.gz) = 464907eafae49b346fd531838f2791465bb20c76
-RMD160 (gtkhtml2_viewer-0.17.tar.gz) = 75c7567528df516b93d502d9300acc1e76e46a74
-Size (gtkhtml2_viewer-0.17.tar.gz) = 407315 bytes
+SHA1 (gtkhtml2_viewer-0.18.tar.gz) = e028f499ae6688e945d90b445bb189b4ab4666b9
+RMD160 (gtkhtml2_viewer-0.18.tar.gz) = f430f2bd0333b6f82ed49d84643cb71621c741fc
+Size (gtkhtml2_viewer-0.18.tar.gz) = 699178 bytes
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 3d2c472796f..7abf7cd0be0 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:10 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/12 02:25:40 smb Exp $
 #
 
-DISTNAME=	mailmbox-1.14
-PKGNAME=	claws-mail-mailmbox-1.14
+DISTNAME=	mailmbox-1.14.1
+PKGNAME=	claws-mail-mailmbox-1.14.1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Handles mailboxes in mbox format
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-mailmbox/distinfo b/mail/claws-mail-mailmbox/distinfo
index 8c5dffcefeb..149adbc27dc 100644
--- a/mail/claws-mail-mailmbox/distinfo
+++ b/mail/claws-mail-mailmbox/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/09/18 03:17:28 smb Exp $
+$NetBSD: distinfo,v 1.3 2008/05/12 02:25:40 smb Exp $
 
-SHA1 (mailmbox-1.14.tar.gz) = 5f1403c00f9c5ecd21a30fd2eaa30321ea33b044
-RMD160 (mailmbox-1.14.tar.gz) = 804a3148d4cda280228cd24e52c75dc877936315
-Size (mailmbox-1.14.tar.gz) = 403040 bytes
+SHA1 (mailmbox-1.14.1.tar.gz) = 1f25145df3af1945182549b97c7314f5d9369101
+RMD160 (mailmbox-1.14.1.tar.gz) = 9b0abe14bc6c29376082f5c0cd42c7d82eb3b8f5
+Size (mailmbox-1.14.1.tar.gz) = 407434 bytes
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 68379616c67..c3dbfb47aab 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.6 2008/01/09 03:55:11 smb Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/12 02:25:40 smb Exp $
 #
 
-DISTNAME=	newmail-0.0.11
-PKGNAME=	claws-mail-newmail-0.0.11
+DISTNAME=	newmail-0.0.12
+PKGNAME=	claws-mail-newmail-0.0.12
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Write log file info on arriving email
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-newmail/distinfo b/mail/claws-mail-newmail/distinfo
index c14350287bb..75ecf7ec290 100644
--- a/mail/claws-mail-newmail/distinfo
+++ b/mail/claws-mail-newmail/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2007/09/18 03:17:28 smb Exp $
+$NetBSD: distinfo,v 1.3 2008/05/12 02:25:40 smb Exp $
 
-SHA1 (newmail-0.0.11.tar.gz) = bd1a4d0b03f6946cb128571ca2d4e240006e36dc
-RMD160 (newmail-0.0.11.tar.gz) = 4a466380064a4b2b6a44b4a7e8cfc5d9b4d236d9
-Size (newmail-0.0.11.tar.gz) = 322780 bytes
+SHA1 (newmail-0.0.12.tar.gz) = 7fb0c5254550638a8347610c444304d966152ddb
+RMD160 (newmail-0.0.12.tar.gz) = f78e2065fca5019db42524b822a473e60c548084
+Size (newmail-0.0.12.tar.gz) = 327009 bytes
+SHA1 (patch-aa) = 96d860c1792a99224dfbc009b6881c1b693cb8bf
diff --git a/mail/claws-mail-newmail/patches/patch-aa b/mail/claws-mail-newmail/patches/patch-aa
new file mode 100644
index 00000000000..0bc415ccbab
--- /dev/null
+++ b/mail/claws-mail-newmail/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2008/05/12 02:25:40 smb Exp $
+
+--- src/newmail.c.orig	2008-05-11 22:12:47.000000000 -0400
++++ src/newmail.c	2008-05-11 22:18:04.000000000 -0400
+@@ -61,7 +61,7 @@
+ 	"From:\t%s\n"
+ 	"To:\t%s\n"
+ 	"Cc:\t%s\n"
+-	"Size:\t%ld\n"
++	"Size:\t%" PRId64 "\n"
+ 	"Path:\t%s\n"
+ 	"Message:\t%d\n"
+ 	"Folder:\t%s\n",
+@@ -70,7 +70,7 @@
+ 	    defstr (msginfo->from),
+ 	    defstr (msginfo->to),
+ 	    defstr (msginfo->cc),
+-	    msginfo->size,
++	    (int64_t) msginfo->size,
+ 	    defstr (procmsg_get_message_file_path (msginfo)),
+ 	    msginfo->msgnum,
+ 	    tof ? defstr (tof->name) : "(null)");
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 618999fb340..6e0c8b2828b 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2008/04/07 16:50:04 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/12 02:25:40 smb Exp $
 #
 
-DISTNAME=	notification_plugin-0.14
-PKGNAME=	claws-mail-notification-0.14
-PKGREVISION=	1
+DISTNAME=	notification_plugin-0.16
+PKGNAME=	claws-mail-notification-0.16
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Provides various ways to notify the user of new and unread email
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-notification/distinfo b/mail/claws-mail-notification/distinfo
index 9f0419bace4..44bc6a55863 100644
--- a/mail/claws-mail-notification/distinfo
+++ b/mail/claws-mail-notification/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/01/09 03:55:11 smb Exp $
+$NetBSD: distinfo,v 1.5 2008/05/12 02:25:40 smb Exp $
 
-SHA1 (notification_plugin-0.14.tar.gz) = 62ab1830b8c74c4b603acc7f10fec77e332515cb
-RMD160 (notification_plugin-0.14.tar.gz) = a93881e9ef842db1f54d3cc87d3ea624ec1e906c
-Size (notification_plugin-0.14.tar.gz) = 469072 bytes
+SHA1 (notification_plugin-0.16.tar.gz) = df341ae3f2d6fc938c6633a865bab73ef50cb7e0
+RMD160 (notification_plugin-0.16.tar.gz) = 74593bfebd280e9d586f08c7da106599b4f1c514
+Size (notification_plugin-0.16.tar.gz) = 473048 bytes
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 9d7aa4a709d..3b07e9070f0 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2008/01/09 03:55:11 smb Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/12 02:25:40 smb Exp $
 #
 
-DISTNAME=	pdf_viewer-0.8
-PKGNAME=	claws-mail-pdf_viewer-0.8
+DISTNAME=	pdf_viewer-0.9.1
+PKGNAME=	claws-mail-pdf_viewer-0.9.1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -11,7 +11,7 @@ COMMENT=	Enables the viewing of PDF and PostScript attachments
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mail/claws-mail/openssl.mk"
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/claws-mail-pdf_viewer/distinfo b/mail/claws-mail-pdf_viewer/distinfo
index ec1f271fc8b..2c4af264c44 100644
--- a/mail/claws-mail-pdf_viewer/distinfo
+++ b/mail/claws-mail-pdf_viewer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/01/09 03:55:11 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/05/12 02:25:40 smb Exp $
 
-SHA1 (pdf_viewer-0.8.tar.gz) = 22d308dc5262267c75a204749a8b4b4261eafdb4
-RMD160 (pdf_viewer-0.8.tar.gz) = 40ff4697906fa444e333488742e42c30ff92d83d
-Size (pdf_viewer-0.8.tar.gz) = 409916 bytes
+SHA1 (pdf_viewer-0.9.1.tar.gz) = 0aa6b6e8ca7190c7d5ab57be648242bc7327d29f
+RMD160 (pdf_viewer-0.9.1.tar.gz) = 722233027f6e4ec6e5b30dcaf11613f3cfd69443
+Size (pdf_viewer-0.9.1.tar.gz) = 414993 bytes
diff --git a/mail/claws-mail-pgp/Makefile b/mail/claws-mail-pgp/Makefile
index 53578eefcee..c183cd261ad 100644
--- a/mail/claws-mail-pgp/Makefile
+++ b/mail/claws-mail-pgp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/01/09 03:55:11 smb Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/12 02:25:40 smb Exp $
 #
 .include "../../mail/claws-mail/Makefile.vers"
 
@@ -9,9 +9,9 @@ MASTER_SITES=	# none
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Metapackage for the PGP plug-in for Claws-mail
 
-DEPENDS+=	claws-mail-pgpcore-3.2.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
-DEPENDS+=	claws-mail-pgpmime-3.2.0{,nb[0-9]*}:../../mail/claws-mail-pgpmime
-DEPENDS+=	claws-mail-pgpinline-3.2.0{,nb[0-9]*}:../../mail/claws-mail-pgpinline
+DEPENDS+=	claws-mail-pgpcore-3.4.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpmime-3.4.0{,nb[0-9]*}:../../mail/claws-mail-pgpmime
+DEPENDS+=	claws-mail-pgpinline-3.4.0{,nb[0-9]*}:../../mail/claws-mail-pgpinline
 
 META_PACKAGE=	yes
 
diff --git a/mail/claws-mail-pgpcore/Makefile b/mail/claws-mail-pgpcore/Makefile
index 4d65831a1cc..ff96eeffd5a 100644
--- a/mail/claws-mail-pgpcore/Makefile
+++ b/mail/claws-mail-pgpcore/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2008/01/09 03:55:11 smb Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/12 02:25:40 smb Exp $
 #
 
 PLUGIN_NAME=	pgpcore
-PLUG_VER=	3.2.0
+PLUG_VER=	3.4.0
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -17,9 +17,9 @@ CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpmime-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
-DEPENDS+=	gnupg>=1.4.7:../../security/gnupg
-DEPENDS+=	gpgme>=1.1.4:../../security/gpgme
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	gnupg>=1.4.9:../../security/gnupg
+DEPENDS+=	gpgme>=1.1.4nb2:../../security/gpgme
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail-pgpinline/Makefile b/mail/claws-mail-pgpinline/Makefile
index 7850428169d..c8dc879c6f3 100644
--- a/mail/claws-mail-pgpinline/Makefile
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:11 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/12 02:25:40 smb Exp $
 #
 
 PLUGIN_NAME=	pgpinline
-PLUG_VER=	3.2.0
+PLUG_VER=	3.4.0
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -12,7 +12,7 @@ CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
 
-DEPENDS+=	claws-mail-pgpcore-3.2.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpcore-3.4.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
 
 PLIST_SRC+=	PLIST
 
diff --git a/mail/claws-mail-pgpmime/Makefile b/mail/claws-mail-pgpmime/Makefile
index 450af38cc23..97b239a029b 100644
--- a/mail/claws-mail-pgpmime/Makefile
+++ b/mail/claws-mail-pgpmime/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:12 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/12 02:25:40 smb Exp $
 #
 
 PLUGIN_NAME=	pgpmime
-PLUG_VER=	3.2.0
+PLUG_VER=	3.4.0
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -12,7 +12,7 @@ CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpmime-plugin
 
-DEPENDS+=	claws-mail-pgpcore-3.2.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpcore-3.4.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
 
 PLIST_SRC+=	PLIST
 
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 1db179f3cb8..4fb0512af95 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2008/01/18 05:08:21 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/12 02:25:40 smb Exp $
 #
 
-DISTNAME=	rssyl-0.17
-PKGNAME=	claws-mail-rssyl-0.17
-PKGREVISION=	2
+DISTNAME=	rssyl-0.19
+PKGNAME=	claws-mail-rssyl-0.19
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -12,7 +11,7 @@ COMMENT=	Read RSS 1.0, 2.0 and Atom feeds in Claws-Mail
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 PLIST_SRC+=	PLIST
 
diff --git a/mail/claws-mail-rssyl/distinfo b/mail/claws-mail-rssyl/distinfo
index c32772aa632..98e081d2f72 100644
--- a/mail/claws-mail-rssyl/distinfo
+++ b/mail/claws-mail-rssyl/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/01/10 01:57:27 smb Exp $
+$NetBSD: distinfo,v 1.5 2008/05/12 02:25:40 smb Exp $
 
-SHA1 (rssyl-0.17.tar.gz) = 8531d9a5eac8a4688bd88e3ef1e33604e52bb965
-RMD160 (rssyl-0.17.tar.gz) = 7ba0fa3261ee3234360af117194c9b6b036a0c73
-Size (rssyl-0.17.tar.gz) = 472774 bytes
-SHA1 (patch-aa) = af0f39ff0527ae8a4ea23ce88d1b4f2a323470f3
+SHA1 (rssyl-0.19.tar.gz) = 64db76de0a06ee8b4b536224bcaa0d111df3a033
+RMD160 (rssyl-0.19.tar.gz) = 5c1a9b88a0d809c2f973cfb4733579b9ba345afc
+Size (rssyl-0.19.tar.gz) = 480442 bytes
diff --git a/mail/claws-mail-rssyl/patches/patch-aa b/mail/claws-mail-rssyl/patches/patch-aa
deleted file mode 100644
index adbec7d2b3e..00000000000
--- a/mail/claws-mail-rssyl/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2008/01/10 01:57:28 smb Exp $
-
---- src/date.c.orig	2008-01-09 16:03:51.000000000 -0500
-+++ src/date.c	2008-01-09 16:04:27.000000000 -0500
-@@ -33,7 +33,7 @@
- #endif
- 
- /* this is needed for strptime() */
--#define _XOPEN_SOURCE /* glibc2 needs this */
-+#define _XOPEN_SOURCE	600
- 
- #include <time.h>
- #include <glib.h>
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index 71eeadcdf55..3dac1352312 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2008/01/09 03:55:12 smb Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/12 02:25:40 smb Exp $
 
-DISTNAME=	smime-0.7.4
-PKGNAME=	claws-mail-smime-0.7.4
+DISTNAME=	smime-0.7.5
+PKGNAME=	claws-mail-smime-0.7.5
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	This plugin handles S/MIME signed and/or encrypted mails
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 PLIST_SRC+=	PLIST
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/claws-mail-smime/distinfo b/mail/claws-mail-smime/distinfo
index e2704ef3a4f..c1fa9fe627e 100644
--- a/mail/claws-mail-smime/distinfo
+++ b/mail/claws-mail-smime/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/01/09 03:55:12 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/05/12 02:25:40 smb Exp $
 
-SHA1 (smime-0.7.4.tar.gz) = 848d453302af45c5349fb6a9832523dd170c4722
-RMD160 (smime-0.7.4.tar.gz) = 1c1ba5f1824399ddc1318776df3a3cd3cb6f9503
-Size (smime-0.7.4.tar.gz) = 333141 bytes
+SHA1 (smime-0.7.5.tar.gz) = a40bf1c5ed22182e63c12e28ab807b2a96f34d77
+RMD160 (smime-0.7.5.tar.gz) = 26978177c5dc128f4543ee0d1b4576d1b6142624
+Size (smime-0.7.5.tar.gz) = 337417 bytes
diff --git a/mail/claws-mail-spamassassin/Makefile b/mail/claws-mail-spamassassin/Makefile
index a9ed75fe5cb..5e1c39e4bcb 100644
--- a/mail/claws-mail-spamassassin/Makefile
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:12 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/12 02:25:40 smb Exp $
 #
 
 PLUGIN_NAME=	spamassassin
-PLUG_VER=	3.2.0
+PLUG_VER=	3.4.0
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -10,8 +10,8 @@ COMMENT=	Enables the scanning of incoming mail using SpamAssassin
 
 CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
-DEPENDS+=	spamassassin>=3.2.3:../../mail/spamassassin
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	spamassassin>=3.2.4nb1:../../mail/spamassassin
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index eefd1e10fe6..7e20e8d54ec 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.6 2008/04/07 16:51:18 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/12 02:25:40 smb Exp $
 #
 
-DISTNAME=	spam_report-0.3.1
-PKGNAME=	claws-mail-spam_report-0.3.1
-PKGREVISION=	2
+DISTNAME=	spam_report-0.3.3
+PKGNAME=	claws-mail-spam_report-0.3.3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Report spam to various places
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-spamreport/distinfo b/mail/claws-mail-spamreport/distinfo
index 4bc321161eb..68e04f948b2 100644
--- a/mail/claws-mail-spamreport/distinfo
+++ b/mail/claws-mail-spamreport/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/01/09 03:55:12 smb Exp $
+$NetBSD: distinfo,v 1.3 2008/05/12 02:25:40 smb Exp $
 
-SHA1 (spam_report-0.3.1.tar.gz) = 457427fae64e17ede3a8b8286fdd1def2cce3ecf
-RMD160 (spam_report-0.3.1.tar.gz) = 00e610ab9d36f5122b7d4ce03cd0343836ca8dd1
-Size (spam_report-0.3.1.tar.gz) = 385641 bytes
+SHA1 (spam_report-0.3.3.tar.gz) = b53fa638d4e4d3272eb3df0b51198d2b2a28cacf
+RMD160 (spam_report-0.3.3.tar.gz) = 95885aeca7e2ed6fe92b4a171cceff770be1e9ce
+Size (spam_report-0.3.3.tar.gz) = 390202 bytes
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index 36667966301..4f82dd229c5 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:12 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/12 02:25:40 smb Exp $
 #
 
 DISTNAME=	synce_plugin-0.7.3
@@ -9,7 +9,7 @@ MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Synchronize addressbook of a Windows CE with Claws Mail
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index 10104e6c1a8..012c2532913 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2008/01/09 14:49:36 smb Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/12 02:25:40 smb Exp $
 #
 
-DISTNAME=	tnef_parse-0.2.1
-PKGNAME=	claws-mail-tnef-0.2.1
+DISTNAME=	tnef_parse-0.2.3
+PKGNAME=	claws-mail-tnef-0.2.3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 PKGREVISION=	1
@@ -12,7 +12,7 @@ COMMENT=	Handles TNEF attachments from Outlook
 
 #PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-tnef/distinfo b/mail/claws-mail-tnef/distinfo
index 182aa48cf69..9f07c0b86c1 100644
--- a/mail/claws-mail-tnef/distinfo
+++ b/mail/claws-mail-tnef/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2008/01/09 03:55:13 smb Exp $
+$NetBSD: distinfo,v 1.2 2008/05/12 02:25:40 smb Exp $
 
-SHA1 (tnef_parse-0.2.1.tar.gz) = df6b06483db1dd6726636b215310c712d5a90a14
-RMD160 (tnef_parse-0.2.1.tar.gz) = 708b9b68ee39fafe134b3e722587f8f7f8a6038f
-Size (tnef_parse-0.2.1.tar.gz) = 390171 bytes
+SHA1 (tnef_parse-0.2.3.tar.gz) = 0e51c50be58936a76a9145c09c32aa172605a043
+RMD160 (tnef_parse-0.2.3.tar.gz) = 9da8bc1cc2dc9dab46f0fb0b320c0f29b402757b
+Size (tnef_parse-0.2.3.tar.gz) = 394835 bytes
diff --git a/mail/claws-mail-trayicon/Makefile b/mail/claws-mail-trayicon/Makefile
index cc56ff8c747..7291df67f0c 100644
--- a/mail/claws-mail-trayicon/Makefile
+++ b/mail/claws-mail-trayicon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:13 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/12 02:25:40 smb Exp $
 #
 
 PLUGIN_NAME=	trayicon
-PLUG_VER=	3.2.0
+PLUG_VER=	3.4.0
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -10,7 +10,7 @@ COMMENT=	Places an icon in the system tray for new mail
 
 CONFIGURE_ARGS+=	--enable-trayicon-plugin
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 50b03eaed74..36db5d2bad0 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2008/01/18 05:08:21 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/12 02:25:40 smb Exp $
 #
 
-DISTNAME=	vcalendar-1.100
-PKGNAME=	claws-mail-vcalendar-1.100
-PKGREVISION=	1
+DISTNAME=	vcalendar-1.102
+PKGNAME=	claws-mail-vcalendar-1.102
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -12,7 +11,7 @@ COMMENT=	Enable vCalendar message handling
 
 #PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-vcalendar/distinfo b/mail/claws-mail-vcalendar/distinfo
index 119fee1f4e4..5e48c3dc7f9 100644
--- a/mail/claws-mail-vcalendar/distinfo
+++ b/mail/claws-mail-vcalendar/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2008/01/09 03:55:13 smb Exp $
+$NetBSD: distinfo,v 1.5 2008/05/12 02:25:40 smb Exp $
 
-SHA1 (vcalendar-1.100.tar.gz) = 1456ada1143dfcd97603f881e4b373f6ba462cd7
-RMD160 (vcalendar-1.100.tar.gz) = ffaf9ce9b9909eb0c22733880d3f178ad188191e
-Size (vcalendar-1.100.tar.gz) = 767360 bytes
+SHA1 (vcalendar-1.102.tar.gz) = 378a6de503a95ee64c36ba98303217d1065e21af
+RMD160 (vcalendar-1.102.tar.gz) = 53f7913d6c7bb62a03228b6a1d2773a5d3e55e08
+Size (vcalendar-1.102.tar.gz) = 802192 bytes
 SHA1 (patch-aa) = 076cbd15436a81f58134015f667ef78ea4581a3b
-SHA1 (patch-ab) = c0ec5c57bea31d26afb4a9dc5abeea7cfdb6951d
+SHA1 (patch-ab) = da1e44132e72c48bd5972e4d945dab88fc3f675d
diff --git a/mail/claws-mail-vcalendar/patches/patch-ab b/mail/claws-mail-vcalendar/patches/patch-ab
index 725a78b321c..7d9398c25fe 100644
--- a/mail/claws-mail-vcalendar/patches/patch-ab
+++ b/mail/claws-mail-vcalendar/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2007/08/16 23:14:17 smb Exp $
+$NetBSD: patch-ab,v 1.3 2008/05/12 02:25:40 smb Exp $
 
---- ./libical/libical/Makefile.in.orig	2007-07-03 05:13:41.000000000 -0400
-+++ ./libical/libical/Makefile.in	2007-08-09 12:09:42.000000000 -0400
-@@ -324,7 +324,7 @@
+--- libical/libical/Makefile.in.orig	2008-05-11 17:31:57.000000000 -0400
++++ libical/libical/Makefile.in	2008-05-11 17:32:26.000000000 -0400
+@@ -327,7 +327,7 @@
  	vsnprintf.c		\
  	icallangbind.h		
  
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>