* Claws Mail is now licensed under GPLv3 or later.

New in this release:
~~~~~~~~~~~~~~~~~~~~

* added Tags feature
Tags are arbitrary labels that can be applied to messages. It is
possible to create, edit, remove Tags; apply them to mails;
filter on Tags or Tag presence; apply or unset Tags via Filtering
actions; reference Tags in reply Templates.

* Threads can now be sorted by most recent message
/View/Sort/By thread date

* Added "/View/Show or Hide/Column headers"

* Added 'watch thread' feature

* Enabled the running of folder Processing rules on demand

* Added options to stop/enable writing logs to disc, see Logging
page of preferences

* IMAP and News: Implement age-based caching: allow the specifying
of a threshold for the offline synchronisation feature, and whether
old cached bodies should be removed. Accessible from the Folder
Properties.

* IMAP: Made multiple copy, (in the same IMAP account), faster by
matching source/destination message UIDs.

* LDAP: Ability to edit all Person attributes

* Nicer layout of the message part icons

* Speed up and clean up rendering of larger msgs

* Use progress bar when sending messages

* Made mainwindow's /Help/Manual point to the remote copy if the
local copy doesn't exist

* Replaced some deprecated widgets

* Enabled changing the emphasis color used to highlight the
newsreader/x-mailer header value when it matches our preferred
mail agent, (hidden pref 'emphasis_color' added to clawsrc).

* tools/mew2claws-mail.pl
Added new script that imports a Mew address book

* tools/popfile-link.sh
Added a new script that will open selected messages in
POPFile control center, in order to change the message
status.

* Updated the manual

* Check that Dillo's installed when loading the Dillo Browser
plugin

* Maemo improvements:
o Automatically choose the correct application
to open parts
o Better way to notify of new mails
o Destroy messageview after trashing mail
o Simplified layout
o Better toolbars, removal of CTree headers
o Add a specific icon to go back to folder list
o Improvements to the Wizard, About and icon legend dialogues
o add an easy way to store data (mails and IMAP/NNTP caches)
on one of the SD cards, and protect against unmounts if
needed
o plug the online/offline system into maemo's interfaces to
have Claws automatically switch according to the system
status (on IT OS 2007)
o use HildonBanners to display status messages
o force layout to be Small screen
o put the progress bar in the toolbar

* Updated Brazilian Portuguese, Bulgarian, Catalan, Finnish, French,
German, Hungarian, Italian, Polish, Russian, Simplified Chinese and
Slovak translations.

Plus bug fixes

46 files changed, 216 insertions, 160 deletions

diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile
index 889f034e5bc..84af083d282 100644
--- a/mail/claws-mail-attachwarner/Makefile
+++ b/mail/claws-mail-attachwarner/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2007/08/06 21:41:21 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:25 smb Exp $
 #
 
-DISTNAME=attachwarner-0.2.7
-PKGNAME=claws-mail-attachwarner-0.2.7
+DISTNAME=attachwarner-0.2.8
+PKGNAME=claws-mail-attachwarner-0.2.8
 CATEGORIES=mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Warns if a message mentions an attachment without attaching files
-PKGREVISION=	1
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -21,6 +20,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES+=	c
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/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 3ffe9b17c0e..dfa6fda24d8 100644
--- a/mail/claws-mail-attachwarner/distinfo
+++ b/mail/claws-mail-attachwarner/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2007/08/06 00:33:06 smb Exp $
+$NetBSD: distinfo,v 1.2 2007/09/18 03:17:25 smb Exp $
 
-SHA1 (attachwarner-0.2.7.tar.gz) = c525a3fde4707bb0ce011897ff5c5ab11416c44d
-RMD160 (attachwarner-0.2.7.tar.gz) = 2f536b77c4354b66d7f643539f0f75ecbbf2b8e6
-Size (attachwarner-0.2.7.tar.gz) = 381665 bytes
+SHA1 (attachwarner-0.2.8.tar.gz) = b3ce6f9e06e4acc407639f48bdd73b439c38e3f3
+RMD160 (attachwarner-0.2.8.tar.gz) = 3d22ae5dd8ce6ac3d4c9ea73f0546a4c87ddc861
+Size (attachwarner-0.2.8.tar.gz) = 387531 bytes
diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile
index 95e112f1a4b..7db38d43d38 100644
--- a/mail/claws-mail-attremover/Makefile
+++ b/mail/claws-mail-attremover/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.1 2007/08/06 00:33:06 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:26 smb Exp $
 #
 
-DISTNAME=att_remover-1.0.6
-PKGNAME=claws-mail-att_remover-1.0.6
+DISTNAME=att_remover-1.0.7
+PKGNAME=claws-mail-att_remover-1.0.7
 CATEGORIES=mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Permanently deletes attachments from mail
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -18,6 +18,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES+=	c
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/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 560749588fb..142a7615603 100644
--- a/mail/claws-mail-attremover/distinfo
+++ b/mail/claws-mail-attremover/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2007/08/06 00:33:07 smb Exp $
+$NetBSD: distinfo,v 1.2 2007/09/18 03:17:26 smb Exp $
 
