Update to 3.6.1:

* 3.6.1
-------

* Claws Mail now requires libetpan 0.57 for IMAP and NNTP.

* SSL support is now provided by gnuTLS exclusively. OpenSSL support
  has been dropped due to licensing issues.

* Added /View/Fullscreen option.

* Re-ordering of the filtering/processing condition and actions lists
  is now possible using drag'n'drop.

* 3.6.0
-------

* Claws Mail now requires libetpan 0.56 for IMAP and NNTP

* Spell checking is now provided by Enchant instead of Aspell. To
  build spell checker support, you will need the libenchant headers.

* The S/MIME plugin is now part of this package.

* IMAP, NNTP, and SSL are now supported in the Windows port.

* Support for client SSL certificates.

* Better support of SSL certificate stores, to be able to verify
  server certificates.

* Renaming of newsgroups is possible.

* "Always open message when selected" can now have three values:
  'Never', 'Always' and 'When message view is visible'.

* Unsaved server passwords can now be temporarily saved for the
  duration of the session. They can be cleared before the session
  expires by using '/Tools/Forget all session passwords'.

* Auto-wrapping settings are now saved in drafted messages.

* Support for basic auto-indentation in the Compose window.

* Support for animated GIFs in the message view.

* Type-ahead search in Filtering, Templates, Actions dialogs now
  select the result of the search.

* Finer granularity in POP3 accounts' Remove After delay - hours in
  addition to days.

* Spam/Ham flag is now stored on IMAP server when possible, using
  "Junk" and "NonJunk" keywords.

* Use less precise intervals when possible for auto-checking, thus
  the CPU is woken up less frequently.

* The warning icon in the main window is cleared when the error it
  relates to is clipped from the network log.

* IMAP errors now reveal the server on which they happen.

* All deprecated GTK interfaces have been replaced with their
  non-deprecated equivalents.

* csv2addressbook.pl: Added support for FoxMail.

54 files changed, 214 insertions, 435 deletions

diff --git a/mail/claws-mail-archive/Makefile b/mail/claws-mail-archive/Makefile
index b418b871d2c..c0ce06e86e3 100644
--- a/mail/claws-mail-archive/Makefile
+++ b/mail/claws-mail-archive/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.3 2008/10/15 16:22:02 smb Exp $
 #
 
-DISTNAME=	archive-0.6
-PKGNAME=	claws-mail-archive-0.6
+DISTNAME=	archive-0.6.2
+PKGNAME=	claws-mail-archive-0.6.2
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Adds archiving to Claws-Mail
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -24,7 +23,7 @@ USE_LANGUAGES+=	c
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-archive/distinfo b/mail/claws-mail-archive/distinfo
index a749300ae6f..b35b8443347 100644
--- a/mail/claws-mail-archive/distinfo
+++ b/mail/claws-mail-archive/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2008/07/13 22:34:20 smb Exp $
+$NetBSD: distinfo,v 1.2 2008/10/15 16:22:02 smb Exp $
 
-SHA1 (archive-0.6.tar.gz) = 3bf23ecf36fa9a6812e19d7f8ec1797259862b4a
-RMD160 (archive-0.6.tar.gz) = 07527363384b9e44a1fa81f55f9953ade4241742
-Size (archive-0.6.tar.gz) = 419200 bytes
+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
diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile
index fb0ffcfa903..81e0cfa1109 100644
--- a/mail/claws-mail-attachwarner/Makefile
+++ b/mail/claws-mail-attachwarner/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.11 2008/10/15 16:22:02 smb Exp $
 #
 
-DISTNAME=	attachwarner-0.2.12
-PKGNAME=	claws-mail-attachwarner-0.2.12
+DISTNAME=	attachwarner-0.2.14
+PKGNAME=	claws-mail-attachwarner-0.2.14
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Warns if a message mentions an attachment without attaching files
@@ -14,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -25,6 +24,6 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-attachwarner/distinfo b/mail/claws-mail-attachwarner/distinfo
index d37343fd61e..316fede0aaa 100644
--- a/mail/claws-mail-attachwarner/distinfo
+++ b/mail/claws-mail-attachwarner/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/05/12 02:25:39 smb Exp $
+$NetBSD: distinfo,v 1.5 2008/10/15 16:22:02 smb Exp $
 
-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
+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
diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile
index 3607f811cc8..11df5d05fc6 100644
--- a/mail/claws-mail-attremover/Makefile
+++ b/mail/claws-mail-attremover/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:02 smb Exp $
 #
 
-DISTNAME=	att_remover-1.0.8
-PKGNAME=	claws-mail-att_remover-1.0.8
+DISTNAME=	att_remover-1.0.9
+PKGNAME=	claws-mail-att_remover-1.0.9
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Permanently deletes attachments from mail
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -23,6 +22,6 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-attremover/distinfo b/mail/claws-mail-attremover/distinfo
index c889493f712..7dea12ff557 100644
--- a/mail/claws-mail-attremover/distinfo
+++ b/mail/claws-mail-attremover/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/05/12 02:25:39 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/10/15 16:22:02 smb Exp $
 
-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
+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
diff --git a/mail/claws-mail-bogofilter/Makefile b/mail/claws-mail-bogofilter/Makefile
index 54c5f084538..e28eaf3d78d 100644
--- a/mail/claws-mail-bogofilter/Makefile
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:02 smb Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	bogofilter
-PLUG_VER=	3.5.0
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -13,10 +11,7 @@ COMMENT=	Enables the scanning of incoming mail using Bogofilter
 
 CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
-DEPENDS+=	bogofilter>=1.0.3nb1:../../mail/bogofilter
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	bogofilter>=1.0.3nb2:../../mail/bogofilter
 
