Update to version 2.5.5. Thank you to Martin Wilke for PR 34302

and also to George Michaelson for patches. Note that I had already
had updated mine before I saw these, so some things are different.
At this time libetpan is not enabled -- we can make an option for it.

Added more items to disable: libetpan, gnomeprint, bogofiloter and pgp*
plugins.

Set OPENSSL_CFLAGS and OPENSSL_LIBS for SSL support -- so patch
is not needed. (cipher issue for DragonFly was already in upstream.)

Changed config and example directories to sylpheed-claws (instead
of sylpheed).

Specifically make sure jpilot and ldap are disabled if not selected.

Changed includes for gpgme03 to gpgme and gtk to gtk2.

Executable is called "sylpheed-claws" now.

Updated BUILDLINK_API_DEPENDS.sylpheed-claws.

Patch patch-ab is for a problem with installing po files.

NOTE: The plugins needs to be updated. And sylpheed-claws-image-viewer
can be removed.

Changes for sylpheed-claws itself are many:

o bug 1034, 'Incorrect display of size field in message view
   * Make node expanding in the Folder List non-recursive
   * Bug fixes:
     o bug 1024, 'Array index out of range in sylpheed-claws-2.5.2'
     o Fix "Check for new folders" on folders with accented characters
     o Fix filtering "copy" rules
     o Fix "goto next unread" after collapsing/expanding a node

Many more but too many to list here.

cvs: ----------------------------------------------------------------------

7 files changed, 96 insertions, 399 deletions

diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 1ee124beed4..7830039a80d 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2006/10/10 14:40:53 reed Exp $
+# $NetBSD: Makefile,v 1.50 2006/10/16 13:06:09 reed Exp $
 
 .include "Makefile.common"
 
 #PKGNAME=	sylpheed-claws-${SYLPHEED_VERSION}
 
-PKGREVISION=	2
 MAINTAINER=	reed@NetBSD.org
 COMMENT=	X based e-mail and netnews client
 
@@ -13,19 +12,33 @@ CONFLICTS=		sylpheed-[0-9]* sylpheed-gtk2-[0-9]*
 USE_TOOLS+=		msgfmt
 PKGCONFIG_OVERRIDE+=	sylpheed-claws.pc.in
 
+#BUILDLINK_ABI_DEPENDS.libetpan+=	libetpan>=0.46
+
 CONFIGURE_ARGS+=        --enable-aspell
 CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--enable-openssl
 CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-compface
+#CONFIGURE_ARGS+=	--enable-libetpan
+CONFIGURE_ARGS+=	--disable-libetpan
 CONFIGURE_ARGS+=	--disable-trayicon-plugin
 CONFIGURE_ARGS+=	--disable-image-viewer-plugin
 CONFIGURE_ARGS+=	--disable-clamav-plugin
 CONFIGURE_ARGS+=	--disable-dillo-viewer-plugin
 CONFIGURE_ARGS+=	--disable-spamassassin-plugin
 CONFIGURE_ARGS+=	--disable-mathml-viewer-plugin
-
-PKG_SYSCONFSUBDIR=	sylpheed
+CONFIGURE_ARGS+=	--disable-pgpcore-plugin
+CONFIGURE_ARGS+=	--disable-pgpmime-plugin
+CONFIGURE_ARGS+=	--disable-pgpinline-plugin
+CONFIGURE_ARGS+=	--disable-bogofilter-plugin
+CONFIGURE_ARGS+=	--disable-gnomeprint
+
+# 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"
+
+PKG_SYSCONFSUBDIR=	sylpheed-claws
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
@@ -37,7 +50,7 @@ FACES_IS_INSTALLED!=	${PKG_INFO} -e faces || ${ECHO}
 .  include "../../mail/faces/buildlink3.mk"
 .endif
 
