Upgrade Claws Mail to 3.2.0, plus add the tnef plug-in.

# Several GUI improvements
The colour preferences have been split into tabs.
Improve the way 'Find in current message' search results are
shown by vertically centering the selected text in the
Message View.
Improvements to the 'List URIs' dialogue.
Filtering/Processing Match Type dialogue has been reworked.
Several other layout improvements.

# Several address book improvements
Added Custom Attributes, which can be edited from
'/Tools/Edit custom attributes...' and are used from the
'Name' drop down list on the 'Edit Person Details' dialogue.
Always add a new contact if any value is set, instead of
silently rejecting it when an email address is not set.
Better guessing of contact name from incomplete name
information.
Better display of contacts that have no name set, in contact
lists, group contents, find duplicate results.
Error messages don't show in the status bar anymore, alert
panels are used instead.
Several other GUI improvements.

# Added optional Tooltips to the Message List. This is enabled by the
'Show tooltips' option on the '/Display/Summaries' Preferences page
and is only possible with GTK+ >= 2.12

# Much improved handling of Return Receipts, both outgoing and
incoming.

# Added the option to use the system defaults for External Programs
preferences on the '/Message View/External Programs' page.

# Added "select first email in list" to the list of possible
selections in the 'Set default selection on entering a folder'
options on the '/Display/Summaries' preferences page.

# IMAP: Added IMAP tags support. (Note: 'Bandwidth-efficient' mode
prevents fetching of tags.)

# IMAP: Optimised flag handling and message copying.

# Improved printed page layout for built-in GTK+ printing
Bold fonts are now used where appropriate and a demarcation
between header and body has been added.

# Optimised filtering on flags/tags changes.

# MAEMO: Added LED flashing for new mail alerts

# MAEMO: Made all of the left of column in the Folder List a hotspot
for expanding/collapsing the tree.

# Updated translations: Brazilian Portuguese, French, German,
Hungarian, Italian, and Spanish

7 files changed, 48 insertions, 29 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index bc2f4825d66..060841bcb80 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2007/10/27 13:57:29 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/01/09 03:55:09 smb Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	claws-mail-${CLAWS_VERSION}
-PKGREVISION=	1
 
 MAINTAINER=	smb@NetBSD.org
 COMMENT=	X based e-mail and netnews client
@@ -31,12 +30,12 @@ EGDIR=		${PREFIX}/share/examples/claws-mail
 CONF_FILES=	${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.claws-mail
+PKG_SUPPORTED_OPTIONS=	claws-mail-jpilot ldap inet6
 PKG_SUGGESTED_OPTIONS=
-PKG_SUPPORTED_OPTIONS=	jpilot ldap inet6
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mjpilot)
+.if !empty(PKG_OPTIONS:Mclaws-mail-jpilot)
 CONFIGURE_ARGS+=	--enable-jpilot
 .  include "../../comms/pilot-link-libs/buildlink3.mk"
 .  include "../../comms/jpilot/buildlink3.mk"
diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common
index ac0879f26c3..791e57c3649 100644
--- a/mail/claws-mail/Makefile.common
+++ b/mail/claws-mail/Makefile.common
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.common,v 1.5 2007/09/18 06:40:36 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2008/01/09 03:55:09 smb Exp $
 
+# used by mail/claws-mail/plugins.mk
 DISTNAME=	claws-mail-${CLAWS_VERSION}
 CATEGORIES=	mail news x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index 815c7959df7..d451868cbb2 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.3 2007/10/23 20:16:51 smb Exp $
+# $NetBSD: Makefile.vers,v 1.4 2008/01/09 03:55:09 smb Exp $
 #
-CLAWS_VERSION=	3.0.2
+CLAWS_VERSION=	3.2.0
diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST
index 2ab6537a580..b0310e2080d 100644
--- a/mail/claws-mail/PLIST
+++ b/mail/claws-mail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/09/22 21:24:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/01/09 03:55:09 smb Exp $
 bin/claws-mail
 bin/sylpheed-claws
 include/claws-mail/account.h
@@ -8,7 +8,9 @@ include/claws-mail/addr_compl.h
 include/claws-mail/addrbook.h
 include/claws-mail/addrcache.h
 include/claws-mail/addrclip.h
+include/claws-mail/addrcustomattr.h
 include/claws-mail/addrdefs.h
+include/claws-mail/addrduplicates.h
 include/claws-mail/addressadd.h
 include/claws-mail/addressbook.h
 include/claws-mail/addressbook_foldersel.h
@@ -29,7 +31,6 @@ include/claws-mail/common/hooks.h
 include/claws-mail/common/log.h
 include/claws-mail/common/md5.h
 include/claws-mail/common/mgutils.h
-include/claws-mail/common/nntp.h
 include/claws-mail/common/passcrypt.h
 include/claws-mail/common/plugin.h
 include/claws-mail/common/prefs.h
@@ -70,6 +71,7 @@ include/claws-mail/etpan/etpan-errors.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
+include/claws-mail/etpan/nntp-thread.h
 include/claws-mail/exphtmldlg.h
 include/claws-mail/expldifdlg.h
 include/claws-mail/export.h
