Updated claws-mail and all of its plug-ins to 3.7.0

* 3.7.0
-------

* Expanding/Collapsing of threads is now approximately 95% faster.

* Cache reading is now approximately 10% faster.

* The shortcut key settings of the main window and the message list
  context menus are now connected.

* The preferences on the 'Other' page have now been moved to
  Other/Miscellaneous. The parent pages are now unselectable and the
  first page is automatically selected on opening the preferences.

* In the Compose window, on the Others tab, the 'Save message to'
  entry now has a drop-down list of the previous save locations.

*  In the Compose window, the Attachments Properties window is now
   confirmed and closed with the Return key.

* When using an external editor to compose messages, the message is
  automatically saved to Drafts when the external editor is closed.

* A hidden option has been added, 'primary_paste_unselects' which
  causes the primary buffer to be cleared and the insertion point to
  be repositioned when the middle mouse button is used for pasting
  text. It is turned off by default.

* In the Actions window, the Escape key now cancels the action
  editing.

* Offline SSL certificate verification has been added.

* Privacy plugins: The decryption failure messages are now shown
  in the NoticeView just above the message text rather than in a
  popup window.

* Privacy plugins: when listing the UIDs during a signature check,
  show the UID validity

* tools/popfile-link.sh
  Support for reusing existing POPFile session ID has been added.

* tools/kdeservicemenu
  Support for kde4 has been added.

* win32: better integration has been implemented by using the
  standard file associations.

44 files changed, 157 insertions, 146 deletions

diff --git a/mail/claws-mail-archive/Makefile b/mail/claws-mail-archive/Makefile
index c0ce06e86e3..7600c64f631 100644
--- a/mail/claws-mail-archive/Makefile
+++ b/mail/claws-mail-archive/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/10/15 16:22:02 smb Exp $
+# $NetBSD: Makefile,v 1.4 2009/01/11 03:11:37 smb Exp $
 #
 
-DISTNAME=	archive-0.6.2
-PKGNAME=	claws-mail-archive-0.6.2
+DISTNAME=	archive-0.6.3
+PKGNAME=	claws-mail-archive-0.6.3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -11,7 +11,7 @@ COMMENT=	Adds archiving to Claws-Mail
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-archive/PLIST b/mail/claws-mail-archive/PLIST
index e79379753c4..3826d943c22 100644
--- a/mail/claws-mail-archive/PLIST
+++ b/mail/claws-mail-archive/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/10/21 12:10:08 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/01/11 03:11:37 smb Exp $
 include/claws-mail/plugins/archive/archiver.h
 include/claws-mail/plugins/archive/archiver_prefs.h
 lib/claws-mail/plugins/archive.la
@@ -7,6 +7,8 @@ share/locale/es/LC_MESSAGES/archive.mo
 share/locale/fr/LC_MESSAGES/archive.mo
 share/locale/hu/LC_MESSAGES/archive.mo
 share/locale/pt_BR/LC_MESSAGES/archive.mo
+share/locale/cs/LC_MESSAGES/archive.mo
+share/locale/ru/LC_MESSAGES/archive.mo
 @dirrm lib/claws-mail/plugins
 @dirrm include/claws-mail/plugins/archive
 @dirrm include/claws-mail/plugins
diff --git a/mail/claws-mail-archive/distinfo b/mail/claws-mail-archive/distinfo
index b35b8443347..c009e057f51 100644
--- a/mail/claws-mail-archive/distinfo
+++ b/mail/claws-mail-archive/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/10/15 16:22:02 smb Exp $
+$NetBSD: distinfo,v 1.3 2009/01/11 03:11:37 smb Exp $
 
-SHA1 (archive-0.6.2.tar.gz) = 0601ecac921ca1c36131632dfcecbf079de1948a
-RMD160 (archive-0.6.2.tar.gz) = 50769fdd835fe87d79ce027fa428e682fb635790
-Size (archive-0.6.2.tar.gz) = 426391 bytes
+SHA1 (archive-0.6.3.tar.gz) = 83484bde94f4c03c8bc43f07c186515ed9e5ac56
+RMD160 (archive-0.6.3.tar.gz) = 950bbb0f17dcaf21833d700d10f33d5761bbb825
+Size (archive-0.6.3.tar.gz) = 440777 bytes
diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile
index 81e0cfa1109..a727e5787d4 100644
--- a/mail/claws-mail-attachwarner/Makefile
+++ b/mail/claws-mail-attachwarner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2008/10/15 16:22:02 smb Exp $
+# $NetBSD: Makefile,v 1.12 2009/01/11 03:11:37 smb Exp $
 #
 