-.include "../../mail/claws-mail/Makefile.vers"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index a95c0ad1286..4cd804ce436 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:02 smb Exp $
 #
 
-DISTNAME=	cachesaver-0.10.7
-PKGNAME=	claws-mail-cachesaver-0.10.7
+DISTNAME=	cachesaver-0.10.8
+PKGNAME=	claws-mail-cachesaver-0.10.8
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Saves Claws-Mail metadata every 60 seconds
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -23,7 +22,7 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-cachesaver/distinfo b/mail/claws-mail-cachesaver/distinfo
index 053e0322845..2e611301c3e 100644
--- a/mail/claws-mail-cachesaver/distinfo
+++ b/mail/claws-mail-cachesaver/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/05/12 02:25:39 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/10/15 16:22:02 smb Exp $
 
-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
+SHA1 (cachesaver-0.10.8.tar.gz) = 98f0a4620939bcf2884a9b5bdec36d47bb21701c
+RMD160 (cachesaver-0.10.8.tar.gz) = 828fd5f99cca11359442322a3c61e366789a9fa4
+Size (cachesaver-0.10.8.tar.gz) = 333902 bytes
diff --git a/mail/claws-mail-dillo-viewer/Makefile b/mail/claws-mail-dillo-viewer/Makefile
index 8c5d33cb179..579cf8e50f6 100644
--- a/mail/claws-mail-dillo-viewer/Makefile
+++ b/mail/claws-mail-dillo-viewer/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:02 smb Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	dillo_viewer
-PLUG_VER=	3.5.0
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -13,11 +11,11 @@ COMMENT=	Plugin to use the Dillo web browser for html rendering
 
 CONFIGURE_ARGS+=	--enable-dillo_viewer-plugin
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 DEPENDS+=	dillo>=0.8.6nb2:../../www/dillo
 
 .include "../../mail/claws-mail/Makefile.vers"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 8449e034220..33b2627f8d3 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:02 smb Exp $
 #
 
 DISTNAME=	fetchinfo-plugin-0.4.23
 PKGNAME=	claws-mail-fetchinfo-plugin-0.4.23
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Inserts headers containing some download information
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -23,6 +22,6 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-gtkhtml/Makefile b/mail/claws-mail-gtkhtml/Makefile
index 8576d285a68..612a5488664 100644
--- a/mail/claws-mail-gtkhtml/Makefile
+++ b/mail/claws-mail-gtkhtml/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.15 2008/10/15 16:22:02 smb Exp $
 #
 
-DISTNAME=	gtkhtml2_viewer-0.19
-PKGNAME=	claws-mail-gtkhtml2_viewer-0.19
+DISTNAME=	gtkhtml2_viewer-0.21
+PKGNAME=	claws-mail-gtkhtml2_viewer-0.21
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Renders HTML mail using the gtkhtml2 rendering widget
@@ -14,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -26,7 +25,7 @@ USE_LANGUAGES+=	c
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../www/libgtkhtml/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail-gtkhtml/distinfo b/mail/claws-mail-gtkhtml/distinfo
index 8886e196d7a..0195d2421a6 100644
--- a/mail/claws-mail-gtkhtml/distinfo
+++ b/mail/claws-mail-gtkhtml/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2008/07/13 22:34:20 smb Exp $
+$NetBSD: distinfo,v 1.6 2008/10/15 16:22:02 smb Exp $
 
-SHA1 (gtkhtml2_viewer-0.19.tar.gz) = 119fce6c17d03e259d92f2eb7672d9bc9eaa92e6
-RMD160 (gtkhtml2_viewer-0.19.tar.gz) = 543566ecab519f5ca723b31da1344fe44765f41c
-Size (gtkhtml2_viewer-0.19.tar.gz) = 699738 bytes
+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
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 72017774a06..1fb276bd950 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:02 smb Exp $
 #
 
-DISTNAME=	mailmbox-1.14.1
-PKGNAME=	claws-mail-mailmbox-1.14.1
+DISTNAME=	mailmbox-1.14.2
+PKGNAME=	claws-mail-mailmbox-1.14.2
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Handles mailboxes in mbox format
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -23,6 +22,6 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-mailmbox/distinfo b/mail/claws-mail-mailmbox/distinfo
index 149adbc27dc..5eedeea61af 100644
--- a/mail/claws-mail-mailmbox/distinfo
+++ b/mail/claws-mail-mailmbox/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/05/12 02:25:40 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/10/15 16:22:02 smb Exp $
 
-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
+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
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 8b74b86553c..ba87e554fc0 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.11 2008/10/15 16:22:02 smb Exp $
 #
 
-DISTNAME=	newmail-0.0.12
-PKGNAME=	claws-mail-newmail-0.0.12
+DISTNAME=	newmail-0.0.14
+PKGNAME=	claws-mail-newmail-0.0.14
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Write log file info on arriving email
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -24,7 +23,7 @@ USE_LANGUAGES+=	c
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-newmail/distinfo b/mail/claws-mail-newmail/distinfo
index 75ecf7ec290..bce605ea8d9 100644
--- a/mail/claws-mail-newmail/distinfo
+++ b/mail/claws-mail-newmail/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/05/12 02:25:40 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/10/15 16:22:02 smb Exp $
 
-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
+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
diff --git a/mail/claws-mail-newmail/patches/patch-aa b/mail/claws-mail-newmail/patches/patch-aa
deleted file mode 100644
index 0bc415ccbab..00000000000
--- a/mail/claws-mail-newmail/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$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 d0ab1550809..2ae1f02d3b7 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.11 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.12 2008/10/15 16:22:03 smb Exp $
 #
 
