Fix missing .include of ssl, to make things work on Linux; fix

other nits in claws-mail base package, notably missing $NetBSD$
lines.

30 files changed, 82 insertions, 31 deletions

diff --git a/mail/claws-mail-archive/Makefile b/mail/claws-mail-archive/Makefile
index 90eda4afe38..b418b871d2c 100644
--- a/mail/claws-mail-archive/Makefile
+++ b/mail/claws-mail-archive/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.2 2008/09/26 17:51:17 smb Exp $
 #
 
 DISTNAME=	archive-0.6
 PKGNAME=	claws-mail-archive-0.6
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Adds archiving to Claws-Mail
@@ -23,6 +24,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 "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile
index 0c16fa0768f..fb0ffcfa903 100644
--- a/mail/claws-mail-attachwarner/Makefile
+++ b/mail/claws-mail-attachwarner/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/09/26 17:51:17 smb Exp $
 #
 
 DISTNAME=	attachwarner-0.2.12
 PKGNAME=	claws-mail-attachwarner-0.2.12
 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
@@ -24,5 +25,6 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile
index 392170c9f57..3607f811cc8 100644
--- a/mail/claws-mail-attremover/Makefile
+++ b/mail/claws-mail-attremover/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 smb Exp $
 #
 
 DISTNAME=	att_remover-1.0.8
 PKGNAME=	claws-mail-att_remover-1.0.8
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Permanently deletes attachments from mail
@@ -22,5 +23,6 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-bogofilter/Makefile b/mail/claws-mail-bogofilter/Makefile
index 94bd992bbdd..54c5f084538 100644
--- a/mail/claws-mail-bogofilter/Makefile
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 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
@@ -16,5 +17,6 @@ DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
 DEPENDS+=	bogofilter>=1.0.3nb1:../../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 9c06c957ad2..a95c0ad1286 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 smb Exp $
 #
 
 DISTNAME=	cachesaver-0.10.7
 PKGNAME=	claws-mail-cachesaver-0.10.7
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Saves Claws-Mail metadata every 60 seconds
@@ -22,6 +23,7 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-dillo-viewer/Makefile b/mail/claws-mail-dillo-viewer/Makefile
index b90768d021c..8c5d33cb179 100644
--- a/mail/claws-mail-dillo-viewer/Makefile
+++ b/mail/claws-mail-dillo-viewer/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 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
@@ -16,6 +17,7 @@ DEPENDS+=	claws-mail-3.5.0{,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 "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 89776df5be9..8449e034220 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 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
@@ -22,5 +23,6 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
+.include "../../security/openssl/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 3691877a15a..8576d285a68 100644
--- a/mail/claws-mail-gtkhtml/Makefile
+++ b/mail/claws-mail-gtkhtml/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.14 2008/09/26 17:51:17 smb Exp $
 #
 
 DISTNAME=	gtkhtml2_viewer-0.19
 PKGNAME=	claws-mail-gtkhtml2_viewer-0.19
 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
@@ -25,6 +26,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 "../../www/curl/buildlink3.mk"
 .include "../../www/libgtkhtml/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index bc3d1b386e3..72017774a06 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 smb Exp $
 #
 
 DISTNAME=	mailmbox-1.14.1
 PKGNAME=	claws-mail-mailmbox-1.14.1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Handles mailboxes in mbox format
@@ -22,5 +23,6 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 087182dd82e..8b74b86553c 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/09/26 17:51:17 smb Exp $
 #
 
 DISTNAME=	newmail-0.0.12
 PKGNAME=	claws-mail-newmail-0.0.12
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Write log file info on arriving email
@@ -23,6 +24,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 "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 10b9c448da3..d0ab1550809 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.11 2008/09/26 17:51:17 smb Exp $
 #
 
 DISTNAME=	notification_plugin-0.17
 PKGNAME=	claws-mail-notification-0.17
 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
@@ -23,5 +24,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 "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-pgp/Makefile b/mail/claws-mail-pgp/Makefile
index 7b4c78e4946..e0695a5e4e4 100644
--- a/mail/claws-mail-pgp/Makefile
+++ b/mail/claws-mail-pgp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.12 2008/09/26 17:51:17 smb Exp $
 #
 META_PACKAGE=	yes
 
@@ -7,6 +7,7 @@ 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
diff --git a/mail/claws-mail-pgpcore/Makefile b/mail/claws-mail-pgpcore/Makefile
index 931da273459..c629deaac63 100644
--- a/mail/claws-mail-pgpcore/Makefile
+++ b/mail/claws-mail-pgpcore/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2008/07/13 22:32:05 smb Exp $
+# $NetBSD: Makefile,v 1.11 2008/09/26 17:51:17 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
@@ -26,5 +27,6 @@ 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-pgpinline/Makefile b/mail/claws-mail-pgpinline/Makefile
index 8a739452a7e..315f1ade7e6 100644
--- a/mail/claws-mail-pgpinline/Makefile
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 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
@@ -18,6 +19,7 @@ DEPENDS+=	claws-mail-pgpcore-3.5.0{,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-pgpmime/Makefile b/mail/claws-mail-pgpmime/Makefile
index 46857553f4c..133702bee03 100644
--- a/mail/claws-mail-pgpmime/Makefile
+++ b/mail/claws-mail-pgpmime/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 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
@@ -18,6 +19,7 @@ DEPENDS+=	claws-mail-pgpcore-3.5.0{,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 bd712af7b3c..b2b68c63a95 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.12 2008/09/26 17:51:17 smb Exp $
 #
 
 DISTNAME=	rssyl-0.20
 PKGNAME=	claws-mail-rssyl-0.20
 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
@@ -29,5 +30,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 "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index efe704c6791..1b3dab02cd5 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.11 2008/09/26 17:51:17 smb Exp $
 
 DISTNAME=	smime-0.7.6
 PKGNAME=	claws-mail-smime-0.7.6
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=1
+PKGREVISION=2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	This plugin handles S/MIME signed and/or encrypted mails
@@ -27,5 +27,6 @@ USE_LANGUAGES+=	c
 .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-spamassassin/Makefile b/mail/claws-mail-spamassassin/Makefile
index ec4c06bf9a0..5aa1183f2d4 100644
--- a/mail/claws-mail-spamassassin/Makefile
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:17 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
@@ -15,6 +16,7 @@ DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
 DEPENDS+=	spamassassin>=3.2.4nb1:../../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 f209d5773cc..3a6751ad336 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/09/26 17:51:18 smb Exp $
 #
 
 DISTNAME=	spam_report-0.3.4
 PKGNAME=	claws-mail-spam_report-0.3.4
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Report spam to various places
@@ -22,6 +23,7 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index 1d83f9343de..c31770b9915 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:18 smb Exp $
 #
 
 DISTNAME=	synce_plugin-0.7.3
 PKGNAME=	claws-mail-synce_plugin-0.7.3
 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
@@ -24,5 +25,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 "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index f38a8506c81..a9a8244576c 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/09/26 17:51:18 smb Exp $
 #
 
 DISTNAME=	tnef_parse-0.3
 PKGNAME=	claws-mail-tnef-0.3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Handles TNEF attachments from Outlook
@@ -26,5 +27,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 "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-trayicon/Makefile b/mail/claws-mail-trayicon/Makefile
index 4e8bf2bfee1..27bfa8de47b 100644
--- a/mail/claws-mail-trayicon/Makefile
+++ b/mail/claws-mail-trayicon/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.9 2008/09/26 17:51:18 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
@@ -14,6 +15,7 @@ CONFIGURE_ARGS+=	--enable-trayicon-plugin
 DEPENDS+=	claws-mail-3.5.0{,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 601fb9fb665..f40bff01676 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2008/07/13 22:34:20 smb Exp $
+# $NetBSD: Makefile,v 1.12 2008/09/26 17:51:18 smb Exp $
 #
 
 DISTNAME=	vcalendar-2.0
 PKGNAME=	claws-mail-vcalendar-2.0
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Enable vCalendar message handling
@@ -24,6 +25,7 @@ USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common
index 791e57c3649..1f47a5f433f 100644
--- a/mail/claws-mail/Makefile.common
+++ b/mail/claws-mail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2008/01/09 03:55:09 smb Exp $
+# $NetBSD: Makefile.common,v 1.7 2008/09/26 17:51:17 smb Exp $
 
 # used by mail/claws-mail/plugins.mk
 DISTNAME=	claws-mail-${CLAWS_VERSION}
@@ -41,6 +41,7 @@ CONFIGURE_ARGS+=	--disable-gnomeprint
 BUILDLINK_ABI_DEPENDS.libetpan+=	libetpan>=0.49
 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
diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST
index 9978bab0385..bfc47f5903b 100644
--- a/mail/claws-mail/PLIST
+++ b/mail/claws-mail/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2008/07/18 19:08:43 smb Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/09/26 17:51:17 smb Exp $
 bin/claws-mail
 bin/sylpheed-claws
-etc/claws-mail/mime.types
 include/claws-mail/account.h
 include/claws-mail/action.h
 include/claws-mail/adbookbase.h
diff --git a/mail/claws-mail/PLIST.shred b/mail/claws-mail/PLIST.shred
index 257d18af182..74c7489bcc3 100644
--- a/mail/claws-mail/PLIST.shred
+++ b/mail/claws-mail/PLIST.shred
@@ -1 +1,2 @@
+@comment $NetBSD: PLIST.shred,v 1.2 2008/09/26 17:51:17 smb Exp $
 bin/claws-mail-shred
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index f7bc36b59af..0b134bb23d5 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2008/07/13 22:34:19 smb Exp $
+$NetBSD: distinfo,v 1.10 2008/09/26 17:51:17 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 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
 SHA1 (patch-ac) = 6410910bc47784294f508f579891190e19c98402
-SHA1 (patch-ad) = c3df624c54983c0bdc6a568df2d6a0e729d3b2c5
-SHA1 (patch-ae) = b0cf0db0248752d365caab03edabeb136371d07a
-SHA1 (patch-af) = f6670f7387040bab1ad8977667bb7010cbc9b3aa
+SHA1 (patch-ad) = 7470497384704f526e90abc4d0298a4bbe84b95c
+SHA1 (patch-ae) = 0312eeaaf2d31ab72d771598062019127c69cbef
+SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
diff --git a/mail/claws-mail/patches/patch-ad b/mail/claws-mail/patches/patch-ad
index 79259165856..b70143c10c9 100644
--- a/mail/claws-mail/patches/patch-ad
+++ b/mail/claws-mail/patches/patch-ad
@@ -1,3 +1,5 @@
+$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 @@
diff --git a/mail/claws-mail/patches/patch-ae b/mail/claws-mail/patches/patch-ae
index 4d5c9c3d03e..3c8eb6d1acf 100644
--- a/mail/claws-mail/patches/patch-ae
+++ b/mail/claws-mail/patches/patch-ae
@@ -1,3 +1,5 @@
+$NetBSD: patch-ae,v 1.4 2008/09/26 17:51:17 smb Exp $
+
 --- ./src/common/utils.c.orig	2008-07-01 15:11:18.000000000 -0400
 +++ ./src/common/utils.c	2008-07-01 15:11:43.000000000 -0400
 @@ -5078,7 +5078,7 @@
diff --git a/mail/claws-mail/patches/patch-af b/mail/claws-mail/patches/patch-af
index 200d4faf240..602b1ed0fce 100644
--- a/mail/claws-mail/patches/patch-af
+++ b/mail/claws-mail/patches/patch-af
@@ -1,3 +1,5 @@
+$NetBSD: patch-af,v 1.4 2008/09/26 17:51:17 smb Exp $
+
 --- src/prefs_other.c.orig	2008-07-01 15:08:42.000000000 -0400
 +++ src/prefs_other.c	2008-07-01 15:09:51.000000000 -0400
 @@ -590,7 +590,7 @@