-DISTNAME=	attachwarner-0.2.14
-PKGNAME=	claws-mail-attachwarner-0.2.14
+DISTNAME=	attachwarner-0.2.15
+PKGNAME=	claws-mail-attachwarner-0.2.15
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -13,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-attachwarner/PLIST b/mail/claws-mail-attachwarner/PLIST
index 91ba5650e8d..2541b61af2c 100644
--- a/mail/claws-mail-attachwarner/PLIST
+++ b/mail/claws-mail-attachwarner/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/10/21 12:13:05 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/01/11 03:11:37 smb Exp $
 lib/claws-mail/plugins/attachwarner.la
 share/locale/ca/LC_MESSAGES/attachwarner.mo
 share/locale/cs/LC_MESSAGES/attachwarner.mo
@@ -11,6 +11,7 @@ share/locale/it/LC_MESSAGES/attachwarner.mo
 share/locale/pl/LC_MESSAGES/attachwarner.mo
 share/locale/pt_BR/LC_MESSAGES/attachwarner.mo
 share/locale/ru/LC_MESSAGES/attachwarner.mo
+share/locale/cs/LC_MESSAGES/attachwarner.mo
 share/locale/sk/LC_MESSAGES/attachwarner.mo
 share/locale/sr/LC_MESSAGES/attachwarner.mo
 @dirrm lib/claws-mail/plugins
diff --git a/mail/claws-mail-attachwarner/distinfo b/mail/claws-mail-attachwarner/distinfo
index 316fede0aaa..3d2a597a860 100644
--- a/mail/claws-mail-attachwarner/distinfo
+++ b/mail/claws-mail-attachwarner/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2008/10/15 16:22:02 smb Exp $
+$NetBSD: distinfo,v 1.6 2009/01/11 03:11:37 smb Exp $
 
-SHA1 (attachwarner-0.2.14.tar.gz) = 863e6de20e11150d119aafe40f2e002ded1d9c6b
-RMD160 (attachwarner-0.2.14.tar.gz) = 8e3e5bf5e676f1ff02045e57bb8ab36e975fb5f5
-Size (attachwarner-0.2.14.tar.gz) = 404420 bytes
+SHA1 (attachwarner-0.2.15.tar.gz) = af3f7cf328f5f9edd3c32de73679f01700f57518
+RMD160 (attachwarner-0.2.15.tar.gz) = 790036d6d1dbe3c163a8e0937166835550d2733c
+Size (attachwarner-0.2.15.tar.gz) = 405159 bytes
diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile
index 11df5d05fc6..d3bc73d9c94 100644
--- a/mail/claws-mail-attremover/Makefile
+++ b/mail/claws-mail-attremover/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:02 smb Exp $
+# $NetBSD: Makefile,v 1.11 2009/01/11 03:11:37 smb Exp $
 #
 
-DISTNAME=	att_remover-1.0.9
-PKGNAME=	claws-mail-att_remover-1.0.9
+DISTNAME=	att_remover-1.0.10
+PKGNAME=	claws-mail-att_remover-1.0.10
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -11,7 +11,7 @@ COMMENT=	Permanently deletes attachments from mail
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,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 7dea12ff557..52e959b2d08 100644
--- a/mail/claws-mail-attremover/distinfo
+++ b/mail/claws-mail-attremover/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/10/15 16:22:02 smb Exp $
+$NetBSD: distinfo,v 1.5 2009/01/11 03:11:37 smb Exp $
 
-SHA1 (att_remover-1.0.9.tar.gz) = 959171fd5605e83cdc734e3221dbb3a44e281b77
-RMD160 (att_remover-1.0.9.tar.gz) = 0fae9b753408feddc84fb1e50de4c6c0cf9a30a0
-Size (att_remover-1.0.9.tar.gz) = 327333 bytes
+SHA1 (att_remover-1.0.10.tar.gz) = 01831d838bf81cf353f4b9587046343b5de0294c
+RMD160 (att_remover-1.0.10.tar.gz) = 8fb29e8adbd9834156aa99da025d81d9af2b0d35
+Size (att_remover-1.0.10.tar.gz) = 327977 bytes
diff --git a/mail/claws-mail-bogofilter/Makefile b/mail/claws-mail-bogofilter/Makefile
index e28eaf3d78d..2ef7e0f7dd5 100644
--- a/mail/claws-mail-bogofilter/Makefile
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:02 smb Exp $
+# $NetBSD: Makefile,v 1.11 2009/01/11 03:11:37 smb Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -12,6 +12,6 @@ COMMENT=	Enables the scanning of incoming mail using Bogofilter
 CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 
 DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
-DEPENDS+=	bogofilter>=1.0.3nb2:../../mail/bogofilter
+DEPENDS+=	bogofilter>=1.1.7:../../mail/bogofilter
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index 4cd804ce436..f5ebac0976e 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:02 smb Exp $
+# $NetBSD: Makefile,v 1.11 2009/01/11 03:11:37 smb Exp $
 #
 
 DISTNAME=	cachesaver-0.10.8