-DISTNAME=	notification_plugin-0.17
-PKGNAME=	claws-mail-notification-0.17
+DISTNAME=	notification_plugin-0.19
+PKGNAME=	claws-mail-notification-0.19
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Provides various ways to notify the user of new and unread email
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -24,6 +23,6 @@ USE_LANGUAGES+=	c
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-notification/PLIST b/mail/claws-mail-notification/PLIST
index 5d2faa0e0b3..f96b9769f9c 100644
--- a/mail/claws-mail-notification/PLIST
+++ b/mail/claws-mail-notification/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/06/05 10:20:47 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/10/15 16:22:03 smb Exp $
 lib/claws-mail/plugins/notification_plugin.la
 share/locale/ca/LC_MESSAGES/notification_plugin.mo
 share/locale/cs/LC_MESSAGES/notification_plugin.mo
@@ -7,4 +7,5 @@ share/locale/fr/LC_MESSAGES/notification_plugin.mo
 share/locale/hu/LC_MESSAGES/notification_plugin.mo
 share/locale/it/LC_MESSAGES/notification_plugin.mo
 share/locale/pt_BR/LC_MESSAGES/notification_plugin.mo
+share/locale/ru/LC_MESSAGES/notification_plugin.mo
 share/locale/zh_CN/LC_MESSAGES/notification_plugin.mo
diff --git a/mail/claws-mail-notification/distinfo b/mail/claws-mail-notification/distinfo
index d9a00cb96a2..093fcc382f3 100644
--- a/mail/claws-mail-notification/distinfo
+++ b/mail/claws-mail-notification/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2008/07/13 22:34:20 smb Exp $
+$NetBSD: distinfo,v 1.7 2008/10/15 16:22:03 smb Exp $
 
-SHA1 (notification_plugin-0.17.tar.gz) = 6a8d264ec38db9a2a01efc03ada0299ba14f6bc8
-RMD160 (notification_plugin-0.17.tar.gz) = 5bdf4e4af9d15ed205f989485a416267d90ac1f7
-Size (notification_plugin-0.17.tar.gz) = 474599 bytes
+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
diff --git a/mail/claws-mail-pgp/Makefile b/mail/claws-mail-pgp/Makefile
index e0695a5e4e4..9391bfba1d6 100644
--- a/mail/claws-mail-pgp/Makefile
+++ b/mail/claws-mail-pgp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.13 2008/10/15 16:22:03 smb Exp $
 #
 META_PACKAGE=	yes
 
@@ -7,13 +7,12 @@ META_PACKAGE=	yes
 DISTNAME=	claws-mail-pgp-${CLAWS_VERSION}
 CATEGORIES=	mail security
 MASTER_SITES=	# none
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Metapackage for the PGP plug-in for Claws-mail
 
-DEPENDS+=	claws-mail-pgpcore-3.5.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
-DEPENDS+=	claws-mail-pgpmime-3.5.0{,nb[0-9]*}:../../mail/claws-mail-pgpmime
-DEPENDS+=	claws-mail-pgpinline-3.5.0{,nb[0-9]*}:../../mail/claws-mail-pgpinline
+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
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-pgpcore/Makefile b/mail/claws-mail-pgpcore/Makefile
index c629deaac63..ddc75e07aa4 100644
--- a/mail/claws-mail-pgpcore/Makefile
+++ b/mail/claws-mail-pgpcore/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.12 2008/10/15 16:22:03 smb Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	pgpcore
-PLUG_VER=	3.5.0
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -20,13 +18,11 @@ CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpmime-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,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"
 .include "../../security/gpgme/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-pgpcore/buildlink3.mk b/mail/claws-mail-pgpcore/buildlink3.mk
index 5012c91d930..bd59b516a4f 100644
--- a/mail/claws-mail-pgpcore/buildlink3.mk
+++ b/mail/claws-mail-pgpcore/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/07/13 22:32:05 smb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/10/15 16:22:03 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.5.0
+BUILDLINK_API_DEPENDS.claws-mail-pgpcore+=	claws-mail-pgpcore>=3.6.1
 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 315f1ade7e6..df6e207411d 100644
--- a/mail/claws-mail-pgpinline/Makefile
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:03 smb Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	pgpinline
-PLUG_VER=	3.5.0
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -14,12 +12,12 @@ CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
 
-DEPENDS+=	claws-mail-pgpcore-3.5.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpcore-3.6.1{,nb[0-9]*}:../../mail/claws-mail-pgpcore
 
 PLIST_SRC+=	PLIST
 
 .include "../../security/gpgme/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-pgpmime/Makefile b/mail/claws-mail-pgpmime/Makefile
index 133702bee03..0abc5f62a19 100644
--- a/mail/claws-mail-pgpmime/Makefile
+++ b/mail/claws-mail-pgpmime/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:03 smb Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	pgpmime
-PLUG_VER=	3.5.0
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -14,12 +12,11 @@ CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpmime-plugin
 
-DEPENDS+=	claws-mail-pgpcore-3.5.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpcore-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail-pgpcore
 
 PLIST_SRC+=	PLIST
 
 .include "../../security/gpgme/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index b2b68c63a95..05a0c0edc5a 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.13 2008/10/15 16:22:03 smb Exp $
 #
 
-DISTNAME=	rssyl-0.20
-PKGNAME=	claws-mail-rssyl-0.20
+DISTNAME=	rssyl-0.22
+PKGNAME=	claws-mail-rssyl-0.22
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Read RSS 1.0, 2.0 and Atom feeds in Claws-Mail
@@ -14,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 PLIST_SRC+=	PLIST
 
