[pkgsrc/trunk]: pkgsrc/mail/sylpheed-claws Update to version 2.5.5. Thank you...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9505e6a554ec
branches:  trunk
changeset: 520170:9505e6a554ec
user:      reed <reed%pkgsrc.org@localhost>
date:      Mon Oct 16 13:06:09 2006 +0000

description:
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: ----------------------------------------------------------------------

diffstat:

 mail/sylpheed-claws/Makefile         |   30 ++++-
 mail/sylpheed-claws/Makefile.common  |    4 +-
 mail/sylpheed-claws/PLIST            |  210 ++++++++--------------------------
 mail/sylpheed-claws/buildlink3.mk    |    6 +-
 mail/sylpheed-claws/distinfo         |   11 +-
 mail/sylpheed-claws/patches/patch-aa |   39 ------
 mail/sylpheed-claws/patches/patch-ab |  193 +------------------------------
 7 files changed, 95 insertions(+), 398 deletions(-)

diffs (truncated from 711 to 300 lines):

diff -r f708c69c5d14 -r 9505e6a554ec mail/sylpheed-claws/Makefile
--- a/mail/sylpheed-claws/Makefile      Mon Oct 16 12:50:43 2006 +0000
+++ b/mail/sylpheed-claws/Makefile      Mon Oct 16 13:06:09 2006 +0000
@@ -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@localhost
 COMMENT=       X based e-mail and netnews client
 
@@ -13,19 +12,33 @@
 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
+CONFIGURE_ARGS+=       --disable-pgpcore-plugin
+CONFIGURE_ARGS+=       --disable-pgpmime-plugin
+CONFIGURE_ARGS+=       --disable-pgpinline-plugin
+CONFIGURE_ARGS+=       --disable-bogofilter-plugin
+CONFIGURE_ARGS+=       --disable-gnomeprint
 
-PKG_SYSCONFSUBDIR=     sylpheed
+# 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 @@
 .  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 @@
 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 @@
        ${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 -r f708c69c5d14 -r 9505e6a554ec mail/sylpheed-claws/Makefile.common
--- a/mail/sylpheed-claws/Makefile.common       Mon Oct 16 12:50:43 2006 +0000
+++ b/mail/sylpheed-claws/Makefile.common       Mon Oct 16 13:06:09 2006 +0000
@@ -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 @@
 # 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 -r f708c69c5d14 -r 9505e6a554ec mail/sylpheed-claws/PLIST
--- a/mail/sylpheed-claws/PLIST Mon Oct 16 12:50:43 2006 +0000
+++ b/mail/sylpheed-claws/PLIST Mon Oct 16 13:06:09 2006 +0000
@@ -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/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/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/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_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/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/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/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/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/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