* Claws Mail is now licensed under GPLv3 or later.

New in this release:
~~~~~~~~~~~~~~~~~~~~

* added Tags feature
Tags are arbitrary labels that can be applied to messages. It is
possible to create, edit, remove Tags; apply them to mails;
filter on Tags or Tag presence; apply or unset Tags via Filtering
actions; reference Tags in reply Templates.

* Threads can now be sorted by most recent message
/View/Sort/By thread date

* Added "/View/Show or Hide/Column headers"

* Added 'watch thread' feature

* Enabled the running of folder Processing rules on demand

* Added options to stop/enable writing logs to disc, see Logging
page of preferences

* IMAP and News: Implement age-based caching: allow the specifying
of a threshold for the offline synchronisation feature, and whether
old cached bodies should be removed. Accessible from the Folder
Properties.

* IMAP: Made multiple copy, (in the same IMAP account), faster by
matching source/destination message UIDs.

* LDAP: Ability to edit all Person attributes

* Nicer layout of the message part icons

* Speed up and clean up rendering of larger msgs

* Use progress bar when sending messages

* Made mainwindow's /Help/Manual point to the remote copy if the
local copy doesn't exist

* Replaced some deprecated widgets

* Enabled changing the emphasis color used to highlight the
newsreader/x-mailer header value when it matches our preferred
mail agent, (hidden pref 'emphasis_color' added to clawsrc).

* tools/mew2claws-mail.pl
Added new script that imports a Mew address book

* tools/popfile-link.sh
Added a new script that will open selected messages in
POPFile control center, in order to change the message
status.

* Updated the manual

* Check that Dillo's installed when loading the Dillo Browser
plugin

* Maemo improvements:
o Automatically choose the correct application
to open parts
o Better way to notify of new mails
o Destroy messageview after trashing mail
o Simplified layout
o Better toolbars, removal of CTree headers
o Add a specific icon to go back to folder list
o Improvements to the Wizard, About and icon legend dialogues
o add an easy way to store data (mails and IMAP/NNTP caches)
on one of the SD cards, and protect against unmounts if
needed
o plug the online/offline system into maemo's interfaces to
have Claws automatically switch according to the system
status (on IT OS 2007)
o use HildonBanners to display status messages
o force layout to be Small screen
o put the progress bar in the toolbar

* Updated Brazilian Portuguese, Bulgarian, Catalan, Finnish, French,
German, Hungarian, Italian, Polish, Russian, Simplified Chinese and
Slovak translations.

Plus bug fixes

6 files changed, 25 insertions, 26 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 761ef803bc2..4207f66bb43 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2007/08/31 11:04:18 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/18 03:17:24 smb Exp $
 
 .include "Makefile.common"
 
-#PKGNAME=	claws-mail-${CLAWS_VERSION}
+PKGNAME=	claws-mail-${CLAWS_VERSION}
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	X based e-mail and netnews client
-PKGREVISION=	3
 
 CONFLICTS+=	sylpheed-claws-[0-9]*
 
diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common
index 7f74a78f295..9cf22aa712d 100644
--- a/mail/claws-mail/Makefile.common
+++ b/mail/claws-mail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2007/08/09 19:06:31 drochner Exp $
+# $NetBSD: Makefile.common,v 1.4 2007/09/18 03:17:24 smb Exp $
 
 DISTNAME=	claws-mail-${CLAWS_VERSION}
 CATEGORIES=	mail news x11
@@ -10,10 +10,7 @@ HOMEPAGE=	http://claws-mail.org/
 DISTINFO_FILE=	${.CURDIR}/../../mail/claws-mail/distinfo
 PATCHDIR=	${.CURDIR}/../../mail/claws-mail/patches
 
-# for SMTP, POP3 and IMAP over SSL
-# set these just in case we don't have a pkg-config file for openssl
-CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include"
-CONFIGURE_ENV+=		OPENSSL_LIBS="-L${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto"
+.include	"../../mail/claws-mail/openssl.mk"
 
 USE_TOOLS+=		gmake pkg-config
 USE_LANGUAGES+=		c
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index 752d5256daf..be357362130 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.1 2007/08/03 02:34:42 smb Exp $
+# $NetBSD: Makefile.vers,v 1.2 2007/09/18 03:17:24 smb Exp $
 #