-SHA1 (att_remover-1.0.6.tar.gz) = 881e782e3b2870253bd8194a7aed66d2e6c37425
-RMD160 (att_remover-1.0.6.tar.gz) = cbd8738b447db7178f82fc9b60314142bfe808c1
-Size (att_remover-1.0.6.tar.gz) = 322566 bytes
+SHA1 (att_remover-1.0.7.tar.gz) = cd14301814f25875f3ff02907b612fd303b10fec
+RMD160 (att_remover-1.0.7.tar.gz) = 1bfaa456bf8e482773088b6442b9def83f889eb4
+Size (att_remover-1.0.7.tar.gz) = 322799 bytes
diff --git a/mail/claws-mail-bogofilter/Makefile b/mail/claws-mail-bogofilter/Makefile
index 1ab3bf983b7..88a8a1ab81c 100644
--- a/mail/claws-mail-bogofilter/Makefile
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:42 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:26 smb Exp $
 #
 
 PLUGIN_NAME=	bogofilter
@@ -9,9 +9,9 @@ COMMENT=	Enables the scanning of incoming mail using Bogofilter
 
 CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 DEPENDS+=	bogofilter>=1.0.3nb1:../../mail/bogofilter
 
+.include "../../mail/claws-mail/Makefile.vers"
 .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 75b456980f1..d25a0356b58 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.1 2007/08/06 00:33:07 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:26 smb Exp $
 #
 
-DISTNAME=cachesaver-0.10.5
-PKGNAME=claws-mail-cachesaver-0.10.5
+DISTNAME=cachesaver-0.10.6
+PKGNAME=claws-mail-cachesaver-0.10.6
 CATEGORIES=mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Saves Claws-Mail metadata every 60 seconds
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -18,6 +18,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES+=	c
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/mail/claws-mail-cachesaver/distinfo b/mail/claws-mail-cachesaver/distinfo
index c78ffe65a6e..4100b53955f 100644
--- a/mail/claws-mail-cachesaver/distinfo
+++ b/mail/claws-mail-cachesaver/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2007/08/06 00:33:07 smb Exp $
+$NetBSD: distinfo,v 1.2 2007/09/18 03:17:26 smb Exp $
 
-SHA1 (cachesaver-0.10.5.tar.gz) = cf430e7911662aaa75466930b61a00ef0a0d2b79
-RMD160 (cachesaver-0.10.5.tar.gz) = ef7bbfa2b0ea0b166d1c700f8c37a329e59766c8
-Size (cachesaver-0.10.5.tar.gz) = 324614 bytes
+SHA1 (cachesaver-0.10.6.tar.gz) = 9075cb231567478a995cdb4477c0f3a039940b9b
+RMD160 (cachesaver-0.10.6.tar.gz) = 85396643711e0d8353c9d80a9c40f9501795cb56
+Size (cachesaver-0.10.6.tar.gz) = 329371 bytes
diff --git a/mail/claws-mail-clamav/Makefile b/mail/claws-mail-clamav/Makefile
index ca6469c00c1..224c44a036a 100644
--- a/mail/claws-mail-clamav/Makefile
+++ b/mail/claws-mail-clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:43 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:26 smb Exp $
 #
 
 PLUGIN_NAME=	clamav_plugin
@@ -13,9 +13,10 @@ CONFIGURE_ARGS+=	--enable-clamav-plugin
 
 USE_LANGUAGES=	c
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 DEPENDS+=	clamav>=0.91.1nb1:../../mail/clamav
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/clamav/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail-dillo-viewer/Makefile b/mail/claws-mail-dillo-viewer/Makefile
index 92e75e5fbcc..2b8419fee4e 100644
--- a/mail/claws-mail-dillo-viewer/Makefile
+++ b/mail/claws-mail-dillo-viewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:45 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:27 smb Exp $
 #
 
 PLUGIN_NAME=	dillo_viewer
@@ -9,9 +9,10 @@ COMMENT=	Plugin to use the Dillo web browser for html rendering
 
 CONFIGURE_ARGS+=	--enable-dillo_viewer-plugin
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 DEPENDS+=	dillo>=0.8.6nb2:../../www/dillo
 
+.include "../../mail/claws-mail/Makefile.vers"
 .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 6865e79bbac..9cacf41d7b2 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.1 2007/08/06 00:33:08 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:27 smb Exp $
 #
 
-DISTNAME=fetchinfo-plugin-0.4.19
-PKGNAME=claws-mail-fetchinfo-plugin-0.4.19
+DISTNAME=fetchinfo-plugin-0.4.20
+PKGNAME=claws-mail-fetchinfo-plugin-0.4.20
 CATEGORIES=mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Inserts headers containing some download information
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -18,6 +18,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES+=	c
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-fetchinfo/distinfo b/mail/claws-mail-fetchinfo/distinfo
index 73f3b2fe6bb..06bb8aff414 100644
--- a/mail/claws-mail-fetchinfo/distinfo
+++ b/mail/claws-mail-fetchinfo/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2007/08/06 00:33:08 smb Exp $
+$NetBSD: distinfo,v 1.2 2007/09/18 03:17:27 smb Exp $
 
