Repeat after me: NEVER depend on an exact revision of a package unless

you *really* REALLY mean that. Fix the dependencies of all claws-mail
packages on claws-mail itself. Bump all those revisions. Fix some
indentation while here to be at least basic consistent.

23 files changed, 115 insertions, 93 deletions

diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile
index 84af083d282..377b98cfcb4 100644
--- a/mail/claws-mail-attachwarner/Makefile
+++ b/mail/claws-mail-attachwarner/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:25 smb Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/23 17:08:00 joerg Exp $
 #
 
-DISTNAME=attachwarner-0.2.8
-PKGNAME=claws-mail-attachwarner-0.2.8
-CATEGORIES=mail
+DISTNAME=	attachwarner-0.2.8
+PKGNAME=	claws-mail-attachwarner-0.2.8
+PKGREVISION=	1
+CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
@@ -11,7 +12,7 @@ COMMENT=	Warns if a message mentions an attachment without attaching files
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile
index 7db38d43d38..82b3a15b2f7 100644
--- a/mail/claws-mail-attremover/Makefile
+++ b/mail/claws-mail-attremover/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:26 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:01 joerg Exp $
 #
 
-DISTNAME=att_remover-1.0.7
-PKGNAME=claws-mail-att_remover-1.0.7
-CATEGORIES=mail
+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/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Permanently deletes attachments from mail
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-bogofilter/Makefile b/mail/claws-mail-bogofilter/Makefile
index 88a8a1ab81c..4e3f3e2eae5 100644
--- a/mail/claws-mail-bogofilter/Makefile
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:26 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:01 joerg Exp $
 #
 
 PLUGIN_NAME=	bogofilter
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -9,7 +10,7 @@ COMMENT=	Enables the scanning of incoming mail using Bogofilter
 
 CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 DEPENDS+=	bogofilter>=1.0.3nb1:../../mail/bogofilter
 
 .include "../../mail/claws-mail/Makefile.vers"
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index d25a0356b58..33d5d836434 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:26 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:01 joerg Exp $
 #
 
-DISTNAME=cachesaver-0.10.6
-PKGNAME=claws-mail-cachesaver-0.10.6
-CATEGORIES=mail
+DISTNAME=	cachesaver-0.10.6
+PKGNAME=	claws-mail-cachesaver-0.10.6
+PKGREVISION=	1
+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-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-clamav/Makefile b/mail/claws-mail-clamav/Makefile
index 224c44a036a..c28ed9df452 100644
--- a/mail/claws-mail-clamav/Makefile
+++ b/mail/claws-mail-clamav/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:26 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:01 joerg Exp $
 #
 
 PLUGIN_NAME=	clamav_plugin
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 BUILD_DIRS=     src/plugins/clamav
 INSTALL_DIRS=   src/plugins/clamav
@@ -13,7 +14,7 @@ CONFIGURE_ARGS+=	--enable-clamav-plugin
 
 USE_LANGUAGES=	c
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../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 2b8419fee4e..f4f841b9ad7 100644
--- a/mail/claws-mail-dillo-viewer/Makefile
+++ b/mail/claws-mail-dillo-viewer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:27 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:01 joerg Exp $
 #
 
 PLUGIN_NAME=	dillo_viewer
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -9,7 +10,7 @@ COMMENT=	Plugin to use the Dillo web browser for html rendering
 
 CONFIGURE_ARGS+=	--enable-dillo_viewer-plugin
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../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"
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 9cacf41d7b2..8a95b87bb8c 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:27 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:01 joerg Exp $
 #
 
-DISTNAME=fetchinfo-plugin-0.4.20
-PKGNAME=claws-mail-fetchinfo-plugin-0.4.20
-CATEGORIES=mail
+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/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Inserts headers containing some download information
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-gtkhtml/Makefile b/mail/claws-mail-gtkhtml/Makefile
index abb6415a05c..b2b21e2bb52 100644
--- a/mail/claws-mail-gtkhtml/Makefile
+++ b/mail/claws-mail-gtkhtml/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:57 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/23 17:08:02 joerg Exp $
 #
 
-DISTNAME=gtkhtml2_viewer-0.15.2
-PKGNAME=claws-mail-gtkhtml2_viewer-0.15.2
-PKGREVISION=	2
-CATEGORIES=mail
+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/
 
 MAINTAINER=	smb@NetBSD.org
@@ -12,7 +12,7 @@ COMMENT=	Renders HTML mail using the gtkhtml2 rendering widget
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 154475f956f..d518cfbe9a1 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:27 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:02 joerg Exp $
 #
 
-DISTNAME=mailmbox-1.14
-PKGNAME=claws-mail-mailmbox-1.14
-CATEGORIES=mail
+DISTNAME=	mailmbox-1.14
+PKGNAME=	claws-mail-mailmbox-1.14
+PKGREVISION=	1
+CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Handles mailboxes in mbox format
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 4fe8b54e8f8..de57e828b03 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,21 +1,22 @@
-# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:28 smb Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/23 17:08:02 joerg Exp $
 #
 
-DISTNAME=newmail-0.0.11
-PKGNAME=claws-mail-newmail-0.0.11
-CATEGORIES=mail
+DISTNAME=	newmail-0.0.11
+PKGNAME=	claws-mail-newmail-0.0.11
+PKGREVISION=	1
+CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Write log file info on arriving email
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=             pkg-config
+USE_TOOLS+=	pkg-config
 USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 35d12463eca..56ca0ca5c2d 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -1,21 +1,22 @@
-# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:28 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:02 joerg Exp $
 #
 
