Update of claws-mail and the plugins that comes with it's distfile to

version 3.11.1.

Changlog:

3.11.1:
~~~~~~~~~~~~~~~~~~~~

* Use 'gnutls_priority' hidden account preference for POP3 and
  STARTTLS connections, in addition to SMTP.

* RSSyl plugin: Enable use of .netrc to store network credentials.

* Remove dependency on intltool.

* Remove appdata.

* Updated translations: Norwegian Bokmål.

* Bug fixes:
	o bug 3306, 'HTML tag  is not always rendered in error
		     dialog'
	o bug 3308, 'build ignores --localedir'


3.11.0:
~~~~~~~~~~~~~~~~~~~~

* SSLv3 server connections are now disabled by default, in response
  to the POODLE vulnerability, see
  https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-3566.

* Several PGP/Core plugin improvements
  Indicate when a key has been revoked or has expired when displaying
  signature status. For example,
	"Good signature from %s, but the key has expired."
	"Good signature from %s, but the key has been revoked."
  When displaying the full information, show the Validity, and the
  Owner Trust level. Also indicate expired and revoked keys, and
  revoked UIDs.

  The "Content-Disposition: attachment" flag in PGP/MIME signed
  messages has been removed. It was confusing for cetain MUAs.

* A new version of the RSSyl plugin, completely redesigned and
  rewritten. Migration from the previous version is automatic,
  it has a new storage format in ~/.claws-mail/RSSyl/ (hierarchical
  directories instead of flat file format). It uses the expat
  library instead of libxml2 for parsing feed data.

* The results of TAB address completion in the Compose window have
  improved ordering.
	Order of results:
	1. Match beginning of name
	2. Match beginning of additional names
	3. Match complete email address before @
	4. Match beginning of email address
	5. Compare relative position of match
	6. Compare name alphabetically
	7. Compare address alphabetically.

* Due to popular demand, use of the Up key in the message body in the
  Compose window stops at the top of the message body and does not
  continue up to the header fields. This reverts the behaviour
  introduced in version 3.10.0.

* In the Compose window, when navigating with the arrow keys,
  selecting, and thus modifying, the Account selector is now
  prevented.

* In the Compose window, a mnemonic (s) has been added to the Subject
  line.

* The Queue folder is highlighted if there are messages in its sub-
  folders and the tree is collapsed.

* When sorting messages by 'thread date', clicking the 'Date' column
  header will now toggle between ascending/descending and will not
  switch to 'date' sorting.

* A new QuickSearch filter has been added that searches a header's
  content only.
  H S : messages which contain S in the value of any header.

* A Reply-To field has been added to the main Template configuration.

* The menubar can now be hidden, default hotkey: F12.

* Fancy plugin: A user-controlled stylesheet can now be used.

* Python plugin: Add flag attributes to MessageInfo object.

* Python plugin: Make 'account' property of ComposeWindow read/write.

* Libravatar plugin: a network timeout option has been added.

* appdata has been added for package managers, it must be
  specifically enabled, using ./configure --enable-appdata
  See http://people.freedesktop.org/~hughsient/appdata/ for further
  information.

* The tbird2claws.py script, for converting a Thunderbird mailbox to
  a Claws Mail mailbox, now handles sub-directory recursion.

* Updated translations: Brazilian Portuguese, Bulgarian, Dutch,
  Esperanto, Finnish, German, Hebrew, Lithuanian, Slovak, Spanish,
  and Swedish

* Bug fixes:
	o bug 3173, 'quick search ignores trailing blank'
	o bug 3211, 'Fails to build in Debian hurd-i386 architecture'
	o bug 3212, 'When msgnum matches a sub-folder name, fetch
		     fails'
	o bug 3221, 'IMAP: Claws Mail has issues with Yahoo IMAP
		     server/folders'
	o bug 3235, 'Extraneous double quotes inside base64-encoded
		     From header confuse 'Reply' action'
	o bug 3236, 'sc_html_parse_tag() does not recognize '