-SHA1 (fetchinfo-plugin-0.4.19.tar.gz) = 6492dec2641261cd68d93629873c47a00daaf9dd
-RMD160 (fetchinfo-plugin-0.4.19.tar.gz) = e4f3bbe2658f98683db0c011fd7ad342c0dbd0b3
-Size (fetchinfo-plugin-0.4.19.tar.gz) = 328005 bytes
+SHA1 (fetchinfo-plugin-0.4.20.tar.gz) = ad5b1e0e395b13f0fb47f967cff6e2d2845e1a9d
+RMD160 (fetchinfo-plugin-0.4.20.tar.gz) = ce8399ce428e033bf550be0d4aed00c4718f83f6
+Size (fetchinfo-plugin-0.4.20.tar.gz) = 329720 bytes
diff --git a/mail/claws-mail-gtkhtml/Makefile b/mail/claws-mail-gtkhtml/Makefile
index 70f44e548f9..4dbf56bdb53 100644
--- a/mail/claws-mail-gtkhtml/Makefile
+++ b/mail/claws-mail-gtkhtml/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2007/08/06 21:41:21 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:27 smb Exp $
 #
 
-DISTNAME=gtkhtml2_viewer-0.15.1
-PKGNAME=claws-mail-gtkhtml2_viewer-0.15.1
+DISTNAME=gtkhtml2_viewer-0.15.2
+PKGNAME=claws-mail-gtkhtml2_viewer-0.15.2
 CATEGORIES=mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Renders HTML mail using the gtkhtml2 rendering widget
-PKGREVISION=	1
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -21,6 +20,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES+=	c
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/mail/claws-mail-gtkhtml/distinfo b/mail/claws-mail-gtkhtml/distinfo
index 8b3513aa9d1..4dc470f3598 100644
--- a/mail/claws-mail-gtkhtml/distinfo
+++ b/mail/claws-mail-gtkhtml/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2007/08/03 02:34:47 smb Exp $
+$NetBSD: distinfo,v 1.2 2007/09/18 03:17:27 smb Exp $
 
-SHA1 (gtkhtml2_viewer-0.15.1.tar.gz) = cff826f55bd27a260ee7c69438a591da8fa8f90c
-RMD160 (gtkhtml2_viewer-0.15.1.tar.gz) = 24a3dc19709242a43b7255ca25b2e809d559b91c
-Size (gtkhtml2_viewer-0.15.1.tar.gz) = 392495 bytes
+SHA1 (gtkhtml2_viewer-0.15.2.tar.gz) = bc43e823a1325d02195a2050f0b0a86c5d4fbe7e
+RMD160 (gtkhtml2_viewer-0.15.2.tar.gz) = 5e058c83083ea14bc3b4df38de77d4dc7f59f4bd
+Size (gtkhtml2_viewer-0.15.2.tar.gz) = 396853 bytes
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 6031c3db1ac..154475f956f 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.1 2007/08/06 00:33:08 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:27 smb Exp $
 #
 
-DISTNAME=mailmbox-1.13.1
-PKGNAME=claws-mail-mailmbox-1.13.1
+DISTNAME=mailmbox-1.14
+PKGNAME=claws-mail-mailmbox-1.14
 CATEGORIES=mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Handles mailboxes in mbox format
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -18,6 +18,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES+=	c
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/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 abd827f15d2..8c5dffcefeb 100644
--- a/mail/claws-mail-mailmbox/distinfo
+++ b/mail/claws-mail-mailmbox/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2007/08/06 00:33:09 smb Exp $
+$NetBSD: distinfo,v 1.2 2007/09/18 03:17:28 smb Exp $
 
-SHA1 (mailmbox-1.13.1.tar.gz) = d47e8de55bbf5e41e91f50b7907debfc9d713626
-RMD160 (mailmbox-1.13.1.tar.gz) = 2cc65b9c3e8e125b446f79ef3d4f1228171cb1a3
-Size (mailmbox-1.13.1.tar.gz) = 396182 bytes
+SHA1 (mailmbox-1.14.tar.gz) = 5f1403c00f9c5ecd21a30fd2eaa30321ea33b044
+RMD160 (mailmbox-1.14.tar.gz) = 804a3148d4cda280228cd24e52c75dc877936315
+Size (mailmbox-1.14.tar.gz) = 403040 bytes
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 862e79cdbf3..4fe8b54e8f8 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2007/08/17 02:46:30 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:28 smb Exp $
 #
 
-DISTNAME=newmail-0.0.10
-PKGNAME=claws-mail-newmail-0.0.10
+DISTNAME=newmail-0.0.11
+PKGNAME=claws-mail-newmail-0.0.11
 CATEGORIES=mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Write log file info on arriving email
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -19,6 +18,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=             pkg-config
 USE_LANGUAGES+=	c
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail-newmail/distinfo b/mail/claws-mail-newmail/distinfo
index cdf3f162b97..c14350287bb 100644
--- a/mail/claws-mail-newmail/distinfo
+++ b/mail/claws-mail-newmail/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2007/08/03 02:34:49 smb Exp $
+$NetBSD: distinfo,v 1.2 2007/09/18 03:17:28 smb Exp $
 