@@ -11,7 +11,7 @@ COMMENT=	Saves Claws-Mail metadata every 60 seconds
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-dillo-viewer/Makefile b/mail/claws-mail-dillo-viewer/Makefile
index 579cf8e50f6..b1afe919f34 100644
--- a/mail/claws-mail-dillo-viewer/Makefile
+++ b/mail/claws-mail-dillo-viewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:02 smb Exp $
+# $NetBSD: Makefile,v 1.11 2009/01/11 03:11:37 smb Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -12,7 +12,7 @@ COMMENT=	Plugin to use the Dillo web browser for html rendering
 CONFIGURE_ARGS+=	--enable-dillo_viewer-plugin
 
 DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
-DEPENDS+=	dillo>=0.8.6nb2:../../www/dillo
+DEPENDS+=	dillo>=2.0:../../www/dillo
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../security/gnutls/buildlink3.mk"
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index dd58e3460ca..a12364f0398 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2008/12/26 13:21:45 obache Exp $
+# $NetBSD: Makefile,v 1.12 2009/01/11 03:11:37 smb Exp $
 #
 
 DISTNAME=	fetchinfo-plugin-0.4.23
-PKGNAME=	claws-mail-fetchinfo-plugin-0.4.23
-PKGREVISION=	2
+PKGNAME=	claws-mail-fetchinfo-plugin-0.4.24
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -12,7 +11,7 @@ COMMENT=	Inserts headers containing some download information
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-gtkhtml/Makefile b/mail/claws-mail-gtkhtml/Makefile
index 6dd9584b218..5b6d4ac78d3 100644
--- a/mail/claws-mail-gtkhtml/Makefile
+++ b/mail/claws-mail-gtkhtml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2008/12/16 20:35:06 smb Exp $
+# $NetBSD: Makefile,v 1.17 2009/01/11 03:11:37 smb Exp $
 #
 
-DISTNAME=	gtkhtml2_viewer-0.21
-PKGNAME=	claws-mail-gtkhtml2_viewer-0.21
-PKGREVISION=	1
+DISTNAME=	gtkhtml2_viewer-0.22
+PKGNAME=	claws-mail-gtkhtml2_viewer-0.22
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -14,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-gtkhtml/PLIST b/mail/claws-mail-gtkhtml/PLIST
index 1065c540dfe..7078259172c 100644
--- a/mail/claws-mail-gtkhtml/PLIST
+++ b/mail/claws-mail-gtkhtml/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2008/12/16 20:35:06 smb Exp $
-lib/claws-mail/plugins/gtkhtml2_viewer.a
+@comment $NetBSD: PLIST,v 1.4 2009/01/11 03:11:37 smb Exp $
 lib/claws-mail/plugins/gtkhtml2_viewer.la
-lib/claws-mail/plugins/gtkhtml2_viewer.so
 share/locale/ca/LC_MESSAGES/gtkhtml2_viewer.mo
 share/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo
 share/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo
@@ -14,6 +12,7 @@ share/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo
 share/locale/ru/LC_MESSAGES/gtkhtml2_viewer.mo
 share/locale/sk/LC_MESSAGES/gtkhtml2_viewer.mo
 share/locale/sr/LC_MESSAGES/gtkhtml2_viewer.mo
+share/locale/cs/LC_MESSAGES/gtkhtml2_viewer.mo
 share/locale/zh_CN/LC_MESSAGES/gtkhtml2_viewer.mo
 @dirrm lib/claws-mail/plugins
 @dirrm lib/claws-mail
diff --git a/mail/claws-mail-gtkhtml/distinfo b/mail/claws-mail-gtkhtml/distinfo
index 0195d2421a6..2b8e7fda6ba 100644
--- a/mail/claws-mail-gtkhtml/distinfo
+++ b/mail/claws-mail-gtkhtml/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2008/10/15 16:22:02 smb Exp $
+$NetBSD: distinfo,v 1.7 2009/01/11 03:11:37 smb Exp $
 
-SHA1 (gtkhtml2_viewer-0.21.tar.gz) = c077a637a3d440aed6329d76098cd4a416d84041
-RMD160 (gtkhtml2_viewer-0.21.tar.gz) = 7672194cd66cd035a4bc292a035d0d6bf79a3272
-Size (gtkhtml2_viewer-0.21.tar.gz) = 711103 bytes
+SHA1 (gtkhtml2_viewer-0.22.tar.gz) = 2c972c31dc1fa1f64f1ae752202ec0e1d5f8d2c7
+RMD160 (gtkhtml2_viewer-0.22.tar.gz) = 27ca323eb31457fcbe6ce06ada719ea567d37268
+Size (gtkhtml2_viewer-0.22.tar.gz) = 713781 bytes
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 1fb276bd950..59206f414ed 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:02 smb Exp $
+# $NetBSD: Makefile,v 1.11 2009/01/11 03:11:37 smb Exp $
 #
 
-DISTNAME=	mailmbox-1.14.2
-PKGNAME=	claws-mail-mailmbox-1.14.2
+DISTNAME=	mailmbox-1.14.3
+PKGNAME=	claws-mail-mailmbox-1.14.3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -11,7 +11,7 @@ COMMENT=	Handles mailboxes in mbox format
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,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 5eedeea61af..e9575401787 100644
--- a/mail/claws-mail-mailmbox/distinfo
+++ b/mail/claws-mail-mailmbox/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/10/15 16:22:02 smb Exp $
+$NetBSD: distinfo,v 1.5 2009/01/11 03:11:37 smb Exp $
 