'
		     as line break'
	o bug 3246, 'attachment open: "remember this" ignored if
		     ~/.mailcap does not exist'
	o bug 3265, 'procmime.c: unbalanced flockfile() /
		     funlockfile()'
	o bug 3300, 'Cannot send/receive mail when SSL 3.0 is not
		     supported on the server'
	o Debian bug 755022, '[claws-mail-spam-report] likely useless
		     to report to Debian because of the use of http
		     instead of https'
	o Disable SSL3.0 entirely as a Poodle fix.
	o fix msg display when utf8_instead_of_locale_for_broken_mail
	  is turned off and you use a UTF-8 locale
	o fix building without gnuTLS support
	o Don't differentiate the protocols used when using direct
	  SSL/TLS versus STARTTLS
	o disallow editing any account (even current account) when at
	  least one compose window is open
	o Actually display "(No From)" in messageview's From column
	  when appropriate.
	o When changing focus in folderview, make sure the newly
	  focused folder is visible first.
	o various fixes to flaws reported by Coverity scan
	o PGP/Core plugin: Don't automatically re-check signatures
	o PGP/Core plugin: fix erroneous 'untrusted' msg based on
	  validity not trust
	o Make INBOX case-insensitive (as RFC states)
	o Python plugin: Fix ComposeWindow.get_account_selection

3.10.1:

* Add an account preference to allow automatically accepting
unknown and changed SSL certificates, if they're valid (that is,
if the root CA is trusted by the distro).

* RFE 3196, 'When changing quicksearch Search Type, set focus to
search input box'

* PGP/Core plugin: Generate 2048 bit RSA keys.

* Major code cleanup.

* Extended claws-mail.desktop with Compose and Receive actions.

* Updated Bulgarian, Brazilian Portuguese, Czech, Dutch, Esperanto,
Finnish, French, German,Hebrew, Hungarian, Indonesian, Lithuanian,
Slovak, Spanish, and Swedish translations.

* Bug fixes:
o bug 2728, 'erroneous switching from one to three column
view'
o bug 2981, 'claws-mail-3.9.3 compilation warnings'
o bug 3170, 'QuickSearch fights with View/Hide read threads
menu option'
o bug 3179, 'Win32: Please add 'gtk-auto-mnemonics = 1' to
GTK+ setting'
o bug 3201, 'Fix memory corruption in sc_html_read_line()'
o Debian bug 730050, 'vcalendar plugin crash'
o Fix GCond use with newer Glib
o Fix the race fix, now preventing the compose window to be
closed.
o Fix "File (null) doesn't exist" error dialog, when
attaching a non-existing file via --attach
o Fix spacing in Folderview if the font is far from the
system font
o RSSyl: When parsing RSS 2.0, ignore <link> tags with a
namespace prefix.
o RSSyl: Check for existence of xmlNode namespace, to prevent
NULL pointer crashes.

3.10.0:

* Complete SSL certificate chains are now saved, and if built with
Libetpan 1.4.1, the IMAP SSL connection's certificate chain is made
available. Both of these allow correct certificate verification
instead of a bogus 'No certificate issuer found' status.

* Auto-configuration of account email servers, based on SRV records,
is now possible. (GLib >= 2.22 is required.)

* Added a preference to avoid automatically drafting emails that are
to be sent encrypted, (Configuration/Preferences/Compose/Writing).

* Messages saved as Drafts are now saved as New, highlighting the
Drafts folder, in order to draw the attention to unfinished mails
there.

* It is now possible to add a 'Replace signature' button to the
Compose window toolbar.

* Quotation wrapping and undo/redo in the Compose window has been
improved.

* 'Reply to all' now excludes your own address.

* The 'Generate X-Mailer header' option has been renamed 'Add user
agent header' and applies to both X-Mailer and X-Newsreader
headers.

* Added hidden preferences, 'address_search_wildcard' and
'folder_search_wildcard', to choose between matching from start of
the folder name/address or any part of the name. (Activating these
options restores the previous behaviour.)

* Added hidden preference 'enable_avatars' to control the internal
capture/render process, and which allows disabling it by external
plugins for example.

* 'Check for new folders' now only updates the folder list, not
updating the contents of folders. If needed, it can be followed by
'Check for new messages'

* When using Redirect, the redirecting account's address is used in
the SMTP MAIL FROM instead of the original sender's address.

* NEW: Libravatar plugin, which displays avatars from
https://www.libravatar.org/

