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.

10 files changed, 46 insertions, 190 deletions

diff --git a/mail/claws-mail/MESSAGE b/mail/claws-mail/MESSAGE
index 41a736b2345..399bbdfd5b6 100644
--- a/mail/claws-mail/MESSAGE
+++ b/mail/claws-mail/MESSAGE
@@ -1,7 +1,14 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2007/08/03 02:34:40 smb Exp $
+$NetBSD: MESSAGE,v 1.2 2008/10/15 16:22:02 smb Exp $
 
 All Claws-Mail plug-ins are separate packages, and must be installed
 separately.
 
+When upgrading to 3.6.1 from earlier versions, be aware of two things.
+First, all user-specified keyboard shortcuts will have to be recreated.
+Second, the default spell-checker has changed from aspell to enchant, and
+the default installation of enchant from pkgsrc does not include aspell.
+You'll need to either install per-language dictionaries for the supported
+spell-checkers or rebuild enchant with aspell enabled.
+
 ===========================================================================
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 04b91ab4aca..80ab26274f0 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2008/09/06 20:54:33 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2008/10/15 16:22:02 smb Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	claws-mail-${CLAWS_VERSION}
-PKGREVISION=	2
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	X based e-mail and netnews client
@@ -71,8 +70,6 @@ PLIST_SRC+=	PLIST.shred
 .include "../../databases/db4/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/aspell/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common
index 1f47a5f433f..afaefad1275 100644
--- a/mail/claws-mail/Makefile.common
+++ b/mail/claws-mail/Makefile.common
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile.common,v 1.8 2008/10/15 16:22:02 smb Exp $
 
 # used by mail/claws-mail/plugins.mk
+
+.include "../../mail/claws-mail/Makefile.vers"
+
 DISTNAME=	claws-mail-${CLAWS_VERSION}
 CATEGORIES=	mail news x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
@@ -24,10 +27,11 @@ CONFIGURE_ENV+=		ac_cv_path_GNOME_CONFIG="no"
 
 #LICENSE=	gplv3
 
-CONFIGURE_ARGS+=        --enable-aspell
+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
@@ -38,22 +42,13 @@ 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.49
+BUILDLINK_ABI_DEPENDS.libetpan+=	libetpan>=0.57
 CONFIGURE_ARGS+=	--enable-libetpan
-.include "../../mail/libetpan/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-
-#.if !empty(PKG_BUILD_OPTIONS.claws-mail:Mbogofilter)
-#CONFIGURE_ARGS+=	--enable-bogofilter-plugin
-#.else
-#CONFIGURE_ARGS+=	--disable-bogofilter-plugin
-#.endif
-#.if !empty(PKG_BUILD_OPTIONS.claws-mail:Mspamassassin)
-#CONFIGURE_ARGS+=	--enable-spamassassin-plugin
-#.else
-#CONFIGURE_ARGS+=	--disable-spamassassin-plugin
-#.endif
 CONFIGURE_ARGS+=	--disable-bogofilter-plugin
 CONFIGURE_ARGS+=	--disable-spamassassin-plugin
 
-.include "../../mail/claws-mail/Makefile.vers"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../mail/libetpan/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 8c9bb04a621..4c105634bda 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.6 2008/07/13 22:34:19 smb Exp $
+# $NetBSD: Makefile.vers,v 1.7 2008/10/15 16:22:02 smb Exp $
 #
-CLAWS_VERSION=	3.5.0
+CLAWS_VERSION=	3.6.1
diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST
index bfc47f5903b..545a2be5528 100644
--- a/mail/claws-mail/PLIST
+++ b/mail/claws-mail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2008/09/26 17:51:17 smb Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/10/15 16:22:02 smb Exp $
 bin/claws-mail
 bin/sylpheed-claws
 include/claws-mail/account.h
@@ -96,6 +96,9 @@ include/claws-mail/gtk/description_window.h
 include/claws-mail/gtk/filesel.h
 include/claws-mail/gtk/foldersort.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/gtksourceprintjob.h
