Update claws-mail to 3.0.2:

* Bug fixes:
        o bug 1320, 'Memory leak caused by gtk_container_get_children'
        o bug 1321, 'access before allocation when scanning for uris'
        o bug 1324, 'Corrupted IMAP cache'
        o bug 1327, 'segfault when replying to a non-existent news
                     message'
        o bug 1329, 'error in quicksearch.c'
        o bug 1334, 'user defined mail incorporation script not run'
        o bug 1336, 'Segfault if empty space before search-string'
        o bug 1337, 'Crash on removing uncached emails'
        o Prevent unquoted mime boundaries, by always using a /
        o Remove unnecessary error when cancelling export to mbox.
        o MAEMO: make all Folder Properties pages visible
        o MAEMO: fix overlapping buttons in Edit Accounts page

Also update the version dependencies of all plug-ins.  The reality
of the numbering for standard plug-ins was different than had been
assumed, and the actual published dependencies were more complex tha
was captured by the previous structure.

29 files changed, 116 insertions, 88 deletions

diff --git a/doc/CHANGES-2007 b/doc/CHANGES-2007
index a0ed7db19db..2bd96e37a55 100644
--- a/doc/CHANGES-2007
+++ b/doc/CHANGES-2007
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2007,v 1.2216 2007/10/23 15:18:15 adam Exp $
+$NetBSD: CHANGES-2007,v 1.2217 2007/10/23 20:16:50 smb Exp $
 
 Changes to the packages collection and infrastructure in 2007:
 
@@ -4165,3 +4165,27 @@ Changes to the packages collection and infrastructure in 2007:
 	Updated security/gnutls to 2.0.2 [wiz 2007-10-23]
 	Updated devel/glibmm to 2.14.2 [wiz 2007-10-23]
 	Updated mail/exim-html to 4.68 [adam 2007-10-23]
+	Updated mail/claws-mail to 3.0.2 [smb 2007-10-23]
+	Updated mail/claws-mail-attachwarner to 1.0.7nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-attremover to 0.2.8nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-bogofilter to 3.0.1nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-cachesaver to 0.10.6nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-clamav to 3.0.1nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-dillo-viewer to 3.0.1nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-fetchinfo to 0.4.20nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-gtkhtml to 0.15.2nb4 [smb 2007-10-23]
+	Updated mail/claws-mail-mailmbox to 1.14nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-newmail to 0.0.11nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-notification to 0.12.1nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-pdf_viewer to 0.6nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-pgp to 3.0.2 [smb 2007-10-23]
+	Updated mail/claws-mail-pgpcore to 3.0.1nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-pgpinline to 3.0.1nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-pgpmime to 3.0.1nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-rssyl to 0.15nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-smime to 0.7.2nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-spamassassin to 3.0.1nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-spamreport to 0.2nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-synce to 0.7.2nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-trayicon to 3.0.1nb2 [smb 2007-10-23]
+	Updated mail/claws-mail-vcalendar to 1.98nb2 [smb 2007-10-23]
diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile
index 377b98cfcb4..3bdfc56fb20 100644
--- a/mail/claws-mail-attachwarner/Makefile
+++ b/mail/claws-mail-attachwarner/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.4 2007/09/23 17:08:00 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/10/23 20:16:51 smb Exp $
 #
 
 DISTNAME=	attachwarner-0.2.8
 PKGNAME=	claws-mail-attachwarner-0.2.8
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Warns if a message mentions an attachment without attaching files
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.0:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile
index 82b3a15b2f7..3e263d55cf6 100644
--- a/mail/claws-mail-attremover/Makefile
+++ b/mail/claws-mail-attremover/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:01 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:51 smb Exp $
 #
 
 DISTNAME=	att_remover-1.0.7
 PKGNAME=	claws-mail-att_remover-1.0.7
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Permanently deletes attachments from mail
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.0:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-bogofilter/Makefile b/mail/claws-mail-bogofilter/Makefile
index 4e3f3e2eae5..358b66cee29 100644
--- a/mail/claws-mail-bogofilter/Makefile
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:01 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:51 smb Exp $
 #
 
 PLUGIN_NAME=	bogofilter