* Added support for an arbitrary number and sources of 'avatars' and
images for email senders, and migrated Face and X-Face headers.

* Avatars are now included when printing mails.

* The GPG keyring can now be used as the source for address auto-
completion.

* The vCalendar and RSSyl plugins now have an option to disable SSL
certificate verification (and check them by default).

* The ClamAV plugin now pops up an error message only once instead of
repeatedly

* Updated the man page and the manual.

* Updated Brazilian Portuguese, British English, Czech, Dutch,
Finnish, French, Hebrew, Hungarian, Indonesian, Lithuanian, Slovak,
Spanish, and Swedish translations.

* Added Esperanto translation.

* Bug fixes:
o bug 1644, 'race condition between message move and mark as
read after timeout'
o bug 2119, 'Check for new folders on remote mailboxes is
very slow'
o bug 2145, 'Claws becomes unresponsive and gets Killed while
moving messages between imap folders'
o bug 2179, 'Improve quotation wrapping support'
0 bug 2238, 'Incorrect undo/redo operations after paste with
replace from context menu'
o bug 2389, 'GnuPG: invalid/revoked user IDs accepted'
o bug 2398, 'Race when closing compose during drafting'
o bug 2447, 'Compose window crashes if moving a folder that
is being replied to'
o bug 2643, 'claws crash when accessing imap folder'
o bug 2875, 'SMTP session disconnects before recieving'
o bug 2991, 'POP3 sessions duplicated" on race conditions'
o bug 3020, 'Use theme doesn't change some icons until
restart'
o bug 3055, 'Claws segfaults when cancelling a sticky search
after changing folder'
o bug 3038, 'Select a folder incorrectly matches on number in
parentheses'
o bug 3039, 'displaying one specific html email lead in 100%
CPU usage'
o bug 3040, 'Handle revoked GPG private keys'
o bug 3050, 'Claws segfaults when attempting to delete a tag'
o bug 3094, 'OK or Yes to create new directory ?'
o bug 3100, 'Automatic account selection on reply fails if
name is quoted and contains a comma'
o bug 3105, 'vCal plugin via https does not check SSL peer
certificates or host'
o bug 3106, 'rssyl plugin does not verify SSL peer at all'
o bug 3107, 'Height of row in message list does not reflect
font size - three columns, small screen layout'
o bug 3116, 'invalid DTSTART in ics subscription makes claws
crash'
o bug 3117, 'full-day event shown from 01:00 to 01:00 next
day'
o bug 3120, '"Error - File is empty" when redirecting mail
with empty parts'
o bug 3131, 'Crash on reccurent events with no DTSTART'
o bug 3138, 'PGP/Inline crashes on signature check if gpgme
failed to init'
o bug 3139, 'Mainwindow unresponsive due to a busy loop'
o bug 3145, 'Memory corruption in imap_disconnect_all'
o bug 3146, 'Memory corruption when deleting a message from
folder'
o bug 3147, 'verify_folderlist_xml() leaks memory'
o bug 3148, 'Logic error in claws_get_socket_name()'
o bug 3150, 'etpan_certificate_check() leaks memory'
o bug 3155, 'Memory leaks found by Valgrind in
a9065aec26499a0e1294c73b6d9e6f039976521e'
o bug 3169, 'threaded message list performance issue'
o bug 3964, 'headers in wrong order -- file src/common/ssl.c'
o Fix lots of memory leaks
o Fix interference from liboverlay-scrollbar
o Fix some typos
o Fix some layout issues when user has large GTK font
o Fix message search starting from end
o Fix disappearing MIME icon highlight in mails with PGP
signatures
o When autoselecting account for a new message, quoted
recipient names are handled better.
o Python plugin: Also check for _PyGtk_API being a PyCapsule
o MailMBOX plugin: Fix parsing UTC dates
o vCalendar plugin: recognition of quoted parameter values,
which are legal.
o ClamAV plugin: Fix a format string error.

26 files changed, 46 insertions, 71 deletions

diff --git a/mail/claws-mail-archive/Makefile b/mail/claws-mail-archive/Makefile
index 2587f13d43d..1baaabb44b6 100644
--- a/mail/claws-mail-archive/Makefile
+++ b/mail/claws-mail-archive/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2015/01/21 09:12:41 obache Exp $
+# $NetBSD: Makefile,v 1.34 2015/04/03 12:34:44 nros Exp $
 #
 
 PLUGIN_NAME=    archive
