summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/claws-mail-attachwarner/Makefile9
-rw-r--r--mail/claws-mail-attachwarner/distinfo8
-rw-r--r--mail/claws-mail-attremover/Makefile5
-rw-r--r--mail/claws-mail-bogofilter/Makefile7
-rw-r--r--mail/claws-mail-cachesaver/Makefile5
-rw-r--r--mail/claws-mail-clamav/Makefile9
-rw-r--r--mail/claws-mail-dillo-viewer/Makefile7
-rw-r--r--mail/claws-mail-fetchinfo/Makefile9
-rw-r--r--mail/claws-mail-fetchinfo/distinfo8
-rw-r--r--mail/claws-mail-gtkhtml/Makefile9
-rw-r--r--mail/claws-mail-gtkhtml/distinfo8
-rw-r--r--mail/claws-mail-mailmbox/Makefile5
-rw-r--r--mail/claws-mail-newmail/Makefile5
-rw-r--r--mail/claws-mail-notification/Makefile9
-rw-r--r--mail/claws-mail-notification/distinfo8
-rw-r--r--mail/claws-mail-pdf_viewer/Makefile9
-rw-r--r--mail/claws-mail-pdf_viewer/distinfo8
-rw-r--r--mail/claws-mail-pgp/Makefile8
-rw-r--r--mail/claws-mail-pgpcore/DESCR5
-rw-r--r--mail/claws-mail-pgpcore/Makefile7
-rw-r--r--mail/claws-mail-pgpinline/DESCR6
-rw-r--r--mail/claws-mail-pgpinline/Makefile7
-rw-r--r--mail/claws-mail-pgpmime/DESCR6
-rw-r--r--mail/claws-mail-pgpmime/Makefile7
-rw-r--r--mail/claws-mail-rssyl/Makefile9
-rw-r--r--mail/claws-mail-rssyl/distinfo8
-rw-r--r--mail/claws-mail-smime/Makefile9
-rw-r--r--mail/claws-mail-smime/distinfo8
-rw-r--r--mail/claws-mail-spamassassin/Makefile9
-rw-r--r--mail/claws-mail-spamreport/Makefile9
-rw-r--r--mail/claws-mail-spamreport/distinfo8
-rw-r--r--mail/claws-mail-synce/DESCR6
-rw-r--r--mail/claws-mail-synce/Makefile11
-rw-r--r--mail/claws-mail-synce/distinfo8
-rw-r--r--mail/claws-mail-tnef/DESCR5
-rw-r--r--mail/claws-mail-tnef/Makefile28
-rw-r--r--mail/claws-mail-tnef/PLIST18
-rw-r--r--mail/claws-mail-tnef/distinfo5
-rw-r--r--mail/claws-mail-trayicon/Makefile7
-rw-r--r--mail/claws-mail-vcalendar/Makefile9
-rw-r--r--mail/claws-mail-vcalendar/distinfo8
-rw-r--r--mail/claws-mail/Makefile7
-rw-r--r--mail/claws-mail/Makefile.common3
-rw-r--r--mail/claws-mail/Makefile.vers4
-rw-r--r--mail/claws-mail/PLIST11
-rw-r--r--mail/claws-mail/distinfo11
-rw-r--r--mail/claws-mail/patches/patch-ad28
-rw-r--r--mail/claws-mail/patches/patch-af13
48 files changed, 231 insertions, 185 deletions
diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile
index 3bdfc56fb20..3e28a1e9fd8 100644
--- a/mail/claws-mail-attachwarner/Makefile
+++ b/mail/claws-mail-attachwarner/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2007/10/23 20:16:51 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/01/09 03:55:09 smb Exp $
#
-DISTNAME= attachwarner-0.2.8
-PKGNAME= claws-mail-attachwarner-0.2.8
+DISTNAME= attachwarner-0.2.10
+PKGNAME= claws-mail-attachwarner-0.2.10
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>=3.0.0:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/claws-mail-attachwarner/distinfo b/mail/claws-mail-attachwarner/distinfo
index dfa6fda24d8..3c0f6223794 100644
--- a/mail/claws-mail-attachwarner/distinfo
+++ b/mail/claws-mail-attachwarner/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/09/18 03:17:25 smb Exp $
+$NetBSD: distinfo,v 1.3 2008/01/09 03:55:09 smb Exp $
-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
+SHA1 (attachwarner-0.2.10.tar.gz) = c7ab16e31da263addef67a7a39d6d353a22bab7d
+RMD160 (attachwarner-0.2.10.tar.gz) = 55b5c56ffcb597c0d877c60c23d98f9b746ead40
+Size (attachwarner-0.2.10.tar.gz) = 391358 bytes
diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile
index 3e263d55cf6..f1e8a83477b 100644
--- a/mail/claws-mail-attremover/Makefile
+++ b/mail/claws-mail-attremover/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:51 smb Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:09 smb Exp $
#
DISTNAME= att_remover-1.0.7
PKGNAME= claws-mail-att_remover-1.0.7
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>=3.0.0:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,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 358b66cee29..0a0db87f7c7 100644
--- a/mail/claws-mail-bogofilter/Makefile
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:51 smb Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:10 smb Exp $
#
PLUGIN_NAME= bogofilter
-PLUG_VER= 3.0.1
+PLUG_VER= 3.2.0
.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>=3.0.1:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,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 43462fb97bc..fe18f1e8a5a 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:51 smb Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:10 smb Exp $
#
DISTNAME= cachesaver-0.10.6
PKGNAME= claws-mail-cachesaver-0.10.6
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>=3.0.0:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,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 ae0c35f646c..7172c48ac93 100644
--- a/mail/claws-mail-clamav/Makefile
+++ b/mail/claws-mail-clamav/Makefile
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:52 smb Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:10 smb Exp $
#
PLUGIN_NAME= clamav_plugin
-PLUG_VER= 3.0.1
+PLUG_VER= 3.2.0
.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>=3.0.1:../../mail/claws-mail
-DEPENDS+= clamav>=0.91.1nb1:../../mail/clamav
+DEPENDS+= claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+= clamav>=0.92:../../mail/clamav
.include "../../mail/claws-mail/Makefile.vers"
.include "../../mail/clamav/buildlink3.mk"
diff --git a/mail/claws-mail-dillo-viewer/Makefile b/mail/claws-mail-dillo-viewer/Makefile
index 28c76eec805..c600564453c 100644
--- a/mail/claws-mail-dillo-viewer/Makefile
+++ b/mail/claws-mail-dillo-viewer/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:52 smb Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:10 smb Exp $
#
PLUGIN_NAME= dillo_viewer
-PLUG_VER= 3.0.1
+PLUG_VER= 3.2.0
.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>=3.0.1:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,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 8958f26fa57..b17c61082f8 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:52 smb Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:10 smb Exp $
#
-DISTNAME= fetchinfo-plugin-0.4.20
-PKGNAME= claws-mail-fetchinfo-plugin-0.4.20
+DISTNAME= fetchinfo-plugin-0.4.22
+PKGNAME= claws-mail-fetchinfo-plugin-0.4.22
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>=3.0.0:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/claws-mail-fetchinfo/distinfo b/mail/claws-mail-fetchinfo/distinfo
index 06bb8aff414..24bfcd8b90a 100644
--- a/mail/claws-mail-fetchinfo/distinfo
+++ b/mail/claws-mail-fetchinfo/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/09/18 03:17:27 smb Exp $
+$NetBSD: distinfo,v 1.3 2008/01/09 03:55:10 smb Exp $
-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
+SHA1 (fetchinfo-plugin-0.4.22.tar.gz) = 1d2bb89dc916ebf15b43d0931c4268ee2c1daf6f
+RMD160 (fetchinfo-plugin-0.4.22.tar.gz) = 639a22169f9398b57854013cd293a0c4438a54f7
+Size (fetchinfo-plugin-0.4.22.tar.gz) = 329852 bytes
diff --git a/mail/claws-mail-gtkhtml/Makefile b/mail/claws-mail-gtkhtml/Makefile
index 82ea589f3c4..4dd24f61b22 100644
--- a/mail/claws-mail-gtkhtml/Makefile
+++ b/mail/claws-mail-gtkhtml/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.7 2007/10/23 20:16:52 smb Exp $
+# $NetBSD: Makefile,v 1.8 2008/01/09 03:55:10 smb Exp $
#
-DISTNAME= gtkhtml2_viewer-0.15.2
-PKGNAME= claws-mail-gtkhtml2_viewer-0.15.2
+DISTNAME= gtkhtml2_viewer-0.17
+PKGNAME= claws-mail-gtkhtml2_viewer-0.17
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>=3.0.0:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/claws-mail-gtkhtml/distinfo b/mail/claws-mail-gtkhtml/distinfo
index 4dc470f3598..8c1072fb1fe 100644
--- a/mail/claws-mail-gtkhtml/distinfo
+++ b/mail/claws-mail-gtkhtml/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/09/18 03:17:27 smb Exp $
+$NetBSD: distinfo,v 1.3 2008/01/09 03:55:10 smb Exp $
-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
+SHA1 (gtkhtml2_viewer-0.17.tar.gz) = 464907eafae49b346fd531838f2791465bb20c76
+RMD160 (gtkhtml2_viewer-0.17.tar.gz) = 75c7567528df516b93d502d9300acc1e76e46a74
+Size (gtkhtml2_viewer-0.17.tar.gz) = 407315 bytes
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 9a61355a13d..3d2c472796f 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:52 smb Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:10 smb Exp $
#
DISTNAME= mailmbox-1.14
PKGNAME= claws-mail-mailmbox-1.14
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>=3.0.0:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,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 724f9ae332b..68379616c67 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2007/10/23 20:16:52 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/01/09 03:55:11 smb Exp $
#
DISTNAME= newmail-0.0.11
PKGNAME= claws-mail-newmail-0.0.11
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>=3.0.0:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 1da68ddc8f2..7229c20ef81 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2007/12/01 12:32:13 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2008/01/09 03:55:11 smb Exp $
#
-DISTNAME= notification_plugin-0.12.1
-PKGNAME= claws-mail-notification-0.12.1
+DISTNAME= notification_plugin-0.14
+PKGNAME= claws-mail-notification-0.14
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
-PKGREVISION= 3
MAINTAINER= smb@NetBSD.org
COMMENT= Provides various ways to notify the user of new and unread email
-DEPENDS+= claws-mail>=3.0.0:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/claws-mail-notification/distinfo b/mail/claws-mail-notification/distinfo
index f21458592fe..9f0419bace4 100644
--- a/mail/claws-mail-notification/distinfo
+++ b/mail/claws-mail-notification/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2007/10/23 20:16:52 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/01/09 03:55:11 smb Exp $
-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
+SHA1 (notification_plugin-0.14.tar.gz) = 62ab1830b8c74c4b603acc7f10fec77e332515cb
+RMD160 (notification_plugin-0.14.tar.gz) = a93881e9ef842db1f54d3cc87d3ea624ec1e906c
+Size (notification_plugin-0.14.tar.gz) = 469072 bytes
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 62516d6be4a..9d7aa4a709d 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2007/10/23 20:16:53 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/01/09 03:55:11 smb Exp $
#
-DISTNAME= pdf_viewer-0.6
-PKGNAME= claws-mail-pdf_viewer-0.6
+DISTNAME= pdf_viewer-0.8
+PKGNAME= claws-mail-pdf_viewer-0.8
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>=3.0.0:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
.include "../../mail/claws-mail/openssl.mk"
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/claws-mail-pdf_viewer/distinfo b/mail/claws-mail-pdf_viewer/distinfo
index e247e9d6215..ec1f271fc8b 100644
--- a/mail/claws-mail-pdf_viewer/distinfo
+++ b/mail/claws-mail-pdf_viewer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/09/18 03:17:29 smb Exp $
+$NetBSD: distinfo,v 1.3 2008/01/09 03:55:11 smb Exp $
-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
+SHA1 (pdf_viewer-0.8.tar.gz) = 22d308dc5262267c75a204749a8b4b4261eafdb4
+RMD160 (pdf_viewer-0.8.tar.gz) = 40ff4697906fa444e333488742e42c30ff92d83d
+Size (pdf_viewer-0.8.tar.gz) = 409916 bytes
diff --git a/mail/claws-mail-pgp/Makefile b/mail/claws-mail-pgp/Makefile
index c1f416d9ac7..53578eefcee 100644
--- a/mail/claws-mail-pgp/Makefile
+++ b/mail/claws-mail-pgp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/01/05 11:04:21 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2008/01/09 03:55:11 smb Exp $
#
.include "../../mail/claws-mail/Makefile.vers"
@@ -9,9 +9,9 @@ MASTER_SITES= # none
MAINTAINER= smb@NetBSD.org
COMMENT= Metapackage for the PGP plug-in for Claws-mail
-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
+DEPENDS+= claws-mail-pgpcore-3.2.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
+DEPENDS+= claws-mail-pgpmime-3.2.0{,nb[0-9]*}:../../mail/claws-mail-pgpmime
+DEPENDS+= claws-mail-pgpinline-3.2.0{,nb[0-9]*}:../../mail/claws-mail-pgpinline
META_PACKAGE= yes
diff --git a/mail/claws-mail-pgpcore/DESCR b/mail/claws-mail-pgpcore/DESCR
index 289d1095004..3e097131eb2 100644
--- a/mail/claws-mail-pgpcore/DESCR
+++ b/mail/claws-mail-pgpcore/DESCR
@@ -1,4 +1 @@
-Using Dillo, a very light web browser, the dillo-viewer plugin allows
-Sylpheed-claws to render HTML attachments. Note that it is done in a somewhat
-secure way, by passing the -s argument to Dillo, which prevents it from making
-any Internet connection.
+Handles core PGP functions for the Claws Mail PGP support.
diff --git a/mail/claws-mail-pgpcore/Makefile b/mail/claws-mail-pgpcore/Makefile
index c7ecffd4014..4d65831a1cc 100644
--- a/mail/claws-mail-pgpcore/Makefile
+++ b/mail/claws-mail-pgpcore/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2007/10/23 20:16:53 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/01/09 03:55:11 smb Exp $
#
PLUGIN_NAME= pgpcore
-PLUG_VER= 3.0.1
+PLUG_VER= 3.2.0
.include "../../mail/claws-mail/plugins.mk"
MAINTAINER= smb@NetBSD.org
COMMENT= Handles core PGP functions
-PKGREVISION= 2
PLIST_SRC+= PLIST
@@ -18,7 +17,7 @@ CONFIGURE_ARGS+= --enable-pgpcore-plugin
CONFIGURE_ARGS+= --enable-pgpmime-plugin
CONFIGURE_ARGS+= --enable-pgpinline-plugin
-DEPENDS+= claws-mail>=3.0.1:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,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/DESCR b/mail/claws-mail-pgpinline/DESCR
index 289d1095004..e32575c54c2 100644
--- a/mail/claws-mail-pgpinline/DESCR
+++ b/mail/claws-mail-pgpinline/DESCR
@@ -1,4 +1,2 @@
-Using Dillo, a very light web browser, the dillo-viewer plugin allows
-Sylpheed-claws to render HTML attachments. Note that it is done in a somewhat
-secure way, by passing the -s argument to Dillo, which prevents it from making
-any Internet connection.
+Handles PGP/Inline signed and/or encrypted mails. You can decrypt
+mails, verify signatures or sign and encrypt your own mails.
diff --git a/mail/claws-mail-pgpinline/Makefile b/mail/claws-mail-pgpinline/Makefile
index f168a1a5956..7850428169d 100644
--- a/mail/claws-mail-pgpinline/Makefile
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:53 smb Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:11 smb Exp $
#
PLUGIN_NAME= pgpinline
-PLUG_VER= 3.0.1
+PLUG_VER= 3.2.0
.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>=3.0.1:../../mail/claws-mail-pgpcore
+DEPENDS+= claws-mail-pgpcore-3.2.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
PLIST_SRC+= PLIST
diff --git a/mail/claws-mail-pgpmime/DESCR b/mail/claws-mail-pgpmime/DESCR
index 289d1095004..a3368f2b6db 100644
--- a/mail/claws-mail-pgpmime/DESCR
+++ b/mail/claws-mail-pgpmime/DESCR
@@ -1,4 +1,2 @@
-Using Dillo, a very light web browser, the dillo-viewer plugin allows
-Sylpheed-claws to render HTML attachments. Note that it is done in a somewhat
-secure way, by passing the -s argument to Dillo, which prevents it from making
-any Internet connection.
+Handles PGP/MIME signed and/or encrypted mails. You can decrypt
+mails, verify signatures or sign and encrypt your own mails.
diff --git a/mail/claws-mail-pgpmime/Makefile b/mail/claws-mail-pgpmime/Makefile
index 7e0c6b32619..450af38cc23 100644
--- a/mail/claws-mail-pgpmime/Makefile
+++ b/mail/claws-mail-pgpmime/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:53 smb Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:12 smb Exp $
#
PLUGIN_NAME= pgpmime
-PLUG_VER= 3.0.1
+PLUG_VER= 3.2.0
.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>=3.0.1:../../mail/claws-mail-pgpcore
+DEPENDS+= claws-mail-pgpcore-3.2.0{,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 48219ce4a34..a76ed89fe1e 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2007/10/23 20:16:54 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/01/09 03:55:12 smb Exp $
#
-DISTNAME= rssyl-0.15
-PKGNAME= claws-mail-rssyl-0.15
+DISTNAME= rssyl-0.17
+PKGNAME= claws-mail-rssyl-0.17
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>=3.0.0:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
PLIST_SRC+= PLIST
diff --git a/mail/claws-mail-rssyl/distinfo b/mail/claws-mail-rssyl/distinfo
index bb79f2eba83..53adadbeaed 100644
--- a/mail/claws-mail-rssyl/distinfo
+++ b/mail/claws-mail-rssyl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/09/18 03:17:30 smb Exp $
+$NetBSD: distinfo,v 1.3 2008/01/09 03:55:12 smb Exp $
-SHA1 (rssyl-0.15.tar.gz) = af836acb122cf232b2b5d8476a54c1437d1085c7
-RMD160 (rssyl-0.15.tar.gz) = 78fa500d155a8f97b9c30b639c8f854e483034d0
-Size (rssyl-0.15.tar.gz) = 467638 bytes
+SHA1 (rssyl-0.17.tar.gz) = 8531d9a5eac8a4688bd88e3ef1e33604e52bb965
+RMD160 (rssyl-0.17.tar.gz) = 7ba0fa3261ee3234360af117194c9b6b036a0c73
+Size (rssyl-0.17.tar.gz) = 472774 bytes
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index 600ba87a039..71eeadcdf55 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2007/10/23 20:16:54 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/01/09 03:55:12 smb Exp $
-DISTNAME= smime-0.7.2
-PKGNAME= claws-mail-smime-0.7.2
+DISTNAME= smime-0.7.4
+PKGNAME= claws-mail-smime-0.7.4
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>=3.0.0:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
PLIST_SRC+= PLIST
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/claws-mail-smime/distinfo b/mail/claws-mail-smime/distinfo
index 1407611874c..e2704ef3a4f 100644
--- a/mail/claws-mail-smime/distinfo
+++ b/mail/claws-mail-smime/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/09/18 03:17:30 smb Exp $
+$NetBSD: distinfo,v 1.3 2008/01/09 03:55:12 smb Exp $
-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
+SHA1 (smime-0.7.4.tar.gz) = 848d453302af45c5349fb6a9832523dd170c4722
+RMD160 (smime-0.7.4.tar.gz) = 1c1ba5f1824399ddc1318776df3a3cd3cb6f9503
+Size (smime-0.7.4.tar.gz) = 333141 bytes
diff --git a/mail/claws-mail-spamassassin/Makefile b/mail/claws-mail-spamassassin/Makefile
index bd71ae8d9e1..a9ed75fe5cb 100644
--- a/mail/claws-mail-spamassassin/Makefile
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:54 smb Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:12 smb Exp $
#
PLUGIN_NAME= spamassassin
-PLUG_VER= 3.0.1
+PLUG_VER= 3.2.0
.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>=3.0.1:../../mail/claws-mail
-DEPENDS+= spamassassin>=3.2.1:../../mail/spamassassin
+DEPENDS+= claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+= spamassassin>=3.2.3:../../mail/spamassassin
.include "../../mail/claws-mail/Makefile.vers"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 0eea88e45e6..5a5b7b00c07 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2007/10/23 20:16:54 smb Exp $
+# $NetBSD: Makefile,v 1.4 2008/01/09 03:55:12 smb Exp $
#
-DISTNAME= spam_report-0.2
-PKGNAME= claws-mail-spam_report-0.2
+DISTNAME= spam_report-0.3.1
+PKGNAME= claws-mail-spam_report-0.3.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>=3.0.0:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/claws-mail-spamreport/distinfo b/mail/claws-mail-spamreport/distinfo
index 1ef1247ac93..4bc321161eb 100644
--- a/mail/claws-mail-spamreport/distinfo
+++ b/mail/claws-mail-spamreport/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2007/09/18 03:17:31 smb Exp $
+$NetBSD: distinfo,v 1.2 2008/01/09 03:55:12 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
+SHA1 (spam_report-0.3.1.tar.gz) = 457427fae64e17ede3a8b8286fdd1def2cce3ecf
+RMD160 (spam_report-0.3.1.tar.gz) = 00e610ab9d36f5122b7d4ce03cd0343836ca8dd1
+Size (spam_report-0.3.1.tar.gz) = 385641 bytes
diff --git a/mail/claws-mail-synce/DESCR b/mail/claws-mail-synce/DESCR
index 8e87e5b45e2..908b8ad0f52 100644
--- a/mail/claws-mail-synce/DESCR
+++ b/mail/claws-mail-synce/DESCR
@@ -1,3 +1,3 @@
-This plugin is intended to extend the filtering possibilities of
-Claws Mail. It provides a Perl interface to Claws Mail' filtering
-mechanism, allowing the use of full Perl power in email filters.
+This plugin assists in keeping the addressbook of a Windows CE
+device (Pocket PC/ iPAQ, Smartphone etc) in sync with Claws'
+addressbook, with respect to email addresses.
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index f5b57902fd1..36667966301 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:54 smb Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:12 smb Exp $
#
-DISTNAME= synce_plugin-0.7.2
-PKGNAME= claws-mail-synce_plugin-0.7.2
+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= 2
MAINTAINER= smb@NetBSD.org
-COMMENT= Extends filtering by permitting invocatio of Perl scripts
+COMMENT= Synchronize addressbook of a Windows CE with Claws Mail
-DEPENDS+= claws-mail>=3.0.0:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/claws-mail-synce/distinfo b/mail/claws-mail-synce/distinfo
index 30aa68f0c8d..0a3963cc60e 100644
--- a/mail/claws-mail-synce/distinfo
+++ b/mail/claws-mail-synce/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/09/18 03:17:32 smb Exp $
+$NetBSD: distinfo,v 1.3 2008/01/09 03:55:12 smb Exp $
-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
+SHA1 (synce_plugin-0.7.3.tar.gz) = 18adfa4d7dcbae66887a6f21240f02d0f8b49e99
+RMD160 (synce_plugin-0.7.3.tar.gz) = 3cce9762084ffb186f0256ad54ef53be7500ccd9
+Size (synce_plugin-0.7.3.tar.gz) = 334350 bytes
diff --git a/mail/claws-mail-tnef/DESCR b/mail/claws-mail-tnef/DESCR
new file mode 100644
index 00000000000..b0b26be8204
--- /dev/null
+++ b/mail/claws-mail-tnef/DESCR
@@ -0,0 +1,5 @@
+The TNEF Parser plugins handles TNEF attachments from Outlook. TNEF
+attachments have a MIME type of "application/ms-tnef" and are often
+named "winmail.dat". They can contain multiple files. This plugin
+parses this kind of attachment and displays the real files in the
+parts list.
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
new file mode 100644
index 00000000000..14dcd056e07
--- /dev/null
+++ b/mail/claws-mail-tnef/Makefile
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1 2008/01/09 03:55:13 smb Exp $
+#
+
+DISTNAME= tnef_parse-0.2.1
+PKGNAME= claws-mail-tnef-0.2.1
+CATEGORIES= mail
+MASTER_SITES= http://claws-mail.org/downloads/plugins/
+
+MAINTAINER= smb@NetBSD.org
+COMMENT= Handles TNEF attachments from Outlook
+
+#PLIST_SRC+= PLIST
+
+DEPENDS+= claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
+
+.include "../../mk/bsd.prefs.mk"
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+USE_LANGUAGES+= c
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../mail/libytnef/buildlink3.mk"
+.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-tnef/PLIST b/mail/claws-mail-tnef/PLIST
new file mode 100644
index 00000000000..4371e399269
--- /dev/null
+++ b/mail/claws-mail-tnef/PLIST
@@ -0,0 +1,18 @@
+@comment $NetBSD: PLIST,v 1.1 2008/01/09 03:55:13 smb Exp $
+include/vcalendar/plugins/ical.h
+lib/claws-mail/plugins/vcalendar.la
+share/locale/ca/LC_MESSAGES/vcalendar.mo
+share/locale/de/LC_MESSAGES/vcalendar.mo
+share/locale/es/LC_MESSAGES/vcalendar.mo
+share/locale/fi/LC_MESSAGES/vcalendar.mo
+share/locale/fr/LC_MESSAGES/vcalendar.mo
+share/locale/hu/LC_MESSAGES/vcalendar.mo
+share/locale/it/LC_MESSAGES/vcalendar.mo
+share/locale/pl/LC_MESSAGES/vcalendar.mo
+share/locale/pt_BR/LC_MESSAGES/vcalendar.mo
+share/locale/sk/LC_MESSAGES/vcalendar.mo
+share/locale/sr/LC_MESSAGES/vcalendar.mo
+share/locale/zh_CN/LC_MESSAGES/vcalendar.mo
+@dirrm lib/claws-mail/plugins
+@dirrm include/vcalendar/plugins
+@dirrm include/vcalendar
diff --git a/mail/claws-mail-tnef/distinfo b/mail/claws-mail-tnef/distinfo
new file mode 100644
index 00000000000..182aa48cf69
--- /dev/null
+++ b/mail/claws-mail-tnef/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2008/01/09 03:55:13 smb Exp $
+
+SHA1 (tnef_parse-0.2.1.tar.gz) = df6b06483db1dd6726636b215310c712d5a90a14
+RMD160 (tnef_parse-0.2.1.tar.gz) = 708b9b68ee39fafe134b3e722587f8f7f8a6038f
+Size (tnef_parse-0.2.1.tar.gz) = 390171 bytes
diff --git a/mail/claws-mail-trayicon/Makefile b/mail/claws-mail-trayicon/Makefile
index c218e379baa..cc56ff8c747 100644
--- a/mail/claws-mail-trayicon/Makefile
+++ b/mail/claws-mail-trayicon/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2007/10/23 20:16:54 smb Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/09 03:55:13 smb Exp $
#
PLUGIN_NAME= trayicon
-PLUG_VER= 3.0.1
+PLUG_VER= 3.2.0
.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>=3.0.1:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,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 c62aa0b713d..1e6ea94e3dc 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2007/10/23 20:16:54 smb Exp $
+# $NetBSD: Makefile,v 1.6 2008/01/09 03:55:13 smb Exp $
#
-DISTNAME= vcalendar-1.98
-PKGNAME= claws-mail-vcalendar-1.98
+DISTNAME= vcalendar-1.100
+PKGNAME= claws-mail-vcalendar-1.100
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>=3.0.1:../../mail/claws-mail
+DEPENDS+= claws-mail-3.2.0{,nb[0-9]*}:../../mail/claws-mail
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/claws-mail-vcalendar/distinfo b/mail/claws-mail-vcalendar/distinfo
index 5b7d8e26729..119fee1f4e4 100644
--- a/mail/claws-mail-vcalendar/distinfo
+++ b/mail/claws-mail-vcalendar/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2007/09/18 03:17:32 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/01/09 03:55:13 smb Exp $
-SHA1 (vcalendar-1.98.tar.gz) = 0ce90351546bac5922be2dd9a360bd859f1efba4
-RMD160 (vcalendar-1.98.tar.gz) = 28fd1ad3c3cbf198d606ce155ab603ffba82669d
-Size (vcalendar-1.98.tar.gz) = 764473 bytes
+SHA1 (vcalendar-1.100.tar.gz) = 1456ada1143dfcd97603f881e4b373f6ba462cd7
+RMD160 (vcalendar-1.100.tar.gz) = ffaf9ce9b9909eb0c22733880d3f178ad188191e
+Size (vcalendar-1.100.tar.gz) = 767360 bytes
SHA1 (patch-aa) = 076cbd15436a81f58134015f667ef78ea4581a3b
SHA1 (patch-ab) = c0ec5c57bea31d26afb4a9dc5abeea7cfdb6951d
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index bc2f4825d66..060841bcb80 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2007/10/27 13:57:29 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/01/09 03:55:09 smb Exp $
.include "Makefile.common"
PKGNAME= claws-mail-${CLAWS_VERSION}
-PKGREVISION= 1
MAINTAINER= smb@NetBSD.org
COMMENT= X based e-mail and netnews client
@@ -31,12 +30,12 @@ EGDIR= ${PREFIX}/share/examples/claws-mail
CONF_FILES= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
PKG_OPTIONS_VAR= PKG_OPTIONS.claws-mail
+PKG_SUPPORTED_OPTIONS= claws-mail-jpilot ldap inet6
PKG_SUGGESTED_OPTIONS=
-PKG_SUPPORTED_OPTIONS= jpilot ldap inet6
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mjpilot)
+.if !empty(PKG_OPTIONS:Mclaws-mail-jpilot)
CONFIGURE_ARGS+= --enable-jpilot
. include "../../comms/pilot-link-libs/buildlink3.mk"
. include "../../comms/jpilot/buildlink3.mk"
diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common
index ac0879f26c3..791e57c3649 100644
--- a/mail/claws-mail/Makefile.common
+++ b/mail/claws-mail/Makefile.common
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.common,v 1.5 2007/09/18 06:40:36 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2008/01/09 03:55:09 smb Exp $
+# used by mail/claws-mail/plugins.mk
DISTNAME= claws-mail-${CLAWS_VERSION}
CATEGORIES= mail news x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index 815c7959df7..d451868cbb2 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.3 2007/10/23 20:16:51 smb Exp $
+# $NetBSD: Makefile.vers,v 1.4 2008/01/09 03:55:09 smb Exp $
#
-CLAWS_VERSION= 3.0.2
+CLAWS_VERSION= 3.2.0
diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST
index 2ab6537a580..b0310e2080d 100644
--- a/mail/claws-mail/PLIST
+++ b/mail/claws-mail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/09/22 21:24:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/01/09 03:55:09 smb Exp $
bin/claws-mail
bin/sylpheed-claws
include/claws-mail/account.h
@@ -8,7 +8,9 @@ include/claws-mail/addr_compl.h
include/claws-mail/addrbook.h
include/claws-mail/addrcache.h
include/claws-mail/addrclip.h
+include/claws-mail/addrcustomattr.h
include/claws-mail/addrdefs.h
+include/claws-mail/addrduplicates.h
include/claws-mail/addressadd.h
include/claws-mail/addressbook.h
include/claws-mail/addressbook_foldersel.h
@@ -29,7 +31,6 @@ include/claws-mail/common/hooks.h
include/claws-mail/common/log.h
include/claws-mail/common/md5.h
include/claws-mail/common/mgutils.h
-include/claws-mail/common/nntp.h
include/claws-mail/common/passcrypt.h
include/claws-mail/common/plugin.h
include/claws-mail/common/prefs.h
@@ -70,6 +71,7 @@ include/claws-mail/etpan/etpan-errors.h
include/claws-mail/etpan/etpan-thread-manager-types.h
include/claws-mail/etpan/etpan-thread-manager.h
include/claws-mail/etpan/imap-thread.h
+include/claws-mail/etpan/nntp-thread.h
include/claws-mail/exphtmldlg.h
include/claws-mail/expldifdlg.h
include/claws-mail/export.h
@@ -179,6 +181,7 @@ include/claws-mail/prefs_template.h
include/claws-mail/prefs_themes.h
include/claws-mail/prefs_toolbar.h
include/claws-mail/prefs_wrapping.h
+include/claws-mail/printing.h
include/claws-mail/privacy.h
include/claws-mail/procheader.h
include/claws-mail/procmime.h
@@ -252,6 +255,8 @@ share/locale/sr/LC_MESSAGES/claws-mail.mo
share/locale/sv/LC_MESSAGES/claws-mail.mo
share/locale/zh_CN/LC_MESSAGES/claws-mail.mo
share/locale/zh_TW/LC_MESSAGES/claws-mail.mo
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
@dirrm share/examples/claws-mail
@dirrm share/doc/claws-mail/manual/pl
@dirrm share/doc/claws-mail/manual/fr
@@ -265,4 +270,4 @@ share/locale/zh_TW/LC_MESSAGES/claws-mail.mo
@dirrm include/claws-mail/etpan
@dirrm include/claws-mail/common
@dirrm include/claws-mail
-@dirrm etc/claws-mail
+@dirrm lib/claws-mail
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 155ff552b17..08203205561 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2007/10/23 20:16:51 smb Exp $
+$NetBSD: distinfo,v 1.6 2008/01/09 03:55:09 smb Exp $
-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 (claws-mail-3.2.0.tar.bz2) = 23e093afb9cae541f4ace74f41178a551aec3921
+RMD160 (claws-mail-3.2.0.tar.bz2) = 31af404393bfd15b26b20ec2c056de1f82ad3e31
+Size (claws-mail-3.2.0.tar.bz2) = 5880889 bytes
SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
SHA1 (patch-ac) = cb1b427cf2bcd810cc1bd05324fdb9d40c695bfc
-SHA1 (patch-ad) = f4944b8fe86b1c6e2362dd9068d09199de6b83d7
+SHA1 (patch-ad) = e37162dbbf335bef2b418722cd55c2e19f79e0a6
+SHA1 (patch-af) = a24836beb156bf28921bc7606e8a5224d536b0b4
diff --git a/mail/claws-mail/patches/patch-ad b/mail/claws-mail/patches/patch-ad
index fb6d6656364..2a71ab21eff 100644
--- a/mail/claws-mail/patches/patch-ad
+++ b/mail/claws-mail/patches/patch-ad
@@ -1,26 +1,26 @@
-$NetBSD: patch-ad,v 1.2 2007/09/18 03:17:25 smb Exp $
+$NetBSD: patch-ad,v 1.3 2008/01/09 03:55:09 smb Exp $
---- 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") },
+--- src/toolbar.c.orig 2007-12-26 22:40:51.000000000 -0500
++++ src/toolbar.c 2007-12-26 22:41:12.000000000 -0500
+@@ -518,10 +518,8 @@
+ { A_SEPARATOR},
+ { A_TRASH},
#ifndef MAEMO
-#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
- { A_LEARN_SPAM, STOCK_PIXMAP_SPAM_BTN, _("Spam") },
+ { A_LEARN_SPAM},
#endif
-#endif
- { A_SEPARATOR, 0, ("") },
- { A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
+ { A_SEPARATOR},
+ { A_GOTO_NEXT}
};
-@@ -533,10 +531,8 @@
- { A_SEPARATOR, 0, ("") },
- { A_TRASH, STOCK_PIXMAP_TRASH, _("Trash") },
+@@ -617,10 +615,8 @@
+ { A_SEPARATOR},
+ { A_TRASH},
#ifndef MAEMO
-#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
- { A_LEARN_SPAM, STOCK_PIXMAP_SPAM_BTN, _("Spam") },
+ { A_LEARN_SPAM},
#endif
-#endif
- { A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
+ { A_GOTO_NEXT}
};
diff --git a/mail/claws-mail/patches/patch-af b/mail/claws-mail/patches/patch-af
new file mode 100644
index 00000000000..17fdbf031cb
--- /dev/null
+++ b/mail/claws-mail/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2008/01/09 03:55:09 smb Exp $
+
+--- src/common/ssl_certificate.c.orig 2007-12-26 22:47:33.000000000 -0500
++++ src/common/ssl_certificate.c 2007-12-26 22:48:25.000000000 -0500
+@@ -34,6 +34,8 @@
+ #include <unistd.h>
+ #include <string.h>
+ #endif
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <glib.h>
+ #include <glib/gi18n.h>
+