Hi!
Attached is a patch to update claws-mail to version 3.3.0.
NOTE: The clamav-plugin is not part of this anymore, it is now
available as external plugin due to licensing problems.
changelog is here: <http://www.claws-mail.org/news.php>
Tested and works so far on i386.
Ulrich
diff -x CVS -urN claws-mail.orig/Makefile claws-mail/Makefile
--- claws-mail.orig/Makefile Fri Jan 25 22:33:50 2008
+++ claws-mail/Makefile Fri Feb 8 20:38:46 2008
@@ -7,13 +7,12 @@
COMMENT-dillo= dillo plugin
COMMENT-spamassassin= spamassassin plugin
-V= 3.2.0
+V= 3.3.0
DISTNAME= claws-mail-${V}
-PKGNAME-main= ${DISTNAME}p0
+PKGNAME-main= ${DISTNAME}
FULLPKGNAME-docs= claws-mail-docs-${V}
FULLPKGNAME-bogofilter= claws-mail-bogofilter-${V}
-FULLPKGNAME-clamav= claws-mail-clamav-${V}
FULLPKGNAME-dillo= claws-mail-dillo-${V}
FULLPKGNAME-spamassassin= claws-mail-spamassassin-${V}
@@ -34,8 +33,7 @@
DIST_SUBDIR= claws
-MULTI_PACKAGES= -main -docs -bogofilter -clamav -dillo \
- -spamassassin
+MULTI_PACKAGES= -main -docs -bogofilter -dillo -spamassassin
FLAVORS= jpilot compface ldap debug
FLAVOR?=
@@ -45,7 +43,6 @@
SHARED_ONLY= Yes
RUN_DEPENDS-bogofilter= ::${BUILD_PKGPATH} \
::mail/bogofilter
-RUN_DEPENDS-clamav= ::${BUILD_PKGPATH}
RUN_DEPENDS-dillo= ::${BUILD_PKGPATH} \
::www/dillo
RUN_DEPENDS-spamassassin=::${BUILD_PKGPATH} \
@@ -58,7 +55,6 @@
WANTLIB-main= ${WANTLIB} ICE SM c pthread stdc++
WANTLIB-docs=
-WANTLIB-clamav= ${WANTLIB} bz2 gmp
LIB_DEPENDS= atk-1.0::devel/atk \
cairo::graphics/cairo \
@@ -78,14 +74,15 @@
startup-notification-1::devel/startup-notification \
aspell::textproc/aspell/core \
gpgme::security/gpgme \
- gpg-error::security/libgpg-error
-CONFIGURE_ARGS+= --disable-gnomeprint
+ gpg-error::security/libgpg-error \
+ dbus-1::x11/dbus \
+ dbus-glib-1::x11/dbus-glib
+CONFIGURE_ARGS+= --disable-gnomeprint \
+ --disable-networkmanager-support
+
LIB_DEPENDS-docs=
PKG_ARCH-docs= *
-
-LIB_DEPENDS-clamav= ${LIB_DEPENDS} \
- clamav::security/clamav
MODULES= devel/gettext
USE_X11= Yes
diff -x CVS -urN claws-mail.orig/distinfo claws-mail/distinfo
--- claws-mail.orig/distinfo Thu Jan 10 17:56:54 2008
+++ claws-mail/distinfo Fri Feb 8 17:55:00 2008
@@ -1,5 +1,5 @@
-MD5 (claws/claws-mail-3.2.0.tar.bz2) = rL/ZGfe2M9UelqBBmsB4Ag==
-RMD160 (claws/claws-mail-3.2.0.tar.bz2) = Ma9AQ5O/0Vsmsg7CwFbeH4KtPjE=
-SHA1 (claws/claws-mail-3.2.0.tar.bz2) = I+CTr7nK5UH0rOdPQReKVRrsOSE=
-SHA256 (claws/claws-mail-3.2.0.tar.bz2) = Ju1szqKCzsl4ooZ3O7oFgaE/Zv5ddKbMFgpi2azFXSE=
-SIZE (claws/claws-mail-3.2.0.tar.bz2) = 5880889
+MD5 (claws/claws-mail-3.3.0.tar.bz2) = ZG/qab+oK+X1B+cuBVlXtg==
+RMD160 (claws/claws-mail-3.3.0.tar.bz2) = iRRPpX6u5CsRND4v4aPvgmJrTyg=
+SHA1 (claws/claws-mail-3.3.0.tar.bz2) = tu7kwichqaeekcCjX/rMNOCLeIQ=
+SHA256 (claws/claws-mail-3.3.0.tar.bz2) = FtSp7zosYvh5xoi3lJ9NC4NLJsmQXRb+59dkMt8p2P0=
+SIZE (claws/claws-mail-3.3.0.tar.bz2) = 5933626
diff -x CVS -urN claws-mail.orig/patches/patch-src_common_ssl_certificate_c claws-mail/patches/patch-src_common_ssl_certificate_c
--- claws-mail.orig/patches/patch-src_common_ssl_certificate_c Fri Jan 25 22:33:50 2008
+++ claws-mail/patches/patch-src_common_ssl_certificate_c Fri Feb 8 18:20:09 2008
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_common_ssl_certificate_c,v 1.2 2008/01/25 14:20:31 landry Exp $
---- src/common/ssl_certificate.c.orig Mon Dec 17 06:37:01 2007
-+++ src/common/ssl_certificate.c Thu Jan 24 17:54:43 2008
-@@ -37,6 +37,9 @@
+--- src/common/ssl_certificate.c.orig Fri Feb 8 06:33:16 2008
++++ src/common/ssl_certificate.c Fri Feb 8 17:55:41 2008
+@@ -40,6 +40,9 @@
#include <glib.h>
#include <glib/gi18n.h>
diff -x CVS -urN claws-mail.orig/patches/patch-src_etpan_imap-thread_c claws-mail/patches/patch-src_etpan_imap-thread_c
--- claws-mail.orig/patches/patch-src_etpan_imap-thread_c Fri Jan 25 15:20:31 2008
+++ claws-mail/patches/patch-src_etpan_imap-thread_c Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_etpan_imap-thread_c,v 1.1 2008/01/25 14:20:31 landry Exp $
---- src/etpan/imap-thread.c.orig Thu Jan 24 17:55:29 2008
-+++ src/etpan/imap-thread.c Thu Jan 24 17:55:56 2008
-@@ -288,6 +288,9 @@ void imap_main_set_timeout(int sec)
- void imap_main_done(void)
- {
- etpan_thread_manager_stop(thread_manager);
-+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
-+ return;
-+#endif
- etpan_thread_manager_join(thread_manager);
-
- g_source_remove(thread_manager_signal);
diff -x CVS -urN claws-mail.orig/patches/patch-src_etpan_nntp-thread_c claws-mail/patches/patch-src_etpan_nntp-thread_c
--- claws-mail.orig/patches/patch-src_etpan_nntp-thread_c Fri Jan 25 15:20:31 2008
+++ claws-mail/patches/patch-src_etpan_nntp-thread_c Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_etpan_nntp-thread_c,v 1.1 2008/01/25 14:20:31 landry Exp $
---- src/etpan/nntp-thread.c.orig Thu Jan 24 17:55:38 2008
-+++ src/etpan/nntp-thread.c Thu Jan 24 17:56:14 2008
-@@ -150,6 +150,9 @@ void nntp_main_init(gboolean skip_ssl_cert_check)
- void nntp_main_done(void)
- {
- etpan_thread_manager_stop(thread_manager);
-+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
-+ return;
-+#endif
- etpan_thread_manager_join(thread_manager);
-
- g_source_remove(thread_manager_signal);
diff -x CVS -urN claws-mail.orig/patches/patch-src_procmime_c claws-mail/patches/patch-src_procmime_c
--- claws-mail.orig/patches/patch-src_procmime_c Thu Jan 10 17:56:54 2008
+++ claws-mail/patches/patch-src_procmime_c Fri Feb 8 18:20:09 2008
@@ -1,15 +1,7 @@
$OpenBSD: patch-src_procmime_c,v 1.4 2008/01/08 23:13:23 landry Exp $
---- src/procmime.c.orig Mon Dec 17 06:37:02 2007
-+++ src/procmime.c Fri Dec 28 23:49:56 2007
-@@ -1055,14 +1055,14 @@ GList *procmime_get_mime_type_list(void)
- if (mime_type_list)
- return mime_type_list;
-
--#if defined(__NetBSD__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
- if ((fp = g_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL)
- #else
- if ((fp = g_fopen("/usr/share/mime/globs", "rb")) == NULL)
+--- src/procmime.c.orig Fri Feb 8 06:33:17 2008
++++ src/procmime.c Fri Feb 8 18:19:56 2008
+@@ -1083,7 +1083,7 @@ GList *procmime_get_mime_type_list(void)
#endif
{
fp_is_glob_file = FALSE;
diff -x CVS -urN claws-mail.orig/pkg/DESCR-clamav claws-mail/pkg/DESCR-clamav
--- claws-mail.orig/pkg/DESCR-clamav Wed Apr 11 22:48:43 2007
+++ claws-mail/pkg/DESCR-clamav Thu Jan 1 01:00:00 1970
@@ -1 +0,0 @@
-Claws Mail plugin for clamav support.
diff -x CVS -urN claws-mail.orig/pkg/PLIST-clamav claws-mail/pkg/PLIST-clamav
--- claws-mail.orig/pkg/PLIST-clamav Fri Apr 20 07:42:51 2007
+++ claws-mail/pkg/PLIST-clamav Thu Jan 1 01:00:00 1970
@@ -1,4 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-clamav,v 1.3 2007/04/20 05:42:51 steven Exp $
[EMAIL PROTECTED] mail/sylpheed-claws,-clamav${FLAVOR_STRING}
-lib/claws-mail/plugins/clamav_plugin.la
-lib/claws-mail/plugins/clamav_plugin.so
diff -x CVS -urN claws-mail.orig/pkg/PLIST-main claws-mail/pkg/PLIST-main
--- claws-mail.orig/pkg/PLIST-main Fri Jan 25 22:33:50 2008
+++ claws-mail/pkg/PLIST-main Fri Feb 8 19:46:59 2008
@@ -302,6 +302,7 @@
share/locale/es/LC_MESSAGES/claws-mail.mo
share/locale/fi/LC_MESSAGES/claws-mail.mo
share/locale/fr/LC_MESSAGES/claws-mail.mo
+share/locale/he/LC_MESSAGES/claws-mail.mo
share/locale/hr/LC_MESSAGES/claws-mail.mo
share/locale/hu/LC_MESSAGES/claws-mail.mo
share/locale/it/LC_MESSAGES/claws-mail.mo