-PKGREVISION=	2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile
index bb120845d33..02b95fd08b7 100644
--- a/mail/claws-mail-attachwarner/Makefile
+++ b/mail/claws-mail-attachwarner/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.39 2015/04/03 12:34:44 nros Exp $
 #
 
 PLUGIN_NAME=    attachwarner
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile
index 4faf9b896ee..fbc34a2d195 100644
--- a/mail/claws-mail-attremover/Makefile
+++ b/mail/claws-mail-attremover/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.38 2015/04/03 12:34:44 nros Exp $
 #
 
 PLUGIN_NAME=    att_remover
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-bogofilter/Makefile b/mail/claws-mail-bogofilter/Makefile
index aa51041ba18..ac2a9e30342 100644
--- a/mail/claws-mail-bogofilter/Makefile
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.33 2015/04/03 12:34:44 nros Exp $
 #
 
 PLUGIN_NAME=	bogofilter
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 5b5d850054a..0a68f345af4 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.39 2015/04/03 12:34:44 nros Exp $
 #
 
 PLUGIN_NAME=    fetchinfo
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index d5e6595eadb..436a694365e 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.38 2015/04/03 12:34:44 nros Exp $
 #
 
 PLUGIN_NAME=    mailmbox
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index fa1c01c63a5..89054dfaf64 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.40 2015/04/03 12:34:44 nros Exp $
 #
 
 PLUGIN_NAME=    newmail
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index d2349d79f69..b8326cb5628 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.41 2015/04/03 12:34:44 nros Exp $
 #
 
 PLUGIN_NAME=    notification
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-pgpcore/Makefile b/mail/claws-mail-pgpcore/Makefile
index 002e2de959d..64dc47083ad 100644
--- a/mail/claws-mail-pgpcore/Makefile
+++ b/mail/claws-mail-pgpcore/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2014/05/05 00:48:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2015/04/03 12:34:44 nros Exp $
 #
 
 PLUGIN_NAME=	pgpcore
-PKGREVISION=	2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -10,8 +9,6 @@ COMMENT=	Handles core PGP functions
 
 PLIST_SRC+=	PLIST
 
-PLIST_SRC+=	PLIST
-
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpmime-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
diff --git a/mail/claws-mail-pgpcore/PLIST b/mail/claws-mail-pgpcore/PLIST
index be219957371..3d88bb0f803 100644
--- a/mail/claws-mail-pgpcore/PLIST
+++ b/mail/claws-mail-pgpcore/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2014/01/15 17:22:31 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/04/03 12:34:44 nros Exp $
+include/claws-mail/plugins/pgpcore/autocompletion.h
 include/claws-mail/plugins/pgpcore/passphrase.h
 include/claws-mail/plugins/pgpcore/pgp_utils.h
 include/claws-mail/plugins/pgpcore/pgp_viewer.h
 include/claws-mail/plugins/pgpcore/prefs_gpg.h
 include/claws-mail/plugins/pgpcore/select-keys.h
 include/claws-mail/plugins/pgpcore/sgpgme.h
-lib/claws-mail/plugins/pgpcore.la
diff --git a/mail/claws-mail-pgpinline/Makefile b/mail/claws-mail-pgpinline/Makefile
index 3eb1ab98db1..de124e79bbc 100644
--- a/mail/claws-mail-pgpinline/Makefile
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2014/05/05 00:48:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2015/04/03 12:34:44 nros Exp $
 #
 
 PLUGIN_NAME=	pgpinline
-PKGREVISION=	2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-pgpmime/Makefile b/mail/claws-mail-pgpmime/Makefile
index a1c0a275c6a..e34f192a301 100644
--- a/mail/claws-mail-pgpmime/Makefile
+++ b/mail/claws-mail-pgpmime/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2014/05/05 00:48:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2015/04/03 12:34:45 nros Exp $
 #
 
 PLUGIN_NAME=	pgpmime