@@ -30,6 +29,6 @@ USE_LANGUAGES+=	c
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-rssyl/PLIST b/mail/claws-mail-rssyl/PLIST
index b751f8e0ad2..ed5ee941430 100644
--- a/mail/claws-mail-rssyl/PLIST
+++ b/mail/claws-mail-rssyl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2007/08/06 00:33:09 smb Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/10/15 16:22:03 smb Exp $
 lib/claws-mail/plugins/rssyl.la
 share/locale/ca/LC_MESSAGES/rssyl.mo
 share/locale/cs/LC_MESSAGES/rssyl.mo
@@ -10,6 +10,7 @@ share/locale/hu/LC_MESSAGES/rssyl.mo
 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/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 fae2fbd5df2..44d017084dd 100644
--- a/mail/claws-mail-rssyl/distinfo
+++ b/mail/claws-mail-rssyl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2008/07/13 22:34:20 smb Exp $
+$NetBSD: distinfo,v 1.7 2008/10/15 16:22:03 smb Exp $
 
-SHA1 (rssyl-0.20.tar.gz) = 7dbb8292461b76b4a081b595dd1599c7f09186ba
-RMD160 (rssyl-0.20.tar.gz) = ea1c7bd5d59a6ec92367592320f15b1ea04d3f3b
-Size (rssyl-0.20.tar.gz) = 480610 bytes
+SHA1 (rssyl-0.22.tar.gz) = 538c713f2ac4e50d26b0d0b2596fdc17a891add6
+RMD160 (rssyl-0.22.tar.gz) = d479499c17f7fa16359fdc129c110a794a5e0a72
+Size (rssyl-0.22.tar.gz) = 492868 bytes
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index 1b3dab02cd5..6222ca021af 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,32 +1,26 @@
-# $NetBSD: Makefile,v 1.11 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.12 2008/10/15 16:22:03 smb Exp $
+#
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-DISTNAME=	smime-0.7.6
-PKGNAME=	claws-mail-smime-0.7.6
-CATEGORIES=	mail
-MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=2
+PLUGIN_NAME=	smime
+.include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	This plugin handles S/MIME signed and/or encrypted mails
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
 PLIST_SRC+=	PLIST
 
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+=	--enable-gpgme
+CONFIGURE_ARGS+=	--enable-smime-plugin
+CONFIGURE_ARGS+=	--enable-pgpcore-plugin
+
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+#DEPENDS+=	gpgme>=1.1.4nb2:../../security/gpgme
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config
-USE_LIBTOOL=	yes
-USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
-.include "../../mail/claws-mail/buildlink3.mk"
 .include "../../mail/claws-mail-pgpcore/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../security/gnupg2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-smime/PLIST b/mail/claws-mail-smime/PLIST
index f7c6a19e011..2da735f6daf 100644
--- a/mail/claws-mail-smime/PLIST
+++ b/mail/claws-mail-smime/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:59 smb Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/10/15 16:22:03 smb Exp $
 lib/claws-mail/plugins/smime.deps
 lib/claws-mail/plugins/smime.la
+include/claws-mail/plugins/smime/smime.h
+lib/claws-mail/plugins/smime.deps
 @dirrm lib/claws-mail/plugins
+@dirrm include/claws-mail/plugins/smime
diff --git a/mail/claws-mail-smime/distinfo b/mail/claws-mail-smime/distinfo
index fd7b04f377d..02d3771360a 100644
--- a/mail/claws-mail-smime/distinfo
+++ b/mail/claws-mail-smime/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2008/07/13 22:56:08 smb Exp $
+$NetBSD: distinfo,v 1.7 2008/10/15 16:22:03 smb Exp $
 
 SHA1 (smime-0.7.6.tar.gz) = c43760b3f97ca89f7b607537795d2cc2089c5226
 RMD160 (smime-0.7.6.tar.gz) = e86981be2d83166057dbb2994e49cec802bb6040
 Size (smime-0.7.6.tar.gz) = 337459 bytes
-SHA1 (patch-aa) = 8db7d35d818ceb1bb3d936e45600c7481914042b
diff --git a/mail/claws-mail-smime/patches/patch-aa b/mail/claws-mail-smime/patches/patch-aa
deleted file mode 100644
index 7f2e629b972..00000000000
--- a/mail/claws-mail-smime/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2008/07/04 17:02:50 smb Exp $
-
---- src/smime.c.orig	2008-06-30 22:57:10.000000000 -0400
-+++ src/smime.c	2008-06-30 22:57:18.000000000 -0400
-@@ -19,7 +19,7 @@
-  */
- 
- #ifdef HAVE_CONFIG_H
--#  include "config.h"
-+#  include "pluginconfig.h"
- #endif
- 
- #ifdef USE_GPGME
diff --git a/mail/claws-mail-spamassassin/Makefile b/mail/claws-mail-spamassassin/Makefile
index 5aa1183f2d4..7a619e6692d 100644
--- a/mail/claws-mail-spamassassin/Makefile
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:03 smb Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	spamassassin
-PLUG_VER=	3.5.0
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -12,11 +10,9 @@ COMMENT=	Enables the scanning of incoming mail using SpamAssassin
 
 CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
-DEPENDS+=	spamassassin>=3.2.4nb1:../../mail/spamassassin
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	spamassassin>=3.2.5:../../mail/spamassassin
 
 .include "../../mail/claws-mail/Makefile.vers"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 3a6751ad336..2c501caa87f 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2008/09/26 17:51:18 smb Exp $
+# $NetBSD: Makefile,v 1.11 2008/10/15 16:22:03 smb Exp $
 #
 
