diff options
5 files changed, 82 insertions, 27 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 01015f7e8..63e58dc92 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.50 2005/07/06 18:22:17 mezz Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.51 2005/07/13 06:31:57 marcus Exp $ # PORTNAME= evolution-data-server -PORTVERSION= 1.3.5 +PORTVERSION= 1.3.6.1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.3 diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo index 766ad3fc5..375e86b8a 100644 --- a/databases/evolution-data-server/distinfo +++ b/databases/evolution-data-server/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/evolution-data-server-1.3.5.tar.bz2) = bb8ee85dbe096f7c00bff181a9a3c264 -SIZE (gnome2/evolution-data-server-1.3.5.tar.bz2) = 14416322 +MD5 (gnome2/evolution-data-server-1.3.6.1.tar.bz2) = 5a8e0309b19b8a4b1a54c38a4b41e49a +SIZE (gnome2/evolution-data-server-1.3.6.1.tar.bz2) = 14453677 diff --git a/databases/evolution-data-server/files/patch-addressbook_backends_groupwise_e-book-backend-groupwise.c b/databases/evolution-data-server/files/patch-addressbook_backends_groupwise_e-book-backend-groupwise.c new file mode 100644 index 000000000..3d2557a26 --- /dev/null +++ b/databases/evolution-data-server/files/patch-addressbook_backends_groupwise_e-book-backend-groupwise.c @@ -0,0 +1,44 @@ +--- addressbook/backends/groupwise/e-book-backend-groupwise.c.orig Fri Jul 29 17:41:45 2005 ++++ addressbook/backends/groupwise/e-book-backend-groupwise.c Fri Jul 29 17:42:32 2005 +@@ -1977,6 +1977,7 @@ get_contacts_from_cache (EBookBackendGro + printf ("\nread contacts from cache for the ids found in summary\n"); + for (i = 0; i < ids->len; i ++) { + char *uid = g_ptr_array_index (ids, i); ++ EContact *contact; + + g_mutex_lock (closure->mutex); + stopped = closure->stopped; +@@ -1985,7 +1986,7 @@ get_contacts_from_cache (EBookBackendGro + if (stopped) + break; + +- EContact *contact = ++ contact = + e_book_backend_cache_get_contact (priv->cache, uid); + e_data_book_view_notify_update (book_view, contact); + g_object_unref (contact); +@@ -2652,6 +2653,12 @@ update_address_book_deltas (EBookBackend + EBookBackendGroupwisePrivate *priv = ebgw->priv; + EBookBackendCache *cache = priv->cache; + ++ struct timeval start, end; ++ unsigned long diff; ++ const char *cache_file_name; ++ struct stat buf; ++ time_t mod_time; ++ + if (enable_debug) + printf("\nupdating GroupWise system address book cache \n"); + +@@ -2697,11 +2704,6 @@ update_address_book_deltas (EBookBackend + return TRUE; + } + +- struct timeval start, end; +- unsigned long diff; +- const char *cache_file_name; +- struct stat buf; +- time_t mod_time; + + if (enable_debug) + gettimeofday(&start, NULL); diff --git a/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c b/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c index edd21f218..92d2ca305 100644 --- a/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c +++ b/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c @@ -1,6 +1,6 @@ ---- calendar/backends/groupwise/e-cal-backend-groupwise.c.orig Wed Jul 13 02:21:58 2005 -+++ calendar/backends/groupwise/e-cal-backend-groupwise.c Wed Jul 13 02:22:22 2005 -@@ -365,11 +365,12 @@ get_deltas (gpointer handle) +--- calendar/backends/groupwise/e-cal-backend-groupwise.c.orig Mon Jul 25 21:47:58 2005 ++++ calendar/backends/groupwise/e-cal-backend-groupwise.c Fri Jul 29 17:26:01 2005 +@@ -312,12 +312,13 @@ get_deltas (gpointer handle) for (; item_list != NULL; item_list = g_list_next(item_list)) { EGwItem *item = NULL; @@ -9,8 +9,18 @@ char *cache_comp_str = NULL; const char *uid, *rid = NULL; int r_key; -+ -+ item = E_GW_ITEM(item_list->data); ++ item = E_GW_ITEM(item_list->data); ++ modified_comp = e_gw_item_to_cal_component (item, cbgw); if (!modified_comp) { + g_message ("Invalid component returned in update"); +@@ -1048,7 +1049,7 @@ e_cal_backend_groupwise_get_static_capab + CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY "," \ + CAL_STATIC_CAPABILITY_NO_ORGANIZER "," \ + CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER "," \ +- CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING "," \ ++ CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING "," \ + CAL_STATIC_CAPABILITY_SAVE_SCHEDULES); + + return GNOME_Evolution_Calendar_Success; diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure index 7c244a1ac..fe88433c1 100644 --- a/databases/evolution-data-server/files/patch-configure +++ b/databases/evolution-data-server/files/patch-configure @@ -1,19 +1,20 @@ ---- configure.orig Wed Jun 8 17:33:56 2005 -+++ configure Wed Jun 8 17:38:06 2005 -@@ -25007,10 +25007,10 @@ - Example: --with-nspr-libs=/usr/lib" >&2;} - { (exit 1); exit 1; }; } - else -- nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" -+ nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" - fi - else -- nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" -+ nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" - fi - - echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5 -@@ -27124,7 +27124,7 @@ +--- configure.orig Fri Jul 29 17:13:44 2005 ++++ configure Fri Jul 29 17:15:52 2005 +@@ -23461,6 +23461,13 @@ + DL_LIB='' + SOFTOKN3_LIB='' + ;; ++*freebsd*) ++ os_win32=no ++ NO_UNDEFINED='' ++ SOCKET_LIBS='' ++ DL_LIB='' ++ SOFTOKN3_LIB='-lsoftokn3' ++ ;; + *) os_win32=no + NO_UNDEFINED='' + SOCKET_LIBS='' +@@ -27135,7 +27142,7 @@ #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> @@ -22,7 +23,7 @@ int main () -@@ -27862,7 +27862,7 @@ +@@ -27873,7 +27880,7 @@ LDFLAGS_save="$LDFLAGS" mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" @@ -31,7 +32,7 @@ echo "$as_me:$LINENO: checking for Kerberos 5" >&5 echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6 if test "${ac_cv_lib_kerberos5+set}" = set; then -@@ -31155,7 +31155,7 @@ +@@ -31176,7 +31183,7 @@ imagesdir="$datadir/pixmaps/evolution-data-server-$BASE_VERSION" |