@@ -232,6 +235,7 @@ share/doc/claws-mail/manual/pl/claws-mail-manual.ps
 share/doc/claws-mail/manual/pl/claws-mail-manual.txt
 share/examples/claws-mail/mime.types
 share/icons/hicolor/48x48/apps/claws-mail.png
+share/locale/bg/LC_MESSAGES/claws-mail.mo
 share/locale/ca/LC_MESSAGES/claws-mail.mo
 share/locale/de/LC_MESSAGES/claws-mail.mo
 share/locale/en_GB/LC_MESSAGES/claws-mail.mo
@@ -240,10 +244,13 @@ 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/it/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
+share/locale/ru/LC_MESSAGES/claws-mail.mo
 share/locale/sk/LC_MESSAGES/claws-mail.mo
 share/locale/sr/LC_MESSAGES/claws-mail.mo
+share/locale/sv/LC_MESSAGES/claws-mail.mo
 share/locale/zh_CN/LC_MESSAGES/claws-mail.mo
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
diff --git a/mail/claws-mail/buildlink3.mk b/mail/claws-mail/buildlink3.mk
index c156e3d4c80..7d2b2a5179c 100644
--- a/mail/claws-mail/buildlink3.mk
+++ b/mail/claws-mail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/07/18 19:08:43 smb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/10/15 16:22:02 smb Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CLAWS_MAIL_BUILDLINK3_MK:=	${CLAWS_MAIL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	claws-mail
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}claws-mail
 
 .if ${CLAWS_MAIL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=3.5.0
+BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=3.6.1
 BUILDLINK_PKGSRCDIR.claws-mail?=	../../mail/claws-mail
 .endif	# CLAWS_MAIL_BUILDLINK3_MK
 
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 0b134bb23d5..65be1ad888a 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.10 2008/09/26 17:51:17 smb Exp $
+$NetBSD: distinfo,v 1.11 2008/10/15 16:22:02 smb Exp $
 
-SHA1 (claws-mail-3.5.0.tar.bz2) = 1833106a3a365a16a8f1b83362da36ef32edd6fb
-RMD160 (claws-mail-3.5.0.tar.bz2) = 837220a2665c0a395d25bbdab64af8903e578d1d
-Size (claws-mail-3.5.0.tar.bz2) = 4819732 bytes
+SHA1 (claws-mail-3.6.1.tar.bz2) = 5894b6e533a151ce8e4be6445e117cd40a0f63b9
+RMD160 (claws-mail-3.6.1.tar.bz2) = a36a92bbe9fe203f770bfea80ebe06362e59c666
+Size (claws-mail-3.6.1.tar.bz2) = 5387916 bytes
 SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
-SHA1 (patch-ac) = 6410910bc47784294f508f579891190e19c98402
-SHA1 (patch-ad) = 7470497384704f526e90abc4d0298a4bbe84b95c
+SHA1 (patch-ac) = 74d1910be9382748ac5a92dde966553cea683c64
 SHA1 (patch-ae) = 0312eeaaf2d31ab72d771598062019127c69cbef
 SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
diff --git a/mail/claws-mail/patches/patch-ac b/mail/claws-mail/patches/patch-ac
index 3707a574366..fafa85b43a4 100644
--- a/mail/claws-mail/patches/patch-ac
+++ b/mail/claws-mail/patches/patch-ac
@@ -1,24 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2008/05/12 02:25:39 smb Exp $
+$NetBSD: patch-ac,v 1.5 2008/10/15 16:22:02 smb Exp $
 
---- src/prefs_common.h.orig	2008-05-11 17:01:21.000000000 -0400
-+++ src/prefs_common.h	2008-05-11 17:02:01.000000000 -0400
-@@ -157,7 +157,6 @@
- 	gboolean block_cursor;
- 	gchar *quote_chars;
- 	
--#if USE_ASPELL
- 	gboolean enable_aspell;
- 	gchar *aspell_path;
- 	gchar *dictionary;
-@@ -168,7 +167,6 @@
- 	gboolean recheck_when_changing_dict;
- 	gboolean use_alternate;
- 	gboolean use_both_dicts;
--#endif
-         
- 	/* Display */
- 	/* obsolete fonts */
-@@ -322,7 +320,6 @@
+--- src/prefs_common.h.orig	2008-10-12 14:54:54.000000000 -0400
++++ src/prefs_common.h	2008-10-12 14:55:07.000000000 -0400
+@@ -331,7 +331,6 @@
  
  	GList *mime_open_cmd_history;
  
@@ -26,7 +10,7 @@ $NetBSD: patch-ac,v 1.4 2008/05/12 02:25:39 smb Exp $
  	/* Privacy */
  	gboolean auto_check_signatures;
  	gboolean gpg_signature_popup;
-@@ -330,7 +327,6 @@
+@@ -339,7 +338,6 @@
  	gint store_passphrase_timeout;
  	gboolean passphrase_grab;
  	gboolean gpg_warning;
diff --git a/mail/claws-mail/patches/patch-ad b/mail/claws-mail/patches/patch-ad
deleted file mode 100644
index b70143c10c9..00000000000
--- a/mail/claws-mail/patches/patch-ad
+++ /dev/null
@@ -1,134 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2008/09/26 17:51:17 smb Exp $
-
---- src/toolbar.c.orig	2008-06-30 10:36:22.000000000 -0400
-+++ src/toolbar.c	2008-06-30 10:37:19.000000000 -0400
-@@ -164,10 +164,8 @@
- 					 	 gpointer	 data);
- static void toolbar_addrbook_cb   		(GtkWidget   	*widget, 
- 					 	 gpointer     	 data);
--#ifdef USE_ASPELL
- static void toolbar_check_spelling_cb  		(GtkWidget   	*widget, 
- 					 	 gpointer     	 data);
--#endif
- static void toolbar_cancel_inc_cb		(GtkWidget	*widget,
- 						 gpointer	 data);
- 
-@@ -208,9 +206,7 @@
- 	{ "A_LINEWRAP_CURRENT",	N_("Wrap long lines of current paragraph") }, 
- 	{ "A_LINEWRAP_ALL",     N_("Wrap all long lines")                  }, 
- 	{ "A_ADDRBOOK",      	N_("Address book")                         },
--#ifdef USE_ASPELL
- 	{ "A_CHECK_SPELLING",	N_("Check spelling")                       },
--#endif
- 	{ "A_CLAWS_ACTIONS",   	N_("Claws Mail Actions Feature")	   }, 
- 	{ "A_CANCEL_INC",	N_("Cancel receiving")			   },
- 	{ "A_CLOSE",		N_("Close window")			   },
-@@ -346,9 +342,7 @@
- 					A_INSERT,        A_ATTACH,       A_SIG,
- 					A_EXTEDITOR,     A_LINEWRAP_CURRENT,     
- 					A_LINEWRAP_ALL,  A_ADDRBOOK,
--#ifdef USE_ASPELL
- 					A_CHECK_SPELLING, 
--#endif
- 					A_CLOSE };	
- 
- 		for (i = 0; i < sizeof comp_items / sizeof comp_items[0]; i++) 
-@@ -449,9 +443,7 @@
- 	case A_ADDRBOOK: 	return _("Address");
- 	case A_CANCEL_INC:	return _("Stop");
- 	case A_EXECUTE:		return _("Execute");
--	#ifdef USE_ASPELL
- 	case A_CHECK_SPELLING:	return _("Check spelling");
--	#endif
- 	default:		return "";
- 	}
- }
-@@ -492,9 +484,7 @@
- 	case A_ADDRBOOK: 	return STOCK_PIXMAP_ADDRESS_BOOK;
- 	case A_CANCEL_INC:	return STOCK_PIXMAP_CANCEL;
- 	case A_EXECUTE:		return STOCK_PIXMAP_EXEC;
--	#ifdef USE_ASPELL
- 	case A_CHECK_SPELLING:	return STOCK_PIXMAP_CHECK_SPELLING;
--	#endif
- 	default:		return -1;
- 	}
- }
-@@ -523,10 +513,8 @@
- 		{ A_SEPARATOR},
- 		{ A_TRASH},
- #ifndef GENERIC_UMPC
--#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
- 		{ A_LEARN_SPAM},
- #endif
--#endif
- 		{ A_SEPARATOR},
- 		{ A_GOTO_NEXT}
- 	};
-@@ -622,10 +610,8 @@
- 		{ A_SEPARATOR},
- 		{ A_TRASH},
- #ifndef GENERIC_UMPC
--#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
- 		{ A_LEARN_SPAM},
- #endif
--#endif
- 		{ A_GOTO_NEXT}
- 	};
- 	
-@@ -1585,12 +1571,10 @@
- 	compose_toolbar_cb(A_LINEWRAP_ALL, data);
- }
- 
--#ifdef USE_ASPELL
- static void toolbar_check_spelling_cb(GtkWidget *widget, gpointer data)
- {
- 	compose_toolbar_cb(A_CHECK_SPELLING, data);
- }
--#endif
- /*
-  * Execute actions from toolbar
-  */
-@@ -1715,9 +1699,7 @@
- 		{ A_LINEWRAP_CURRENT,	toolbar_linewrap_current_cb   	},
- 		{ A_LINEWRAP_ALL,	toolbar_linewrap_all_cb   	},
- 		{ A_ADDRBOOK,		toolbar_addrbook_cb		},
--#ifdef USE_ASPELL
- 		{ A_CHECK_SPELLING,     toolbar_check_spelling_cb       },
--#endif
- 		{ A_CLAWS_ACTIONS,	toolbar_actions_execute_cb	},
- 		{ A_CANCEL_INC,		toolbar_cancel_inc_cb		}
- 	};
-@@ -2059,12 +2041,10 @@
- 			TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Address book"));
- 			toolbar_data->addrbook_btn = item;
- 			break;
--#ifdef USE_ASPELL
- 		case A_CHECK_SPELLING:
- 			TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Check spelling"));
- 			toolbar_data->spellcheck_btn = item;
- 			break;
--#endif
- 
- 		case A_CLAWS_ACTIONS:
- 			TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,toolbar_item->text);
-@@ -2417,10 +2397,8 @@
- 		GTK_BUTTON_SET_SENSITIVE(compose->toolbar->linewrap_all_btn, sensitive);
- 	if (compose->toolbar->addrbook_btn)
- 		GTK_BUTTON_SET_SENSITIVE(compose->toolbar->addrbook_btn, sensitive);
--#ifdef USE_ASPELL
- 	if (compose->toolbar->spellcheck_btn)
- 		GTK_BUTTON_SET_SENSITIVE(compose->toolbar->spellcheck_btn, sensitive);
--#endif
- 	for (; items != NULL; items = g_slist_next(items)) {
- 		ToolbarClawsActions *item = (ToolbarClawsActions *)items->data;
- 		GTK_BUTTON_SET_SENSITIVE(item->widget, sensitive);
-@@ -2463,9 +2441,7 @@
- 	toolbar->linewrap_current_btn	= NULL;	
- 	toolbar->linewrap_all_btn     	= NULL;	
- 	toolbar->addrbook_btn     	= NULL;	
--#ifdef USE_ASPELL
- 	toolbar->spellcheck_btn   	= NULL;
--#endif
- 
- 	toolbar_destroy(toolbar);
- }
diff --git a/mail/claws-mail/plugins.mk b/mail/claws-mail/plugins.mk
index 6b30458023a..d3e66e88aec 100644
--- a/mail/claws-mail/plugins.mk
+++ b/mail/claws-mail/plugins.mk
@@ -1,9 +1,10 @@
-# $NetBSD: plugins.mk,v 1.2 2007/10/23 20:16:51 smb Exp $
+# $NetBSD: plugins.mk,v 1.3 2008/10/15 16:22:02 smb Exp $
 #
 
 .include "../../mail/claws-mail/Makefile.common"
+.include "../../mail/claws-mail/Makefile.vers"
 
-PKGNAME=	claws-mail-${PLUGIN_NAME:S/_/-/}-${PLUG_VER}
+PKGNAME=	claws-mail-${PLUGIN_NAME:S/_/-/}-${CLAWS_VERSION}
 
 CONFIGURE_DIRS=	.
 BUILD_DIRS=	src/plugins/${PLUGIN_NAME}