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.

4 files changed, 17 insertions, 34 deletions

diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index 1b3dab02cd5..6222ca021af 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,32 +1,26 @@
-# $NetBSD: Makefile,v 1.11 2008/09/26 17:51:17 smb Exp $
+# $NetBSD: Makefile,v 1.12 2008/10/15 16:22:03 smb Exp $
+#
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-DISTNAME=	smime-0.7.6
-PKGNAME=	claws-mail-smime-0.7.6
-CATEGORIES=	mail
-MASTER_SITES=	http://claws-mail.org/downloads/plugins/
-PKGREVISION=2
+PLUGIN_NAME=	smime
+.include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	This plugin handles S/MIME signed and/or encrypted mails
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-DEPENDS+=	claws-mail-3.5.0{,nb[0-9]*}:../../mail/claws-mail
 PLIST_SRC+=	PLIST
 
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+=	--enable-gpgme
+CONFIGURE_ARGS+=	--enable-smime-plugin
+CONFIGURE_ARGS+=	--enable-pgpcore-plugin
+
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+#DEPENDS+=	gpgme>=1.1.4nb2:../../security/gpgme
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config
-USE_LIBTOOL=	yes
-USE_LANGUAGES+=	c
 
 .include "../../mail/claws-mail/Makefile.vers"
-.include "../../mail/claws-mail/buildlink3.mk"
 .include "../../mail/claws-mail-pgpcore/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../security/gnupg2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-smime/PLIST b/mail/claws-mail-smime/PLIST
index f7c6a19e011..2da735f6daf 100644
--- a/mail/claws-mail-smime/PLIST
+++ b/mail/claws-mail-smime/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2007/08/03 02:34:59 smb Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/10/15 16:22:03 smb Exp $
 lib/claws-mail/plugins/smime.deps
 lib/claws-mail/plugins/smime.la
+include/claws-mail/plugins/smime/smime.h
+lib/claws-mail/plugins/smime.deps
 @dirrm lib/claws-mail/plugins
+@dirrm include/claws-mail/plugins/smime
diff --git a/mail/claws-mail-smime/distinfo b/mail/claws-mail-smime/distinfo
index fd7b04f377d..02d3771360a 100644
--- a/mail/claws-mail-smime/distinfo
+++ b/mail/claws-mail-smime/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2008/07/13 22:56:08 smb Exp $
+$NetBSD: distinfo,v 1.7 2008/10/15 16:22:03 smb Exp $
 
 SHA1 (smime-0.7.6.tar.gz) = c43760b3f97ca89f7b607537795d2cc2089c5226
 RMD160 (smime-0.7.6.tar.gz) = e86981be2d83166057dbb2994e49cec802bb6040
 Size (smime-0.7.6.tar.gz) = 337459 bytes
-SHA1 (patch-aa) = 8db7d35d818ceb1bb3d936e45600c7481914042b
diff --git a/mail/claws-mail-smime/patches/patch-aa b/mail/claws-mail-smime/patches/patch-aa
deleted file mode 100644
index 7f2e629b972..00000000000
--- a/mail/claws-mail-smime/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2008/07/04 17:02:50 smb Exp $
-
---- src/smime.c.orig	2008-06-30 22:57:10.000000000 -0400
-+++ src/smime.c	2008-06-30 22:57:18.000000000 -0400
-@@ -19,7 +19,7 @@
-  */
- 
- #ifdef HAVE_CONFIG_H
--#  include "config.h"
-+#  include "pluginconfig.h"
- #endif
- 
- #ifdef USE_GPGME