Changes 0.9.7:

* the MIME parser has been rewritten
* GnuPG/GPGME: the method of checking signed messages has been
  improved and the reporting of signed messages has been modified.
* GnuPG/GPGME: decrypted messages are no longer saved and the user
  will now be prompted to decrypt each time the message is selected.
* new icons have been added for MIME types
* Filtering: 3 new actions have been added.
* IMAP: UIDPLUS support for COPY and EXPUNGE has been added
* Folder Properties: 'Procesing on startup' has been added.
* LDAP: it is possible to browse an entry that was retrieved using
  an explicit LDAP search
* LDAP: a 'contains' query is now possible
* SpamAssassin plugin: updated spamc to version 2.60. Support for
  new libspamc transports has been added
* updated translations: Croatian, French, German, Japanese,
  Polish, Spanish, Serbian, Simpilified Chinese, and Slovak
* Bug fixes

4 files changed, 190 insertions, 29 deletions

diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 2615e458515..44e72e39b90 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2003/11/12 03:39:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.24 2003/12/11 15:22:28 adam Exp $
 #
 
-DISTNAME=	sylpheed-0.9.4claws
-PKGREVISION=	4
-PKGNAME=	sylpheed-claws-0.9.4
+DISTNAME=	sylpheed-0.9.7claws
+PKGNAME=	sylpheed-claws-0.9.7
 CATEGORIES=	mail news x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,17 +11,21 @@ MAINTAINER=	chris@NetBSD.org
 HOMEPAGE=	http://sylpheed-claws.sourceforge.net/
 COMMENT=	X based e-mail and netnews client
 
-BUILD_USES_MSGFMT=	yes
+BUILD_USES_MSGFMT=	YES
 
 CONFLICTS=		sylpheed-[0-9]* sylpheed-gtk2-[0-9]*
 
-USE_BUILDLINK2=		yes
-USE_PKGINSTALL=		yes
-USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
-USE_GMAKE=		yes
+USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
+USE_PKGLOCALEDIR=	YES
+USE_X11=		YES
+USE_GMAKE=		YES
 
-GNU_CONFIGURE=		yes
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/sylpheed-claws.pc.in
+
+GNU_CONFIGURE=		YES
 # Force gnome detection off to avoid installing some extra files
 CONFIGURE_ENV+=		ac_cv_path_GNOME_CONFIG="no"
 CONFIGURE_ARGS+=        --enable-aspell
diff --git a/mail/sylpheed-claws/PLIST b/mail/sylpheed-claws/PLIST
index 5427874eaf7..10b73eae490 100644
--- a/mail/sylpheed-claws/PLIST
+++ b/mail/sylpheed-claws/PLIST
@@ -1,5 +1,172 @@
-@comment $NetBSD: PLIST,v 1.9 2003/09/03 18:19:43 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.10 2003/12/11 15:22:28 adam Exp $
 bin/sylpheed