-DISTNAME=	spam_report-0.3.4
-PKGNAME=	claws-mail-spam_report-0.3.4
+DISTNAME=	spam_report-0.3.6
+PKGNAME=	claws-mail-spam_report-0.3.6
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Report spam to various places
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -23,7 +22,7 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-spamreport/distinfo b/mail/claws-mail-spamreport/distinfo
index bf4bfd3a192..a825e879226 100644
--- a/mail/claws-mail-spamreport/distinfo
+++ b/mail/claws-mail-spamreport/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/07/13 22:34:20 smb Exp $
+$NetBSD: distinfo,v 1.5 2008/10/15 16:22:03 smb Exp $
 
-SHA1 (spam_report-0.3.4.tar.gz) = 2a5358d2a17123f487dca63711e922693eab1c65
-RMD160 (spam_report-0.3.4.tar.gz) = 95cfc35331af8986dd21aa532e3045f2ff1454a6
-Size (spam_report-0.3.4.tar.gz) = 390220 bytes
+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
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index c31770b9915..c1c4923cd86 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:18 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:03 smb Exp $
 #
 
-DISTNAME=	synce_plugin-0.7.3
-PKGNAME=	claws-mail-synce_plugin-0.7.3
+DISTNAME=	synce_plugin-0.7.4
+PKGNAME=	claws-mail-synce_plugin-0.7.4
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Synchronize addressbook of a Windows CE with Claws Mail
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -25,6 +24,6 @@ USE_LANGUAGES+=	c
 .include "../../comms/synce-libsynce/buildlink3.mk"
 .include "../../comms/synce-librapi2/buildlink3.mk"
 .include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-synce/distinfo b/mail/claws-mail-synce/distinfo
index 0a3963cc60e..e01ed546fc4 100644
--- a/mail/claws-mail-synce/distinfo
+++ b/mail/claws-mail-synce/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/01/09 03:55:12 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/10/15 16:22:03 smb Exp $
 
-SHA1 (synce_plugin-0.7.3.tar.gz) = 18adfa4d7dcbae66887a6f21240f02d0f8b49e99
-RMD160 (synce_plugin-0.7.3.tar.gz) = 3cce9762084ffb186f0256ad54ef53be7500ccd9
-Size (synce_plugin-0.7.3.tar.gz) = 334350 bytes
+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
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index a9a8244576c..c2873e6176a 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2008/09/26 17:51:18 smb Exp $
+# $NetBSD: Makefile,v 1.7 2008/10/15 16:22:03 smb Exp $
 #
 
-DISTNAME=	tnef_parse-0.3
-PKGNAME=	claws-mail-tnef-0.3
+DISTNAME=	tnef_parse-0.3.2
+PKGNAME=	claws-mail-tnef-0.3.2
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Handles TNEF attachments from Outlook
@@ -14,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 #PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -27,6 +26,6 @@ USE_LANGUAGES+=	c
 .include "../../mail/libytnef/buildlink3.mk"
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-tnef/distinfo b/mail/claws-mail-tnef/distinfo
index 80f9167cf4d..a4387d2439c 100644
--- a/mail/claws-mail-tnef/distinfo
+++ b/mail/claws-mail-tnef/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/07/13 22:34:20 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/10/15 16:22:03 smb Exp $
 
-SHA1 (tnef_parse-0.3.tar.gz) = 722e89401407ba5d51baf8f2ae03e7ceafac7825
-RMD160 (tnef_parse-0.3.tar.gz) = d05c4ad4225ab46127ca0f73e7661e4e6ccc3dc9
-Size (tnef_parse-0.3.tar.gz) = 414863 bytes
+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
diff --git a/mail/claws-mail-trayicon/Makefile b/mail/claws-mail-trayicon/Makefile
index 27bfa8de47b..8f4fab9e1cd 100644
--- a/mail/claws-mail-trayicon/Makefile
+++ b/mail/claws-mail-trayicon/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:18 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/15 16:22:03 smb Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	trayicon
-PLUG_VER=	3.5.0
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -12,10 +10,8 @@ COMMENT=	Places an icon in the system tray for new mail
 
 CONFIGURE_ARGS+=	--enable-trayicon-plugin
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mail/claws-mail/Makefile.vers"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index f40bff01676..a74dd8fd6f5 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2008/09/26 17:51:18 smb Exp $
+# $NetBSD: Makefile,v 1.13 2008/10/15 16:22:03 smb Exp $
 #
 
-DISTNAME=	vcalendar-2.0
-PKGNAME=	claws-mail-vcalendar-2.0
+DISTNAME=	vcalendar-2.0.2
+PKGNAME=	claws-mail-vcalendar-2.0.2
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Enable vCalendar message handling
@@ -14,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 #PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -25,7 +24,7 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-vcalendar/distinfo b/mail/claws-mail-vcalendar/distinfo
index 1e21c449633..b551d317ebe 100644
--- a/mail/claws-mail-vcalendar/distinfo
+++ b/mail/claws-mail-vcalendar/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2008/07/13 22:34:20 smb Exp $
+$NetBSD: distinfo,v 1.7 2008/10/15 16:22:03 smb Exp $
 
-SHA1 (vcalendar-2.0.tar.gz) = e29cae11365ed3d8218850e54d51217b34183e80
-RMD160 (vcalendar-2.0.tar.gz) = fffad7b462132cf8912c65f8ab48116914d17c0d
-Size (vcalendar-2.0.tar.gz) = 803592 bytes
+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 (patch-aa) = 076cbd15436a81f58134015f667ef78ea4581a3b
 SHA1 (patch-ab) = da1e44132e72c48bd5972e4d945dab88fc3f675d