-PKGREVISION=	1
+PLUG_VER=	3.0.1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Enables the scanning of incoming mail using Bogofilter
+PKGREVISION=	2
 
 CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.1:../../mail/claws-mail
 DEPENDS+=	bogofilter>=1.0.3nb1:../../mail/bogofilter
 
 .include "../../mail/claws-mail/Makefile.vers"
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index 33d5d836434..43462fb97bc 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:01 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:51 smb Exp $
 #
 
 DISTNAME=	cachesaver-0.10.6
 PKGNAME=	claws-mail-cachesaver-0.10.6
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Saves Claws-Mail metadata every 60 seconds
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.0:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-clamav/Makefile b/mail/claws-mail-clamav/Makefile
index c28ed9df452..ae0c35f646c 100644
--- a/mail/claws-mail-clamav/Makefile
+++ b/mail/claws-mail-clamav/Makefile
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:01 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:52 smb Exp $
 #
 
 PLUGIN_NAME=	clamav_plugin
-PKGREVISION=	1
+PLUG_VER=	3.0.1
 .include "../../mail/claws-mail/plugins.mk"
 BUILD_DIRS=     src/plugins/clamav
 INSTALL_DIRS=   src/plugins/clamav
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Enables the scanning of message attachments using Clam AntiVirus
+PKGREVISION=	2
 
 CONFIGURE_ARGS+=	--enable-clamav-plugin
 
 USE_LANGUAGES=	c
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.1:../../mail/claws-mail
 DEPENDS+=	clamav>=0.91.1nb1:../../mail/clamav
 
 .include "../../mail/claws-mail/Makefile.vers"
diff --git a/mail/claws-mail-dillo-viewer/Makefile b/mail/claws-mail-dillo-viewer/Makefile
index f4f841b9ad7..28c76eec805 100644
--- a/mail/claws-mail-dillo-viewer/Makefile
+++ b/mail/claws-mail-dillo-viewer/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:01 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:52 smb Exp $
 #
 
 PLUGIN_NAME=	dillo_viewer
-PKGREVISION=	1
+PLUG_VER=	3.0.1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Plugin to use the Dillo web browser for html rendering
+PKGREVISION=	2
 
 CONFIGURE_ARGS+=	--enable-dillo_viewer-plugin
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.1:../../mail/claws-mail
 DEPENDS+=	dillo>=0.8.6nb2:../../www/dillo
 
 .include "../../mail/claws-mail/Makefile.vers"
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 8a95b87bb8c..8958f26fa57 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:01 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:52 smb Exp $
 #
 
 DISTNAME=	fetchinfo-plugin-0.4.20
 PKGNAME=	claws-mail-fetchinfo-plugin-0.4.20
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Inserts headers containing some download information
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.0:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-gtkhtml/Makefile b/mail/claws-mail-gtkhtml/Makefile
index b2b21e2bb52..82ea589f3c4 100644
--- a/mail/claws-mail-gtkhtml/Makefile
+++ b/mail/claws-mail-gtkhtml/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.6 2007/09/23 17:08:02 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2007/10/23 20:16:52 smb Exp $
 #
 
 DISTNAME=	gtkhtml2_viewer-0.15.2
 PKGNAME=	claws-mail-gtkhtml2_viewer-0.15.2
-PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	4
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Renders HTML mail using the gtkhtml2 rendering widget
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.0:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index d518cfbe9a1..9a61355a13d 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:02 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:52 smb Exp $
 #
 
 DISTNAME=	mailmbox-1.14
 PKGNAME=	claws-mail-mailmbox-1.14
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Handles mailboxes in mbox format
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.0:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index de57e828b03..724f9ae332b 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2007/09/23 17:08:02 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/10/23 20:16:52 smb Exp $
 #
 
 DISTNAME=	newmail-0.0.11
 PKGNAME=	claws-mail-newmail-0.0.11
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Write log file info on arriving email
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.0:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 56ca0ca5c2d..55db0af2f30 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:02 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:52 smb Exp $
 #
 
 DISTNAME=	notification_plugin-0.12.1
 PKGNAME=	claws-mail-notification-0.12.1
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Provides various ways to notify the user of new and unread email
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.0:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-notification/distinfo b/mail/claws-mail-notification/distinfo
index c9a1e3ffa3b..f21458592fe 100644
--- a/mail/claws-mail-notification/distinfo
+++ b/mail/claws-mail-notification/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/09/18 03:17:28 smb Exp $
+$NetBSD: distinfo,v 1.3 2007/10/23 20:16:52 smb Exp $
 