+include/sylpheed/account.h
+include/sylpheed/action.h
+include/sylpheed/adbookbase.h
+include/sylpheed/addr_compl.h
+include/sylpheed/addrbook.h
+include/sylpheed/addrcache.h
+include/sylpheed/addrclip.h
+include/sylpheed/addrdefs.h
+include/sylpheed/addressadd.h
+include/sylpheed/addressbook.h
+include/sylpheed/addressitem.h
+include/sylpheed/addrgather.h
+include/sylpheed/addrharvest.h
+include/sylpheed/addrindex.h
+include/sylpheed/addritem.h
+include/sylpheed/addrquery.h
+include/sylpheed/addrselect.h
+include/sylpheed/alertpanel.h
+include/sylpheed/browseldap.h
+include/sylpheed/codeconv.h
+include/sylpheed/common/base64.h
+include/sylpheed/common/defs.h
+include/sylpheed/common/hooks.h
+include/sylpheed/common/intl.h
+include/sylpheed/common/log.h
+include/sylpheed/common/md5.h
+include/sylpheed/common/mgutils.h
+include/sylpheed/common/nntp.h
+include/sylpheed/common/passcrypt.h
+include/sylpheed/common/plugin.h
+include/sylpheed/common/prefs.h
+include/sylpheed/common/progressindicator.h
+include/sylpheed/common/quoted-printable.h
+include/sylpheed/common/session.h
+include/sylpheed/common/smtp.h
+include/sylpheed/common/socket.h
+include/sylpheed/common/ssl.h
+include/sylpheed/common/ssl_certificate.h
+include/sylpheed/common/stringtable.h
+include/sylpheed/common/sylpheed.h
+include/sylpheed/common/template.h
+include/sylpheed/common/utils.h
+include/sylpheed/common/uuencode.h
+include/sylpheed/common/version.h
+include/sylpheed/common/xml.h
+include/sylpheed/common/xmlprops.h
+include/sylpheed/compose.h
+include/sylpheed/config.h
+include/sylpheed/crash.h
+include/sylpheed/customheader.h
+include/sylpheed/displayheader.h
+include/sylpheed/editaddress.h
+include/sylpheed/editbook.h
+include/sylpheed/editgroup.h
+include/sylpheed/editjpilot.h
+include/sylpheed/editldap.h
+include/sylpheed/editldap_basedn.h
+include/sylpheed/editvcard.h
+include/sylpheed/enriched.h
+include/sylpheed/exphtmldlg.h
+include/sylpheed/expldifdlg.h
+include/sylpheed/export.h
+include/sylpheed/exporthtml.h
+include/sylpheed/exportldif.h
+include/sylpheed/filtering.h
+include/sylpheed/folder.h
+include/sylpheed/folder_item_prefs.h
+include/sylpheed/foldersel.h
+include/sylpheed/folderview.h
+include/sylpheed/grouplistdialog.h
+include/sylpheed/gtk/about.h
+include/sylpheed/gtk/colorlabel.h
+include/sylpheed/gtk/colorsel.h
+include/sylpheed/gtk/description_window.h
+include/sylpheed/gtk/filesel.h
+include/sylpheed/gtk/gtkaspell.h
+include/sylpheed/gtk/gtksctree.h
+include/sylpheed/gtk/gtkshruler.h
+include/sylpheed/gtk/gtkstext.h
+include/sylpheed/gtk/gtkutils.h
+include/sylpheed/gtk/gtkvscrollbutton.h
+include/sylpheed/gtk/logwindow.h
+include/sylpheed/gtk/manage_window.h
+include/sylpheed/gtk/menu.h
+include/sylpheed/gtk/pluginwindow.h
+include/sylpheed/gtk/prefswindow.h
+include/sylpheed/gtk/progressdialog.h
+include/sylpheed/gtk/sslcertwindow.h
+include/sylpheed/headerview.h
+include/sylpheed/html.h
+include/sylpheed/imap.h
+include/sylpheed/import.h
+include/sylpheed/importldif.h
+include/sylpheed/importmutt.h
+include/sylpheed/importpine.h
+include/sylpheed/inc.h
+include/sylpheed/inputdialog.h
+include/sylpheed/jpilot.h
+include/sylpheed/ldapctrl.h
+include/sylpheed/ldaplocate.h
+include/sylpheed/ldapquery.h
+include/sylpheed/ldapserver.h
+include/sylpheed/ldaputil.h
+include/sylpheed/ldif.h
+include/sylpheed/main.h
+include/sylpheed/mainwindow.h
+include/sylpheed/manual.h
+include/sylpheed/matcher.h
+include/sylpheed/matcher_parser.h
+include/sylpheed/matcher_parser_lex.h
+include/sylpheed/matcher_parser_parse.h
+include/sylpheed/mbox.h
+include/sylpheed/message_search.h
+include/sylpheed/messageview.h
+include/sylpheed/mh.h
+include/sylpheed/mimeview.h
+include/sylpheed/msgcache.h
+include/sylpheed/mutt.h
+include/sylpheed/news.h
+include/sylpheed/noticeview.h
+include/sylpheed/passphrase.h
+include/sylpheed/pgpmime.h
+include/sylpheed/pine.h
+include/sylpheed/pop.h
+include/sylpheed/prefs_account.h
+include/sylpheed/prefs_actions.h
+include/sylpheed/prefs_common.h
+include/sylpheed/prefs_customheader.h
+include/sylpheed/prefs_display_header.h
+include/sylpheed/prefs_filtering.h
+include/sylpheed/prefs_filtering_action.h
+include/sylpheed/prefs_folder_item.h
+include/sylpheed/prefs_fonts.h
+include/sylpheed/prefs_gtk.h
+include/sylpheed/prefs_matcher.h
+include/sylpheed/prefs_scoring.h
+include/sylpheed/prefs_spelling.h
+include/sylpheed/prefs_summary_column.h
+include/sylpheed/prefs_template.h
+include/sylpheed/prefs_toolbar.h
+include/sylpheed/privacy.h
+include/sylpheed/procheader.h
+include/sylpheed/procmime.h
+include/sylpheed/procmsg.h
+include/sylpheed/quote_fmt.h
+include/sylpheed/quote_fmt_lex.h
+include/sylpheed/quote_fmt_parse.h
+include/sylpheed/recv.h
+include/sylpheed/rfc2015.h
+include/sylpheed/scoring.h
+include/sylpheed/select-keys.h
+include/sylpheed/send_message.h
+include/sylpheed/setup.h
+include/sylpheed/sgpgme.h
+include/sylpheed/sourcewindow.h
+include/sylpheed/ssl_manager.h
+include/sylpheed/statusbar.h
+include/sylpheed/stock_pixmap.h
+include/sylpheed/string_match.h
+include/sylpheed/summary_search.h
+include/sylpheed/summaryview.h
+include/sylpheed/textview.h
+include/sylpheed/toolbar.h
+include/sylpheed/undo.h
+include/sylpheed/unmime.h
+include/sylpheed/vcard.h
+lib/pkgconfig/sylpheed-claws.pc
 man/man1/sylpheed.1
 share/examples/sylpheed/mime.types
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/sylpheed.mo
@@ -18,8 +185,10 @@ ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/sylpheed.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/sylpheed.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/sylpheed.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/sylpheed.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/sylpheed.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sylpheed.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/sylpheed.mo
 ${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
 share/sylpheed/faq/de/sylpheed-faq-1.html
 share/sylpheed/faq/de/sylpheed-faq-2.html
@@ -165,3 +334,6 @@ share/sylpheed/sylpheed.png
 @dirrm share/sylpheed/faq
 @dirrm share/sylpheed
 @dirrm share/examples/sylpheed
+@dirrm include/sylpheed/gtk
+@dirrm include/sylpheed/common
+@dirrm include/sylpheed
diff --git a/mail/sylpheed-claws/distinfo b/mail/sylpheed-claws/distinfo
index fd6a0b4ded2..a7082bdc4a6 100644
--- a/mail/sylpheed-claws/distinfo
+++ b/mail/sylpheed-claws/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.9 2003/10/22 16:49:25 cube Exp $
+$NetBSD: distinfo,v 1.10 2003/12/11 15:22:28 adam Exp $
 
-SHA1 (sylpheed-0.9.4claws.tar.bz2) = 4c97d56e154463f09c6f9b9517110ffd1eeaf80b
-Size (sylpheed-0.9.4claws.tar.bz2) = 2609202 bytes
-SHA1 (patch-aa) = 85f1f67c1fd6a12a4dca03460e2af7bd2f40e4a4
+SHA1 (sylpheed-0.9.7claws.tar.bz2) = 5611837ea9a5addd81089d574abffb2c67c92117
+Size (sylpheed-0.9.7claws.tar.bz2) = 2846105 bytes
diff --git a/mail/sylpheed-claws/patches/patch-aa b/mail/sylpheed-claws/patches/patch-aa
deleted file mode 100644
index 5c1325bc147..00000000000
--- a/mail/sylpheed-claws/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/10/22 16:49:26 cube Exp $
-
---- src/send_message.c.orig	2003-07-22 13:16:26.000000000 +0200
-+++ src/send_message.c
-@@ -614,7 +614,7 @@ static void send_put_error(Session *sess
- 	if (log_msg)
- 		log_warning("%s\n", log_msg);
- 	if (err_msg) {
--		alertpanel_error_log(err_msg);
-+		alertpanel_error_log("%s", err_msg);
- 		g_free(err_msg);
- 	}
- }