update to 3.8.1

changes:
-UI improvements
-bugfixes
-translation updates

7 files changed, 20 insertions, 99 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 729897de0fb..81a04939903 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2012/06/12 15:45:57 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2012/07/02 19:07:50 drochner Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS+=	${EGDIR}
@@ -7,7 +7,6 @@ INSTALLATION_DIRS+=	share/claws-mail
 .include "Makefile.common"
 
 PKGNAME=	claws-mail-${CLAWS_VERSION}
-PKGREVISION=	5
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	X based e-mail and netnews client
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index 7a74aa8787b..eb65646401f 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.14 2011/09/12 17:43:05 drochner Exp $
+# $NetBSD: Makefile.vers,v 1.15 2012/07/02 19:07:50 drochner Exp $
 #
-CLAWS_VERSION=	3.7.10
+CLAWS_VERSION=	3.8.1
diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST
index 26185798511..5310cec9bb2 100644
--- a/mail/claws-mail/PLIST
+++ b/mail/claws-mail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2011/09/12 17:43:05 drochner Exp $
+@comment $NetBSD: PLIST,v 1.18 2012/07/02 19:07:50 drochner Exp $
 bin/claws-mail
 bin/sylpheed-claws
 include/claws-mail/account.h
@@ -12,6 +12,7 @@ include/claws-mail/addrcustomattr.h
 include/claws-mail/addrdefs.h
 include/claws-mail/addrduplicates.h
 include/claws-mail/addressadd.h
+include/claws-mail/addressbook-dbus.h
 include/claws-mail/addressbook.h
 include/claws-mail/addressbook_foldersel.h
 include/claws-mail/addressitem.h
@@ -93,12 +94,14 @@ include/claws-mail/gtk/combobox.h
 include/claws-mail/gtk/description_window.h
 include/claws-mail/gtk/filesel.h
 include/claws-mail/gtk/foldersort.h
+include/claws-mail/gtk/gdkkeysyms-new.h
 include/claws-mail/gtk/gtkaspell.h
 include/claws-mail/gtk/gtkcmclist.h
 include/claws-mail/gtk/gtkcmctree.h
 include/claws-mail/gtk/gtkcmoptionmenu.h
 include/claws-mail/gtk/gtksctree.h
 include/claws-mail/gtk/gtkshruler.h
+include/claws-mail/gtk/gtkunit.h
 include/claws-mail/gtk/gtkutils.h
 include/claws-mail/gtk/gtkvscrollbutton.h
 include/claws-mail/gtk/headers.h
@@ -228,7 +231,7 @@ 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/hu/LC_MESSAGES/claws-mail.mo
-share/locale/id/LC_MESSAGES/claws-mail.mo
+share/locale/id_ID/LC_MESSAGES/claws-mail.mo
 share/locale/it/LC_MESSAGES/claws-mail.mo
 share/locale/ja/LC_MESSAGES/claws-mail.mo
 share/locale/lt/LC_MESSAGES/claws-mail.mo
@@ -241,3 +244,4 @@ share/locale/sk/LC_MESSAGES/claws-mail.mo
 share/locale/sv/LC_MESSAGES/claws-mail.mo
 share/locale/uk/LC_MESSAGES/claws-mail.mo
 share/locale/zh_CN/LC_MESSAGES/claws-mail.mo
+share/locale/zh_TW/LC_MESSAGES/claws-mail.mo
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index e6cf07afaa3..8bc87d00e43 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.20 2012/05/06 16:48:34 dholland Exp $
+$NetBSD: distinfo,v 1.21 2012/07/02 19:07:50 drochner Exp $
 
-SHA1 (claws-mail-3.7.10.tar.bz2) = 6cdb5695bfff8f8eab2bcbfd5d98576ca37a5edd
-RMD160 (claws-mail-3.7.10.tar.bz2) = 6da263b0ccc313ab346648cdb9b5c128734621d5
-Size (claws-mail-3.7.10.tar.bz2) = 7165265 bytes
+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 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
 SHA1 (patch-ae) = 0312eeaaf2d31ab72d771598062019127c69cbef
 SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
-SHA1 (patch-ag) = 4e487c358b7da1317db07ecd7be5d36587c936c0
-SHA1 (patch-ah) = dbc2c4095ebee928e086c3d39c1fd11788613d49
+SHA1 (patch-ag) = c5c3d16343437aedb9c899bec151338aea9fbbfb
 SHA1 (patch-bb) = 2d432d7c1c3869b76965adea77f05127796a27f5