diff --git a/mail/claws-mail/MESSAGE b/mail/claws-mail/MESSAGE
index 41a736b2345..399bbdfd5b6 100644
--- a/mail/claws-mail/MESSAGE
+++ b/mail/claws-mail/MESSAGE
@@ -1,7 +1,14 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2007/08/03 02:34:40 smb Exp $
+$NetBSD: MESSAGE,v 1.2 2008/10/15 16:22:02 smb Exp $
 
 All Claws-Mail plug-ins are separate packages, and must be installed
 separately.
 
+When upgrading to 3.6.1 from earlier versions, be aware of two things.
+First, all user-specified keyboard shortcuts will have to be recreated.
+Second, the default spell-checker has changed from aspell to enchant, and
+the default installation of enchant from pkgsrc does not include aspell.
+You'll need to either install per-language dictionaries for the supported
+spell-checkers or rebuild enchant with aspell enabled.
+
 ===========================================================================
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 04b91ab4aca..80ab26274f0 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2008/09/06 20:54:33 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2008/10/15 16:22:02 smb Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	claws-mail-${CLAWS_VERSION}
-PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	X based e-mail and netnews client
@@ -71,8 +70,6 @@ PLIST_SRC+=	PLIST.shred
 .include "../../databases/db4/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/aspell/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common
index 1f47a5f433f..afaefad1275 100644
--- a/mail/claws-mail/Makefile.common
+++ b/mail/claws-mail/Makefile.common
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile.common,v 1.8 2008/10/15 16:22:02 smb Exp $
 
 # used by mail/claws-mail/plugins.mk
+
+.include "../../mail/claws-mail/Makefile.vers"
+
 DISTNAME=	claws-mail-${CLAWS_VERSION}
 CATEGORIES=	mail news x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
@@ -24,10 +27,11 @@ CONFIGURE_ENV+=		ac_cv_path_GNOME_CONFIG="no"
 
 #LICENSE=	gplv3
 
-CONFIGURE_ARGS+=        --enable-aspell
+CONFIGURE_ARGS+=        --enable-enchant
 CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--enable-openssl
 CONFIGURE_ARGS+=	--enable-compface
+CONFIGURE_ARGS+=	--disable-smime
 CONFIGURE_ARGS+=	--disable-gpgme
 CONFIGURE_ARGS+=	--disable-pgpcore-plugin
 CONFIGURE_ARGS+=	--disable-pgpmime-plugin
@@ -38,22 +42,13 @@ CONFIGURE_ARGS+=	--disable-clamav-plugin
 CONFIGURE_ARGS+=	--disable-dillo-viewer-plugin
 CONFIGURE_ARGS+=	--disable-mathml-viewer-plugin
 CONFIGURE_ARGS+=	--disable-gnomeprint
-BUILDLINK_ABI_DEPENDS.libetpan+=	libetpan>=0.49
+BUILDLINK_ABI_DEPENDS.libetpan+=	libetpan>=0.57
 CONFIGURE_ARGS+=	--enable-libetpan
-.include "../../mail/libetpan/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-
-#.if !empty(PKG_BUILD_OPTIONS.claws-mail:Mbogofilter)
-#CONFIGURE_ARGS+=	--enable-bogofilter-plugin
-#.else
-#CONFIGURE_ARGS+=	--disable-bogofilter-plugin
-#.endif
-#.if !empty(PKG_BUILD_OPTIONS.claws-mail:Mspamassassin)
-#CONFIGURE_ARGS+=	--enable-spamassassin-plugin
-#.else
-#CONFIGURE_ARGS+=	--disable-spamassassin-plugin
-#.endif
 CONFIGURE_ARGS+=	--disable-bogofilter-plugin
 CONFIGURE_ARGS+=	--disable-spamassassin-plugin
 
-.include "../../mail/claws-mail/Makefile.vers"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../mail/libetpan/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../textproc/enchant/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index 8c9bb04a621..4c105634bda 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.6 2008/07/13 22:34:19 smb Exp $
+# $NetBSD: Makefile.vers,v 1.7 2008/10/15 16:22:02 smb Exp $
 #
-CLAWS_VERSION=	3.5.0
+CLAWS_VERSION=	3.6.1
diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST
index bfc47f5903b..545a2be5528 100644
--- a/mail/claws-mail/PLIST
+++ b/mail/claws-mail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2008/09/26 17:51:17 smb Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/10/15 16:22:02 smb Exp $
 bin/claws-mail
 bin/sylpheed-claws
 include/claws-mail/account.h
@@ -96,6 +96,9 @@ include/claws-mail/gtk/description_window.h
 include/claws-mail/gtk/filesel.h
 include/claws-mail/gtk/foldersort.h
 include/claws-mail/gtk/gtkaspell.h
+include/claws-mail/gtk/gtkcmclist.h
+include/claws-mail/gtk/gtkcmctree.h
+include/claws-mail/gtk/gtkcmoptionmenu.h
 include/claws-mail/gtk/gtksctree.h
 include/claws-mail/gtk/gtkshruler.h
 include/claws-mail/gtk/gtksourceprintjob.h
@@ -232,6 +235,7 @@ share/doc/claws-mail/manual/pl/claws-mail-manual.ps
 share/doc/claws-mail/manual/pl/claws-mail-manual.txt
 share/examples/claws-mail/mime.types
 share/icons/hicolor/48x48/apps/claws-mail.png
+share/locale/bg/LC_MESSAGES/claws-mail.mo
 share/locale/ca/LC_MESSAGES/claws-mail.mo
 share/locale/de/LC_MESSAGES/claws-mail.mo
 share/locale/en_GB/LC_MESSAGES/claws-mail.mo
@@ -240,10 +244,13 @@ share/locale/fi/LC_MESSAGES/claws-mail.mo
 share/locale/fr/LC_MESSAGES/claws-mail.mo
 share/locale/hu/LC_MESSAGES/claws-mail.mo
 share/locale/it/LC_MESSAGES/claws-mail.mo
