update to 3.9.2

many fixes and feature improvements, too much to list here

9 files changed, 86 insertions, 43 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 8a5328b0ef4..0c85d4bcffe 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2013/06/06 12:54:40 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2013/07/24 15:26:11 drochner Exp $
 
 INSTALLATION_DIRS+=	${EGDIR}
 INSTALLATION_DIRS+=	share/claws-mail
@@ -6,7 +6,6 @@ INSTALLATION_DIRS+=	share/claws-mail
 .include "Makefile.common"
 
 PKGNAME=	claws-mail-${CLAWS_VERSION}
-PKGREVISION=	12
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	X based e-mail and netnews client
@@ -19,6 +18,8 @@ PKGCONFIG_OVERRIDE+=	claws-mail.pc.in
 PKG_SYSCONFSUBDIR=	claws-mail
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
+CONFIGURE_ENV+=	ac_cv_path_GPGME_CONFIG=no
+
 .include "../../mk/bsd.prefs.mk"
 
 FACES_IS_INSTALLED!=	${PKG_INFO} -e faces || ${ECHO}
diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common
index a3bfca3e9ac..f9a1a1cd847 100644
--- a/mail/claws-mail/Makefile.common
+++ b/mail/claws-mail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2011/06/27 19:46:50 gls Exp $
+# $NetBSD: Makefile.common,v 1.12 2013/07/24 15:26:11 drochner Exp $
 
 # used by mail/claws-mail/plugins.mk
 
@@ -15,8 +15,6 @@ LICENSE=	gnu-gpl-v3
 DISTINFO_FILE=	${.CURDIR}/../../mail/claws-mail/distinfo
 PATCHDIR=	${.CURDIR}/../../mail/claws-mail/patches
 
-.include	"../../mail/claws-mail/openssl.mk"
-
 USE_TOOLS+=		gmake pkg-config
 USE_LANGUAGES+=		c
 USE_LIBTOOL=		YES
@@ -28,26 +26,35 @@ CONFIGURE_ENV+=		ac_cv_path_GNOME_CONFIG="no"
 
 CONFIGURE_ARGS+=        --enable-enchant
 CONFIGURE_ARGS+=	--enable-nls
-CONFIGURE_ARGS+=	--enable-openssl
 CONFIGURE_ARGS+=	--enable-compface
-CONFIGURE_ARGS+=	--disable-smime
-CONFIGURE_ARGS+=	--disable-gpgme
 CONFIGURE_ARGS+=	--disable-pgpcore-plugin
 CONFIGURE_ARGS+=	--disable-pgpmime-plugin
 CONFIGURE_ARGS+=	--disable-pgpinline-plugin
-CONFIGURE_ARGS+=	--disable-trayicon-plugin
-CONFIGURE_ARGS+=	--disable-image-viewer-plugin
-CONFIGURE_ARGS+=	--disable-clamav-plugin
-CONFIGURE_ARGS+=	--disable-dillo-viewer-plugin
-CONFIGURE_ARGS+=	--disable-mathml-viewer-plugin
-CONFIGURE_ARGS+=	--disable-gnomeprint
 BUILDLINK_ABI_DEPENDS.libetpan+=	libetpan>=0.57
 CONFIGURE_ARGS+=	--enable-libetpan
 CONFIGURE_ARGS+=	--disable-bogofilter-plugin
 CONFIGURE_ARGS+=	--disable-spamassassin-plugin
 
+CONFIGURE_ARGS+=	--disable-acpi_notifier-plugin
+CONFIGURE_ARGS+=	--disable-address_keeper-plugin
+CONFIGURE_ARGS+=	--disable-archive-plugin
+CONFIGURE_ARGS+=	--disable-att_remover-plugin
+CONFIGURE_ARGS+=	--disable-attachwarner-plugin
+CONFIGURE_ARGS+=	--disable-bsfilter-plugin
+CONFIGURE_ARGS+=	--disable-clamd-plugin
+CONFIGURE_ARGS+=	--disable-fancy-plugin
+CONFIGURE_ARGS+=	--disable-fetchinfo-plugin
+CONFIGURE_ARGS+=	--disable-mailmbox-plugin
+CONFIGURE_ARGS+=	--disable-newmail-plugin
+CONFIGURE_ARGS+=	--disable-notification-plugin
+CONFIGURE_ARGS+=	--disable-rssyl-plugin
+CONFIGURE_ARGS+=	--disable-spam_report-plugin
+CONFIGURE_ARGS+=	--disable-tnef_parse-plugin
+CONFIGURE_ARGS+=	--disable-perl-plugin
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mail/libetpan/buildlink3.mk"
+#.include "../../net/libsoup24/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/enchant/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index eb65646401f..632d671734e 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.15 2012/07/02 19:07:50 drochner Exp $
+# $NetBSD: Makefile.vers,v 1.16 2013/07/24 15:26:11 drochner Exp $
 #
