From 4f08b5f56231c259adb6979bf408988293caa168 Mon Sep 17 00:00:00 2001 From: pyr Date: Fri, 28 Sep 2007 22:12:00 +0000 Subject: [PATCH] Update to 3.0.1 from brad. Tested on many workstations. ok brad@ --- mail/claws-mail/Makefile | 11 +++++------ mail/claws-mail/distinfo | 10 +++++----- mail/claws-mail/patches/patch-configure_ac | 12 ++++++------ mail/claws-mail/patches/patch-src_inc_c | 10 +++++----- mail/claws-mail/patches/patch-src_mbox_c | 10 +++++----- mail/claws-mail/patches/patch-src_procmime_c | 8 ++++---- 6 files changed, 30 insertions(+), 31 deletions(-) diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index bbc58bfe9cb..6b864a4ebdd 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2007/09/16 00:17:04 merdely Exp $ +# $OpenBSD: Makefile,v 1.10 2007/09/28 22:12:00 pyr Exp $ COMMENT-main= mail and news client COMMENT-docs= documentation @@ -7,7 +7,7 @@ COMMENT-clamav= clamav plugin COMMENT-dillo= dillo plugin COMMENT-spamassassin= spamassassin plugin -V= 3.0.0 +V= 3.0.1 DISTNAME= claws-mail-${V} PKGNAME-main= ${DISTNAME} FULLPKGNAME-docs= claws-mail-docs-${V} @@ -22,7 +22,7 @@ HOMEPAGE= http://www.claws-mail.org/ MAINTAINER= Ulrich Kahl -# GPL +# GPLv3 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -56,7 +56,7 @@ WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \ WANTLIB-main= ${WANTLIB} ICE SM c pthread stdc++ WANTLIB-docs= -WANTLIB-clamav= ${WANTLIB} bz2 gmp idn +WANTLIB-clamav= ${WANTLIB} bz2 gmp LIB_DEPENDS= atk-1.0::devel/atk \ cairo::graphics/cairo \ @@ -79,8 +79,7 @@ LIB_DEPENDS-docs= PKG_ARCH-docs= * LIB_DEPENDS-clamav= ${LIB_DEPENDS} \ - clamav::security/clamav \ - curl::net/curl + clamav::security/clamav MODULES= devel/gettext USE_X11= Yes diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo index 768fc439e03..3d6ad4fef86 100644 --- a/mail/claws-mail/distinfo +++ b/mail/claws-mail/distinfo @@ -1,5 +1,5 @@ -MD5 (claws/claws-mail-3.0.0.tar.bz2) = nGOQ1xGyxghAzJE4RWp81Q== -RMD160 (claws/claws-mail-3.0.0.tar.bz2) = eEpPrss8ocoRA9l4YctmOLI0HkY= -SHA1 (claws/claws-mail-3.0.0.tar.bz2) = xYXUOA9+1lCIJi652IDBUnOoysc= -SHA256 (claws/claws-mail-3.0.0.tar.bz2) = dvhRL9EwY+gUXBj1KTL7T/VkDWZSw+g13dZMHTLZRDU= -SIZE (claws/claws-mail-3.0.0.tar.bz2) = 5647644 +MD5 (claws/claws-mail-3.0.1.tar.bz2) = cAxrTv6xDMM6QxEcKnNNuA== +RMD160 (claws/claws-mail-3.0.1.tar.bz2) = QxqzygUTgtseMH7xq6/FzmWfSqM= +SHA1 (claws/claws-mail-3.0.1.tar.bz2) = ZwwnMb9r8gnKfTvTQbOPwxCOY5A= +SHA256 (claws/claws-mail-3.0.1.tar.bz2) = WCWa/W8jmCmurxWjcJeOENi5igitXrTra3D7dpbv7DA= +SIZE (claws/claws-mail-3.0.1.tar.bz2) = 5654189 diff --git a/mail/claws-mail/patches/patch-configure_ac b/mail/claws-mail/patches/patch-configure_ac index 8aca1e117aa..5fe44789fa1 100644 --- a/mail/claws-mail/patches/patch-configure_ac +++ b/mail/claws-mail/patches/patch-configure_ac @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_ac,v 1.1 2007/07/10 06:14:43 pyr Exp $ ---- configure.ac.orig Tue May 8 04:03:10 2007 -+++ configure.ac Sun Jul 1 19:04:48 2007 -@@ -548,6 +548,7 @@ else +$OpenBSD: patch-configure_ac,v 1.2 2007/09/28 22:12:01 pyr Exp $ +--- configure.ac.orig Mon Sep 17 04:49:36 2007 ++++ configure.ac Tue Sep 18 21:45:38 2007 +@@ -567,6 +567,7 @@ else AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="$LDAP_LIBS -lresolv") AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket") AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl") @@ -9,7 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2007/07/10 06:14:43 pyr Exp $ AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="$LDAP_LIBS -llber",, $LDAP_LIBS) -@@ -563,7 +564,8 @@ else +@@ -582,7 +583,8 @@ else AC_CHECK_LIB(ldap, ldap_start_tls_s, [ ac_cv_have_tls=yes ], @@ -19,7 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2007/07/10 06:14:43 pyr Exp $ fi -@@ -600,7 +602,7 @@ if test "$ac_cv_enable_jpilot" = yes; then +@@ -619,7 +621,7 @@ if test "$ac_cv_enable_jpilot" = yes; then AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ]) fi diff --git a/mail/claws-mail/patches/patch-src_inc_c b/mail/claws-mail/patches/patch-src_inc_c index 4583515a87b..c1d49385f67 100644 --- a/mail/claws-mail/patches/patch-src_inc_c +++ b/mail/claws-mail/patches/patch-src_inc_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_inc_c,v 1.2 2007/05/04 12:13:14 steven Exp $ ---- src/inc.c.orig Tue Apr 3 12:52:24 2007 -+++ src/inc.c Thu Apr 19 19:48:15 2007 -@@ -69,7 +69,7 @@ static GdkPixbuf *currentpix; +$OpenBSD: patch-src_inc_c,v 1.3 2007/09/28 22:12:01 pyr Exp $ +--- src/inc.c.orig Mon Sep 17 04:14:33 2007 ++++ src/inc.c Tue Sep 18 21:45:32 2007 +@@ -83,7 +83,7 @@ static GdkPixbuf *currentpix; static GdkPixbuf *errorpix; static GdkPixbuf *okpix; @@ -10,7 +10,7 @@ $OpenBSD: patch-src_inc_c,v 1.2 2007/05/04 12:13:14 steven Exp $ static void inc_finished (MainWindow *mainwin, gboolean new_messages, -@@ -924,7 +924,7 @@ static void inc_progress_dialog_set_label(IncProgressD +@@ -938,7 +938,7 @@ static void inc_progress_dialog_set_label(IncProgressD static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog, IncSession *inc_session) { diff --git a/mail/claws-mail/patches/patch-src_mbox_c b/mail/claws-mail/patches/patch-src_mbox_c index 1b13a648bc3..dd7015da0ea 100644 --- a/mail/claws-mail/patches/patch-src_mbox_c +++ b/mail/claws-mail/patches/patch-src_mbox_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_mbox_c,v 1.1.1.1 2007/03/23 17:38:22 deanna Exp $ ---- src/mbox.c.orig Mon Mar 5 23:44:47 2007 -+++ src/mbox.c Thu Mar 22 01:31:28 2007 -@@ -48,7 +48,7 @@ +$OpenBSD: patch-src_mbox_c,v 1.2 2007/09/28 22:12:01 pyr Exp $ +--- src/mbox.c.orig Mon Sep 17 04:14:33 2007 ++++ src/mbox.c Tue Sep 18 21:45:32 2007 +@@ -52,7 +52,7 @@ #include "alertpanel.h" #include "statusbar.h" @@ -10,7 +10,7 @@ $OpenBSD: patch-src_mbox_c,v 1.1.1.1 2007/03/23 17:38:22 deanna Exp $ #ifdef HAVE_FGETS_UNLOCKED #define SC_FGETS fgets_unlocked -@@ -78,7 +78,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gb +@@ -82,7 +82,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gb /* return values: -1 error, >=0 number of msgs added */ { FILE *mbox_fp; diff --git a/mail/claws-mail/patches/patch-src_procmime_c b/mail/claws-mail/patches/patch-src_procmime_c index a1227e394f5..7740a70efd8 100644 --- a/mail/claws-mail/patches/patch-src_procmime_c +++ b/mail/claws-mail/patches/patch-src_procmime_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_procmime_c,v 1.2 2007/05/10 07:43:39 steven Exp $ ---- src/procmime.c.orig Tue May 8 03:59:22 2007 -+++ src/procmime.c Tue May 8 13:19:20 2007 -@@ -1128,7 +1128,7 @@ GList *procmime_get_mime_type_list(void) +$OpenBSD: patch-src_procmime_c,v 1.3 2007/09/28 22:12:01 pyr Exp $ +--- src/procmime.c.orig Mon Sep 17 04:14:33 2007 ++++ src/procmime.c Tue Sep 18 21:45:32 2007 +@@ -1154,7 +1154,7 @@ GList *procmime_get_mime_type_list(void) #endif { fp_is_glob_file = FALSE;