-SHA1 (newmail-0.0.10.tar.gz) = 7800ea9d73e737a726fb396d409f293daad4e5dc
-RMD160 (newmail-0.0.10.tar.gz) = c7ea906b94822ef9b6c15b4d593b72feecd65f6e
-Size (newmail-0.0.10.tar.gz) = 322622 bytes
+SHA1 (newmail-0.0.11.tar.gz) = bd1a4d0b03f6946cb128571ca2d4e240006e36dc
+RMD160 (newmail-0.0.11.tar.gz) = 4a466380064a4b2b6a44b4a7e8cfc5d9b4d236d9
+Size (newmail-0.0.11.tar.gz) = 322780 bytes
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 5ac290df751..35d12463eca 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:49 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:28 smb Exp $
 #
 
-DISTNAME=notification_plugin-0.11
-PKGNAME=claws-mail-notification-0.11
+DISTNAME=notification_plugin-0.12.1
+PKGNAME=claws-mail-notification-0.12.1
 CATEGORIES=mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Provides various ways to notify the user of new and unread email
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -18,6 +18,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=             pkg-config
 USE_LANGUAGES+=	c
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail-notification/distinfo b/mail/claws-mail-notification/distinfo
index 7175e47bfe3..c9a1e3ffa3b 100644
--- a/mail/claws-mail-notification/distinfo
+++ b/mail/claws-mail-notification/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2007/08/03 02:34:50 smb Exp $
+$NetBSD: distinfo,v 1.2 2007/09/18 03:17:28 smb Exp $
 
-SHA1 (notification_plugin-0.11.tar.gz) = 694ac3b7ad85a7a411cb82fadb1eb070180df012
-RMD160 (notification_plugin-0.11.tar.gz) = 24df62b7304e65d88cbd6bdd94b990462b6bf13a
-Size (notification_plugin-0.11.tar.gz) = 436031 bytes
+SHA1 (notification_plugin-0.12.1.tar.gz) = 7555653e1d95b27249dc965cebdb062d3df6fbb0
+RMD160 (notification_plugin-0.12.1.tar.gz) = c7749010d445f3340e814412fb832e94ebe71602
+Size (notification_plugin-0.12.1.tar.gz) = 458955 bytes
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index ef25693a9e9..f0eabd5fd51 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.2 2007/08/06 21:41:22 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:28 smb Exp $
 #
 
-DISTNAME=pdf_viewer-0.5
-PKGNAME=claws-mail-pdf_viewer-0.5
+DISTNAME=pdf_viewer-0.6
+PKGNAME=claws-mail-pdf_viewer-0.6
 CATEGORIES=mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Enables the viewing of PDF and PostScript attachments
-PKGREVISION=	1
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 
+.include "../../mail/claws-mail/openssl.mk"
 .include "../../mk/bsd.prefs.mk"
 
 GNU_CONFIGURE=	yes
@@ -22,6 +22,7 @@ USE_TOOLS+=	pkg-config
 USE_TOOLS+=	gs:run
 USE_LANGUAGES+=	c
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mail/claws-mail/buildlink3.mk"
 .include "../../print/poppler-glib/buildlink3.mk"
diff --git a/mail/claws-mail-pdf_viewer/distinfo b/mail/claws-mail-pdf_viewer/distinfo
index 46f650184bd..e247e9d6215 100644
--- a/mail/claws-mail-pdf_viewer/distinfo
+++ b/mail/claws-mail-pdf_viewer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2007/08/03 02:34:52 smb Exp $
+$NetBSD: distinfo,v 1.2 2007/09/18 03:17:29 smb Exp $
 
-SHA1 (pdf_viewer-0.5.tar.gz) = d1191d90e9a86708508ebebfb9a69004530d7bf1
-RMD160 (pdf_viewer-0.5.tar.gz) = 65bf8df2dfabc21aa39ee7e72a56fb8b8b6ec51b
-Size (pdf_viewer-0.5.tar.gz) = 396385 bytes
+SHA1 (pdf_viewer-0.6.tar.gz) = 54313c7782a002fcf188b0ab8097fc096ff95148
+RMD160 (pdf_viewer-0.6.tar.gz) = 0872158bfd778c5e370d2a7164c1406b9a299086
+Size (pdf_viewer-0.6.tar.gz) = 403190 bytes
diff --git a/mail/claws-mail-pgp/Makefile b/mail/claws-mail-pgp/Makefile
index 1270c73c618..25cb7343349 100644
--- a/mail/claws-mail-pgp/Makefile
+++ b/mail/claws-mail-pgp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:53 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:29 smb Exp $
 #
 .include "../../mail/claws-mail/Makefile.vers"
 
@@ -10,9 +10,9 @@ DISTFILES=	# empy
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Metapackage for the PGP plug-in for Claws-mail
 