+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/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
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
diff --git a/mail/claws-mail/buildlink3.mk b/mail/claws-mail/buildlink3.mk
index c156e3d4c80..7d2b2a5179c 100644
--- a/mail/claws-mail/buildlink3.mk
+++ b/mail/claws-mail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/07/18 19:08:43 smb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/10/15 16:22:02 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.5.0
+BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=3.6.1
 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 0b134bb23d5..65be1ad888a 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.10 2008/09/26 17:51:17 smb Exp $
+$NetBSD: distinfo,v 1.11 2008/10/15 16:22:02 smb Exp $
 
-SHA1 (claws-mail-3.5.0.tar.bz2) = 1833106a3a365a16a8f1b83362da36ef32edd6fb
-RMD160 (claws-mail-3.5.0.tar.bz2) = 837220a2665c0a395d25bbdab64af8903e578d1d
-Size (claws-mail-3.5.0.tar.bz2) = 4819732 bytes
+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 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
-SHA1 (patch-ac) = 6410910bc47784294f508f579891190e19c98402
-SHA1 (patch-ad) = 7470497384704f526e90abc4d0298a4bbe84b95c
+SHA1 (patch-ac) = 74d1910be9382748ac5a92dde966553cea683c64
 SHA1 (patch-ae) = 0312eeaaf2d31ab72d771598062019127c69cbef
 SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
diff --git a/mail/claws-mail/patches/patch-ac b/mail/claws-mail/patches/patch-ac
index 3707a574366..fafa85b43a4 100644
--- a/mail/claws-mail/patches/patch-ac
+++ b/mail/claws-mail/patches/patch-ac
@@ -1,24 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2008/05/12 02:25:39 smb Exp $
+$NetBSD: patch-ac,v 1.5 2008/10/15 16:22:02 smb Exp $
 
---- 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;
- 	
--#if USE_ASPELL
- 	gboolean enable_aspell;
- 	gchar *aspell_path;
- 	gchar *dictionary;
-@@ -168,7 +167,6 @@
- 	gboolean recheck_when_changing_dict;
- 	gboolean use_alternate;
- 	gboolean use_both_dicts;
--#endif
-         
- 	/* Display */
- 	/* obsolete fonts */
-@@ -322,7 +320,6 @@
+--- src/prefs_common.h.orig	2008-10-12 14:54:54.000000000 -0400
++++ src/prefs_common.h	2008-10-12 14:55:07.000000000 -0400
+@@ -331,7 +331,6 @@
  
  	GList *mime_open_cmd_history;
  
@@ -26,7 +10,7 @@ $NetBSD: patch-ac,v 1.4 2008/05/12 02:25:39 smb Exp $
  	/* Privacy */
  	gboolean auto_check_signatures;
  	gboolean gpg_signature_popup;
-@@ -330,7 +327,6 @@
+@@ -339,7 +338,6 @@
  	gint store_passphrase_timeout;
  	gboolean passphrase_grab;
  	gboolean gpg_warning;
