Update to 3.6.1:

* 3.6.1
-------

* Claws Mail now requires libetpan 0.57 for IMAP and NNTP.

* SSL support is now provided by gnuTLS exclusively. OpenSSL support
  has been dropped due to licensing issues.

* Added /View/Fullscreen option.

* Re-ordering of the filtering/processing condition and actions lists
  is now possible using drag'n'drop.

* 3.6.0
-------

* Claws Mail now requires libetpan 0.56 for IMAP and NNTP

* Spell checking is now provided by Enchant instead of Aspell. To
  build spell checker support, you will need the libenchant headers.

* The S/MIME plugin is now part of this package.

* IMAP, NNTP, and SSL are now supported in the Windows port.

* Support for client SSL certificates.

* Better support of SSL certificate stores, to be able to verify
  server certificates.

* Renaming of newsgroups is possible.

* "Always open message when selected" can now have three values:
  'Never', 'Always' and 'When message view is visible'.

* Unsaved server passwords can now be temporarily saved for the
  duration of the session. They can be cleared before the session
  expires by using '/Tools/Forget all session passwords'.

* Auto-wrapping settings are now saved in drafted messages.

* Support for basic auto-indentation in the Compose window.

* Support for animated GIFs in the message view.

* Type-ahead search in Filtering, Templates, Actions dialogs now
  select the result of the search.

* Finer granularity in POP3 accounts' Remove After delay - hours in
  addition to days.

* Spam/Ham flag is now stored on IMAP server when possible, using
  "Junk" and "NonJunk" keywords.

* Use less precise intervals when possible for auto-checking, thus
  the CPU is woken up less frequently.

* The warning icon in the main window is cleared when the error it
  relates to is clipped from the network log.

* IMAP errors now reveal the server on which they happen.

* All deprecated GTK interfaces have been replaced with their
  non-deprecated equivalents.

* csv2addressbook.pl: Added support for FoxMail.

3 files changed, 9 insertions, 33 deletions

diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 8b74b86553c..ba87e554fc0 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.11 2008/10/15 16:22:02 smb Exp $
 #
 
-DISTNAME=	newmail-0.0.12
-PKGNAME=	claws-mail-newmail-0.0.12
+DISTNAME=	newmail-0.0.14
+PKGNAME=	claws-mail-newmail-0.0.14
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	Write log file info on arriving email
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
+DEPENDS+=	claws-mail-3.6.1{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -24,7 +23,7 @@ USE_LANGUAGES+=	c
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-newmail/distinfo b/mail/claws-mail-newmail/distinfo
index 75ecf7ec290..bce605ea8d9 100644
--- a/mail/claws-mail-newmail/distinfo
+++ b/mail/claws-mail-newmail/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/05/12 02:25:40 smb Exp $
+$NetBSD: distinfo,v 1.4 2008/10/15 16:22:02 smb Exp $
 
-SHA1 (newmail-0.0.12.tar.gz) = 7fb0c5254550638a8347610c444304d966152ddb
-RMD160 (newmail-0.0.12.tar.gz) = f78e2065fca5019db42524b822a473e60c548084
-Size (newmail-0.0.12.tar.gz) = 327009 bytes
-SHA1 (patch-aa) = 96d860c1792a99224dfbc009b6881c1b693cb8bf
+SHA1 (newmail-0.0.14.tar.gz) = 81d128315cc48398c8372d84906490f99fd5a490
+RMD160 (newmail-0.0.14.tar.gz) = f17e9876b014a183a69d1468b2bca2e88e3bd210
+Size (newmail-0.0.14.tar.gz) = 327283 bytes
diff --git a/mail/claws-mail-newmail/patches/patch-aa b/mail/claws-mail-newmail/patches/patch-aa
deleted file mode 100644
index 0bc415ccbab..00000000000
--- a/mail/claws-mail-newmail/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2008/05/12 02:25:40 smb Exp $
-
---- src/newmail.c.orig	2008-05-11 22:12:47.000000000 -0400
-+++ src/newmail.c	2008-05-11 22:18:04.000000000 -0400
-@@ -61,7 +61,7 @@
- 	"From:\t%s\n"
- 	"To:\t%s\n"
- 	"Cc:\t%s\n"
--	"Size:\t%ld\n"
-+	"Size:\t%" PRId64 "\n"
- 	"Path:\t%s\n"
- 	"Message:\t%d\n"
- 	"Folder:\t%s\n",
-@@ -70,7 +70,7 @@
- 	    defstr (msginfo->from),
- 	    defstr (msginfo->to),
- 	    defstr (msginfo->cc),
--	    msginfo->size,
-+	    (int64_t) msginfo->size,
- 	    defstr (procmsg_get_message_file_path (msginfo)),
- 	    msginfo->msgnum,
- 	    tof ? defstr (tof->name) : "(null)");