-SHA1 (mailmbox-1.14.2.tar.gz) = 0960d2bab2aba9c53d2d4c415c357650cfea5f57
-RMD160 (mailmbox-1.14.2.tar.gz) = 22c0f9a12d9d38f25212fbdb522bc867cb6251af
-Size (mailmbox-1.14.2.tar.gz) = 407892 bytes
+SHA1 (mailmbox-1.14.3.tar.gz) = b8df870959a9886c9486c49dffdcf9204bfab7b0
+RMD160 (mailmbox-1.14.3.tar.gz) = be890a4d2430ddfda58316506f1ecb1e732743b5
+Size (mailmbox-1.14.3.tar.gz) = 408671 bytes
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index ba87e554fc0..1fd73234046 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2008/10/15 16:22:02 smb Exp $
+# $NetBSD: Makefile,v 1.12 2009/01/11 03:11:37 smb Exp $
 #
 
-DISTNAME=	newmail-0.0.14
-PKGNAME=	claws-mail-newmail-0.0.14
+DISTNAME=	newmail-0.0.15
+PKGNAME=	claws-mail-newmail-0.0.15
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -11,7 +11,7 @@ COMMENT=	Write log file info on arriving email
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,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 bce605ea8d9..e8c33758178 100644
--- a/mail/claws-mail-newmail/distinfo
+++ b/mail/claws-mail-newmail/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/10/15 16:22:02 smb Exp $
+$NetBSD: distinfo,v 1.5 2009/01/11 03:11:38 smb Exp $
 
-SHA1 (newmail-0.0.14.tar.gz) = 81d128315cc48398c8372d84906490f99fd5a490
-RMD160 (newmail-0.0.14.tar.gz) = f17e9876b014a183a69d1468b2bca2e88e3bd210
-Size (newmail-0.0.14.tar.gz) = 327283 bytes
+SHA1 (newmail-0.0.15.tar.gz) = 7665de0060d611e0cf63f209c3e5ea7c2daf5cec
+RMD160 (newmail-0.0.15.tar.gz) = 9b6fa11e5c551d6ed5fa771ce7fb185a83e6c583
+Size (newmail-0.0.15.tar.gz) = 327928 bytes
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 2ae1f02d3b7..89c27d75f03 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2008/10/15 16:22:03 smb Exp $
+# $NetBSD: Makefile,v 1.13 2009/01/11 03:11:38 smb Exp $
 #
 
-DISTNAME=	notification_plugin-0.19
-PKGNAME=	claws-mail-notification-0.19
+DISTNAME=	notification_plugin-0.20
+PKGNAME=	claws-mail-notification-0.20
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -11,7 +11,7 @@ COMMENT=	Provides various ways to notify the user of new and unread email
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,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 093fcc382f3..677f1c17c87 100644
--- a/mail/claws-mail-notification/distinfo
+++ b/mail/claws-mail-notification/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2008/10/15 16:22:03 smb Exp $
+$NetBSD: distinfo,v 1.8 2009/01/11 03:11:38 smb Exp $
 
-SHA1 (notification_plugin-0.19.tar.gz) = e550dab85075a38ba8968b4a882d64084eab2ee4
-RMD160 (notification_plugin-0.19.tar.gz) = b1a4182a84895fd95a5ead398005321644f20fef
-Size (notification_plugin-0.19.tar.gz) = 487441 bytes
+SHA1 (notification_plugin-0.20.tar.gz) = f66f6f6b7d4e78d4327dd27272c79c4ade460809
+RMD160 (notification_plugin-0.20.tar.gz) = 300422c7df95964da3ab590a6bfffdfdcf5fa577
+Size (notification_plugin-0.20.tar.gz) = 488165 bytes
diff --git a/mail/claws-mail-pgp/Makefile b/mail/claws-mail-pgp/Makefile
index 9391bfba1d6..a328d7187c8 100644
--- a/mail/claws-mail-pgp/Makefile
+++ b/mail/claws-mail-pgp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/10/15 16:22:03 smb Exp $
+# $NetBSD: Makefile,v 1.14 2009/01/11 03:11:38 smb Exp $
 #
 META_PACKAGE=	yes
 
@@ -11,8 +11,8 @@ MASTER_SITES=	# none
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Metapackage for the PGP plug-in for Claws-mail
 