-SHA1 (patch-src_common_defs_h) = f5c4342afb8fb57c359d75b72cb1cd695717b308
diff --git a/mail/claws-mail/patches/patch-ag b/mail/claws-mail/patches/patch-ag
index 5ad7c867fec..2820afae79f 100644
--- a/mail/claws-mail/patches/patch-ag
+++ b/mail/claws-mail/patches/patch-ag
@@ -1,25 +1,12 @@
-$NetBSD: patch-ag,v 1.6 2011/09/12 17:43:05 drochner Exp $
+$NetBSD: patch-ag,v 1.7 2012/07/02 19:07:50 drochner Exp $
 
---- src/common/ssl.c.orig	2011-08-27 06:58:15.000000000 +0000
+--- src/common/ssl.c.orig	2012-03-31 15:29:18.000000000 +0000
 +++ src/common/ssl.c
-@@ -29,8 +29,10 @@
+@@ -29,6 +29,7 @@
  #include <glib/gi18n.h>
  #include <errno.h>
  #include <pthread.h>
-+#ifdef HAVE_LIBGCRYPT
- #include <gcrypt.h>
- GCRY_THREAD_OPTION_PTHREAD_IMPL;
-+#endif
- 
- #include "claws.h"
- #include "utils.h"
-@@ -153,7 +155,9 @@ const gchar *claws_ssl_get_cert_dir(void
++#include <gnutls/gnutls.h>
  
- void ssl_init(void)
- {
-+#ifdef HAVE_LIBGCRYPT
- 	gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-+#endif
- #ifdef HAVE_LIBETPAN
- 	mailstream_gnutls_init_not_required();
- #endif	
+ #if GNUTLS_VERSION_NUMBER <= 0x020b00
+ #include <gcrypt.h>
diff --git a/mail/claws-mail/patches/patch-ah b/mail/claws-mail/patches/patch-ah
deleted file mode 100644
index 42d96de26fd..00000000000
--- a/mail/claws-mail/patches/patch-ah
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2011/06/27 19:46:50 gls Exp $
-gnutls uses "nettle" instead of libgcrypt per default now. So a client
- shouldn't try to deal with libgcrypt unless it uses it explicitely.
-
---- configure.orig	2011-04-09 08:51:04.000000000 +0000
-+++ configure
-@@ -16584,13 +16584,13 @@ _ACEOF
- 
-   LIBS="-lgpg-error $LIBS"
- 
--else
--  ac_cv_enable_gnutls=no
-+#else
-+#  ac_cv_enable_gnutls=no
- fi
- 
- 
--else
--  ac_cv_enable_gnutls=no
-+#else
-+#  ac_cv_enable_gnutls=no
- fi
- 
- 
-@@ -16642,13 +16642,13 @@ _ACEOF
- 
-   LIBS="-lgcrypt $LIBS"
- 
--else
--  ac_cv_enable_gnutls=no
-+#else
-+#  ac_cv_enable_gnutls=no
- fi
- 
- 
--else
--  ac_cv_enable_gnutls=no
-+#else
-+#  ac_cv_enable_gnutls=no
- fi
- 
- 
-@@ -16657,7 +16657,7 @@ fi
-   	if test x"$platform_win32" = "xyes"; then
- 		GNUTLS_LIBS="-lgnutls -lgcrypt ${GCRYPT_LIBS}"
- 	else
--		GNUTLS_LIBS="-lgnutls -lgcrypt -lz ${GCRYPT_LIBS}"
-+		GNUTLS_LIBS="-lgnutls"
- 	fi
-   fi
- else
-
diff --git a/mail/claws-mail/patches/patch-src_common_defs_h b/mail/claws-mail/patches/patch-src_common_defs_h
deleted file mode 100644
index 21f89d98a14..00000000000
--- a/mail/claws-mail/patches/patch-src_common_defs_h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_common_defs_h,v 1.1 2012/05/06 16:48:34 dholland Exp $
-
-Fix build with latest glib2.
-
---- src/common/defs.h~	2011-08-27 06:58:14.000000000 +0000
-+++ src/common/defs.h
-@@ -24,7 +24,7 @@
- #  include "config.h"
- #endif
- 
--#include <glibconfig.h>
-+#include <glib.h>
- 
- #ifdef G_OS_WIN32
- #  include <glib/gwin32.h>