Subject: pkg/34302: [update] mail/sylpheed-claws
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Martin Wilke <netbsd@unixfreunde.de>
List: pkgsrc-bugs
Date: 08/27/2006 19:45:00
>Number: 34302
>Category: pkg
>Synopsis: [update] mail/sylpheed-claws
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sun Aug 27 19:45:00 +0000 2006
>Originator: Martin Wilke
>Release: NetBSD 4.0_BETA i386
>Organization:
>Environment:
System: NetBSD 4.0_BETA (GENERIC) #0: Thu Aug 24 06:00:32 UTC 2006
builds@b0.netbsd.org:/home/builds/ab/netbsd-4/i386/200608230000Z-obj/home/builds/ab/netbsd-4/src/sys/arch/i386/compile/GENERIC
>Description:
- Update to 2.4.0
- Switch to gtk2
- Add libetpan depends (with update to 0.46 pr id 34294 (could remove from TODO))
- Remove patches for ssl this is better
- Fix PLIST
- Maintainer is cc'd
Notes: With this update can mail/sylpheed-claws-image-viewer removed . This is not longer supported.
>How-To-Repeat:
>Fix:
--- sylpheed-claws.diff begins here ---
diff -ruN sylpheed-claws.orig/DESCR sylpheed-claws/DESCR
--- sylpheed-claws.orig/DESCR 2006-08-27 17:12:20.000000000 +0200
+++ sylpheed-claws/DESCR 2006-08-27 18:17:35.000000000 +0200
@@ -1,4 +1,4 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+, running on
+Sylpheed-Claws is an e-mail client (and news reader) based on GTK+, running on
X Window System, and aiming for
* Quick response
diff -ruN sylpheed-claws.orig/Makefile sylpheed-claws/Makefile
--- sylpheed-claws.orig/Makefile 2006-08-27 17:12:20.000000000 +0200
+++ sylpheed-claws/Makefile 2006-08-27 19:08:28.000000000 +0200
@@ -2,9 +2,8 @@
.include "Makefile.common"
-#PKGNAME= sylpheed-claws-${SYLPHEED_VERSION}
+PKGNAME= sylpheed-claws-${SYLPHEED_VERSION}
-PKGREVISION= 2
MAINTAINER= chris@NetBSD.org
COMMENT= X based e-mail and netnews client
@@ -18,6 +17,7 @@
CONFIGURE_ARGS+= --enable-openssl
CONFIGURE_ARGS+= --enable-gpgme
CONFIGURE_ARGS+= --enable-compface
+CONFIGURE_ARGS+= --enable-libetpan
CONFIGURE_ARGS+= --disable-trayicon-plugin
CONFIGURE_ARGS+= --disable-image-viewer-plugin
CONFIGURE_ARGS+= --disable-clamav-plugin
@@ -37,7 +37,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
@@ -71,7 +71,8 @@
.include "../../security/gpgme03/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 "../../mail/libetpan/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -ruN sylpheed-claws.orig/Makefile.common sylpheed-claws/Makefile.common
--- sylpheed-claws.orig/Makefile.common 2006-08-27 17:12:20.000000000 +0200
+++ sylpheed-claws/Makefile.common 2006-08-27 18:18:06.000000000 +0200
@@ -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.4.0
.include "../../mk/x11.buildlink3.mk"
diff -ruN sylpheed-claws.orig/PLIST sylpheed-claws/PLIST
--- sylpheed-claws.orig/PLIST 2006-08-27 17:12:20.000000000 +0200
+++ sylpheed-claws/PLIST 2006-08-27 19:07:53.000000000 +0200
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.17 2006/04/17 07:07:24 jlam Exp $
-bin/sylpheed
+@comment $NetBSD$
+bin/sylpheed-claws
include/sylpheed-claws/account.h
include/sylpheed-claws/action.h
include/sylpheed-claws/adbookbase.h
@@ -23,7 +23,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 +41,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 +60,11 @@
include/sylpheed-claws/editldap_basedn.h
include/sylpheed-claws/editvcard.h
include/sylpheed-claws/enriched.h
+include/sylpheed-claws/etpan/etpan-errors.h
+include/sylpheed-claws/etpan/etpan-log.h
+include/sylpheed-claws/etpan/etpan-thread-manager-types.h
+include/sylpheed-claws/etpan/etpan-thread-manager.h
+include/sylpheed-claws/etpan/imap-thread.h
include/sylpheed-claws/exphtmldlg.h
include/sylpheed-claws/expldifdlg.h
include/sylpheed-claws/export.h
@@ -71,19 +76,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 +101,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 +140,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 +191,24 @@
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
+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 +217,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
-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/man/man1/sylpheed-claws.1
+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/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/man/man1
+@dirrm share/man
+@dirrm share/examples/sylpheed-claws
@dirrm include/sylpheed-claws/gtk
+@dirrm include/sylpheed-claws/etpan
@dirrm include/sylpheed-claws/common
@dirrm include/sylpheed-claws
+@dirrm etc/sylpheed
diff -ruN sylpheed-claws.orig/buildlink3.mk sylpheed-claws/buildlink3.mk
--- sylpheed-claws.orig/buildlink3.mk 2006-08-27 17:12:20.000000000 +0200
+++ sylpheed-claws/buildlink3.mk 2006-08-27 18:35:32.000000000 +0200
@@ -1,9 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:58 jlam Exp $
+# $NetBSD$
+# XXX
+# XXX This file was created automatically using createbuildlink-3.13.
+# XXX After this file has been verified as correct, the comment lines
+# XXX beginning with "XXX" should be removed. Please do not commit
+# XXX unverified buildlink3.mk files.
+# XXX
+# XXX Packages that only install static libraries or headers should
+# XXX include the following line:
+# XXX
+# XXX BUILDLINK_DEPMETHOD.sylpheed-claws?= build
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SYLPHEED_CLAWS_BUILDLINK3_MK:= ${SYLPHEED_CLAWS_BUILDLINK3_MK}+
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
BUILDLINK_DEPENDS+= sylpheed-claws
.endif
@@ -11,10 +21,17 @@
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
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../security/gpgme03/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/aspell/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../mail/libetpan/buildlink3.mk"
+
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -ruN sylpheed-claws.orig/distinfo sylpheed-claws/distinfo
--- sylpheed-claws.orig/distinfo 2006-08-27 17:12:20.000000000 +0200
+++ sylpheed-claws/distinfo 2006-08-27 18:19:21.000000000 +0200
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.23 2006/03/24 10:09:14 joerg 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 (sylpheed-claws-2.4.0.tar.bz2) = f61acdf3e9851da3d1e2591321bf43426465955f
+RMD160 (sylpheed-claws-2.4.0.tar.bz2) = 4c22797f73e290cfc2ea1006d9a04b0cdf4783c1
+Size (sylpheed-claws-2.4.0.tar.bz2) = 4593307 bytes
SHA1 (patch-aa) = 49c5c826b43d5ac8ddcc93d2b09c9053a55aa8ed
SHA1 (patch-ab) = 23ae3a93dd78ae549ee6d27764a82b59a7d8a843
diff -ruN sylpheed-claws.orig/patches/patch-aa sylpheed-claws/patches/patch-aa
--- sylpheed-claws.orig/patches/patch-aa 2006-08-27 17:12:20.000000000 +0200
+++ sylpheed-claws/patches/patch-aa 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruN sylpheed-claws.orig/patches/patch-ab sylpheed-claws/patches/patch-ab
--- sylpheed-claws.orig/patches/patch-ab 2006-08-27 17:12:20.000000000 +0200
+++ sylpheed-claws/patches/patch-ab 1970-01-01 01:00:00.000000000 +0100
@@ -1,184 +0,0 @@
-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. */
-
-- 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>
-
-- 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. */
--- sylpheed-claws.diff ends here ---