-DISTNAME=notification_plugin-0.12.1
-PKGNAME=claws-mail-notification-0.12.1
-CATEGORIES=mail
+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/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Provides various ways to notify the user of new and unread email
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=             pkg-config
+USE_TOOLS+=	pkg-config
 USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index f0eabd5fd51..91df19ce50b 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:28 smb Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/23 17:08:02 joerg Exp $
 #
 
-DISTNAME=pdf_viewer-0.6
-PKGNAME=claws-mail-pdf_viewer-0.6
-CATEGORIES=mail
+DISTNAME=	pdf_viewer-0.6
+PKGNAME=	claws-mail-pdf_viewer-0.6
+PKGREVISION=	1
+CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
@@ -11,7 +12,7 @@ COMMENT=	Enables the viewing of PDF and PostScript attachments
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../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 25cb7343349..fef00019269 100644
--- a/mail/claws-mail-pgp/Makefile
+++ b/mail/claws-mail-pgp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:29 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:02 joerg Exp $
 #
 .include "../../mail/claws-mail/Makefile.vers"
 
 DISTNAME=	claws-mail-pgp-${CLAWS_VERSION}
+PKGREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	# empty
 DISTFILES=	# empy
@@ -10,9 +11,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}{,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
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/mail/claws-mail-pgpcore/Makefile b/mail/claws-mail-pgpcore/Makefile
index 6a91d611ca6..bce6139d3cf 100644
--- a/mail/claws-mail-pgpcore/Makefile
+++ b/mail/claws-mail-pgpcore/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:29 smb Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/23 17:08:03 joerg Exp $
 #
 
 PLUGIN_NAME=	pgpcore
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -16,7 +17,7 @@ CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpmime-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../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 aa242e529a5..a968e800ef1 100644
--- a/mail/claws-mail-pgpinline/Makefile
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:29 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:03 joerg Exp $
 #
 
 PLUGIN_NAME=	pgpinline
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -11,7 +12,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}{,nb[0-9]*}:../../mail/claws-mail-pgpcore
 
 PLIST_SRC+=	PLIST
 
diff --git a/mail/claws-mail-pgpmime/Makefile b/mail/claws-mail-pgpmime/Makefile
index 33f588d455e..8a7598b8f7e 100644
--- a/mail/claws-mail-pgpmime/Makefile
+++ b/mail/claws-mail-pgpmime/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:29 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:03 joerg Exp $
 #
 
 PLUGIN_NAME=	pgpmime
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -11,7 +12,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}{,nb[0-9]*}:../../mail/claws-mail-pgpcore
 
 PLIST_SRC+=	PLIST
 
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index adc6b0e5870..21f1082f6f0 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:30 smb Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/23 17:08:03 joerg Exp $
 #
 
-DISTNAME=rssyl-0.15
-PKGNAME=claws-mail-rssyl-0.15
-CATEGORIES=mail
+DISTNAME=	rssyl-0.15
+PKGNAME=	claws-mail-rssyl-0.15
+PKGREVISION=	1
+CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
@@ -11,7 +12,7 @@ COMMENT=	Read RSS 1.0, 2.0 and Atom feeds in Claws-Mail
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 PLIST_SRC+=	PLIST
 
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index 4d768bfb0fe..7d64d172257 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:30 smb Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/23 17:08:03 joerg Exp $
 
-DISTNAME=smime-0.7.2
-PKGNAME=claws-mail-smime-0.7.2
-CATEGORIES=mail
+DISTNAME=	smime-0.7.2
+PKGNAME=	claws-mail-smime-0.7.2
+PKGREVISION=	1
+CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	This plugin handles S/MIME signed and/or encrypted mails
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../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 77b59abfbb2..8f7dbd3a3e6 100644
--- a/mail/claws-mail-spamassassin/Makefile
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:30 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:03 joerg Exp $
 #
 
 PLUGIN_NAME=	spamassassin
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -9,7 +10,7 @@ COMMENT=	Enables the scanning of incoming mail using SpamAssassin
 
 CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../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 fb744e01cda..a9bcfda864c 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.1 2007/09/18 03:17:31 smb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/23 17:08:03 joerg Exp $
 #
 
-DISTNAME=spam_report-0.2
-PKGNAME=claws-mail-spam_report-0.2
-CATEGORIES=mail
+DISTNAME=	spam_report-0.2
+PKGNAME=	claws-mail-spam_report-0.2
+PKGREVISION=	1
+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
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index 4c53c43f587..4d7d8920208 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:31 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:04 joerg Exp $
 #
 
-DISTNAME=synce_plugin-0.7.2
-PKGNAME=claws-mail-synce_plugin-0.7.2
-CATEGORIES=mail
+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/
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Extends filtering by permitting invocatio of Perl scripts
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-trayicon/Makefile b/mail/claws-mail-trayicon/Makefile
index f075986ae33..ba3bae2fe67 100644
--- a/mail/claws-mail-trayicon/Makefile
+++ b/mail/claws-mail-trayicon/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/09/18 03:17:32 smb Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/23 17:08:04 joerg Exp $
 #
 
 PLUGIN_NAME=	trayicon
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -9,7 +10,7 @@ COMMENT=	Places an icon in the system tray for new mail
 
 CONFIGURE_ARGS+=	--enable-trayicon-plugin
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 6bd99b11890..4edefac1ab4 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2007/09/18 03:17:32 smb Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/23 17:08:04 joerg Exp $
 #
 
-DISTNAME=vcalendar-1.98
-PKGNAME=claws-mail-vcalendar-1.98
-CATEGORIES=mail
+DISTNAME=	vcalendar-1.98
+PKGNAME=	claws-mail-vcalendar-1.98
+PKGREVISION=	1
+CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
 MAINTAINER=	smb@NetBSD.org
@@ -11,7 +12,7 @@ COMMENT=	Enable vCalendar message handling
 
 #PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}:../../mail/claws-mail
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"