-PKGREVISION=	2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 8ffb29ea3f5..77e04c9a97e 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.46 2015/04/03 12:34:45 nros Exp $
 #
 
 PLUGIN_NAME=    rssyl
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index 1abf0582eec..63dec0f573f 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2014/05/05 00:48:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2015/04/03 12:34:45 nros Exp $
 #
 
 PLUGIN_NAME=	smime
-PKGREVISION=	2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-spamassassin/Makefile b/mail/claws-mail-spamassassin/Makefile
index 06686a7e32d..16bd312aa6f 100644
--- a/mail/claws-mail-spamassassin/Makefile
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.32 2015/04/03 12:34:45 nros Exp $
 #
 
 PLUGIN_NAME=	spamassassin
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 38226e71a68..5b151da8b72 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.43 2015/04/03 12:34:45 nros Exp $
 #
 
 PLUGIN_NAME=    spam_report
-PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index 8016cf65205..0e29544fd9b 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2014/05/05 00:48:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2015/04/03 12:34:45 nros Exp $
 #
 
 PLUGIN_NAME=    tnef_parse
-PKGREVISION=	2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 5cee41080dc..aa0a87350ef 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2014/05/29 23:36:44 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2015/04/03 12:34:45 nros Exp $
 #
 
 PLUGIN_NAME=    vcalendar
-PKGREVISION=	2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index c32f23b15e0..c0aa5f36ab9 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2014/06/09 14:18:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.69 2015/04/03 12:34:44 nros 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=	5
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	X based e-mail and netnews client
@@ -60,10 +59,14 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
+INSTALLATION_DIRS+=	share/applications
+
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/mime.types ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/claws-mail*.png \
 		${DESTDIR}${PREFIX}/share/claws-mail
+	${INSTALL_DATA} ${WRKSRC}/claws-mail.desktop \
+		${DESTDIR}${PREFIX}/share/applications
 .if exists(files/shred.${OPSYS})
 	${INSTALL_SCRIPT} files/shred.${OPSYS} \
 		${DESTDIR}${PREFIX}/bin/claws-mail-shred
diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common
index f9a1a1cd847..a1f5dc4b285 100644
--- a/mail/claws-mail/Makefile.common
+++ b/mail/claws-mail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2013/07/24 15:26:11 drochner Exp $
+# $NetBSD: Makefile.common,v 1.13 2015/04/03 12:34:44 nros Exp $
 
 # used by mail/claws-mail/plugins.mk
 
@@ -6,8 +6,8 @@
 
 DISTNAME=	claws-mail-${CLAWS_VERSION}
 CATEGORIES=	mail news x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=claws-mail/}
+EXTRACT_SUFX=	.tar.xz
 
 HOMEPAGE=	http://claws-mail.org/
 LICENSE=	gnu-gpl-v3
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index 68cc0a88cdd..0865f9b4f40 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.17 2014/01/15 17:19:30 drochner Exp $
+# $NetBSD: Makefile.vers,v 1.18 2015/04/03 12:34:44 nros Exp $
 #
-CLAWS_VERSION=	3.9.3
+CLAWS_VERSION=	3.11.1
diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST
index c9f5f34cfec..2d43f2dffd5 100644
--- a/mail/claws-mail/PLIST
+++ b/mail/claws-mail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2014/01/15 17:19:30 drochner Exp $
+@comment $NetBSD: PLIST,v 1.21 2015/04/03 12:34:44 nros Exp $
 bin/claws-mail
 bin/sylpheed-claws
 include/claws-mail/account.h
@@ -25,6 +25,7 @@ include/claws-mail/addrselect.h
 include/claws-mail/advsearch.h
 include/claws-mail/alertpanel.h
 include/claws-mail/autofaces.h
+include/claws-mail/avatars.h
 include/claws-mail/browseldap.h
 include/claws-mail/claws-features.h
 include/claws-mail/codeconv.h
@@ -70,6 +71,7 @@ include/claws-mail/edittags.h
 include/claws-mail/editvcard.h
 include/claws-mail/enriched.h
 include/claws-mail/etpan/etpan-errors.h
