Update to 3.5.0:

# IMAP with STARTTLS The certificate port on TLS was fixed, however this will trigger one wrong 'New certificate' warning on the first connection. New in this release: # Added an option, "Use secure file deletion if possible", which enables shredding of temporary files and messages instead of just removing them. This is available on the Other preferences page. # Added an option, "Select the HTML part of multipart/alternative messages". This is available on the Message View/Text Options preferences page. # Added an option to the 'Create new folder' dialogue which enables new folders to inherit the properties of their parent folders during folder creation. # Added a hidden option, "two_line_vertical", which toggles the 2-line view in the message list when using the 3-column layout. Defaults to '1', show 2 lines. # Added a hidden option, "outgoing_fallback_to_ascii", which allows the user to specify an outgoing charset/encoding, but still fall back to 7bit US-ASCII when possible. Defaults to '1', fallback when possible. # Added support for the Avant Window Navgator (Awn) information bubble. This is automatically enabled if dbus is available. # Face and X-Face headers can now be added globally and per-account from configuration files under ~/.claws-mail/autofaces/. Further information is provided in the manual. # The SHA1 fingerprint is now shown on the SSL certificate dialogue and the labels are now selectable. # Several GUI improvements have been made, (Address book, filtering dialogue, Actions dialogue, and Account preferences). # New icons have been added for 'Reply to list' and 'Cancel'. The 'Insert file' and 'Close' icons have been improved, as have the tray icons. # Added the Trash and Delete icons to the Custom Toolbars options. # SMTP-only accounts are now not shown in the Receive menus and Account lists in filtering/processing, as they are irrelevant here. # tools/csv2addressbook.pl Support for a gmail exported csv address book was added. # Updated English, French, and Spanish manuals. # Updated translations: Brazilian Portuguese, Finnish, French, German, and Spanish. # Removed unmaintained translations: Bulgarian, Croatian, Czech, Dutch, Greek, Hebrew, Japanese, Korean, Norwegian, Russian, Swedish, and Taiwanese. (New maintainers are very welcome, contact paul@claws-mail.org)
author: smb <smb> 2008-07-13 22:34:19 +0000
committer: smb <smb> 2008-07-13 22:34:19 +0000
commit: 9085a928d9be9c6e4b1fcf1a659fbc4ad387f60e (patch)
tree: 6d7cf9551b9a10e4e9b8bbf223b915e25d58a473 /mail
parent: 01e8150ecb477997fc2a7232ca4539f74b6d7048 (diff)
download: pkgsrc-9085a928d9be9c6e4b1fcf1a659fbc4ad387f60e.tar.gz
48 files changed, 341 insertions, 128 deletions
diff --git a/mail/claws-mail-archive/DESCR b/mail/claws-mail-archive/DESCR
new file mode 100644
index 00000000000..e0638cb7a74
--- /dev/null
+++ b/mail/claws-mail-archive/DESCR
@@ -0,0 +1,18 @@
+This plugin uses libarchive to extends claws-mails features to include
+archiving of IMAP, LOCAL and POP account as well as calendar accounts.
+
+Archives are created with the following option:
+
+    format
+        - TAR
+        - PAX
+        - SHAR
+        - CPIO
+
+    compression:
+        - GZIP/ZIP
+        - BZIP2
+        - None
+
+    recursive
+        - Yes/No
diff --git a/mail/claws-mail-archive/Makefile b/mail/claws-mail-archive/Makefile
new file mode 100644
index 00000000000..90eda4afe38
--- /dev/null
+++ b/mail/claws-mail-archive/Makefile
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1 2008/07/13 22:34:20 smb Exp $
+#
+
+DISTNAME=	archive-0.6
+PKGNAME=	claws-mail-archive-0.6
+CATEGORIES=	mail
+MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+
+MAINTAINER=	smb@NetBSD.org
+COMMENT=	Adds archiving to Claws-Mail
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+DEPENDS+=	claws-mail-3.5.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 "../../archivers/libarchive/buildlink3.mk"
+.include "../../mail/claws-mail/Makefile.vers"
+.include "../../mail/claws-mail/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-archive/PLIST b/mail/claws-mail-archive/PLIST
new file mode 100644
index 00000000000..8c8d51e88d2
--- /dev/null
+++ b/mail/claws-mail-archive/PLIST
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST,v 1.1 2008/07/13 22:34:20 smb Exp $
+include/claws-mail/plugins/archive/archiver.h
+include/claws-mail/plugins/archive/archiver_prefs.h
+lib/claws-mail/plugins/archive.la
+share/locale/es/LC_MESSAGES/archive.mo
+share/locale/fr/LC_MESSAGES/archive.mo
+share/locale/pt_BR/LC_MESSAGES/archive.mo
+@dirrm lib/claws-mail/plugins
+@dirrm include/claws-mail/plugins/archive
+@dirrm include/claws-mail/plugins
diff --git a/mail/claws-mail-archive/distinfo b/mail/claws-mail-archive/distinfo
new file mode 100644
index 00000000000..a749300ae6f
--- /dev/null
+++ b/mail/claws-mail-archive/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2008/07/13 22:34:20 smb Exp $
+
+SHA1 (archive-0.6.tar.gz) = 3bf23ecf36fa9a6812e19d7f8ec1797259862b4a
+RMD160 (archive-0.6.tar.gz) = 07527363384b9e44a1fa81f55f9953ade4241742
+Size (archive-0.6.tar.gz) = 419200 bytes
diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile
index b44fc80aed7..0c16fa0768f 100644
--- a/mail/claws-mail-attachwarner/Makefile
+++ b/mail/claws-mail-attachwarner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:33 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/07/13 22:34:20 smb Exp $
 #
 
 DISTNAME=	attachwarner-0.2.12