-DEPENDS+=	claws-mail-pgpcore>=${CLAWS_VERSION}:../../mail/claws-mail-pgpcore
-DEPENDS+=	claws-mail-pgpmime>=${CLAWS_VERSION}:../../mail/claws-mail-pgpmime
-DEPENDS+=	claws-mail-pgpinline>=${CLAWS_VERSION}:../../mail/claws-mail-pgpinline
+DEPENDS+=	claws-mail-pgpcore-${CLAWS_VERSION}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpmime-${CLAWS_VERSION}:../../mail/claws-mail-pgpmime
+DEPENDS+=	claws-mail-pgpinline-${CLAWS_VERSION}:../../mail/claws-mail-pgpinline
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/mail/claws-mail-pgpcore/Makefile b/mail/claws-mail-pgpcore/Makefile
index cfe0b689962..6a91d611ca6 100644
--- a/mail/claws-mail-pgpcore/Makefile
+++ b/mail/claws-mail-pgpcore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/08/06 21:41:22 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:29 smb Exp $
 #
 
 PLUGIN_NAME=	pgpcore
@@ -6,7 +6,8 @@ PLUGIN_NAME=	pgpcore
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Handles core PGP functions
-PKGREVISION=	1
+
+PLIST_SRC+=	PLIST
 
 PLIST_SRC+=	PLIST
 
@@ -15,10 +16,11 @@ CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpmime-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 DEPENDS+=	gnupg>=1.4.7:../../security/gnupg
 DEPENDS+=	gpgme>=1.1.4:../../security/gpgme
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 
diff --git a/mail/claws-mail-pgpcore/PLIST b/mail/claws-mail-pgpcore/PLIST
index 67f05655e29..b3465b090a3 100644
--- a/mail/claws-mail-pgpcore/PLIST
+++ b/mail/claws-mail-pgpcore/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:55 smb Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/09/18 03:17:29 smb Exp $
 include/claws-mail/plugins/pgpcore/passphrase.h
 include/claws-mail/plugins/pgpcore/pgp_viewer.h
 include/claws-mail/plugins/pgpcore/prefs_gpg.h
@@ -6,6 +6,7 @@ include/claws-mail/plugins/pgpcore/select-keys.h
 include/claws-mail/plugins/pgpcore/sgpgme.h
 lib/claws-mail/plugins/pgpcore.la
 @dirrm lib/claws-mail/plugins
+@dirrm lib/claws-mail
 @dirrm include/claws-mail/plugins/pgpcore
 @dirrm include/claws-mail/plugins
 @dirrm include/claws-mail
diff --git a/mail/claws-mail-pgpinline/Makefile b/mail/claws-mail-pgpinline/Makefile
index c0e93a97ecd..aa242e529a5 100644
--- a/mail/claws-mail-pgpinline/Makefile
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:55 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:29 smb Exp $
 #
 
 PLUGIN_NAME=	pgpinline
@@ -11,7 +11,7 @@ CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
 
-DEPENDS+=	claws-mail-pgpcore>=${CLAWS_VERSION}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpcore-${CLAWS_VERSION}:../../mail/claws-mail-pgpcore
 
 PLIST_SRC+=	PLIST
 
diff --git a/mail/claws-mail-pgpmime/Makefile b/mail/claws-mail-pgpmime/Makefile
index e372608f46e..33f588d455e 100644
--- a/mail/claws-mail-pgpmime/Makefile
+++ b/mail/claws-mail-pgpmime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:56 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:29 smb Exp $
 #
 
 PLUGIN_NAME=	pgpmime
@@ -11,7 +11,7 @@ CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpmime-plugin
 
-DEPENDS+=	claws-mail-pgpcore>=${CLAWS_VERSION}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpcore-${CLAWS_VERSION}:../../mail/claws-mail-pgpcore
 
 PLIST_SRC+=	PLIST
 
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index d7033b3e5dc..adc6b0e5870 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2007/08/06 21:41:22 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:30 smb Exp $
 #
 
-DISTNAME=rssyl-0.14
-PKGNAME=claws-mail-rssyl-0.14
+DISTNAME=rssyl-0.15
+PKGNAME=claws-mail-rssyl-0.15
 CATEGORIES=mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Read RSS 1.0, 2.0 and Atom feeds in Claws-Mail
-PKGREVISION=	1
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 
 PLIST_SRC+=	PLIST
 
@@ -23,6 +22,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES+=	c
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail-rssyl/distinfo b/mail/claws-mail-rssyl/distinfo
index 1b3ea2e3e14..bb79f2eba83 100644
--- a/mail/claws-mail-rssyl/distinfo
+++ b/mail/claws-mail-rssyl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2007/08/06 00:33:09 smb Exp $
+$NetBSD: distinfo,v 1.2 2007/09/18 03:17:30 smb Exp $
 
-SHA1 (rssyl-0.14.tar.gz) = 710f58e10a1bb195980d407b2930ceb2ebc35e91
-RMD160 (rssyl-0.14.tar.gz) = b03c090225c0a1d23bd8cb37cfe87fb887e787f9
-Size (rssyl-0.14.tar.gz) = 464197 bytes
+SHA1 (rssyl-0.15.tar.gz) = af836acb122cf232b2b5d8476a54c1437d1085c7
+RMD160 (rssyl-0.15.tar.gz) = 78fa500d155a8f97b9c30b639c8f854e483034d0
+Size (rssyl-0.15.tar.gz) = 467638 bytes
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index 0bc480ef1f4..4d768bfb0fe 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2007/08/06 21:41:22 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:30 smb Exp $
 