-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
+SHA1 (notification_plugin-0.12.1.tar.gz) = 0637f6f0837ab6da535cb8343892c2d1af2a21dc
+RMD160 (notification_plugin-0.12.1.tar.gz) = 951afe5556cbaaa970381012339406a2a797fea8
+Size (notification_plugin-0.12.1.tar.gz) = 460042 bytes
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 91df19ce50b..62516d6be4a 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.4 2007/09/23 17:08:02 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/10/23 20:16:53 smb Exp $
 #
 
 DISTNAME=	pdf_viewer-0.6
 PKGNAME=	claws-mail-pdf_viewer-0.6
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Enables the viewing of PDF and PostScript attachments
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.0:../../mail/claws-mail
 
 .include "../../mail/claws-mail/openssl.mk"
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/claws-mail-pgp/Makefile b/mail/claws-mail-pgp/Makefile
index fef00019269..32e6aa0c9c0 100644
--- a/mail/claws-mail-pgp/Makefile
+++ b/mail/claws-mail-pgp/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:02 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:53 smb Exp $
 #
 .include "../../mail/claws-mail/Makefile.vers"
 
 DISTNAME=	claws-mail-pgp-${CLAWS_VERSION}
-PKGREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	# empty
 DISTFILES=	# empy
@@ -11,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}{,nb[0-9]*}:../../mail/claws-mail-pgpcore
-DEPENDS+=	claws-mail-pgpmime-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail-pgpmime
-DEPENDS+=	claws-mail-pgpinline-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail-pgpinline
+DEPENDS+=	claws-mail-pgpcore-3.0.1{,nb[0-9]*}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpmime-3.0.1{,nb[0-9]*}:../../mail/claws-mail-pgpmime
+DEPENDS+=	claws-mail-pgpinline-3.0.1{,nb[0-9]*}:../../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 bce6139d3cf..c7ecffd4014 100644
--- a/mail/claws-mail-pgpcore/Makefile
+++ b/mail/claws-mail-pgpcore/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2007/09/23 17:08:03 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/10/23 20:16:53 smb Exp $
 #
 
 PLUGIN_NAME=	pgpcore
-PKGREVISION=	1
+PLUG_VER=	3.0.1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Handles core PGP functions
+PKGREVISION=	2
 
 PLIST_SRC+=	PLIST
 
@@ -17,7 +18,7 @@ CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpmime-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.1:../../mail/claws-mail
 DEPENDS+=	gnupg>=1.4.7:../../security/gnupg
 DEPENDS+=	gpgme>=1.1.4:../../security/gpgme
 
diff --git a/mail/claws-mail-pgpinline/Makefile b/mail/claws-mail-pgpinline/Makefile
index a968e800ef1..f168a1a5956 100644
--- a/mail/claws-mail-pgpinline/Makefile
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:03 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:53 smb Exp $
 #
 
 PLUGIN_NAME=	pgpinline
-PKGREVISION=	1
+PLUG_VER=	3.0.1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Handles PGP/Inline signed and/or encrypted mails
+PKGREVISION=	2
 
 CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
 
-DEPENDS+=	claws-mail-pgpcore-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpcore>=3.0.1:../../mail/claws-mail-pgpcore
 
 PLIST_SRC+=	PLIST
 
diff --git a/mail/claws-mail-pgpmime/Makefile b/mail/claws-mail-pgpmime/Makefile
index 8a7598b8f7e..7e0c6b32619 100644
--- a/mail/claws-mail-pgpmime/Makefile
+++ b/mail/claws-mail-pgpmime/Makefile
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:03 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:53 smb Exp $
 #
 
 PLUGIN_NAME=	pgpmime
-PKGREVISION=	1
+PLUG_VER=	3.0.1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Handles PGP/MIME signed and/or encrypted mails
+PKGREVISION=	2
 
 CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpmime-plugin
 
-DEPENDS+=	claws-mail-pgpcore-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpcore>=3.0.1:../../mail/claws-mail-pgpcore
 
 PLIST_SRC+=	PLIST
 
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 21f1082f6f0..48219ce4a34 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.4 2007/09/23 17:08:03 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/10/23 20:16:54 smb Exp $
 #
 
 DISTNAME=	rssyl-0.15
 PKGNAME=	claws-mail-rssyl-0.15
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Read RSS 1.0, 2.0 and Atom feeds in Claws-Mail
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.0:../../mail/claws-mail
 
 PLIST_SRC+=	PLIST
 
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index 7d64d172257..600ba87a039 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2007/09/23 17:08:03 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/10/23 20:16:54 smb Exp $
 
 DISTNAME=	smime-0.7.2
 PKGNAME=	claws-mail-smime-0.7.2
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	This plugin handles S/MIME signed and/or encrypted mails
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.0:../../mail/claws-mail
 PLIST_SRC+=	PLIST
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/claws-mail-spamassassin/Makefile b/mail/claws-mail-spamassassin/Makefile
index 8f7dbd3a3e6..bd71ae8d9e1 100644
--- a/mail/claws-mail-spamassassin/Makefile
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:03 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:54 smb Exp $
 #
 
 PLUGIN_NAME=	spamassassin