@@ -179,6 +181,7 @@ include/claws-mail/prefs_template.h
 include/claws-mail/prefs_themes.h
 include/claws-mail/prefs_toolbar.h
 include/claws-mail/prefs_wrapping.h
+include/claws-mail/printing.h
 include/claws-mail/privacy.h
 include/claws-mail/procheader.h
 include/claws-mail/procmime.h
@@ -252,6 +255,8 @@ 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
 share/locale/zh_TW/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
 @dirrm share/examples/claws-mail
 @dirrm share/doc/claws-mail/manual/pl
 @dirrm share/doc/claws-mail/manual/fr
@@ -265,4 +270,4 @@ share/locale/zh_TW/LC_MESSAGES/claws-mail.mo
 @dirrm include/claws-mail/etpan
 @dirrm include/claws-mail/common
 @dirrm include/claws-mail
-@dirrm etc/claws-mail
+@dirrm lib/claws-mail
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 155ff552b17..08203205561 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2007/10/23 20:16:51 smb Exp $
+$NetBSD: distinfo,v 1.6 2008/01/09 03:55:09 smb Exp $
 
-SHA1 (claws-mail-3.0.2.tar.bz2) = a607aca53a349f3a0a8d8f7a51f4754705e12350
-RMD160 (claws-mail-3.0.2.tar.bz2) = e7041fa284b73faa40ba7fc6dce3914625cd89d9
-Size (claws-mail-3.0.2.tar.bz2) = 5664767 bytes
+SHA1 (claws-mail-3.2.0.tar.bz2) = 23e093afb9cae541f4ace74f41178a551aec3921
+RMD160 (claws-mail-3.2.0.tar.bz2) = 31af404393bfd15b26b20ec2c056de1f82ad3e31
+Size (claws-mail-3.2.0.tar.bz2) = 5880889 bytes
 SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
 SHA1 (patch-ac) = cb1b427cf2bcd810cc1bd05324fdb9d40c695bfc
-SHA1 (patch-ad) = f4944b8fe86b1c6e2362dd9068d09199de6b83d7
+SHA1 (patch-ad) = e37162dbbf335bef2b418722cd55c2e19f79e0a6
+SHA1 (patch-af) = a24836beb156bf28921bc7606e8a5224d536b0b4
diff --git a/mail/claws-mail/patches/patch-ad b/mail/claws-mail/patches/patch-ad
index fb6d6656364..2a71ab21eff 100644
--- a/mail/claws-mail/patches/patch-ad
+++ b/mail/claws-mail/patches/patch-ad
@@ -1,26 +1,26 @@
-$NetBSD: patch-ad,v 1.2 2007/09/18 03:17:25 smb Exp $
+$NetBSD: patch-ad,v 1.3 2008/01/09 03:55:09 smb Exp $
 
---- 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")   },
+--- src/toolbar.c.orig	2007-12-26 22:40:51.000000000 -0500
++++ src/toolbar.c	2007-12-26 22:41:12.000000000 -0500
+@@ -518,10 +518,8 @@
+ 		{ A_SEPARATOR},
+ 		{ A_TRASH},
  #ifndef MAEMO
 -#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
- 		{ A_LEARN_SPAM,	   STOCK_PIXMAP_SPAM_BTN,             _("Spam")    },
+ 		{ A_LEARN_SPAM},
  #endif
 -#endif
- 		{ A_SEPARATOR,     0,                                 ("")         },
- 		{ A_GOTO_NEXT,     STOCK_PIXMAP_DOWN_ARROW,           _("Next")    }
+ 		{ A_SEPARATOR},
+ 		{ A_GOTO_NEXT}
  	};
-@@ -533,10 +531,8 @@
- 		{ A_SEPARATOR,     0,                                 ("")         },
- 		{ A_TRASH,         STOCK_PIXMAP_TRASH,                _("Trash")   },
+@@ -617,10 +615,8 @@
+ 		{ A_SEPARATOR},
+ 		{ A_TRASH},
  #ifndef MAEMO
 -#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
- 		{ A_LEARN_SPAM,	   STOCK_PIXMAP_SPAM_BTN,             _("Spam")    },
+ 		{ A_LEARN_SPAM},
  #endif
 -#endif
- 		{ A_GOTO_NEXT,     STOCK_PIXMAP_DOWN_ARROW,           _("Next")    }
+ 		{ A_GOTO_NEXT}
  	};
  	
diff --git a/mail/claws-mail/patches/patch-af b/mail/claws-mail/patches/patch-af
new file mode 100644
index 00000000000..17fdbf031cb
--- /dev/null
+++ b/mail/claws-mail/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2008/01/09 03:55:09 smb Exp $
+
+--- src/common/ssl_certificate.c.orig	2007-12-26 22:47:33.000000000 -0500
++++ src/common/ssl_certificate.c	2007-12-26 22:48:25.000000000 -0500
+@@ -34,6 +34,8 @@
+ #include <unistd.h>
+ #include <string.h>
+ #endif
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <glib.h>
+ #include <glib/gi18n.h>
+