-DISTNAME=smime-0.7.1
-PKGNAME=claws-mail-smime-0.7.1
+DISTNAME=smime-0.7.2
+PKGNAME=claws-mail-smime-0.7.2
 CATEGORIES=mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	This plugin handles S/MIME signed and/or encrypted mails
-PKGREVISION=	1
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 PLIST_SRC+=	PLIST
 
 .include "../../mk/bsd.prefs.mk"
@@ -19,6 +18,7 @@ USE_TOOLS+=	pkg-config
 USE_LIBTOOL=	yes
 USE_LANGUAGES+=	c
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
diff --git a/mail/claws-mail-smime/distinfo b/mail/claws-mail-smime/distinfo
index fa76449c5ac..1407611874c 100644
--- a/mail/claws-mail-smime/distinfo
+++ b/mail/claws-mail-smime/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2007/08/03 02:34:58 smb Exp $
+$NetBSD: distinfo,v 1.2 2007/09/18 03:17:30 smb Exp $
 
-SHA1 (smime-0.7.1.tar.gz) = aef2a5a0779dbaf18268f202e6752145df9f8edc
-RMD160 (smime-0.7.1.tar.gz) = 5f296ef28feca0adedd5e0ac9cac4fb2f54de918
-Size (smime-0.7.1.tar.gz) = 329614 bytes
+SHA1 (smime-0.7.2.tar.gz) = 5da6fb9483eac007bc5e1bcd77d79a5aeb02ddf4
+RMD160 (smime-0.7.2.tar.gz) = ad9148aa739f0b1c104830849c1c8933303f744c
+Size (smime-0.7.2.tar.gz) = 332878 bytes
diff --git a/mail/claws-mail-spamassassin/Makefile b/mail/claws-mail-spamassassin/Makefile
index 86050a23d2e..77b59abfbb2 100644
--- a/mail/claws-mail-spamassassin/Makefile
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2007/08/03 02:34:59 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:30 smb Exp $
 #
 
 PLUGIN_NAME=	spamassassin
@@ -9,9 +9,10 @@ COMMENT=	Enables the scanning of incoming mail using SpamAssassin
 
 CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 DEPENDS+=	spamassassin>=3.2.1:../../mail/spamassassin
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-spamreport/DESCR b/mail/claws-mail-spamreport/DESCR
new file mode 100644
index 00000000000..1afba8f3799
--- /dev/null
+++ b/mail/claws-mail-spamreport/DESCR
@@ -0,0 +1,3 @@
+This Claws Mail plugin allows you to upload your spams to various
+spam reporting places, like http://www.signal-spam.fr/. Currently,
+only Signal-Spam is supported.
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
new file mode 100644
index 00000000000..fb744e01cda
--- /dev/null
+++ b/mail/claws-mail-spamreport/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2007/09/18 03:17:31 smb Exp $
+#
+
+DISTNAME=spam_report-0.2
+PKGNAME=claws-mail-spam_report-0.2
+CATEGORIES=mail
+MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+
+MAINTAINER=	smb@NetBSD.org
+COMMENT=	Report spam to various places
+
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+
+.include "../../mk/bsd.prefs.mk"
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+USE_LANGUAGES+=	c
+
+.include "../../mail/claws-mail/Makefile.vers"
+.include "../../mail/claws-mail/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-spamreport/PLIST b/mail/claws-mail-spamreport/PLIST
new file mode 100644
index 00000000000..b539f4f152f
--- /dev/null
+++ b/mail/claws-mail-spamreport/PLIST
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST,v 1.1 2007/09/18 03:17:31 smb Exp $
+lib/claws-mail/plugins/spamreport.la
+share/locale/ca/LC_MESSAGES/spam_report.mo
+share/locale/es/LC_MESSAGES/spam_report.mo
+share/locale/fi/LC_MESSAGES/spam_report.mo
+share/locale/fr/LC_MESSAGES/spam_report.mo
+share/locale/hu/LC_MESSAGES/spam_report.mo
+share/locale/pt_BR/LC_MESSAGES/spam_report.mo
+share/locale/sk/LC_MESSAGES/spam_report.mo
+@dirrm lib/claws-mail/plugins
diff --git a/mail/claws-mail-spamreport/distinfo b/mail/claws-mail-spamreport/distinfo
new file mode 100644
index 00000000000..1ef1247ac93
--- /dev/null
+++ b/mail/claws-mail-spamreport/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2007/09/18 03:17:31 smb Exp $
+
+SHA1 (spam_report-0.2.tar.gz) = 21487da3cb2b3e775527e8ac96e7471887891b39
+RMD160 (spam_report-0.2.tar.gz) = a010e17e769ca25c4e2affd6a059d6ffb7caa5b7
+Size (spam_report-0.2.tar.gz) = 379740 bytes
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index a525bc7c574..4c53c43f587 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.1 2007/08/08 13:22:30 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:31 smb Exp $
 #
 