@@ -13,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.0{,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 0a3b3db9ea2..392170c9f57 100644
--- a/mail/claws-mail-attremover/Makefile
+++ b/mail/claws-mail-attremover/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:33 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
 #
 
 DISTNAME=	att_remover-1.0.8
@@ -11,7 +11,7 @@ COMMENT=	Permanently deletes attachments from mail
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.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 2c8a5a6ad25..94bd992bbdd 100644
--- a/mail/claws-mail-bogofilter/Makefile
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:33 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	bogofilter
-PLUG_VER=	3.4.0
+PLUG_VER=	3.5.0
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -12,7 +12,7 @@ COMMENT=	Enables the scanning of incoming mail using Bogofilter
 
 CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+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"
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index 05ece4e3ad5..9c06c957ad2 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:33 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
 #
 
 DISTNAME=	cachesaver-0.10.7
@@ -11,7 +11,7 @@ COMMENT=	Saves Claws-Mail metadata every 60 seconds
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-dillo-viewer/Makefile b/mail/claws-mail-dillo-viewer/Makefile
index b3e39c36086..b90768d021c 100644
--- a/mail/claws-mail-dillo-viewer/Makefile
+++ b/mail/claws-mail-dillo-viewer/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:33 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	dillo_viewer
-PLUG_VER=	3.4.0
+PLUG_VER=	3.5.0
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -12,7 +12,7 @@ COMMENT=	Plugin to use the Dillo web browser for html rendering
 
 CONFIGURE_ARGS+=	--enable-dillo_viewer-plugin
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+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"
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 4a8912856c4..89776df5be9 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:33 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
 #
 
 DISTNAME=	fetchinfo-plugin-0.4.23
@@ -11,7 +11,7 @@ COMMENT=	Inserts headers containing some download information
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.0{,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 129d6043452..3691877a15a 100644
--- a/mail/claws-mail-gtkhtml/Makefile
+++ b/mail/claws-mail-gtkhtml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2008/06/12 02:14:33 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2008/07/13 22:34:20 smb Exp $
 #
 
-DISTNAME=	gtkhtml2_viewer-0.18
-PKGNAME=	claws-mail-gtkhtml2_viewer-0.18
+DISTNAME=	gtkhtml2_viewer-0.19
+PKGNAME=	claws-mail-gtkhtml2_viewer-0.19
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -13,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.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 8e1b33d2e99..8886e196d7a 100644
--- a/mail/claws-mail-gtkhtml/distinfo
+++ b/mail/claws-mail-gtkhtml/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/05/12 02:25:39 smb Exp $
+$NetBSD: distinfo,v 1.5 2008/07/13 22:34:20 smb Exp $
 
-SHA1 (gtkhtml2_viewer-0.18.tar.gz) = e028f499ae6688e945d90b445bb189b4ab4666b9
-RMD160 (gtkhtml2_viewer-0.18.tar.gz) = f430f2bd0333b6f82ed49d84643cb71621c741fc
-Size (gtkhtml2_viewer-0.18.tar.gz) = 699178 bytes
+SHA1 (gtkhtml2_viewer-0.19.tar.gz) = 119fce6c17d03e259d92f2eb7672d9bc9eaa92e6
+RMD160 (gtkhtml2_viewer-0.19.tar.gz) = 543566ecab519f5ca723b31da1344fe44765f41c
+Size (gtkhtml2_viewer-0.19.tar.gz) = 699738 bytes
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 71fdb5a4aac..bc3d1b386e3 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:33 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
 #
 
 DISTNAME=	mailmbox-1.14.1
@@ -11,7 +11,7 @@ COMMENT=	Handles mailboxes in mbox format
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.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 bbbaeaea036..087182dd82e 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:33 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/07/13 22:34:20 smb Exp $
 #
 
 DISTNAME=	newmail-0.0.12
@@ -11,7 +11,7 @@ COMMENT=	Write log file info on arriving email
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.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 e77658924dc..10b9c448da3 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2008/06/12 02:14:33 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/07/13 22:34:20 smb Exp $
 #
 
-DISTNAME=	notification_plugin-0.16
-PKGNAME=	claws-mail-notification-0.16
+DISTNAME=	notification_plugin-0.17
+PKGNAME=	claws-mail-notification-0.17
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -11,7 +11,7 @@ COMMENT=	Provides various ways to notify the user of new and unread email
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.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 44bc6a55863..d9a00cb96a2 100644
--- a/mail/claws-mail-notification/distinfo
+++ b/mail/claws-mail-notification/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2008/05/12 02:25:40 smb Exp $
+$NetBSD: distinfo,v 1.6 2008/07/13 22:34:20 smb Exp $
 
-SHA1 (notification_plugin-0.16.tar.gz) = df341ae3f2d6fc938c6633a865bab73ef50cb7e0
-RMD160 (notification_plugin-0.16.tar.gz) = 74593bfebd280e9d586f08c7da106599b4f1c514
-Size (notification_plugin-0.16.tar.gz) = 473048 bytes
+SHA1 (notification_plugin-0.17.tar.gz) = 6a8d264ec38db9a2a01efc03ada0299ba14f6bc8
+RMD160 (notification_plugin-0.17.tar.gz) = 5bdf4e4af9d15ed205f989485a416267d90ac1f7
+Size (notification_plugin-0.17.tar.gz) = 474599 bytes
diff --git a/mail/claws-mail-pgp/Makefile b/mail/claws-mail-pgp/Makefile
index 25b38ba3924..7b4c78e4946 100644
--- a/mail/claws-mail-pgp/Makefile
+++ b/mail/claws-mail-pgp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/06/15 09:51:59 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2008/07/13 22:34:20 smb Exp $
 #
 META_PACKAGE=	yes
 
@@ -11,8 +11,8 @@ MASTER_SITES=	# none
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Metapackage for the PGP plug-in for Claws-mail
 
-DEPENDS+=	claws-mail-pgpcore-3.4.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
-DEPENDS+=	claws-mail-pgpmime-3.4.0{,nb[0-9]*}:../../mail/claws-mail-pgpmime
-DEPENDS+=	claws-mail-pgpinline-3.4.0{,nb[0-9]*}:../../mail/claws-mail-pgpinline
+DEPENDS+=	claws-mail-pgpcore-3.5.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpmime-3.5.0{,nb[0-9]*}:../../mail/claws-mail-pgpmime
+DEPENDS+=	claws-mail-pgpinline-3.5.0{,nb[0-9]*}:../../mail/claws-mail-pgpinline
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-pgpinline/Makefile b/mail/claws-mail-pgpinline/Makefile
index 8167db7b971..8a739452a7e 100644
--- a/mail/claws-mail-pgpinline/Makefile
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:34 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	pgpinline
-PLUG_VER=	3.4.0
+PLUG_VER=	3.5.0
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -13,7 +13,7 @@ CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
 
-DEPENDS+=	claws-mail-pgpcore-3.4.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpcore-3.5.0{,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 2152db7d502..46857553f4c 100644
--- a/mail/claws-mail-pgpmime/Makefile
+++ b/mail/claws-mail-pgpmime/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:34 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	pgpmime
-PLUG_VER=	3.4.0
+PLUG_VER=	3.5.0
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -13,7 +13,7 @@ CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpmime-plugin
 
-DEPENDS+=	claws-mail-pgpcore-3.4.0{,nb[0-9]*}:../../mail/claws-mail-pgpcore
+DEPENDS+=	claws-mail-pgpcore-3.5.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 13dcad026ef..bd712af7b3c 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2008/06/12 02:14:34 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2008/07/13 22:34:20 smb Exp $
 #
 
-DISTNAME=	rssyl-0.19
-PKGNAME=	claws-mail-rssyl-0.19
+DISTNAME=	rssyl-0.20
+PKGNAME=	claws-mail-rssyl-0.20
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -13,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.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 98e081d2f72..fae2fbd5df2 100644
--- a/mail/claws-mail-rssyl/distinfo
+++ b/mail/claws-mail-rssyl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2008/05/12 02:25:40 smb Exp $
+$NetBSD: distinfo,v 1.6 2008/07/13 22:34:20 smb Exp $
 
-SHA1 (rssyl-0.19.tar.gz) = 64db76de0a06ee8b4b536224bcaa0d111df3a033
-RMD160 (rssyl-0.19.tar.gz) = 5c1a9b88a0d809c2f973cfb4733579b9ba345afc
-Size (rssyl-0.19.tar.gz) = 480442 bytes
+SHA1 (rssyl-0.20.tar.gz) = 7dbb8292461b76b4a081b595dd1599c7f09186ba
+RMD160 (rssyl-0.20.tar.gz) = ea1c7bd5d59a6ec92367592320f15b1ea04d3f3b
+Size (rssyl-0.20.tar.gz) = 480610 bytes
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index 8d4b59bec2f..efe704c6791 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2008/07/04 17:02:50 smb Exp $
+# $NetBSD: Makefile,v 1.10 2008/07/13 22:34:20 smb Exp $
 
-DISTNAME=	smime-0.7.5
-PKGNAME=	claws-mail-smime-0.7.5
+DISTNAME=	smime-0.7.6
+PKGNAME=	claws-mail-smime-0.7.6
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 PKGREVISION=1
@@ -11,7 +11,7 @@ COMMENT=	This plugin handles S/MIME signed and/or encrypted mails
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.0{,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 b6984993214..ec4c06bf9a0 100644
--- a/mail/claws-mail-spamassassin/Makefile
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:34 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	spamassassin
-PLUG_VER=	3.4.0
+PLUG_VER=	3.5.0
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -11,7 +11,7 @@ COMMENT=	Enables the scanning of incoming mail using SpamAssassin
 
 CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+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"
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 8a895a96bd7..f209d5773cc 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:34 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/07/13 22:34:20 smb Exp $
 #
 
-DISTNAME=	spam_report-0.3.3
-PKGNAME=	claws-mail-spam_report-0.3.3
+DISTNAME=	spam_report-0.3.4
+PKGNAME=	claws-mail-spam_report-0.3.4
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -11,7 +11,7 @@ COMMENT=	Report spam to various places
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.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 68e04f948b2..bf4bfd3a192 100644
--- a/mail/claws-mail-spamreport/distinfo
+++ b/mail/claws-mail-spamreport/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/05/12 02:25:40 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/07/13 22:34:20 smb Exp $
 
-SHA1 (spam_report-0.3.3.tar.gz) = b53fa638d4e4d3272eb3df0b51198d2b2a28cacf
-RMD160 (spam_report-0.3.3.tar.gz) = 95885aeca7e2ed6fe92b4a171cceff770be1e9ce
-Size (spam_report-0.3.3.tar.gz) = 390202 bytes
+SHA1 (spam_report-0.3.4.tar.gz) = 2a5358d2a17123f487dca63711e922693eab1c65
+RMD160 (spam_report-0.3.4.tar.gz) = 95cfc35331af8986dd21aa532e3045f2ff1454a6
+Size (spam_report-0.3.4.tar.gz) = 390220 bytes
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index b740332db16..1d83f9343de 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:34 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
 #
 
 DISTNAME=	synce_plugin-0.7.3
@@ -11,7 +11,7 @@ COMMENT=	Synchronize addressbook of a Windows CE with Claws Mail
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index 88373dbb9e7..f38a8506c81 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2008/06/12 02:14:34 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/07/13 22:34:20 smb Exp $
 #
 
-DISTNAME=	tnef_parse-0.2.3
-PKGNAME=	claws-mail-tnef-0.2.3
+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
@@ -14,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 #PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/claws-mail-tnef/distinfo b/mail/claws-mail-tnef/distinfo
index 9f07c0b86c1..80f9167cf4d 100644
--- a/mail/claws-mail-tnef/distinfo
+++ b/mail/claws-mail-tnef/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/05/12 02:25:40 smb Exp $
+$NetBSD: distinfo,v 1.3 2008/07/13 22:34:20 smb Exp $
 
-SHA1 (tnef_parse-0.2.3.tar.gz) = 0e51c50be58936a76a9145c09c32aa172605a043
-RMD160 (tnef_parse-0.2.3.tar.gz) = 9da8bc1cc2dc9dab46f0fb0b320c0f29b402757b
-Size (tnef_parse-0.2.3.tar.gz) = 394835 bytes
+SHA1 (tnef_parse-0.3.tar.gz) = 722e89401407ba5d51baf8f2ae03e7ceafac7825
+RMD160 (tnef_parse-0.3.tar.gz) = d05c4ad4225ab46127ca0f73e7661e4e6ccc3dc9
+Size (tnef_parse-0.3.tar.gz) = 414863 bytes
diff --git a/mail/claws-mail-trayicon/Makefile b/mail/claws-mail-trayicon/Makefile
index 549beb0311d..4e8bf2bfee1 100644
--- a/mail/claws-mail-trayicon/Makefile
+++ b/mail/claws-mail-trayicon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:34 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2008/07/13 22:34:20 smb Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	trayicon
-PLUG_VER=	3.4.0
+PLUG_VER=	3.5.0
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
@@ -11,7 +11,7 @@ COMMENT=	Places an icon in the system tray for new mail
 
 CONFIGURE_ARGS+=	--enable-trayicon-plugin
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.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 3db9b00d66e..601fb9fb665 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2008/06/12 02:14:34 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2008/07/13 22:34:20 smb Exp $
 #
 
-DISTNAME=	vcalendar-1.102
-PKGNAME=	claws-mail-vcalendar-1.102
+DISTNAME=	vcalendar-2.0
+PKGNAME=	claws-mail-vcalendar-2.0
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
@@ -13,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 #PLIST_SRC+=	PLIST
 
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.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 5e48c3dc7f9..1e21c449633 100644
--- a/mail/claws-mail-vcalendar/distinfo
+++ b/mail/claws-mail-vcalendar/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2008/05/12 02:25:40 smb Exp $
+$NetBSD: distinfo,v 1.6 2008/07/13 22:34:20 smb Exp $
 
-SHA1 (vcalendar-1.102.tar.gz) = 378a6de503a95ee64c36ba98303217d1065e21af
-RMD160 (vcalendar-1.102.tar.gz) = 53f7913d6c7bb62a03228b6a1d2773a5d3e55e08
-Size (vcalendar-1.102.tar.gz) = 802192 bytes
+SHA1 (vcalendar-2.0.tar.gz) = e29cae11365ed3d8218850e54d51217b34183e80
+RMD160 (vcalendar-2.0.tar.gz) = fffad7b462132cf8912c65f8ab48116914d17c0d
+Size (vcalendar-2.0.tar.gz) = 803592 bytes
 SHA1 (patch-aa) = 076cbd15436a81f58134015f667ef78ea4581a3b
 SHA1 (patch-ab) = da1e44132e72c48bd5972e4d945dab88fc3f675d
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 4f74552b4ce..ca02e74457d 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2008/05/21 14:02:44 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/07/13 22:34:19 smb Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	claws-mail-${CLAWS_VERSION}
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	X based e-mail and netnews client
@@ -62,6 +61,11 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/mime.types ${EGDIR}
 	${INSTALL_DATA_DIR} ${PREFIX}/share/claws-mail
 	${INSTALL_DATA} ${WRKSRC}/claws-mail*.png ${PREFIX}/share/claws-mail
+.if exists(files/shred.${OPSYS})
+	${INSTALL_SCRIPT} files/shred.${OPSYS} ${PREFIX}/bin/claws-mail-shred
+PLIST_SRC=	PLIST
+PLIST_SRC+=	PLIST.shred
+.endif
 
 .include "../../databases/db4/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index 24ca34e2b0b..8c9bb04a621 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.5 2008/05/12 02:25:39 smb Exp $
+# $NetBSD: Makefile.vers,v 1.6 2008/07/13 22:34:19 smb Exp $
 #
-CLAWS_VERSION=	3.4.0
+CLAWS_VERSION=	3.5.0
diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST
index 24cb49de908..fb2fa4a2d51 100644
--- a/mail/claws-mail/PLIST
+++ b/mail/claws-mail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/05/20 18:14:45 tnn Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/07/13 22:34:19 smb Exp $
 bin/claws-mail
 bin/sylpheed-claws
 include/claws-mail/account.h
@@ -231,31 +231,19 @@ share/doc/claws-mail/manual/pl/claws-mail-manual.ps
 share/doc/claws-mail/manual/pl/claws-mail-manual.txt
 share/examples/claws-mail/mime.types
 share/icons/hicolor/48x48/apps/claws-mail.png
-share/locale/bg/LC_MESSAGES/claws-mail.mo
 share/locale/ca/LC_MESSAGES/claws-mail.mo
-share/locale/cs/LC_MESSAGES/claws-mail.mo
 share/locale/de/LC_MESSAGES/claws-mail.mo
-share/locale/el/LC_MESSAGES/claws-mail.mo
 share/locale/en_GB/LC_MESSAGES/claws-mail.mo
 share/locale/es/LC_MESSAGES/claws-mail.mo
 share/locale/fi/LC_MESSAGES/claws-mail.mo
 share/locale/fr/LC_MESSAGES/claws-mail.mo
-share/locale/he/LC_MESSAGES/claws-mail.mo
-share/locale/hr/LC_MESSAGES/claws-mail.mo
 share/locale/hu/LC_MESSAGES/claws-mail.mo
 share/locale/it/LC_MESSAGES/claws-mail.mo
-share/locale/ja/LC_MESSAGES/claws-mail.mo
-share/locale/ko/LC_MESSAGES/claws-mail.mo
-share/locale/nb/LC_MESSAGES/claws-mail.mo
-share/locale/nl/LC_MESSAGES/claws-mail.mo
 share/locale/pl/LC_MESSAGES/claws-mail.mo
 share/locale/pt_BR/LC_MESSAGES/claws-mail.mo
-share/locale/ru/LC_MESSAGES/claws-mail.mo
 share/locale/sk/LC_MESSAGES/claws-mail.mo
 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
diff --git a/mail/claws-mail/PLIST.shred b/mail/claws-mail/PLIST.shred
new file mode 100644
index 00000000000..257d18af182
--- /dev/null
+++ b/mail/claws-mail/PLIST.shred
@@ -0,0 +1 @@
+bin/claws-mail-shred
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index f6eaa621afe..f7bc36b59af 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.8 2008/05/12 02:25:39 smb Exp $
+$NetBSD: distinfo,v 1.9 2008/07/13 22:34:19 smb Exp $
 
-SHA1 (claws-mail-3.4.0.tar.bz2) = 67cf9bc9b9fe917fb4c2b895e6bc9291e5e6497c
-RMD160 (claws-mail-3.4.0.tar.bz2) = 5c1d3a5ca95b5d61948791170ac547ead764a27f
-Size (claws-mail-3.4.0.tar.bz2) = 5999033 bytes
+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) = e37162dbbf335bef2b418722cd55c2e19f79e0a6
+SHA1 (patch-ad) = c3df624c54983c0bdc6a568df2d6a0e729d3b2c5
+SHA1 (patch-ae) = b0cf0db0248752d365caab03edabeb136371d07a
+SHA1 (patch-af) = f6670f7387040bab1ad8977667bb7010cbc9b3aa
diff --git a/mail/claws-mail/files/shred.Darwin b/mail/claws-mail/files/shred.Darwin
new file mode 100644
index 00000000000..52b263eb6d8
--- /dev/null
+++ b/mail/claws-mail/files/shred.Darwin
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# Front end to securely delete a file on *BSD and Darwin
+#
+exec rm -P "$@"
diff --git a/mail/claws-mail/files/shred.DragonFlyBSD b/mail/claws-mail/files/shred.DragonFlyBSD
new file mode 100644
index 00000000000..52b263eb6d8
--- /dev/null
+++ b/mail/claws-mail/files/shred.DragonFlyBSD
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# Front end to securely delete a file on *BSD and Darwin
+#
+exec rm -P "$@"
diff --git a/mail/claws-mail/files/shred.FreeBSD b/mail/claws-mail/files/shred.FreeBSD
new file mode 100644
index 00000000000..52b263eb6d8
--- /dev/null
+++ b/mail/claws-mail/files/shred.FreeBSD
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# Front end to securely delete a file on *BSD and Darwin
+#
+exec rm -P "$@"
diff --git a/mail/claws-mail/files/shred.Linux b/mail/claws-mail/files/shred.Linux
new file mode 100644
index 00000000000..8ed8775c401
--- /dev/null
+++ b/mail/claws-mail/files/shred.Linux
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# Front end to securely delete a file on Linux
+#
+exec shred "$@"
diff --git a/mail/claws-mail/files/shred.NetBSD b/mail/claws-mail/files/shred.NetBSD
new file mode 100644
index 00000000000..52b263eb6d8
--- /dev/null
+++ b/mail/claws-mail/files/shred.NetBSD
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# Front end to securely delete a file on *BSD and Darwin
+#
+exec rm -P "$@"
diff --git a/mail/claws-mail/files/shred.OpenBSD b/mail/claws-mail/files/shred.OpenBSD
new file mode 100644
index 00000000000..52b263eb6d8
--- /dev/null
+++ b/mail/claws-mail/files/shred.OpenBSD
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# Front end to securely delete a file on *BSD and Darwin
+#
+exec rm -P "$@"
diff --git a/mail/claws-mail/patches/patch-ad b/mail/claws-mail/patches/patch-ad
index 2a71ab21eff..79259165856 100644
--- a/mail/claws-mail/patches/patch-ad
+++ b/mail/claws-mail/patches/patch-ad
@@ -1,11 +1,60 @@
-$NetBSD: patch-ad,v 1.3 2008/01/09 03:55:09 smb Exp $
-
---- 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 @@
+--- 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 @@
+ 					 	 gpointer	 data);
+ static void toolbar_addrbook_cb   		(GtkWidget   	*widget, 
+ 					 	 gpointer     	 data);
+-#ifdef USE_ASPELL
+ static void toolbar_check_spelling_cb  		(GtkWidget   	*widget, 
+ 					 	 gpointer     	 data);
+-#endif
+ static void toolbar_cancel_inc_cb		(GtkWidget	*widget,
+ 						 gpointer	 data);
+ 
+@@ -208,9 +206,7 @@
+ 	{ "A_LINEWRAP_CURRENT",	N_("Wrap long lines of current paragraph") }, 
+ 	{ "A_LINEWRAP_ALL",     N_("Wrap all long lines")                  }, 
+ 	{ "A_ADDRBOOK",      	N_("Address book")                         },
+-#ifdef USE_ASPELL
+ 	{ "A_CHECK_SPELLING",	N_("Check spelling")                       },
+-#endif
+ 	{ "A_CLAWS_ACTIONS",   	N_("Claws Mail Actions Feature")	   }, 
+ 	{ "A_CANCEL_INC",	N_("Cancel receiving")			   },
+ 	{ "A_CLOSE",		N_("Close window")			   },
+@@ -346,9 +342,7 @@
+ 					A_INSERT,        A_ATTACH,       A_SIG,
+ 					A_EXTEDITOR,     A_LINEWRAP_CURRENT,     
+ 					A_LINEWRAP_ALL,  A_ADDRBOOK,
+-#ifdef USE_ASPELL
+ 					A_CHECK_SPELLING, 
+-#endif
+ 					A_CLOSE };	
+ 
+ 		for (i = 0; i < sizeof comp_items / sizeof comp_items[0]; i++) 
+@@ -449,9 +443,7 @@
+ 	case A_ADDRBOOK: 	return _("Address");
+ 	case A_CANCEL_INC:	return _("Stop");
+ 	case A_EXECUTE:		return _("Execute");
+-	#ifdef USE_ASPELL
+ 	case A_CHECK_SPELLING:	return _("Check spelling");
+-	#endif
+ 	default:		return "";
+ 	}
+ }
+@@ -492,9 +484,7 @@
+ 	case A_ADDRBOOK: 	return STOCK_PIXMAP_ADDRESS_BOOK;
+ 	case A_CANCEL_INC:	return STOCK_PIXMAP_CANCEL;
+ 	case A_EXECUTE:		return STOCK_PIXMAP_EXEC;
+-	#ifdef USE_ASPELL
+ 	case A_CHECK_SPELLING:	return STOCK_PIXMAP_CHECK_SPELLING;
+-	#endif
+ 	default:		return -1;
+ 	}
+ }
+@@ -523,10 +513,8 @@
  		{ A_SEPARATOR},
  		{ A_TRASH},