-DEPENDS+=	claws-mail-pgpcore-3.6.1{,nb[0-9]*}:../../mail/claws-mail-pgpcore
-DEPENDS+=	claws-mail-pgpmime-3.6.1{,nb[0-9]*}:../../mail/claws-mail-pgpmime
-DEPENDS+=	claws-mail-pgpinline-3.6.1{,nb[0-9]*}:../../mail/claws-mail-pgpinline
+DEPENDS+=	claws-mail-pgpcore-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpmime-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail-pgpmime
+DEPENDS+=	claws-mail-pgpinline-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail-pgpinline
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-pgpcore/buildlink3.mk b/mail/claws-mail-pgpcore/buildlink3.mk
index bd59b516a4f..5fc78ba692f 100644
--- a/mail/claws-mail-pgpcore/buildlink3.mk
+++ b/mail/claws-mail-pgpcore/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/10/15 16:22:03 smb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/01/11 03:11:38 smb Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 CLAWS_MAIL_PGPCORE_BUILDLINK3_MK:=	${CLAWS_MAIL_PGPCORE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	claws-mail-pgpcore
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}claws-mail-pgpcore
 
 .if ${CLAWS_MAIL_PGPCORE_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.claws-mail-pgpcore+=	claws-mail-pgpcore>=3.6.1
+BUILDLINK_API_DEPENDS.claws-mail-pgpcore+=	claws-mail-pgpcore>=3.7.0
 BUILDLINK_PKGSRCDIR.claws-mail-pgpcore?=	../../mail/claws-mail-pgpcore
 .endif	# CLAWS_MAIL_PGPCORE_BUILDLINK3_MK
 
diff --git a/mail/claws-mail-pgpinline/Makefile b/mail/claws-mail-pgpinline/Makefile
index df6e207411d..be440d56239 100644
--- a/mail/claws-mail-pgpinline/Makefile
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:03 smb Exp $
+# $NetBSD: Makefile,v 1.11 2009/01/11 03:11:38 smb Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -12,7 +12,7 @@ CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
 
-DEPENDS+=	claws-mail-pgpcore-3.6.1{,nb[0-9]*}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpcore-${CLAWS_VERSION}{,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 05a0c0edc5a..5d5dac370b6 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2008/10/15 16:22:03 smb Exp $
+# $NetBSD: Makefile,v 1.14 2009/01/11 03:11:38 smb Exp $
 #
 
-DISTNAME=	rssyl-0.22
-PKGNAME=	claws-mail-rssyl-0.22
+DISTNAME=	rssyl-0.23
+PKGNAME=	claws-mail-rssyl-0.23
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -13,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 PLIST_SRC+=	PLIST
 
diff --git a/mail/claws-mail-rssyl/PLIST b/mail/claws-mail-rssyl/PLIST
index ed5ee941430..c04a97ce87e 100644
--- a/mail/claws-mail-rssyl/PLIST
+++ b/mail/claws-mail-rssyl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/10/15 16:22:03 smb Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/01/11 03:11:38 smb Exp $
 lib/claws-mail/plugins/rssyl.la
 share/locale/ca/LC_MESSAGES/rssyl.mo
 share/locale/cs/LC_MESSAGES/rssyl.mo
@@ -11,6 +11,7 @@ share/locale/it/LC_MESSAGES/rssyl.mo
 share/locale/pl/LC_MESSAGES/rssyl.mo
 share/locale/pt_BR/LC_MESSAGES/rssyl.mo
 share/locale/ru/LC_MESSAGES/rssyl.mo
+share/locale/cs/LC_MESSAGES/rssyl.mo
 share/locale/sk/LC_MESSAGES/rssyl.mo
 share/locale/sr/LC_MESSAGES/rssyl.mo
 share/locale/sv/LC_MESSAGES/rssyl.mo
diff --git a/mail/claws-mail-rssyl/distinfo b/mail/claws-mail-rssyl/distinfo
index 44d017084dd..dd6eeff87f7 100644
--- a/mail/claws-mail-rssyl/distinfo
+++ b/mail/claws-mail-rssyl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2008/10/15 16:22:03 smb Exp $
+$NetBSD: distinfo,v 1.8 2009/01/11 03:11:38 smb Exp $
 
-SHA1 (rssyl-0.22.tar.gz) = 538c713f2ac4e50d26b0d0b2596fdc17a891add6
-RMD160 (rssyl-0.22.tar.gz) = d479499c17f7fa16359fdc129c110a794a5e0a72
-Size (rssyl-0.22.tar.gz) = 492868 bytes
+SHA1 (rssyl-0.23.tar.gz) = 0493d1b72f3675ad4f32dc992c8396720ff0d01f
+RMD160 (rssyl-0.23.tar.gz) = ed7dba30fefa0186ece0069688fd867ec1321be5
+Size (rssyl-0.23.tar.gz) = 494738 bytes
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 6a4508cc752..567d547a95a 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2008/12/16 20:59:53 smb Exp $
+# $NetBSD: Makefile,v 1.13 2009/01/11 03:11:38 smb Exp $
 #
 
-DISTNAME=	spam_report-0.3.6
-PKGNAME=	claws-mail-spam_report-0.3.6
-PKGREVISION=	1
+DISTNAME=	spam_report-0.3.7
+PKGNAME=	claws-mail-spam_report-0.3.7
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -12,7 +11,7 @@ COMMENT=	Report spam to various places
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-spamreport/PLIST b/mail/claws-mail-spamreport/PLIST
index 930833c48d3..dc24a21fba1 100644
--- a/mail/claws-mail-spamreport/PLIST
+++ b/mail/claws-mail-spamreport/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2008/12/16 20:59:53 smb Exp $
-lib/claws-mail/plugins/spamreport.a
+@comment $NetBSD: PLIST,v 1.5 2009/01/11 03:11:38 smb Exp $
 lib/claws-mail/plugins/spamreport.la
-lib/claws-mail/plugins/spamreport.so
 share/locale/ca/LC_MESSAGES/spam_report.mo
 share/locale/es/LC_MESSAGES/spam_report.mo
 share/locale/fi/LC_MESSAGES/spam_report.mo
@@ -11,5 +9,6 @@ share/locale/it/LC_MESSAGES/spam_report.mo
 share/locale/pt_BR/LC_MESSAGES/spam_report.mo
 share/locale/ru/LC_MESSAGES/spam_report.mo
 share/locale/sk/LC_MESSAGES/spam_report.mo
+share/locale/cs/LC_MESSAGES/spam_report.mo
 @dirrm lib/claws-mail/plugins
 @dirrm lib/claws-mail
diff --git a/mail/claws-mail-spamreport/distinfo b/mail/claws-mail-spamreport/distinfo
index a825e879226..1d955192e1a 100644
--- a/mail/claws-mail-spamreport/distinfo
+++ b/mail/claws-mail-spamreport/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2008/10/15 16:22:03 smb Exp $
+$NetBSD: distinfo,v 1.6 2009/01/11 03:11:38 smb Exp $
 
-SHA1 (spam_report-0.3.6.tar.gz) = b52a33e2e7b9a419e2b5854ed93a92badda78112
-RMD160 (spam_report-0.3.6.tar.gz) = 01b7f5ecf1c14529d2a20ab43ed3ebc43528028c
-Size (spam_report-0.3.6.tar.gz) = 391055 bytes
+SHA1 (spam_report-0.3.7.tar.gz) = 708e0fb249068f4d531fe193e9416c4ee4e248d1
+RMD160 (spam_report-0.3.7.tar.gz) = 354d215bb971b18624e7242b3b4df992967cbaee
+Size (spam_report-0.3.7.tar.gz) = 392808 bytes
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index c1c4923cd86..fbbf4c00b1d 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:03 smb Exp $
+# $NetBSD: Makefile,v 1.11 2009/01/11 03:11:38 smb Exp $
 #
 
-DISTNAME=	synce_plugin-0.7.4
-PKGNAME=	claws-mail-synce_plugin-0.7.4
+DISTNAME=	synce_plugin-0.7.5
+PKGNAME=	claws-mail-synce_plugin-0.7.5
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -11,7 +11,7 @@ COMMENT=	Synchronize addressbook of a Windows CE with Claws Mail
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-synce/distinfo b/mail/claws-mail-synce/distinfo
index e01ed546fc4..ba5cab985d3 100644
--- a/mail/claws-mail-synce/distinfo
+++ b/mail/claws-mail-synce/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/10/15 16:22:03 smb Exp $
+$NetBSD: distinfo,v 1.5 2009/01/11 03:11:38 smb Exp $
 
-SHA1 (synce_plugin-0.7.4.tar.gz) = 15c05bb13ad61e59974bd143ba30cafe48116e12
-RMD160 (synce_plugin-0.7.4.tar.gz) = 713a785d7fdc82c70484ed7b63f4619ff7c511c5
-Size (synce_plugin-0.7.4.tar.gz) = 338768 bytes
+SHA1 (synce_plugin-0.7.5.tar.gz) = c23f587218e859238b8bfa2d9a3ad3b41b5ff8bb
+RMD160 (synce_plugin-0.7.5.tar.gz) = 0cc50f58b6ce3317d0eaabe9d8d0f9b86d9d46db
+Size (synce_plugin-0.7.5.tar.gz) = 339485 bytes
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index 147a5e105c1..4fe50d05aea 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2008/12/16 21:47:47 smb Exp $
+# $NetBSD: Makefile,v 1.9 2009/01/11 03:11:38 smb Exp $
 #
 
-DISTNAME=	tnef_parse-0.3.2
-PKGNAME=	claws-mail-tnef-0.3.2
-PKGREVISION=	1
+DISTNAME=	tnef_parse-0.3.3
+PKGNAME=	claws-mail-tnef-0.3.3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -14,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 #PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-tnef/PLIST b/mail/claws-mail-tnef/PLIST
index fe5197354af..1cc1d80583b 100644
--- a/mail/claws-mail-tnef/PLIST
+++ b/mail/claws-mail-tnef/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2008/12/16 21:47:47 smb Exp $
-lib/claws-mail/plugins/tnef_parse.a
+@comment $NetBSD: PLIST,v 1.5 2009/01/11 03:11:38 smb Exp $
 lib/claws-mail/plugins/tnef_parse.la
-lib/claws-mail/plugins/tnef_parse.so
 share/locale/ca/LC_MESSAGES/tnef_parse.mo
 share/locale/fi/LC_MESSAGES/tnef_parse.mo
 share/locale/fr/LC_MESSAGES/tnef_parse.mo
@@ -10,5 +8,6 @@ share/locale/it/LC_MESSAGES/tnef_parse.mo
 share/locale/pt_BR/LC_MESSAGES/tnef_parse.mo
 share/locale/ru/LC_MESSAGES/tnef_parse.mo
 share/locale/sk/LC_MESSAGES/tnef_parse.mo
+share/locale/cs/LC_MESSAGES/tnef_parse.mo
 @dirrm lib/claws-mail/plugins
 @dirrm lib/claws-mail
diff --git a/mail/claws-mail-tnef/distinfo b/mail/claws-mail-tnef/distinfo
index a4387d2439c..c60a7daff9e 100644
--- a/mail/claws-mail-tnef/distinfo
+++ b/mail/claws-mail-tnef/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/10/15 16:22:03 smb Exp $
+$NetBSD: distinfo,v 1.5 2009/01/11 03:11:38 smb Exp $
 
-SHA1 (tnef_parse-0.3.2.tar.gz) = 3d065e9630135f651f915b6ba695986638fc5c6c
-RMD160 (tnef_parse-0.3.2.tar.gz) = 12118180730eada1788e9bce1d6006d12d523615
-Size (tnef_parse-0.3.2.tar.gz) = 418521 bytes
+SHA1 (tnef_parse-0.3.3.tar.gz) = 7fb1736e6663a7572b1fa43335757386427777a5
+RMD160 (tnef_parse-0.3.3.tar.gz) = 742a8fb54e6689260fb7891ed9d7a4ea420722df
+Size (tnef_parse-0.3.3.tar.gz) = 419227 bytes
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index a74dd8fd6f5..184dfa02f6d 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2008/10/15 16:22:03 smb Exp $
+# $NetBSD: Makefile,v 1.14 2009/01/11 03:11:38 smb Exp $
 #
 
-DISTNAME=	vcalendar-2.0.2
-PKGNAME=	claws-mail-vcalendar-2.0.2
+DISTNAME=	vcalendar-2.0.3
+PKGNAME=	claws-mail-vcalendar-2.0.3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -13,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 #PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-vcalendar/PLIST b/mail/claws-mail-vcalendar/PLIST
index 6f81329b2b1..e3b3319665f 100644
--- a/mail/claws-mail-vcalendar/PLIST
+++ b/mail/claws-mail-vcalendar/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/06/05 10:19:31 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/01/11 03:11:38 smb Exp $
 include/claws-mail/plugins/vcalendar/vcal_interface.h
 include/vcalendar/plugins/ical.h
 lib/claws-mail/plugins/vcalendar.la
@@ -11,9 +11,10 @@ share/locale/hu/LC_MESSAGES/vcalendar.mo
 share/locale/it/LC_MESSAGES/vcalendar.mo
 share/locale/pl/LC_MESSAGES/vcalendar.mo
 share/locale/pt_BR/LC_MESSAGES/vcalendar.mo
+share/locale/cs/LC_MESSAGES/vcalendar.mo
+share/locale/zh_CN/LC_MESSAGES/vcalendar.mo
 share/locale/sk/LC_MESSAGES/vcalendar.mo
 share/locale/sr/LC_MESSAGES/vcalendar.mo
-share/locale/zh_CN/LC_MESSAGES/vcalendar.mo
 @dirrm include/vcalendar/plugins
 @dirrm include/vcalendar
 @dirrm include/claws-mail/plugins/vcalendar
diff --git a/mail/claws-mail-vcalendar/distinfo b/mail/claws-mail-vcalendar/distinfo
index b551d317ebe..e2ba8223f58 100644
--- a/mail/claws-mail-vcalendar/distinfo
+++ b/mail/claws-mail-vcalendar/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2008/10/15 16:22:03 smb Exp $
+$NetBSD: distinfo,v 1.8 2009/01/11 03:11:38 smb Exp $
 
-SHA1 (vcalendar-2.0.2.tar.gz) = 11187702896185ad9a0e3939a9b12a5b7edbe4dd
-RMD160 (vcalendar-2.0.2.tar.gz) = 80c79a15a6e2cde61f72be1320f9af74f63bf243
-Size (vcalendar-2.0.2.tar.gz) = 814055 bytes
+SHA1 (vcalendar-2.0.3.tar.gz) = ad6666726d97910a425ef164e37032dbf668e8a3
+RMD160 (vcalendar-2.0.3.tar.gz) = db1c346d6c89caec5735529ef269145d5e68a44f
+Size (vcalendar-2.0.3.tar.gz) = 822375 bytes
 SHA1 (patch-aa) = 076cbd15436a81f58134015f667ef78ea4581a3b
 SHA1 (patch-ab) = da1e44132e72c48bd5972e4d945dab88fc3f675d
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index 4c105634bda..4b29fa6886b 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.7 2008/10/15 16:22:02 smb Exp $
+# $NetBSD: Makefile.vers,v 1.8 2009/01/11 03:11:37 smb Exp $
 #
-CLAWS_VERSION=	3.6.1
+CLAWS_VERSION=	3.7.0
diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST
index 545a2be5528..d4bb5ce5eee 100644
--- a/mail/claws-mail/PLIST
+++ b/mail/claws-mail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2008/10/15 16:22:02 smb Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/01/11 03:11:37 smb Exp $
 bin/claws-mail
 bin/sylpheed-claws
 include/claws-mail/account.h
@@ -248,8 +248,7 @@ share/locale/nl/LC_MESSAGES/claws-mail.mo
 share/locale/pl/LC_MESSAGES/claws-mail.mo
 share/locale/pt_BR/LC_MESSAGES/claws-mail.mo
 share/locale/ru/LC_MESSAGES/claws-mail.mo
-share/locale/sk/LC_MESSAGES/claws-mail.mo
-share/locale/sr/LC_MESSAGES/claws-mail.mo
+share/locale/cs/LC_MESSAGES/claws-mail.mo
 share/locale/sv/LC_MESSAGES/claws-mail.mo
 share/locale/zh_CN/LC_MESSAGES/claws-mail.mo
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
diff --git a/mail/claws-mail/buildlink3.mk b/mail/claws-mail/buildlink3.mk
index 7d2b2a5179c..b1b1e577cd8 100644
--- a/mail/claws-mail/buildlink3.mk
+++ b/mail/claws-mail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/10/15 16:22:02 smb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/01/11 03:11:37 smb Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CLAWS_MAIL_BUILDLINK3_MK:=	${CLAWS_MAIL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	claws-mail
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}claws-mail
 
 .if ${CLAWS_MAIL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=3.6.1
+BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=3.7.0
 BUILDLINK_PKGSRCDIR.claws-mail?=	../../mail/claws-mail
 .endif	# CLAWS_MAIL_BUILDLINK3_MK
 
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 65be1ad888a..eba04d3469f 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2008/10/15 16:22:02 smb Exp $
+$NetBSD: distinfo,v 1.12 2009/01/11 03:11:37 smb Exp $
 
-SHA1 (claws-mail-3.6.1.tar.bz2) = 5894b6e533a151ce8e4be6445e117cd40a0f63b9
-RMD160 (claws-mail-3.6.1.tar.bz2) = a36a92bbe9fe203f770bfea80ebe06362e59c666
-Size (claws-mail-3.6.1.tar.bz2) = 5387916 bytes
+SHA1 (claws-mail-3.7.0.tar.bz2) = f0627f50c6a60467a7c9ebc9b543d1c4c234f5e8
+RMD160 (claws-mail-3.7.0.tar.bz2) = ac02b5d9eb9faab2e3bb02c48a45a2bd44b8d591
+Size (claws-mail-3.7.0.tar.bz2) = 5346500 bytes
 SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
-SHA1 (patch-ac) = 74d1910be9382748ac5a92dde966553cea683c64
 SHA1 (patch-ae) = 0312eeaaf2d31ab72d771598062019127c69cbef
 SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
+SHA1 (patch-ag) = d3fc46f5b3125e336fb8edabeaa61e847e06f027
diff --git a/mail/claws-mail/patches/patch-ag b/mail/claws-mail/patches/patch-ag
new file mode 100644
index 00000000000..d9930f33c30
--- /dev/null
+++ b/mail/claws-mail/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2009/01/11 03:11:37 smb Exp $
+
+--- tools/popfile-link.sh.orig	2009-01-10 18:04:13.000000000 -0500
++++ tools/popfile-link.sh	2009-01-10 18:04:40.000000000 -0500
+@@ -32,7 +32,7 @@
+ 
+ 
+ SESSION_ID=""
+-if [ "$1" == "--ask-session-id" ]
++if [ "$1" = "--ask-session-id" ]
+ then
+ 	shift
+ 	SESSION_ID=$(gxmessage -entry -center -wrap -buttons "OK:0,Cancel:1" -default "OK" \
diff --git a/mail/clawsker/Makefile b/mail/clawsker/Makefile
index ab7c0dbcadf..ecb68a53aae 100644
--- a/mail/clawsker/Makefile
+++ b/mail/clawsker/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2008/12/26 13:21:45 obache Exp $
+# $NetBSD: Makefile,v 1.9 2009/01/11 03:11:38 smb Exp $
 
 DISTNAME=	clawsker-0.5.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/tools/
 
@@ -16,7 +16,8 @@ REPLACE_PERL=	clawsker
 
 DEPENDS+=	p5-gtk2>=1.182:../../x11/p5-gtk2
 DEPENDS+=	p5-gettext>=1.05nb2:../../devel/p5-gettext
-DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"