-DISTNAME=synce_plugin-0.7.1
-PKGNAME=claws-mail-synce_plugin-0.7.1
+DISTNAME=synce_plugin-0.7.2
+PKGNAME=claws-mail-synce_plugin-0.7.2
 CATEGORIES=mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Extends filtering by permitting invocatio of Perl scripts
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -18,6 +18,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES+=	c
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../comms/synce-libsynce/buildlink3.mk"
 .include "../../comms/synce-librapi2/buildlink3.mk"
 .include "../../mail/claws-mail/buildlink3.mk"
diff --git a/mail/claws-mail-synce/distinfo b/mail/claws-mail-synce/distinfo
index 3126cf1683f..30aa68f0c8d 100644
--- a/mail/claws-mail-synce/distinfo
+++ b/mail/claws-mail-synce/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2007/08/08 13:22:30 smb Exp $
+$NetBSD: distinfo,v 1.2 2007/09/18 03:17:32 smb Exp $
 
-SHA1 (synce_plugin-0.7.1.tar.gz) = f7af69bc665ad96b8085e9ccce10398676d54233
-RMD160 (synce_plugin-0.7.1.tar.gz) = 3c906e7395713cc31add23c7360985a76a23c0ff
-Size (synce_plugin-0.7.1.tar.gz) = 333513 bytes
+SHA1 (synce_plugin-0.7.2.tar.gz) = 570dbd2dbbc08c85e8aea1d1ed3bd5bdbf8a32f5
+RMD160 (synce_plugin-0.7.2.tar.gz) = a9f3b28b02e400bd5d09e342120bf29c95adc69d
+Size (synce_plugin-0.7.2.tar.gz) = 334142 bytes
diff --git a/mail/claws-mail-trayicon/Makefile b/mail/claws-mail-trayicon/Makefile
index 57b63a362bf..f075986ae33 100644
--- a/mail/claws-mail-trayicon/Makefile
+++ b/mail/claws-mail-trayicon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2007/08/03 02:35:00 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:32 smb Exp $
 #
 
 PLUGIN_NAME=	trayicon
@@ -9,8 +9,9 @@ COMMENT=	Places an icon in the system tray for new mail
 
 CONFIGURE_ARGS+=	--enable-trayicon-plugin
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 
+.include "../../mail/claws-mail/Makefile.vers"
 .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 5b155fef7bc..6bd99b11890 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2007/08/16 23:14:17 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:32 smb Exp $
 #
 
-DISTNAME=vcalendar-1.96
-PKGNAME=claws-mail-vcalendar-1.96
+DISTNAME=vcalendar-1.98
+PKGNAME=claws-mail-vcalendar-1.98
 CATEGORIES=mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Enable vCalendar message handling
 
 #PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail>=2.10.0:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -21,6 +20,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES+=	c
 
+.include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/mail/claws-mail-vcalendar/distinfo b/mail/claws-mail-vcalendar/distinfo
index efe29eb10ef..5b7d8e26729 100644
--- a/mail/claws-mail-vcalendar/distinfo
+++ b/mail/claws-mail-vcalendar/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2007/08/16 23:14:17 smb Exp $
+$NetBSD: distinfo,v 1.3 2007/09/18 03:17:32 smb Exp $
 
-SHA1 (vcalendar-1.96.tar.gz) = 64fac1382e0385a09ff84d354e0d5e3838c5b571
-RMD160 (vcalendar-1.96.tar.gz) = e0f36c122c4b221a455d0c1bbfb6854cde3a0e5f
-Size (vcalendar-1.96.tar.gz) = 747018 bytes
+SHA1 (vcalendar-1.98.tar.gz) = 0ce90351546bac5922be2dd9a360bd859f1efba4
+RMD160 (vcalendar-1.98.tar.gz) = 28fd1ad3c3cbf198d606ce155ab603ffba82669d
+Size (vcalendar-1.98.tar.gz) = 764473 bytes
 SHA1 (patch-aa) = 076cbd15436a81f58134015f667ef78ea4581a3b
 SHA1 (patch-ab) = c0ec5c57bea31d26afb4a9dc5abeea7cfdb6951d
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 761ef803bc2..4207f66bb43 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2007/08/31 11:04:18 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/18 03:17:24 smb Exp $
 
 .include "Makefile.common"
 
-#PKGNAME=	claws-mail-${CLAWS_VERSION}
+PKGNAME=	claws-mail-${CLAWS_VERSION}
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	X based e-mail and netnews client
-PKGREVISION=	3
 
 CONFLICTS+=	sylpheed-claws-[0-9]*
 
diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common
index 7f74a78f295..9cf22aa712d 100644
--- a/mail/claws-mail/Makefile.common
+++ b/mail/claws-mail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2007/08/09 19:06:31 drochner Exp $
+# $NetBSD: Makefile.common,v 1.4 2007/09/18 03:17:24 smb Exp $
 
 DISTNAME=	claws-mail-${CLAWS_VERSION}
 CATEGORIES=	mail news x11
@@ -10,10 +10,7 @@ HOMEPAGE=	http://claws-mail.org/
 DISTINFO_FILE=	${.CURDIR}/../../mail/claws-mail/distinfo
 PATCHDIR=	${.CURDIR}/../../mail/claws-mail/patches
 