-CLAWS_VERSION=	3.8.1
+CLAWS_VERSION=	3.9.2
diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST
index 5310cec9bb2..2d71ccbf6f5 100644
--- a/mail/claws-mail/PLIST
+++ b/mail/claws-mail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2012/07/02 19:07:50 drochner Exp $
+@comment $NetBSD: PLIST,v 1.19 2013/07/24 15:26:11 drochner Exp $
 bin/claws-mail
 bin/sylpheed-claws
 include/claws-mail/account.h
@@ -22,9 +22,11 @@ include/claws-mail/addrindex.h
 include/claws-mail/addritem.h
 include/claws-mail/addrquery.h
 include/claws-mail/addrselect.h
+include/claws-mail/advsearch.h
 include/claws-mail/alertpanel.h
 include/claws-mail/autofaces.h
 include/claws-mail/browseldap.h
+include/claws-mail/claws-features.h
 include/claws-mail/codeconv.h
 include/claws-mail/common/base64.h
 include/claws-mail/common/claws.h
@@ -54,7 +56,6 @@ include/claws-mail/common/version.h
 include/claws-mail/common/xml.h
 include/claws-mail/common/xmlprops.h
 include/claws-mail/compose.h
-include/claws-mail/config.h
 include/claws-mail/crash.h
 include/claws-mail/customheader.h
 include/claws-mail/displayheader.h
@@ -142,6 +143,7 @@ include/claws-mail/matcher.h
 include/claws-mail/matcher_parser.h
 include/claws-mail/matcher_parser_lex.h
 include/claws-mail/matcher_parser_parse.h
+include/claws-mail/matchertypes.h
 include/claws-mail/mbox.h
 include/claws-mail/message_search.h
 include/claws-mail/messageview.h
@@ -191,6 +193,7 @@ include/claws-mail/privacy.h
 include/claws-mail/procheader.h
 include/claws-mail/procmime.h
 include/claws-mail/procmsg.h
+include/claws-mail/proctypes.h
 include/claws-mail/quote_fmt.h
 include/claws-mail/quote_fmt_lex.h
 include/claws-mail/quote_fmt_parse.h
@@ -210,6 +213,7 @@ include/claws-mail/undo.h
 include/claws-mail/unmime.h
 include/claws-mail/uri_opener.h
 include/claws-mail/vcard.h
+include/claws-mail/viewtypes.h
 include/claws-mail/wizard.h
 lib/pkgconfig/claws-mail.pc
 man/man1/claws-mail.1
@@ -230,6 +234,7 @@ 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/hu/LC_MESSAGES/claws-mail.mo
 share/locale/id_ID/LC_MESSAGES/claws-mail.mo
 share/locale/it/LC_MESSAGES/claws-mail.mo
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index d28c8e8fd80..b2f1382645e 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.22 2012/10/10 09:48:45 drochner Exp $
+$NetBSD: distinfo,v 1.23 2013/07/24 15:26:11 drochner Exp $
 
-SHA1 (claws-mail-3.8.1.tar.bz2) = c519d07121bfb3095c7a3d47e53b6726bf397ed8
-RMD160 (claws-mail-3.8.1.tar.bz2) = e50ddd80589e7edb9f1c172a83e7f41dd8dec372
-Size (claws-mail-3.8.1.tar.bz2) = 7335864 bytes
+SHA1 (claws-mail-3.9.2.tar.bz2) = 73c91b3c742d1ababc734bfac39961831e55eb38
+RMD160 (claws-mail-3.9.2.tar.bz2) = 7a8d201913a078708761ae492e7e362848a36df1
+Size (claws-mail-3.9.2.tar.bz2) = 9413758 bytes
 SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
-SHA1 (patch-ae) = 0312eeaaf2d31ab72d771598062019127c69cbef
+SHA1 (patch-ae) = f1991ef4e31bd6a7cbddf6655f489f72fb40308b
 SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
 SHA1 (patch-ag) = c5c3d16343437aedb9c899bec151338aea9fbbfb
+SHA1 (patch-ah) = cdfd816669c0c1ae6dba0d97a6d1fe5a8c2e4626
+SHA1 (patch-ai) = 22b9ad0763ee3053f8b3082a639991b6574e6f65
 SHA1 (patch-bb) = 2d432d7c1c3869b76965adea77f05127796a27f5