diff --git a/mail/claws-mail/patches/patch-ad b/mail/claws-mail/patches/patch-ad
deleted file mode 100644
index b70143c10c9..00000000000
--- a/mail/claws-mail/patches/patch-ad
+++ /dev/null
@@ -1,134 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2008/09/26 17:51:17 smb Exp $
-
---- src/toolbar.c.orig	2008-06-30 10:36:22.000000000 -0400
-+++ src/toolbar.c	2008-06-30 10:37:19.000000000 -0400
-@@ -164,10 +164,8 @@
- 					 	 gpointer	 data);
- static void toolbar_addrbook_cb   		(GtkWidget   	*widget, 
- 					 	 gpointer     	 data);
--#ifdef USE_ASPELL
- static void toolbar_check_spelling_cb  		(GtkWidget   	*widget, 
- 					 	 gpointer     	 data);
--#endif
- static void toolbar_cancel_inc_cb		(GtkWidget	*widget,
- 						 gpointer	 data);
- 
-@@ -208,9 +206,7 @@
- 	{ "A_LINEWRAP_CURRENT",	N_("Wrap long lines of current paragraph") }, 
- 	{ "A_LINEWRAP_ALL",     N_("Wrap all long lines")                  }, 
- 	{ "A_ADDRBOOK",      	N_("Address book")                         },
--#ifdef USE_ASPELL
- 	{ "A_CHECK_SPELLING",	N_("Check spelling")                       },
--#endif
- 	{ "A_CLAWS_ACTIONS",   	N_("Claws Mail Actions Feature")	   }, 
- 	{ "A_CANCEL_INC",	N_("Cancel receiving")			   },
- 	{ "A_CLOSE",		N_("Close window")			   },
-@@ -346,9 +342,7 @@
- 					A_INSERT,        A_ATTACH,       A_SIG,
- 					A_EXTEDITOR,     A_LINEWRAP_CURRENT,     
- 					A_LINEWRAP_ALL,  A_ADDRBOOK,
--#ifdef USE_ASPELL
- 					A_CHECK_SPELLING, 
--#endif
- 					A_CLOSE };	
- 
- 		for (i = 0; i < sizeof comp_items / sizeof comp_items[0]; i++) 
-@@ -449,9 +443,7 @@
- 	case A_ADDRBOOK: 	return _("Address");
- 	case A_CANCEL_INC:	return _("Stop");
- 	case A_EXECUTE:		return _("Execute");
--	#ifdef USE_ASPELL
- 	case A_CHECK_SPELLING:	return _("Check spelling");
--	#endif
- 	default:		return "";
- 	}
- }
-@@ -492,9 +484,7 @@
- 	case A_ADDRBOOK: 	return STOCK_PIXMAP_ADDRESS_BOOK;
- 	case A_CANCEL_INC:	return STOCK_PIXMAP_CANCEL;
- 	case A_EXECUTE:		return STOCK_PIXMAP_EXEC;
--	#ifdef USE_ASPELL
- 	case A_CHECK_SPELLING:	return STOCK_PIXMAP_CHECK_SPELLING;
--	#endif
- 	default:		return -1;
- 	}
- }
-@@ -523,10 +513,8 @@
- 		{ A_SEPARATOR},
- 		{ A_TRASH},
- #ifndef GENERIC_UMPC
--#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
- 		{ A_LEARN_SPAM},
- #endif
--#endif
- 		{ A_SEPARATOR},
- 		{ A_GOTO_NEXT}
- 	};
-@@ -622,10 +610,8 @@
- 		{ A_SEPARATOR},
- 		{ A_TRASH},
- #ifndef GENERIC_UMPC
--#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
- 		{ A_LEARN_SPAM},
- #endif
--#endif
- 		{ A_GOTO_NEXT}
- 	};
- 	
-@@ -1585,12 +1571,10 @@
- 	compose_toolbar_cb(A_LINEWRAP_ALL, data);
- }
- 
--#ifdef USE_ASPELL
- static void toolbar_check_spelling_cb(GtkWidget *widget, gpointer data)
- {
- 	compose_toolbar_cb(A_CHECK_SPELLING, data);
- }
--#endif
- /*
-  * Execute actions from toolbar
-  */
-@@ -1715,9 +1699,7 @@
- 		{ A_LINEWRAP_CURRENT,	toolbar_linewrap_current_cb   	},
- 		{ A_LINEWRAP_ALL,	toolbar_linewrap_all_cb   	},
- 		{ A_ADDRBOOK,		toolbar_addrbook_cb		},
--#ifdef USE_ASPELL
- 		{ A_CHECK_SPELLING,     toolbar_check_spelling_cb       },
--#endif
- 		{ A_CLAWS_ACTIONS,	toolbar_actions_execute_cb	},
- 		{ A_CANCEL_INC,		toolbar_cancel_inc_cb		}
- 	};
-@@ -2059,12 +2041,10 @@
- 			TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Address book"));
- 			toolbar_data->addrbook_btn = item;
- 			break;
--#ifdef USE_ASPELL
- 		case A_CHECK_SPELLING:
- 			TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Check spelling"));
- 			toolbar_data->spellcheck_btn = item;
- 			break;
--#endif
- 
- 		case A_CLAWS_ACTIONS:
- 			TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,toolbar_item->text);
-@@ -2417,10 +2397,8 @@
- 		GTK_BUTTON_SET_SENSITIVE(compose->toolbar->linewrap_all_btn, sensitive);
- 	if (compose->toolbar->addrbook_btn)
- 		GTK_BUTTON_SET_SENSITIVE(compose->toolbar->addrbook_btn, sensitive);
--#ifdef USE_ASPELL
- 	if (compose->toolbar->spellcheck_btn)
- 		GTK_BUTTON_SET_SENSITIVE(compose->toolbar->spellcheck_btn, sensitive);
--#endif
- 	for (; items != NULL; items = g_slist_next(items)) {
- 		ToolbarClawsActions *item = (ToolbarClawsActions *)items->data;
- 		GTK_BUTTON_SET_SENSITIVE(item->widget, sensitive);
-@@ -2463,9 +2441,7 @@
- 	toolbar->linewrap_current_btn	= NULL;	
- 	toolbar->linewrap_all_btn     	= NULL;	
- 	toolbar->addrbook_btn     	= NULL;	
--#ifdef USE_ASPELL
- 	toolbar->spellcheck_btn   	= NULL;
--#endif
- 
- 	toolbar_destroy(toolbar);
- }
diff --git a/mail/claws-mail/plugins.mk b/mail/claws-mail/plugins.mk
index 6b30458023a..d3e66e88aec 100644
--- a/mail/claws-mail/plugins.mk
+++ b/mail/claws-mail/plugins.mk
@@ -1,9 +1,10 @@
-# $NetBSD: plugins.mk,v 1.2 2007/10/23 20:16:51 smb Exp $
+# $NetBSD: plugins.mk,v 1.3 2008/10/15 16:22:02 smb Exp $
 #
 
 .include "../../mail/claws-mail/Makefile.common"
+.include "../../mail/claws-mail/Makefile.vers"
 
-PKGNAME=	claws-mail-${PLUGIN_NAME:S/_/-/}-${PLUG_VER}
+PKGNAME=	claws-mail-${PLUGIN_NAME:S/_/-/}-${CLAWS_VERSION}
 
 CONFIGURE_DIRS=	.
 BUILD_DIRS=	src/plugins/${PLUGIN_NAME}
diff --git a/mail/clawsker/Makefile b/mail/clawsker/Makefile
index be446ae7b29..8d032fa0024 100644
--- a/mail/clawsker/Makefile
+++ b/mail/clawsker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/09/18 09:13:39 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/10/15 16:22:03 smb Exp $
 
 DISTNAME=	clawsker-0.5.0
 CATEGORIES=	mail
@@ -14,8 +14,8 @@ USE_TOOLS+=	gmake msgfmt perl
 REPLACE_PERL=	clawsker
 
 DEPENDS+=	p5-gtk2>=1.182:../../x11/p5-gtk2
-DEPENDS+=	p5-gettext>=1.05:../../devel/p5-gettext
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	p5-gettext>=1.05nb2:../../devel/p5-gettext
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"