-# for SMTP, POP3 and IMAP over SSL
-# set these just in case we don't have a pkg-config file for openssl
-CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include"
-CONFIGURE_ENV+=		OPENSSL_LIBS="-L${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto"
+.include	"../../mail/claws-mail/openssl.mk"
 
 USE_TOOLS+=		gmake pkg-config
 USE_LANGUAGES+=		c
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index 752d5256daf..be357362130 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.1 2007/08/03 02:34:42 smb Exp $
+# $NetBSD: Makefile.vers,v 1.2 2007/09/18 03:17:24 smb Exp $
 #
-CLAWS_VERSION=	2.10.0
+CLAWS_VERSION=	3.0.1
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 684fdafe5e3..776446ed0f6 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.3 2007/08/31 11:04:18 drochner Exp $
+$NetBSD: distinfo,v 1.4 2007/09/18 03:17:24 smb Exp $
 
-SHA1 (claws-mail-2.10.0.tar.bz2) = 0ee38ec2dd0c37941b0bcc4af7ab441ec432c63c
-RMD160 (claws-mail-2.10.0.tar.bz2) = e10eed2c3461a8c85d6313f0c57581a3b0ea654f
-Size (claws-mail-2.10.0.tar.bz2) = 5520512 bytes
+SHA1 (claws-mail-3.0.1.tar.bz2) = 670c2731bf6bf209ca7d3bd341b38fc3108e6390
+RMD160 (claws-mail-3.0.1.tar.bz2) = 431ab3ca051382db1e307ef1abafc5ce659f4aa3
+Size (claws-mail-3.0.1.tar.bz2) = 5654189 bytes
 SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
-SHA1 (patch-ac) = 51eff8f483ad603c1493bdc6520a9669c3d097c9
-SHA1 (patch-ad) = 9090824f9ad3688315567ed0857673cb94123897
-SHA1 (patch-ae) = 003ce854d58b8f25f12617b99fb245749704ec3d
+SHA1 (patch-ac) = cb1b427cf2bcd810cc1bd05324fdb9d40c695bfc
+SHA1 (patch-ad) = f4944b8fe86b1c6e2362dd9068d09199de6b83d7
diff --git a/mail/claws-mail/patches/patch-ac b/mail/claws-mail/patches/patch-ac
index cececad604f..f002f77f737 100644
--- a/mail/claws-mail/patches/patch-ac
+++ b/mail/claws-mail/patches/patch-ac
@@ -1,3 +1,5 @@
+$NetBSD: patch-ac,v 1.3 2007/09/18 03:17:25 smb Exp $
+
 --- src/prefs_common.h.orig	2007-08-16 22:50:08.000000000 -0400
 +++ src/prefs_common.h	2007-08-16 22:50:33.000000000 -0400
 @@ -153,7 +153,6 @@
diff --git a/mail/claws-mail/patches/patch-ad b/mail/claws-mail/patches/patch-ad
index f01946de508..fb6d6656364 100644
--- a/mail/claws-mail/patches/patch-ad
+++ b/mail/claws-mail/patches/patch-ad
@@ -1,24 +1,26 @@
-$NetBSD: patch-ad,v 1.1 2007/08/03 02:34:38 smb Exp $
+$NetBSD: patch-ad,v 1.2 2007/09/18 03:17:25 smb Exp $
 
---- src/toolbar.c.orig	2007-08-02 04:10:24.000000000 -0400
-+++ src/toolbar.c	2007-08-02 04:10:58.000000000 -0400
-@@ -427,9 +427,7 @@
- 		{ A_FORWARD,       STOCK_PIXMAP_MAIL_FORWARD,         _("Forward") },
+--- src/toolbar.c.orig	2007-09-06 17:09:58.000000000 -0400
++++ src/toolbar.c	2007-09-06 17:10:26.000000000 -0400
+@@ -430,10 +430,8 @@
  		{ A_SEPARATOR,     0,                                 ("")         },
  		{ A_TRASH,         STOCK_PIXMAP_TRASH,                _("Trash")   },
+ #ifndef MAEMO
 -#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
  		{ A_LEARN_SPAM,	   STOCK_PIXMAP_SPAM_BTN,             _("Spam")    },
+ #endif
 -#endif
  		{ A_SEPARATOR,     0,                                 ("")         },
  		{ A_GOTO_NEXT,     STOCK_PIXMAP_DOWN_ARROW,           _("Next")    }
  	};
-@@ -525,9 +523,7 @@
- 		{ A_FORWARD,       STOCK_PIXMAP_MAIL_FORWARD,         _("Forward") },
+@@ -533,10 +531,8 @@
  		{ A_SEPARATOR,     0,                                 ("")         },
  		{ A_TRASH,         STOCK_PIXMAP_TRASH,                _("Trash")   },
+ #ifndef MAEMO
 -#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
  		{ A_LEARN_SPAM,	   STOCK_PIXMAP_SPAM_BTN,             _("Spam")    },
+ #endif
 -#endif
  		{ A_GOTO_NEXT,     STOCK_PIXMAP_DOWN_ARROW,           _("Next")    }
- #ifdef MAEMO
- 		,
+ 	};
+