From 68e0e268d5e6a0a8031adeda0a598d001454f78e Mon Sep 17 00:00:00 2001 From: jasper Date: Mon, 12 Jan 2009 16:13:42 +0000 Subject: [PATCH] - update evolution to 2.24.3 --- mail/evolution/Makefile | 7 +++---- mail/evolution/distinfo | 10 +++++----- mail/evolution/patches/patch-configure | 14 +++++++------- mail/evolution/patches/patch-mail_message-list_c | 10 +++++----- mail/evolution/pkg/PLIST | 6 +++--- 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 684089fb85c..ae8f41917bf 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.53 2008/12/17 18:42:31 jasper Exp $ +# $OpenBSD: Makefile,v 1.54 2009/01/12 16:13:42 jasper Exp $ COMMENT= integrated email and PIM software for GNOME # NOTE: when major version changes, increment EVO_VERSION accordingly -# under mail/evolution-plugin-rss/Makefile (and bump) +# in mail/evolution-plugin-rss/Makefile (and bump). GNOME_PROJECT= evolution -GNOME_VERSION= 2.24.2 -PKGNAME= ${DISTNAME}p2 +GNOME_VERSION= 2.24.3 CATEGORIES= mail HOMEPAGE= http://www.gnome.org/projects/evolution/ diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index a53cba356b5..24e6aaa0f00 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,5 +1,5 @@ -MD5 (evolution-2.24.2.tar.bz2) = K2Yh6LcbBttXt3b2Z5jztA== -RMD160 (evolution-2.24.2.tar.bz2) = jpGjIhV7eZ2hh3uAhrF1848xXkk= -SHA1 (evolution-2.24.2.tar.bz2) = 0jJgTfwMAgPGRWyxaEB3ESieiMQ= -SHA256 (evolution-2.24.2.tar.bz2) = J+fby2N55D4KEfyaQRK+1S6myhn4ppPuncxvRrE2mAc= -SIZE (evolution-2.24.2.tar.bz2) = 32620836 +MD5 (evolution-2.24.3.tar.bz2) = ZnGy0x6ne6YZD628URhlZw== +RMD160 (evolution-2.24.3.tar.bz2) = B/hOw5xrCj+LVvhyFmCm4/GN0GE= +SHA1 (evolution-2.24.3.tar.bz2) = Mj19fdo+24/jChsSQNbNloF0+xQ= +SHA256 (evolution-2.24.3.tar.bz2) = /wQE7Kkg2nSsDTLr8yo7qt07MJ7sfFADgabLb9cRzT8= +SIZE (evolution-2.24.3.tar.bz2) = 32652280 diff --git a/mail/evolution/patches/patch-configure b/mail/evolution/patches/patch-configure index e3d96acb335..bc60d21d86a 100644 --- a/mail/evolution/patches/patch-configure +++ b/mail/evolution/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.7 2008/11/21 17:28:07 jasper Exp $ ---- configure.orig Thu Nov 13 20:16:54 2008 -+++ configure Thu Nov 13 20:18:48 2008 -@@ -28244,9 +28244,6 @@ LIBS=$ac_check_lib_save_LIBS +$OpenBSD: patch-configure,v 1.8 2009/01/12 16:13:42 jasper Exp $ +--- configure.orig Fri Jan 9 10:34:14 2009 ++++ configure Mon Jan 12 14:44:40 2009 +@@ -28338,9 +28338,6 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5 $as_echo "$ac_cv_lib_resolv_res_query" >&6; } @@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.7 2008/11/21 17:28:07 jasper Exp $ { $as_echo "$as_me:$LINENO: checking for bind in -lsocket" >&5 $as_echo_n "checking for bind in -lsocket... " >&6; } -@@ -29314,13 +29311,13 @@ _ACEOF +@@ -29408,13 +29405,13 @@ _ACEOF PTHREAD_LIB="" @@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.7 2008/11/21 17:28:07 jasper Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29380,7 +29377,7 @@ fi +@@ -29474,7 +29471,7 @@ fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } if test $ac_cv_lib_pthread_pthread_create = yes; then @@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.7 2008/11/21 17:28:07 jasper Exp $ else { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5 $as_echo_n "checking for pthread_create in -lpthreads... " >&6; } -@@ -30947,7 +30944,7 @@ if test "x${with_krb5}" != "xno"; then +@@ -31041,7 +31038,7 @@ if test "x${with_krb5}" != "xno"; then LDFLAGS_save="$LDFLAGS" mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" diff --git a/mail/evolution/patches/patch-mail_message-list_c b/mail/evolution/patches/patch-mail_message-list_c index e6444483e75..6504cab8d09 100644 --- a/mail/evolution/patches/patch-mail_message-list_c +++ b/mail/evolution/patches/patch-mail_message-list_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-mail_message-list_c,v 1.5 2008/11/21 17:28:07 jasper Exp $ ---- mail/message-list.c.orig Mon Oct 20 05:28:32 2008 -+++ mail/message-list.c Thu Nov 13 20:19:22 2008 -@@ -2543,6 +2543,10 @@ clear_tree (MessageList *ml) +$OpenBSD: patch-mail_message-list_c,v 1.6 2009/01/12 16:13:42 jasper Exp $ +--- mail/message-list.c.orig Mon Dec 15 07:50:24 2008 ++++ mail/message-list.c Mon Jan 12 14:44:40 2009 +@@ -2548,6 +2548,10 @@ clear_tree (MessageList *ml) ml->tree_root = e_tree_memory_node_insert (E_TREE_MEMORY(etm), NULL, 0, NULL); @@ -12,7 +12,7 @@ $OpenBSD: patch-mail_message-list_c,v 1.5 2008/11/21 17:28:07 jasper Exp $ #ifdef TIMEIT gettimeofday(&end, NULL); diff = end.tv_sec * 1000 + end.tv_usec/1000; -@@ -3146,6 +3150,9 @@ mail_folder_hide_by_flag (CamelFolder *folder, Message +@@ -3151,6 +3155,9 @@ mail_folder_hide_by_flag (CamelFolder *folder, Message CamelFolderChangeInfo *newchanges, *oldchanges = *changes; CamelMessageInfo *info; int i; diff --git a/mail/evolution/pkg/PLIST b/mail/evolution/pkg/PLIST index c7829b24444..88b5d4df70d 100644 --- a/mail/evolution/pkg/PLIST +++ b/mail/evolution/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.22 2008/12/17 18:42:31 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.23 2009/01/12 16:13:42 jasper Exp $ %%SHARED%% @bin bin/evolution include/evolution-${R}/ @@ -529,6 +529,8 @@ share/evolution/${R}/help/ share/evolution/${R}/help/quickref/ share/evolution/${R}/help/quickref/C/ share/evolution/${R}/help/quickref/C/quickref.pdf +share/evolution/${R}/help/quickref/cs/ +share/evolution/${R}/help/quickref/cs/quickref.pdf share/evolution/${R}/help/quickref/de/ share/evolution/${R}/help/quickref/de/quickref.pdf share/evolution/${R}/help/quickref/es/ @@ -2075,8 +2077,6 @@ share/locale/ast/LC_MESSAGES/ share/locale/ast/LC_MESSAGES/evolution-${R}.mo share/locale/az/LC_MESSAGES/evolution-${R}.mo share/locale/be/LC_MESSAGES/evolution-${R}.mo -share/locale/be@latin/ -share/locale/be@latin/LC_MESSAGES/ share/locale/be@latin/LC_MESSAGES/evolution-${R}.mo share/locale/bg/LC_MESSAGES/evolution-${R}.mo share/locale/bn/LC_MESSAGES/evolution-${R}.mo