-SHA1 (patch-ca) = 305882268b80cdcf8d827828ad67f191ef0c1729
diff --git a/mail/claws-mail/patches/patch-ae b/mail/claws-mail/patches/patch-ae
index 3c8eb6d1acf..e63106c0bbf 100644
--- a/mail/claws-mail/patches/patch-ae
+++ b/mail/claws-mail/patches/patch-ae
@@ -1,8 +1,17 @@
-$NetBSD: patch-ae,v 1.4 2008/09/26 17:51:17 smb Exp $
+$NetBSD: patch-ae,v 1.5 2013/07/24 15:26:11 drochner 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 @@
+--- src/common/utils.c.orig	2013-03-19 06:31:04.000000000 +0000
++++ src/common/utils.c
+@@ -5208,7 +5208,7 @@ size_t fast_strftime(gchar *buf, gint bu
+ 				*curpos++ = '0'+(lt->tm_min % 10);
+ 				break;
+ 			case 's':
+-				snprintf(subbuf, 64, "%ld", mktime(lt));
++				snprintf(subbuf, 64, "%lld", (long long)mktime(lt));
+ 				len = strlen(subbuf); CHECK_SIZE();
+ 				strncpy2(curpos, subbuf, buflen - total_done);
+ 				break;
+@@ -5319,7 +5319,7 @@ int claws_unlink(const gchar *filename) 
  	if (prefs_common_get_use_shred()) {
  		if (found_shred == -1) {
  			/* init */
diff --git a/mail/claws-mail/patches/patch-ah b/mail/claws-mail/patches/patch-ah
new file mode 100644
index 00000000000..b5e2064a263
--- /dev/null
+++ b/mail/claws-mail/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.3 2013/07/24 15:26:11 drochner Exp $
+
+--- src/plugins/pgpcore/sgpgme.c.orig	2013-05-08 08:46:17.000000000 +0000
++++ src/plugins/pgpcore/sgpgme.c
+@@ -271,6 +271,7 @@ gchar *sgpgme_sigstat_info_full(gpgme_ct
+ 		gpgme_key_t key;
+ 		gpgme_error_t err;
+ 		const gchar *keytype, *keyid, *uid;
++		time_t ts;
+ 		
+ 		err = gpgme_get_key(ctx, sig->fpr, &key, 0);
+ 
+@@ -294,7 +295,8 @@ gchar *sgpgme_sigstat_info_full(gpgme_ct
+ 		}
+ 
+ 		memset(buf, 0, sizeof(buf));
+-		fast_strftime(buf, sizeof(buf)-1, prefs_common_get_prefs()->date_format, localtime_r(&sig->timestamp, &lt));
++		ts = sig->timestamp;
++		fast_strftime(buf, sizeof(buf)-1, prefs_common_get_prefs()->date_format, localtime_r(&ts, &lt));
+ 		g_string_append_printf(siginfo,
+ 			_("Signature made on %s using %s key ID %s\n"),
+ 			buf, keytype, keyid);
diff --git a/mail/claws-mail/patches/patch-ai b/mail/claws-mail/patches/patch-ai
new file mode 100644
index 00000000000..675906afba6
--- /dev/null
+++ b/mail/claws-mail/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2013/07/24 15:26:11 drochner Exp $
+
+--- src/Makefile.in.orig	2013-05-06 16:32:55.000000000 +0000
++++ src/Makefile.in
+@@ -530,7 +530,7 @@ top_srcdir = @top_srcdir@
+ @CLAWS_LIBETPAN_TRUE@etpan_dir = etpan
+ @CLAWS_LIBETPAN_FALSE@etpan_library = 
+ @CLAWS_LIBETPAN_TRUE@etpan_library = etpan/libclawsetpan.la
+-SUBDIRS = common gtk $(etpan_dir) . plugins 
++SUBDIRS = common gtk $(etpan_dir) .
+ @PLATFORM_WIN32_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
+ @PLATFORM_WIN32_TRUE@     `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ @PLATFORM_WIN32_TRUE@     sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
diff --git a/mail/claws-mail/patches/patch-ca b/mail/claws-mail/patches/patch-ca
deleted file mode 100644
index 090b2b9551b..00000000000
--- a/mail/claws-mail/patches/patch-ca
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2012/10/10 09:48:45 drochner Exp $
-
-see http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2743
-
---- src/procmime.c.orig	2012-06-27 09:05:22.000000000 +0000
-+++ src/procmime.c
-@@ -1753,6 +1753,8 @@ static void parse_parameters(const gchar
- 			continue;
- 
- 		charset = value;
-+		if (charset == NULL)
-+			continue;
- 		lang = strchr(charset, '\'');
- 		if (lang == NULL)
- 			continue;