- #ifndef MAEMO
+ #ifndef GENERIC_UMPC
 -#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
  		{ A_LEARN_SPAM},
  #endif
@@ -13,10 +62,10 @@ $NetBSD: patch-ad,v 1.3 2008/01/09 03:55:09 smb Exp $
  		{ A_SEPARATOR},
  		{ A_GOTO_NEXT}
  	};
-@@ -617,10 +615,8 @@
+@@ -622,10 +610,8 @@
  		{ A_SEPARATOR},
  		{ A_TRASH},
- #ifndef MAEMO
+ #ifndef GENERIC_UMPC
 -#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
  		{ A_LEARN_SPAM},
  #endif
@@ -24,3 +73,60 @@ $NetBSD: patch-ad,v 1.3 2008/01/09 03:55:09 smb Exp $
  		{ A_GOTO_NEXT}
  	};
  	
+@@ -1585,12 +1571,10 @@
+ 	compose_toolbar_cb(A_LINEWRAP_ALL, data);
+ }
+ 
+-#ifdef USE_ASPELL
+ static void toolbar_check_spelling_cb(GtkWidget *widget, gpointer data)
+ {
+ 	compose_toolbar_cb(A_CHECK_SPELLING, data);
+ }
+-#endif
+ /*
+  * Execute actions from toolbar
+  */
+@@ -1715,9 +1699,7 @@
+ 		{ A_LINEWRAP_CURRENT,	toolbar_linewrap_current_cb   	},
+ 		{ A_LINEWRAP_ALL,	toolbar_linewrap_all_cb   	},
+ 		{ A_ADDRBOOK,		toolbar_addrbook_cb		},
+-#ifdef USE_ASPELL
+ 		{ A_CHECK_SPELLING,     toolbar_check_spelling_cb       },
+-#endif
+ 		{ A_CLAWS_ACTIONS,	toolbar_actions_execute_cb	},
+ 		{ A_CANCEL_INC,		toolbar_cancel_inc_cb		}
+ 	};
+@@ -2059,12 +2041,10 @@
+ 			TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Address book"));
+ 			toolbar_data->addrbook_btn = item;
+ 			break;
+-#ifdef USE_ASPELL
+ 		case A_CHECK_SPELLING:
+ 			TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Check spelling"));
+ 			toolbar_data->spellcheck_btn = item;
+ 			break;
+-#endif
+ 
+ 		case A_CLAWS_ACTIONS:
+ 			TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,toolbar_item->text);
+@@ -2417,10 +2397,8 @@
+ 		GTK_BUTTON_SET_SENSITIVE(compose->toolbar->linewrap_all_btn, sensitive);
+ 	if (compose->toolbar->addrbook_btn)
+ 		GTK_BUTTON_SET_SENSITIVE(compose->toolbar->addrbook_btn, sensitive);
+-#ifdef USE_ASPELL
+ 	if (compose->toolbar->spellcheck_btn)
+ 		GTK_BUTTON_SET_SENSITIVE(compose->toolbar->spellcheck_btn, sensitive);
+-#endif
+ 	for (; items != NULL; items = g_slist_next(items)) {
+ 		ToolbarClawsActions *item = (ToolbarClawsActions *)items->data;
+ 		GTK_BUTTON_SET_SENSITIVE(item->widget, sensitive);
+@@ -2463,9 +2441,7 @@
+ 	toolbar->linewrap_current_btn	= NULL;	
+ 	toolbar->linewrap_all_btn     	= NULL;	
+ 	toolbar->addrbook_btn     	= NULL;	
+-#ifdef USE_ASPELL
+ 	toolbar->spellcheck_btn   	= NULL;
+-#endif
+ 
+ 	toolbar_destroy(toolbar);
+ }
diff --git a/mail/claws-mail/patches/patch-ae b/mail/claws-mail/patches/patch-ae
new file mode 100644
index 00000000000..4d5c9c3d03e
--- /dev/null
+++ b/mail/claws-mail/patches/patch-ae
@@ -0,0 +1,11 @@
+--- ./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 @@
+ 	if (prefs_common_get_use_shred()) {
+ 		if (found_shred == -1) {
+ 			/* init */
+-			args[0] = g_find_program_in_path("shred");
++			args[0] = g_find_program_in_path("claws-mail-shred");
+ 			debug_print("found shred: %s\n", args[0]);
+ 			found_shred = (args[0] != NULL) ? 1:0;
+ 			args[1] = "-f";
diff --git a/mail/claws-mail/patches/patch-af b/mail/claws-mail/patches/patch-af
new file mode 100644
index 00000000000..200d4faf240
--- /dev/null
+++ b/mail/claws-mail/patches/patch-af
@@ -0,0 +1,11 @@
+--- 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 @@
+ 	PACK_CHECK_BUTTON (vbox2, checkbtn_askonfilter,
+ 			   _("Ask about account specific filtering rules when "
+ 			     "filtering manually"));
+-	shred_binary = g_find_program_in_path("shred");
++	shred_binary = g_find_program_in_path("claws-mail-shred");
+ 	if (shred_binary) {
+ 		PACK_CHECK_BUTTON (vbox2, checkbtn_use_shred,
+ 				   _("Use secure file deletion if possible"));
diff --git a/mail/clawsker/Makefile b/mail/clawsker/Makefile
index e8c685f06d1..31624191704 100644
--- a/mail/clawsker/Makefile
+++ b/mail/clawsker/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:23 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/07/13 22:34:20 smb Exp $
 
-DISTNAME=	clawsker-0.4.0
-PKGREVISION=	1
+DISTNAME=	clawsker-0.5.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/tools/
 
@@ -17,7 +16,7 @@ REPLACE_PERL=	clawsker
 
 DEPENDS+=	p5-gtk2>=1.182:../../x11/p5-gtk2
 DEPENDS+=	p5-gettext>=1.05:../../devel/p5-gettext
-DEPENDS+=	claws-mail-3.4.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/clawsker/PLIST b/mail/clawsker/PLIST
index 962f29194e9..3208803974d 100644
--- a/mail/clawsker/PLIST
+++ b/mail/clawsker/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2008/06/16 14:28:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/07/13 22:34:20 smb Exp $
 bin/clawsker
 share/locale/es/LC_MESSAGES/clawsker.mo
 share/locale/sr/LC_MESSAGES/clawsker.mo
+share/locale/fr/LC_MESSAGES/clawsker.mo
 share/locale/sr@latin/LC_MESSAGES/clawsker.mo
 man/man1/clawsker.1
diff --git a/mail/clawsker/distinfo b/mail/clawsker/distinfo
index 2f62204c5c8..afadfaa69eb 100644
--- a/mail/clawsker/distinfo
+++ b/mail/clawsker/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2008/05/12 02:28:00 smb Exp $
+$NetBSD: distinfo,v 1.3 2008/07/13 22:34:20 smb Exp $
 
-SHA1 (clawsker-0.4.0.tar.gz) = 3d2a7fd1f9413a30846be8abfcc780922798cb9a
-RMD160 (clawsker-0.4.0.tar.gz) = 388d7513453ed6e2a3f0087ef5bcab489e48e08e
-Size (clawsker-0.4.0.tar.gz) = 36364 bytes
+SHA1 (clawsker-0.5.0.tar.gz) = 8b1bbc123dd2b91373e0a2de1578952bfb0ddeaa
+RMD160 (clawsker-0.5.0.tar.gz) = debe0edbe6329150e9ea0f41b3483c010d7ac614
+Size (clawsker-0.5.0.tar.gz) = 40761 bytes
 SHA1 (patch-aa) = bc7d011e4fae77968d6d5e9ccbfaa6feb4a6bbc5
 SHA1 (patch-ac) = 95ae82ef362248fce8f84de80c7a3b912938a9f5
author	smb <smb>	2008-07-13 22:34:19 +0000
committer	smb <smb>	2008-07-13 22:34:19 +0000
commit	9085a928d9be9c6e4b1fcf1a659fbc4ad387f60e (patch)
tree	6d7cf9551b9a10e4e9b8bbf223b915e25d58a473 /mail
parent	01e8150ecb477997fc2a7232ca4539f74b6d7048 (diff)
download	pkgsrc-9085a928d9be9c6e4b1fcf1a659fbc4ad387f60e.tar.gz