-PKGREVISION=	1
+PLUG_VER=	3.0.1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Enables the scanning of incoming mail using SpamAssassin
+PKGREVISION=	2
 
 CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.1:../../mail/claws-mail
 DEPENDS+=	spamassassin>=3.2.1:../../mail/spamassassin
 
 .include "../../mail/claws-mail/Makefile.vers"
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index a9bcfda864c..0eea88e45e6 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2007/09/23 17:08:03 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/10/23 20:16:54 smb Exp $
 #
 
 DISTNAME=	spam_report-0.2
 PKGNAME=	claws-mail-spam_report-0.2
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Report spam to various places
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.0:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index 4d7d8920208..f5b57902fd1 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:04 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:54 smb Exp $
 #
 
 DISTNAME=	synce_plugin-0.7.2
 PKGNAME=	claws-mail-synce_plugin-0.7.2
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Extends filtering by permitting invocatio of Perl scripts
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.0:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-trayicon/Makefile b/mail/claws-mail-trayicon/Makefile
index ba3bae2fe67..c218e379baa 100644
--- a/mail/claws-mail-trayicon/Makefile
+++ b/mail/claws-mail-trayicon/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:04 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:54 smb Exp $
 #
 
 PLUGIN_NAME=	trayicon
-PKGREVISION=	1
+PLUG_VER=	3.0.1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Places an icon in the system tray for new mail
+PKGREVISION=	2
 
 CONFIGURE_ARGS+=	--enable-trayicon-plugin
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.1:../../mail/claws-mail
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 4edefac1ab4..c62aa0b713d 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.4 2007/09/23 17:08:04 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/10/23 20:16:54 smb Exp $
 #
 
 DISTNAME=	vcalendar-1.98
 PKGNAME=	claws-mail-vcalendar-1.98
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Enable vCalendar message handling
 
 #PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail>=3.0.1:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 6b073bef788..4efd060d6ae 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2007/09/22 21:24:24 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/10/23 20:16:51 smb Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	claws-mail-${CLAWS_VERSION}
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	X based e-mail and netnews client
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index be357362130..815c7959df7 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.2 2007/09/18 03:17:24 smb Exp $
+# $NetBSD: Makefile.vers,v 1.3 2007/10/23 20:16:51 smb Exp $
 #
-CLAWS_VERSION=	3.0.1
+CLAWS_VERSION=	3.0.2
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 776446ed0f6..155ff552b17 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2007/09/18 03:17:24 smb Exp $
+$NetBSD: distinfo,v 1.5 2007/10/23 20:16:51 smb Exp $
 
-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 (claws-mail-3.0.2.tar.bz2) = a607aca53a349f3a0a8d8f7a51f4754705e12350
+RMD160 (claws-mail-3.0.2.tar.bz2) = e7041fa284b73faa40ba7fc6dce3914625cd89d9
+Size (claws-mail-3.0.2.tar.bz2) = 5664767 bytes
 SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
 SHA1 (patch-ac) = cb1b427cf2bcd810cc1bd05324fdb9d40c695bfc
 SHA1 (patch-ad) = f4944b8fe86b1c6e2362dd9068d09199de6b83d7
diff --git a/mail/claws-mail/plugins.mk b/mail/claws-mail/plugins.mk
index 361597e8651..6b30458023a 100644
--- a/mail/claws-mail/plugins.mk
+++ b/mail/claws-mail/plugins.mk
@@ -1,16 +1,14 @@
-# $NetBSD: plugins.mk,v 1.1 2007/08/03 02:34:41 smb Exp $
+# $NetBSD: plugins.mk,v 1.2 2007/10/23 20:16:51 smb Exp $
 #
 
 .include "../../mail/claws-mail/Makefile.common"
 
-PKGNAME=	claws-mail-${PLUGIN_NAME:S/_/-/}-${CLAWS_VERSION}
+PKGNAME=	claws-mail-${PLUGIN_NAME:S/_/-/}-${PLUG_VER}
 
 CONFIGURE_DIRS=	.
 BUILD_DIRS=	src/plugins/${PLUGIN_NAME}
 INSTALL_DIRS=	src/plugins/${PLUGIN_NAME}
 
-DEPENDS+=       claws-mail>=${CLAWS_VERSION}:../../mail/claws-mail
-
 LIBTOOL_OVERRIDE=	../../../libtool
 
 #.include "../../mail/claws-mail/options.mk"