-EGDIR=		${PREFIX}/share/examples/sylpheed
+EGDIR=		${PREFIX}/share/examples/sylpheed-claws
 CONF_FILES=	${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sylpheed-claws
@@ -49,11 +62,15 @@ PKG_SUPPORTED_OPTIONS=	jpilot ldap inet6
 CONFIGURE_ARGS+=	--enable-jpilot
 .  include "../../comms/pilot-link-libs/buildlink3.mk"
 .  include "../../comms/jpilot/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-jpilot
 .endif
 
 .if !empty(PKG_OPTIONS:Mldap)
 CONFIGURE_ARGS+=	--enable-ldap
 .  include "../../databases/openldap-client/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-ldap
 .endif
 
 .if !empty(PKG_OPTIONS:Minet6)
@@ -68,10 +85,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sylpheed*.png ${PREFIX}/share/sylpheed-claws
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../security/gpgme03/buildlink3.mk"
+#.include "../../mail/libetpan/buildlink3.mk"
+.include "../../security/gpgme/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed-claws/Makefile.common b/mail/sylpheed-claws/Makefile.common
index 64a65000085..b8eef0cf2ed 100644
--- a/mail/sylpheed-claws/Makefile.common
+++ b/mail/sylpheed-claws/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2006/10/04 21:47:17 wiz Exp $
+# $NetBSD: Makefile.common,v 1.17 2006/10/16 13:06:09 reed Exp $
 
 DISTNAME=	sylpheed-claws-${SYLPHEED_VERSION}
 CATEGORIES=	mail news x11
@@ -18,6 +18,6 @@ GNU_CONFIGURE=		YES
 # Force gnome detection off to avoid installing some extra files
 CONFIGURE_ENV+=		ac_cv_path_GNOME_CONFIG="no"
 
-SYLPHEED_VERSION=	1.0.4
+SYLPHEED_VERSION=	2.5.5
 
 .include "../../mk/x11.buildlink3.mk"
diff --git a/mail/sylpheed-claws/PLIST b/mail/sylpheed-claws/PLIST
index f5d13d50ab5..51a75eeeb05 100644
--- a/mail/sylpheed-claws/PLIST
+++ b/mail/sylpheed-claws/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.17 2006/04/17 07:07:24 jlam Exp $
-bin/sylpheed
+@comment $NetBSD: PLIST,v 1.18 2006/10/16 13:06:09 reed Exp $
+bin/sylpheed-claws
 include/sylpheed-claws/account.h
 include/sylpheed-claws/action.h
 include/sylpheed-claws/adbookbase.h
@@ -10,6 +10,7 @@ include/sylpheed-claws/addrclip.h
 include/sylpheed-claws/addrdefs.h
 include/sylpheed-claws/addressadd.h
 include/sylpheed-claws/addressbook.h
+include/sylpheed-claws/addressbook_foldersel.h
 include/sylpheed-claws/addressitem.h
 include/sylpheed-claws/addrgather.h
 include/sylpheed-claws/addrharvest.h
@@ -23,7 +24,6 @@ include/sylpheed-claws/codeconv.h
 include/sylpheed-claws/common/base64.h
 include/sylpheed-claws/common/defs.h
 include/sylpheed-claws/common/hooks.h
-include/sylpheed-claws/common/intl.h
 include/sylpheed-claws/common/log.h
 include/sylpheed-claws/common/md5.h
 include/sylpheed-claws/common/mgutils.h
@@ -42,6 +42,7 @@ include/sylpheed-claws/common/string_match.h
 include/sylpheed-claws/common/stringtable.h
 include/sylpheed-claws/common/sylpheed.h
 include/sylpheed-claws/common/template.h
+include/sylpheed-claws/common/timing.h
 include/sylpheed-claws/common/utils.h
 include/sylpheed-claws/common/uuencode.h
 include/sylpheed-claws/common/version.h
@@ -60,6 +61,11 @@ include/sylpheed-claws/editldap.h
 include/sylpheed-claws/editldap_basedn.h
 include/sylpheed-claws/editvcard.h
 include/sylpheed-claws/enriched.h
+@comment include/sylpheed-claws/etpan/etpan-errors.h
+@comment include/sylpheed-claws/etpan/etpan-log.h
+@comment include/sylpheed-claws/etpan/etpan-thread-manager-types.h
+@comment include/sylpheed-claws/etpan/etpan-thread-manager.h
+@comment include/sylpheed-claws/etpan/imap-thread.h
 include/sylpheed-claws/exphtmldlg.h
 include/sylpheed-claws/expldifdlg.h
 include/sylpheed-claws/export.h
@@ -71,19 +77,22 @@ include/sylpheed-claws/folder_item_prefs.h
 include/sylpheed-claws/foldersel.h
 include/sylpheed-claws/folderutils.h
 include/sylpheed-claws/folderview.h
+include/sylpheed-claws/gedit-print.h
 include/sylpheed-claws/grouplistdialog.h
 include/sylpheed-claws/gtk/about.h
 include/sylpheed-claws/gtk/colorlabel.h
 include/sylpheed-claws/gtk/colorsel.h
+include/sylpheed-claws/gtk/combobox.h
 include/sylpheed-claws/gtk/description_window.h
 include/sylpheed-claws/gtk/filesel.h
 include/sylpheed-claws/gtk/foldersort.h
 include/sylpheed-claws/gtk/gtkaspell.h
 include/sylpheed-claws/gtk/gtksctree.h
 include/sylpheed-claws/gtk/gtkshruler.h
-include/sylpheed-claws/gtk/gtkstext.h
+include/sylpheed-claws/gtk/gtksourceprintjob.h
 include/sylpheed-claws/gtk/gtkutils.h
 include/sylpheed-claws/gtk/gtkvscrollbutton.h
+include/sylpheed-claws/gtk/icon_legend.h
 include/sylpheed-claws/gtk/inputdialog.h
 include/sylpheed-claws/gtk/logwindow.h
 include/sylpheed-claws/gtk/manage_window.h
@@ -93,8 +102,10 @@ include/sylpheed-claws/gtk/prefswindow.h
 include/sylpheed-claws/gtk/progressdialog.h
 include/sylpheed-claws/gtk/quicksearch.h
 include/sylpheed-claws/gtk/sslcertwindow.h
+include/sylpheed-claws/gtk/sylpheed-marshal.h
 include/sylpheed-claws/headerview.h
 include/sylpheed-claws/html.h
+include/sylpheed-claws/image_viewer.h
 include/sylpheed-claws/imap.h
 include/sylpheed-claws/imap_gtk.h
 include/sylpheed-claws/import.h
@@ -130,26 +141,30 @@ include/sylpheed-claws/news_gtk.h
 include/sylpheed-claws/noticeview.h
 include/sylpheed-claws/partial_download.h
 include/sylpheed-claws/pine.h
-include/sylpheed-claws/plugins/pgpmime/passphrase.h
-include/sylpheed-claws/plugins/pgpmime/pgpmime.h
-include/sylpheed-claws/plugins/pgpmime/prefs_gpg.h
-include/sylpheed-claws/plugins/pgpmime/select-keys.h
-include/sylpheed-claws/plugins/pgpmime/sgpgme.h
 include/sylpheed-claws/pop.h
 include/sylpheed-claws/prefs_account.h
 include/sylpheed-claws/prefs_actions.h
 include/sylpheed-claws/prefs_common.h
+include/sylpheed-claws/prefs_compose_writing.h
 include/sylpheed-claws/prefs_customheader.h
 include/sylpheed-claws/prefs_display_header.h
 include/sylpheed-claws/prefs_ext_prog.h
 include/sylpheed-claws/prefs_filtering.h
 include/sylpheed-claws/prefs_filtering_action.h
+include/sylpheed-claws/prefs_folder_column.h
 include/sylpheed-claws/prefs_folder_item.h
 include/sylpheed-claws/prefs_fonts.h
 include/sylpheed-claws/prefs_gtk.h
+include/sylpheed-claws/prefs_image_viewer.h
 include/sylpheed-claws/prefs_matcher.h
+include/sylpheed-claws/prefs_message.h
 include/sylpheed-claws/prefs_msg_colors.h
+include/sylpheed-claws/prefs_other.h
+include/sylpheed-claws/prefs_quote.h
+include/sylpheed-claws/prefs_receive.h
+include/sylpheed-claws/prefs_send.h
 include/sylpheed-claws/prefs_spelling.h
+include/sylpheed-claws/prefs_summaries.h
 include/sylpheed-claws/prefs_summary_column.h
 include/sylpheed-claws/prefs_template.h
 include/sylpheed-claws/prefs_themes.h
@@ -177,22 +192,25 @@ include/sylpheed-claws/toolbar.h
 include/sylpheed-claws/undo.h
 include/sylpheed-claws/unmime.h
 include/sylpheed-claws/vcard.h
+include/sylpheed-claws/wizard.h
 lib/pkgconfig/sylpheed-claws.pc
-lib/sylpheed-claws/plugins/pgpmime.la
-man/man1/sylpheed.1
-share/examples/sylpheed/mime.types
+man/man1/sylpheed-claws.1
+share/examples/sylpheed-claws/mime.types
 share/locale/bg/LC_MESSAGES/sylpheed-claws.mo
+share/locale/ca/LC_MESSAGES/sylpheed-claws.mo
 share/locale/cs/LC_MESSAGES/sylpheed-claws.mo
 share/locale/de/LC_MESSAGES/sylpheed-claws.mo
 share/locale/el/LC_MESSAGES/sylpheed-claws.mo
 share/locale/en_GB/LC_MESSAGES/sylpheed-claws.mo
 share/locale/es/LC_MESSAGES/sylpheed-claws.mo
+share/locale/fi/LC_MESSAGES/sylpheed-claws.mo
 share/locale/fr/LC_MESSAGES/sylpheed-claws.mo
 share/locale/hr/LC_MESSAGES/sylpheed-claws.mo
 share/locale/hu/LC_MESSAGES/sylpheed-claws.mo
 share/locale/it/LC_MESSAGES/sylpheed-claws.mo
 share/locale/ja/LC_MESSAGES/sylpheed-claws.mo
 share/locale/ko/LC_MESSAGES/sylpheed-claws.mo
+share/locale/nb/LC_MESSAGES/sylpheed-claws.mo
 share/locale/nl/LC_MESSAGES/sylpheed-claws.mo
 share/locale/pl/LC_MESSAGES/sylpheed-claws.mo
 share/locale/pt_BR/LC_MESSAGES/sylpheed-claws.mo
@@ -201,157 +219,33 @@ share/locale/sk/LC_MESSAGES/sylpheed-claws.mo
 share/locale/sr/LC_MESSAGES/sylpheed-claws.mo
 share/locale/sv/LC_MESSAGES/sylpheed-claws.mo
 share/locale/zh_CN/LC_MESSAGES/sylpheed-claws.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed-claws.mo
-share/sylpheed-claws/faq/de/sylpheed-faq-1.html
-share/sylpheed-claws/faq/de/sylpheed-faq-2.html
-share/sylpheed-claws/faq/de/sylpheed-faq-3.html
-share/sylpheed-claws/faq/de/sylpheed-faq.html
-share/sylpheed-claws/faq/en/sylpheed-faq-1.html
-share/sylpheed-claws/faq/en/sylpheed-faq-2.html
-share/sylpheed-claws/faq/en/sylpheed-faq-3.html
-share/sylpheed-claws/faq/en/sylpheed-faq-4.html
-share/sylpheed-claws/faq/en/sylpheed-faq.html
-share/sylpheed-claws/faq/es/sylpheed-faq-1.html
-share/sylpheed-claws/faq/es/sylpheed-faq-2.html
-share/sylpheed-claws/faq/es/sylpheed-faq-3.html
-share/sylpheed-claws/faq/es/sylpheed-faq-4.html
-share/sylpheed-claws/faq/es/sylpheed-faq.html
-share/sylpheed-claws/faq/fr/sylpheed-faq-1.html
-share/sylpheed-claws/faq/fr/sylpheed-faq-2.html
-share/sylpheed-claws/faq/fr/sylpheed-faq-3.html
-share/sylpheed-claws/faq/fr/sylpheed-faq.html
-share/sylpheed-claws/faq/it/sylpheed-faq-1.html
-share/sylpheed-claws/faq/it/sylpheed-faq-2.html
-share/sylpheed-claws/faq/it/sylpheed-faq-3.html
-share/sylpheed-claws/faq/it/sylpheed-faq.html
-share/sylpheed-claws/manual/de/sylpheed-1.html
-share/sylpheed-claws/manual/de/sylpheed-10.html
-share/sylpheed-claws/manual/de/sylpheed-11.html
-share/sylpheed-claws/manual/de/sylpheed-12.html
-share/sylpheed-claws/manual/de/sylpheed-13.html
-share/sylpheed-claws/manual/de/sylpheed-14.html
-share/sylpheed-claws/manual/de/sylpheed-15.html
-share/sylpheed-claws/manual/de/sylpheed-16.html
-share/sylpheed-claws/manual/de/sylpheed-17.html
-share/sylpheed-claws/manual/de/sylpheed-18.html
-share/sylpheed-claws/manual/de/sylpheed-19.html
-share/sylpheed-claws/manual/de/sylpheed-2.html
-share/sylpheed-claws/manual/de/sylpheed-20.html
-share/sylpheed-claws/manual/de/sylpheed-3.html
-share/sylpheed-claws/manual/de/sylpheed-4.html
-share/sylpheed-claws/manual/de/sylpheed-5.html
-share/sylpheed-claws/manual/de/sylpheed-6.html
-share/sylpheed-claws/manual/de/sylpheed-7.html
-share/sylpheed-claws/manual/de/sylpheed-8.html
-share/sylpheed-claws/manual/de/sylpheed-9.html
-share/sylpheed-claws/manual/de/sylpheed.html
-share/sylpheed-claws/manual/en/sylpheed-1.html
-share/sylpheed-claws/manual/en/sylpheed-10.html
-share/sylpheed-claws/manual/en/sylpheed-11.html
-share/sylpheed-claws/manual/en/sylpheed-12.html
-share/sylpheed-claws/manual/en/sylpheed-13.html
-share/sylpheed-claws/manual/en/sylpheed-14.html
-share/sylpheed-claws/manual/en/sylpheed-15.html
-share/sylpheed-claws/manual/en/sylpheed-16.html
-share/sylpheed-claws/manual/en/sylpheed-17.html
-share/sylpheed-claws/manual/en/sylpheed-18.html
-share/sylpheed-claws/manual/en/sylpheed-19.html
-share/sylpheed-claws/manual/en/sylpheed-2.html
-share/sylpheed-claws/manual/en/sylpheed-20.html
-share/sylpheed-claws/manual/en/sylpheed-21.html
-share/sylpheed-claws/manual/en/sylpheed-22.html
-share/sylpheed-claws/manual/en/sylpheed-3.html
-share/sylpheed-claws/manual/en/sylpheed-4.html
-share/sylpheed-claws/manual/en/sylpheed-5.html
-share/sylpheed-claws/manual/en/sylpheed-6.html
-share/sylpheed-claws/manual/en/sylpheed-7.html
-share/sylpheed-claws/manual/en/sylpheed-8.html
-share/sylpheed-claws/manual/en/sylpheed-9.html
-share/sylpheed-claws/manual/en/sylpheed.html
-share/sylpheed-claws/manual/es/sylpheed-1.html
-share/sylpheed-claws/manual/es/sylpheed-10.html
-share/sylpheed-claws/manual/es/sylpheed-11.html
-share/sylpheed-claws/manual/es/sylpheed-12.html
-share/sylpheed-claws/manual/es/sylpheed-13.html
-share/sylpheed-claws/manual/es/sylpheed-14.html
-share/sylpheed-claws/manual/es/sylpheed-15.html
-share/sylpheed-claws/manual/es/sylpheed-16.html
-share/sylpheed-claws/manual/es/sylpheed-17.html
-share/sylpheed-claws/manual/es/sylpheed-18.html
-share/sylpheed-claws/manual/es/sylpheed-19.html
-share/sylpheed-claws/manual/es/sylpheed-2.html
-share/sylpheed-claws/manual/es/sylpheed-20.html
-share/sylpheed-claws/manual/es/sylpheed-3.html
-share/sylpheed-claws/manual/es/sylpheed-4.html
-share/sylpheed-claws/manual/es/sylpheed-5.html
-share/sylpheed-claws/manual/es/sylpheed-6.html
-share/sylpheed-claws/manual/es/sylpheed-7.html
-share/sylpheed-claws/manual/es/sylpheed-8.html
-share/sylpheed-claws/manual/es/sylpheed-9.html
-share/sylpheed-claws/manual/es/sylpheed.html
-share/sylpheed-claws/manual/fr/sylpheed-1.html
-share/sylpheed-claws/manual/fr/sylpheed-10.html
-share/sylpheed-claws/manual/fr/sylpheed-11.html
-share/sylpheed-claws/manual/fr/sylpheed-12.html
-share/sylpheed-claws/manual/fr/sylpheed-13.html
-share/sylpheed-claws/manual/fr/sylpheed-14.html
-share/sylpheed-claws/manual/fr/sylpheed-15.html
-share/sylpheed-claws/manual/fr/sylpheed-16.html
-share/sylpheed-claws/manual/fr/sylpheed-17.html
-share/sylpheed-claws/manual/fr/sylpheed-18.html
-share/sylpheed-claws/manual/fr/sylpheed-19.html
-share/sylpheed-claws/manual/fr/sylpheed-2.html
-share/sylpheed-claws/manual/fr/sylpheed-20.html
-share/sylpheed-claws/manual/fr/sylpheed-3.html
-share/sylpheed-claws/manual/fr/sylpheed-4.html
-share/sylpheed-claws/manual/fr/sylpheed-5.html
-share/sylpheed-claws/manual/fr/sylpheed-6.html
-share/sylpheed-claws/manual/fr/sylpheed-7.html
-share/sylpheed-claws/manual/fr/sylpheed-8.html
-share/sylpheed-claws/manual/fr/sylpheed-9.html
-share/sylpheed-claws/manual/fr/sylpheed.html
-share/sylpheed-claws/manual/ja/sylpheed-1.html
-share/sylpheed-claws/manual/ja/sylpheed-10.html
-share/sylpheed-claws/manual/ja/sylpheed-11.html
-share/sylpheed-claws/manual/ja/sylpheed-12.html
-share/sylpheed-claws/manual/ja/sylpheed-13.html
-share/sylpheed-claws/manual/ja/sylpheed-14.html
-share/sylpheed-claws/manual/ja/sylpheed-15.html
-share/sylpheed-claws/manual/ja/sylpheed-16.html
-share/sylpheed-claws/manual/ja/sylpheed-17.html
-share/sylpheed-claws/manual/ja/sylpheed-18.html
-share/sylpheed-claws/manual/ja/sylpheed-19.html
-share/sylpheed-claws/manual/ja/sylpheed-2.html
-share/sylpheed-claws/manual/ja/sylpheed-20.html
-share/sylpheed-claws/manual/ja/sylpheed-3.html
-share/sylpheed-claws/manual/ja/sylpheed-4.html
-share/sylpheed-claws/manual/ja/sylpheed-5.html
-share/sylpheed-claws/manual/ja/sylpheed-6.html
-share/sylpheed-claws/manual/ja/sylpheed-7.html
-share/sylpheed-claws/manual/ja/sylpheed-8.html
-share/sylpheed-claws/manual/ja/sylpheed-9.html
-share/sylpheed-claws/manual/ja/sylpheed.html
-share/sylpheed-claws/manual/ja/sylpheed.sgml
-share/sylpheed-claws/sylpheed-128x128.png
-share/sylpheed-claws/sylpheed-64x64.png
-share/sylpheed-claws/sylpheed.png
-@dirrm share/sylpheed-claws/manual/ja
+share/locale/zh_TW/LC_MESSAGES/sylpheed-claws.mo
+share/sylpheed-claws/manual/en/sylpheed-claws-manual.html
+share/sylpheed-claws/manual/en/sylpheed-claws-manual.pdf
+share/sylpheed-claws/manual/en/sylpheed-claws-manual.ps
+share/sylpheed-claws/manual/en/sylpheed-claws-manual.txt
+share/sylpheed-claws/manual/es/sylpheed-claws-manual.html
+share/sylpheed-claws/manual/es/sylpheed-claws-manual.pdf
+share/sylpheed-claws/manual/es/sylpheed-claws-manual.ps
+share/sylpheed-claws/manual/es/sylpheed-claws-manual.txt
+share/sylpheed-claws/manual/fr/sylpheed-claws-manual.html
+share/sylpheed-claws/manual/fr/sylpheed-claws-manual.pdf
+share/sylpheed-claws/manual/fr/sylpheed-claws-manual.ps
+share/sylpheed-claws/manual/fr/sylpheed-claws-manual.txt
+share/sylpheed-claws/manual/pl/sylpheed-claws-manual.html
+share/sylpheed-claws/manual/pl/sylpheed-claws-manual.pdf
+share/sylpheed-claws/manual/pl/sylpheed-claws-manual.ps
+share/sylpheed-claws/manual/pl/sylpheed-claws-manual.txt
+share/sylpheed-claws/sylpheed-claws-128x128.png
+share/sylpheed-claws/sylpheed-claws-64x64.png
+share/sylpheed-claws/sylpheed-claws.png
+@dirrm share/sylpheed-claws/manual/pl
 @dirrm share/sylpheed-claws/manual/fr
 @dirrm share/sylpheed-claws/manual/es
 @dirrm share/sylpheed-claws/manual/en
-@dirrm share/sylpheed-claws/manual/de
 @dirrm share/sylpheed-claws/manual
-@dirrm share/sylpheed-claws/faq/it
-@dirrm share/sylpheed-claws/faq/fr
-@dirrm share/sylpheed-claws/faq/es
-@dirrm share/sylpheed-claws/faq/en
-@dirrm share/sylpheed-claws/faq/de
-@dirrm share/sylpheed-claws/faq
 @dirrm share/sylpheed-claws
-@dirrm share/examples/sylpheed
-@dirrm lib/sylpheed-claws/plugins
-@dirrm include/sylpheed-claws/plugins/pgpmime
-@dirrm include/sylpheed-claws/plugins
+@dirrm share/examples/sylpheed-claws
 @dirrm include/sylpheed-claws/gtk
 @dirrm include/sylpheed-claws/common
 @dirrm include/sylpheed-claws
diff --git a/mail/sylpheed-claws/buildlink3.mk b/mail/sylpheed-claws/buildlink3.mk
index 6c4672978f5..be181340b15 100644
--- a/mail/sylpheed-claws/buildlink3.mk
+++ b/mail/sylpheed-claws/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:58 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/10/16 13:06:09 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SYLPHEED_CLAWS_BUILDLINK3_MK:=	${SYLPHEED_CLAWS_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	sylpheed-claws
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sylpheed-claws
 
 .if !empty(SYLPHEED_CLAWS_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.sylpheed-claws+=	sylpheed-claws>=0.9.7nb1
-BUILDLINK_ABI_DEPENDS.sylpheed-claws?=	sylpheed-claws>=1.0.4nb1
+.if ${SYLPHEED_CLAWS_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.sylpheed-claws+= sylpheed-claws>=2.4.0
 BUILDLINK_PKGSRCDIR.sylpheed-claws?=	../../mail/sylpheed-claws
 .endif	# SYLPHEED_CLAWS_BUILDLINK3_MK
 
diff --git a/mail/sylpheed-claws/distinfo b/mail/sylpheed-claws/distinfo
index 3e448d61b62..39c0e839fab 100644
--- a/mail/sylpheed-claws/distinfo
+++ b/mail/sylpheed-claws/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.24 2006/09/16 15:29:36 hira Exp $
+$NetBSD: distinfo,v 1.25 2006/10/16 13:06:09 reed Exp $
 
-SHA1 (sylpheed-claws-1.0.4.tar.bz2) = 168452f7244b490bdb0c38ed14f762ed3fb21dbc
-RMD160 (sylpheed-claws-1.0.4.tar.bz2) = fc831101a7a0d7e942709bf36566d5a266e4248d
-Size (sylpheed-claws-1.0.4.tar.bz2) = 3188838 bytes
-SHA1 (patch-aa) = 49c5c826b43d5ac8ddcc93d2b09c9053a55aa8ed
-SHA1 (patch-ab) = 56ae3dd8550df3f2358b0657764aa60262249bfb
+SHA1 (sylpheed-claws-2.5.5.tar.bz2) = 1908c485af6f0a3baee373e4734f71010a26d182
+RMD160 (sylpheed-claws-2.5.5.tar.bz2) = 3cad84790a50029fbe1f8d6b91383e01a10459eb
+Size (sylpheed-claws-2.5.5.tar.bz2) = 5038409 bytes
+SHA1 (patch-ab) = 926d79d328cb3a94f4c53bc5d3d2657f8534114d
diff --git a/mail/sylpheed-claws/patches/patch-aa b/mail/sylpheed-claws/patches/patch-aa
deleted file mode 100644
index bc4d49c72b4..00000000000
--- a/mail/sylpheed-claws/patches/patch-aa
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/01/22 02:26:54 joerg Exp $
-
---- configure.ac.orig	2005-03-24 10:55:19.000000000 +0000
-+++ configure.ac
-@@ -238,19 +238,28 @@ dnl Check for OpenSSL
- AC_ARG_ENABLE(openssl,
- 	[  --enable-openssl    Attempt to use OpenSSL for SSL support.],
- 	[ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=yes])
--if test x"$ac_cv_enable_openssl" = xyes; then
--	PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7, :, ac_cv_enable_openssl=no)
--	if test x$ac_cv_enable_openssl = xyes; then
--		AC_DEFINE(USE_OPENSSL, 1, Define if you want OpenSSL support)
--	fi
-+if test $ac_cv_enable_openssl = yes; then
-+        AC_MSG_CHECKING([if openssl is available])
-+        OPENSSL_LIBS="$LIBS -lssl -lcrypto"
-+        AC_TRY_LINK([
-+#include <openssl/opensslv.h>
-+],      [ return OPENSSL_VERSION_NUMBER; ],
-+        [ AC_MSG_RESULT(yes)
-+          AC_DEFINE(USE_OPENSSL, 1, Define if you want OpenSSL support.) ],
-+        [ AC_MSG_RESULT(no)
-+          OPENSSL_LIBS="$ac_save_LIBS"
-+	  ac_cv_enable_openssl=no ])
-+else
-+	AC_MSG_RESULT(no)
- fi
-+
- AC_SUBST(OPENSSL_CFLAGS)
- AC_SUBST(OPENSSL_LIBS)
- 
- dnl password encryption
- OLDLIBS=$LIBS
- LIBS=
--AC_SEARCH_LIBS(encrypt, crypt, [], AC_MSG_ERROR(['encrypt'-function not found.]))
-+AC_SEARCH_LIBS(encrypt, crypt cipher, [], AC_MSG_ERROR(['encrypt'-function not found.]))
- CRYPT_LIBS=$LIBS
- AC_SUBST(CRYPT_LIBS)
- LIBS=$OLDLIBS
diff --git a/mail/sylpheed-claws/patches/patch-ab b/mail/sylpheed-claws/patches/patch-ab
index face7173368..7f4b0672d94 100644
--- a/mail/sylpheed-claws/patches/patch-ab
+++ b/mail/sylpheed-claws/patches/patch-ab
@@ -1,186 +1,11 @@
-$NetBSD: patch-ab,v 1.4 2006/09/16 15:29:36 hira Exp $
-
-diff -uNr sylpheed-claws-1.0.4.orig/configure sylpheed-claws-1.0.4/configure
---- configure.orig	2006-03-24 09:17:34.000000000 +0000
-+++ configure	2006-03-24 09:17:47.000000000 +0000
-@@ -27599,114 +27724,75 @@
- else
-   ac_cv_enable_openssl=yes
- fi;
--if test x"$ac_cv_enable_openssl" = xyes; then
--
--  succeeded=no
--
--  if test -z "$PKG_CONFIG"; then
--    # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
--  ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--
--if test -n "$PKG_CONFIG"; then
--  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--  fi
-+if test $ac_cv_enable_openssl = yes; then
-+        echo "$as_me:$LINENO: checking if openssl is available" >&5
-+echo $ECHO_N "checking if openssl is available... $ECHO_C" >&6
-+        OPENSSL_LIBS="$LIBS -lssl -lcrypto"
-+        cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
+--- po/Makefile.in.in.orig	2006-08-28 02:07:05.000000000 -0500
++++ po/Makefile.in.in	2006-10-11 09:52:32.000000000 -0500
+@@ -30,7 +30,7 @@
  
--  if test "$PKG_CONFIG" = "no" ; then
--     echo "*** The pkg-config script could not be found. Make sure it is"
--     echo "*** in your path, or set the PKG_CONFIG environment variable"
--     echo "*** to the full path to pkg-config."
--     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
--  else
--     PKG_CONFIG_MIN_VERSION=0.9.0
--     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        echo "$as_me:$LINENO: checking for openssl >= 0.9.7" >&5
--echo $ECHO_N "checking for openssl >= 0.9.7... $ECHO_C" >&6
-+#include <openssl/opensslv.h>
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-mkinstalldirs = $(SHELL) @install_sh@ -d
++mkinstalldirs = @install_sh@ -d
+ mkdir_p = @mkdir_p@
  
--        if $PKG_CONFIG --exists "openssl >= 0.9.7" ; then
--            echo "$as_me:$LINENO: result: yes" >&5
-+int
-+main ()
-+{
-+ return OPENSSL_VERSION_NUMBER;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+   echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--            succeeded=yes
--
--            echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5
--echo $ECHO_N "checking OPENSSL_CFLAGS... $ECHO_C" >&6
--            OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 0.9.7"`
--            echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5
--echo "${ECHO_T}$OPENSSL_CFLAGS" >&6
--
--            echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5
--echo $ECHO_N "checking OPENSSL_LIBS... $ECHO_C" >&6
--            OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 0.9.7"`
--            echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5
--echo "${ECHO_T}$OPENSSL_LIBS" >&6
--        else
--            OPENSSL_CFLAGS=""
--            OPENSSL_LIBS=""
--            ## If we have a custom action on failure, don't print errors, but
--            ## do set a variable so people can do so.
--            OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl >= 0.9.7"`
--
--        fi
--
--
--
--     else
--        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
--        echo "*** See http://www.freedesktop.org/software/pkgconfig"
--     fi
--  fi
--
--  if test $succeeded = yes; then
--     :
--  else
--     ac_cv_enable_openssl=no
--  fi
--
--	if test x$ac_cv_enable_openssl = xyes; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_OPENSSL 1
- _ACEOF
- 
--	fi
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+          OPENSSL_LIBS="$ac_save_LIBS"
-+	  ac_cv_enable_openssl=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+else
-+	echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- 
- 
- 
-+
- OLDLIBS=$LIBS
- LIBS=
- echo "$as_me:$LINENO: checking for library containing encrypt" >&5
-@@ -27768,7 +27855,7 @@
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_encrypt" = no; then
--  for ac_lib in crypt; do
-+  for ac_lib in crypt cipher; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
+ GMSGFMT_ = @GMSGFMT@