-CLAWS_VERSION=	2.10.0
+CLAWS_VERSION=	3.0.1
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 684fdafe5e3..776446ed0f6 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.3 2007/08/31 11:04:18 drochner Exp $
+$NetBSD: distinfo,v 1.4 2007/09/18 03:17:24 smb Exp $
 
-SHA1 (claws-mail-2.10.0.tar.bz2) = 0ee38ec2dd0c37941b0bcc4af7ab441ec432c63c
-RMD160 (claws-mail-2.10.0.tar.bz2) = e10eed2c3461a8c85d6313f0c57581a3b0ea654f
-Size (claws-mail-2.10.0.tar.bz2) = 5520512 bytes
+SHA1 (claws-mail-3.0.1.tar.bz2) = 670c2731bf6bf209ca7d3bd341b38fc3108e6390
+RMD160 (claws-mail-3.0.1.tar.bz2) = 431ab3ca051382db1e307ef1abafc5ce659f4aa3
+Size (claws-mail-3.0.1.tar.bz2) = 5654189 bytes
 SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
-SHA1 (patch-ac) = 51eff8f483ad603c1493bdc6520a9669c3d097c9
-SHA1 (patch-ad) = 9090824f9ad3688315567ed0857673cb94123897
-SHA1 (patch-ae) = 003ce854d58b8f25f12617b99fb245749704ec3d
+SHA1 (patch-ac) = cb1b427cf2bcd810cc1bd05324fdb9d40c695bfc
+SHA1 (patch-ad) = f4944b8fe86b1c6e2362dd9068d09199de6b83d7
diff --git a/mail/claws-mail/patches/patch-ac b/mail/claws-mail/patches/patch-ac
index cececad604f..f002f77f737 100644
--- a/mail/claws-mail/patches/patch-ac
+++ b/mail/claws-mail/patches/patch-ac
@@ -1,3 +1,5 @@
+$NetBSD: patch-ac,v 1.3 2007/09/18 03:17:25 smb Exp $
+
 --- src/prefs_common.h.orig	2007-08-16 22:50:08.000000000 -0400
 +++ src/prefs_common.h	2007-08-16 22:50:33.000000000 -0400
 @@ -153,7 +153,6 @@
diff --git a/mail/claws-mail/patches/patch-ad b/mail/claws-mail/patches/patch-ad
index f01946de508..fb6d6656364 100644
--- a/mail/claws-mail/patches/patch-ad
+++ b/mail/claws-mail/patches/patch-ad
@@ -1,24 +1,26 @@
-$NetBSD: patch-ad,v 1.1 2007/08/03 02:34:38 smb Exp $
+$NetBSD: patch-ad,v 1.2 2007/09/18 03:17:25 smb Exp $
 
---- src/toolbar.c.orig	2007-08-02 04:10:24.000000000 -0400
-+++ src/toolbar.c	2007-08-02 04:10:58.000000000 -0400
-@@ -427,9 +427,7 @@
- 		{ A_FORWARD,       STOCK_PIXMAP_MAIL_FORWARD,         _("Forward") },
+--- src/toolbar.c.orig	2007-09-06 17:09:58.000000000 -0400
++++ src/toolbar.c	2007-09-06 17:10:26.000000000 -0400
+@@ -430,10 +430,8 @@
  		{ A_SEPARATOR,     0,                                 ("")         },
  		{ A_TRASH,         STOCK_PIXMAP_TRASH,                _("Trash")   },
+ #ifndef MAEMO
 -#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
  		{ A_LEARN_SPAM,	   STOCK_PIXMAP_SPAM_BTN,             _("Spam")    },
+ #endif
 -#endif
  		{ A_SEPARATOR,     0,                                 ("")         },
  		{ A_GOTO_NEXT,     STOCK_PIXMAP_DOWN_ARROW,           _("Next")    }
  	};
-@@ -525,9 +523,7 @@
- 		{ A_FORWARD,       STOCK_PIXMAP_MAIL_FORWARD,         _("Forward") },
+@@ -533,10 +531,8 @@
  		{ A_SEPARATOR,     0,                                 ("")         },
  		{ A_TRASH,         STOCK_PIXMAP_TRASH,                _("Trash")   },
+ #ifndef MAEMO
 -#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
  		{ A_LEARN_SPAM,	   STOCK_PIXMAP_SPAM_BTN,             _("Spam")    },
+ #endif
 -#endif
  		{ A_GOTO_NEXT,     STOCK_PIXMAP_DOWN_ARROW,           _("Next")    }
- #ifdef MAEMO
- 		,
+ 	};
+