+include/claws-mail/etpan/etpan-ssl.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
@@ -232,6 +234,7 @@ 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/en_GB/LC_MESSAGES/claws-mail.mo
+share/locale/eo/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
@@ -241,6 +244,7 @@ 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
+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
diff --git a/mail/claws-mail/buildlink3.mk b/mail/claws-mail/buildlink3.mk
index 533bd0cf16c..7b01e6a7d9f 100644
--- a/mail/claws-mail/buildlink3.mk
+++ b/mail/claws-mail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2012/09/15 10:05:22 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2015/04/03 12:34:44 nros Exp $
 
 BUILDLINK_TREE+=	claws-mail
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	claws-mail
 CLAWS_MAIL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=3.7.0
-BUILDLINK_ABI_DEPENDS.claws-mail+=	claws-mail>=3.8.1nb3
+BUILDLINK_ABI_DEPENDS.claws-mail+=	claws-mail>=3.11.1
 BUILDLINK_PKGSRCDIR.claws-mail?=	../../mail/claws-mail
 
 .include "../../textproc/enchant/buildlink3.mk"
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index ce8890ffb45..e551d8e1429 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.25 2014/01/15 17:19:30 drochner Exp $
+$NetBSD: distinfo,v 1.26 2015/04/03 12:34:44 nros Exp $
 
-SHA1 (claws-mail-3.9.3.tar.bz2) = 82026ac7dfc0123544def8ef338a4d0746671284
-RMD160 (claws-mail-3.9.3.tar.bz2) = e9258dd2323010596782e2090a40f3fe674344e2
-Size (claws-mail-3.9.3.tar.bz2) = 9463943 bytes
+SHA1 (claws-mail-3.11.1.tar.xz) = b0c07906043f7a3ec726c7a96d6dcfc3c148b9cc
+RMD160 (claws-mail-3.11.1.tar.xz) = 6cdcae95d8c367da3d170dba55b9707b181fa723
+Size (claws-mail-3.11.1.tar.xz) = 6908772 bytes
 SHA1 (patch-ab) = d1c89842cedad037c9ac3836da630244fe8ff9c9
 SHA1 (patch-ae) = f1991ef4e31bd6a7cbddf6655f489f72fb40308b
 SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
-SHA1 (patch-ag) = c5c3d16343437aedb9c899bec151338aea9fbbfb
 SHA1 (patch-ah) = cdfd816669c0c1ae6dba0d97a6d1fe5a8c2e4626
-SHA1 (patch-ai) = 22b9ad0763ee3053f8b3082a639991b6574e6f65
+SHA1 (patch-ai) = e2da8ef08afc0543cbbd00b71720d0002f8b9faf
 SHA1 (patch-bb) = 2d432d7c1c3869b76965adea77f05127796a27f5
 SHA1 (patch-ca) = 6243d9a22cf7e9b355e53ce301069f84278c6274
 SHA1 (patch-cb) = 41c8d3f48a22885854c5bef71558e38b60084e22
diff --git a/mail/claws-mail/patches/patch-ag b/mail/claws-mail/patches/patch-ag
deleted file mode 100644
index 2820afae79f..00000000000
--- a/mail/claws-mail/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2012/07/02 19:07:50 drochner Exp $
-
---- src/common/ssl.c.orig	2012-03-31 15:29:18.000000000 +0000
-+++ src/common/ssl.c
-@@ -29,6 +29,7 @@
- #include <glib/gi18n.h>
- #include <errno.h>
- #include <pthread.h>
-+#include <gnutls/gnutls.h>
- 
- #if GNUTLS_VERSION_NUMBER <= 0x020b00
- #include <gcrypt.h>
diff --git a/mail/claws-mail/patches/patch-ai b/mail/claws-mail/patches/patch-ai
index 675906afba6..c9b6bac6ad1 100644
--- a/mail/claws-mail/patches/patch-ai
+++ b/mail/claws-mail/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1 2013/07/24 15:26:11 drochner Exp $
+$NetBSD: patch-ai,v 1.2 2015/04/03 12:34:44 nros Exp $
 
---- src/Makefile.in.orig	2013-05-06 16:32:55.000000000 +0000
+--- src/Makefile.in.orig	2014-10-27 18:59:09.000000000 +0000
 +++ src/Makefile.in
-@@ -530,7 +530,7 @@ top_srcdir = @top_srcdir@
+@@ -614,7 +614,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) .
++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@     `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
  @PLATFORM_WIN32_TRUE@     sed -e 's/-I/--include-dir /g;s/-D/--define /g'`