Update to 1.3.5.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4224 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 84 insertions, 19 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index a0ae99108..01015f7e8 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.49 2005/07/03 22:19:35 kwm Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.50 2005/07/06 18:22:17 mezz Exp $
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.5
 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 3e78ec2fc..766ad3fc5 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-data-server-1.3.4.tar.bz2) = 7a789c7fbd67fe938e2d9a09973f7a9b
-SIZE (gnome2/evolution-data-server-1.3.4.tar.bz2) = 14594656
+MD5 (gnome2/evolution-data-server-1.3.5.tar.bz2) = bb8ee85dbe096f7c00bff181a9a3c264
+SIZE (gnome2/evolution-data-server-1.3.5.tar.bz2) = 14416322
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
new file mode 100644
index 000000000..edd21f218
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c
@@ -0,0 +1,16 @@
+--- 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)
+ 
+ 	for (; item_list != NULL; item_list = g_list_next(item_list)) {
+ 		EGwItem *item = NULL;
+-		item = E_GW_ITEM(item_list->data);
+ 		ECalComponent *modified_comp = NULL, *cache_comp = NULL;
+ 		char *cache_comp_str = NULL;
+ 		const char *uid, *rid = NULL;
+ 		int r_key;
++
++		item = E_GW_ITEM(item_list->data);
+ 
+ 		modified_comp = e_gw_item_to_cal_component (item, cbgw);
+ 		if (!modified_comp) {
diff --git a/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-folder.c b/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-folder.c
new file mode 100644
index 000000000..366f01dad
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-folder.c
@@ -0,0 +1,14 @@
+--- camel/providers/groupwise/camel-groupwise-folder.c.orig	Wed Jul 13 02:14:43 2005
++++ camel/providers/groupwise/camel-groupwise-folder.c	Wed Jul 13 02:15:18 2005
+@@ -947,9 +947,10 @@ gw_update_summary ( CamelFolder *folder,
+ 		char *temp_date = NULL;
+ 		const char *id;
+ 		GSList *recp_list = NULL;
+-		status_flags = 0;
+ 		CamelStream *cache_stream;
+ 		CamelMimeMessage *mail_msg = NULL;
++
++		status_flags = 0;
+ 
+ 		id = e_gw_item_get_id (temp_item);
+ 
diff --git a/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-utils.c b/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-utils.c
new file mode 100644
index 000000000..2db460f05
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-utils.c
@@ -0,0 +1,14 @@
+--- camel/providers/groupwise/camel-groupwise-utils.c.orig	Wed Jul 13 02:16:06 2005
++++ camel/providers/groupwise/camel-groupwise-utils.c	Wed Jul 13 02:16:19 2005
+@@ -383,9 +383,10 @@ camel_groupwise_util_item_from_message (
+ 				attachment->contentType = g_strdup_printf ("%s/%s", type->type, type->subtype) ;
+ 				if (!g_ascii_strncasecmp (attachment->contentType, RFC_822, strlen (RFC_822))) {
+ 					char *temp_id = NULL, *id = NULL;
++					int len;
+ 					//id = (char *)camel_mime_message_get_message_id ((CamelMimeMessage *)dw);
+ 					temp_id = (char *)camel_medium_get_header (CAMEL_MEDIUM ((CamelMimeMessage *)dw), "Message-Id");
+-					int len = strlen (temp_id);
++					len = strlen (temp_id);
+ 
+ 					id = (char *)g_malloc0 (len-1);
+ 					id = memcpy(id, temp_id+2, len-3);
diff --git a/databases/evolution-data-server/files/patch-libedataserverui_e-name-selector-entry.c b/databases/evolution-data-server/files/patch-libedataserverui_e-name-selector-entry.c
new file mode 100644
index 000000000..d2ba67877
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-libedataserverui_e-name-selector-entry.c
@@ -0,0 +1,11 @@
+--- libedataserverui/e-name-selector-entry.c.orig	Wed Jul 13 02:24:07 2005
++++ libedataserverui/e-name-selector-entry.c	Wed Jul 13 02:24:15 2005
+@@ -1111,7 +1111,7 @@ user_delete_text (ENameSelectorEntry *na
+ {
+ 	const gchar *text;
+ 	gint         index_start, index_end;
+-	gunichar     str_context [2], str_b_context [2];;
++	gunichar     str_context [2], str_b_context [2];
+ 	gint         len;
+ 	gint         i;
+ 
diff --git a/databases/evolution-data-server/files/patch-servers_exchange_storage_e-folder-exchange.c b/databases/evolution-data-server/files/patch-servers_exchange_storage_e-folder-exchange.c
new file mode 100644
index 000000000..29b732762
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-servers_exchange_storage_e-folder-exchange.c
@@ -0,0 +1,16 @@
+--- servers/exchange/storage/e-folder-exchange.c.orig	Wed Jul 13 02:11:08 2005
++++ servers/exchange/storage/e-folder-exchange.c	Wed Jul 13 02:11:52 2005
+@@ -725,11 +725,12 @@ e_folder_exchange_subscribe (EFolder *fo
+ void
+ e_folder_exchange_unsubscribe (EFolder *folder)
+ {
++	E2kContext *ctx;
+ 	g_return_if_fail (E_IS_FOLDER_EXCHANGE (folder));
+ 
+ 	/* FIXME : This is a hack as of now. The free_folder in mail-stub
+ 	gets called when we are in offline and the context is NULL then. */
+-	E2kContext *ctx = E_FOLDER_EXCHANGE_CONTEXT (folder);
++	ctx = E_FOLDER_EXCHANGE_CONTEXT (folder);
+ 	if (ctx) {
+ 		e2k_context_unsubscribe (E_FOLDER_EXCHANGE_CONTEXT (folder),
+ 					 E_FOLDER_EXCHANGE_URI (folder));
diff --git a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c
index c865775da..1cb317a25 100644
--- a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c
+++ b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c
@@ -1,6 +1,6 @@
---- servers/groupwise/e-gw-item.c.orig	Tue Jan 25 20:31:45 2005
-+++ servers/groupwise/e-gw-item.c	Tue Jan 25 20:32:28 2005
-@@ -2604,8 +2604,8 @@
+--- servers/groupwise/e-gw-item.c.orig	Sat Jul  9 08:01:07 2005
++++ servers/groupwise/e-gw-item.c	Wed Jul 13 02:06:07 2005
+@@ -2996,8 +2996,8 @@ e_gw_item_set_calendar_item_elements (EG
  
  	/*attachments*/
  	if (priv->attach_list) {
@@ -10,13 +10,3 @@
  		for (al = priv->attach_list ; al != NULL ;  al = al->next) {
  			EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ;
  			add_attachment_to_soap_message (attachment, msg) ;
-@@ -2669,8 +2669,8 @@
- 
- 		/*attachments*/
- 		if (priv->attach_list) {
--			soup_soap_message_start_element (msg, "attachments", NULL, NULL) ;
- 			GSList *al ;
-+			soup_soap_message_start_element (msg, "attachments", NULL, NULL) ;
- 			for (al = priv->attach_list ; al != NULL ;  al = al->next) {
- 				EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ;
- 				add_attachment_to_soap_message (attachment, msg) ;
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 9ff538db7..d339b4d77 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -125,6 +125,7 @@ include/evolution-data-server-%%VERSION%%/exchange/e2k-propnames.h
 include/evolution-data-server-%%VERSION%%/exchange/e2k-restriction.h
 include/evolution-data-server-%%VERSION%%/exchange/e2k-result.h
 include/evolution-data-server-%%VERSION%%/exchange/e2k-security-descriptor.h
+include/evolution-data-server-%%VERSION%%/exchange/e2k-sid.h
 include/evolution-data-server-%%VERSION%%/exchange/e2k-types.h
 include/evolution-data-server-%%VERSION%%/exchange/e2k-uri.h
 include/evolution-data-server-%%VERSION%%/exchange/e2k-utils.h
@@ -133,6 +134,7 @@ include/evolution-data-server-%%VERSION%%/exchange/e2k-xml-utils.h
 include/evolution-data-server-%%VERSION%%/exchange/exchange-account.h
 include/evolution-data-server-%%VERSION%%/exchange/exchange-constants.h
 include/evolution-data-server-%%VERSION%%/exchange/exchange-folder-size.h
+include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy-foreign.h
 include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy-somedav.h
 include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy-webdav.h
 include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy.h
@@ -144,6 +146,8 @@ include/evolution-data-server-%%VERSION%%/groupwise/e-gw-container.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-filter.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-item.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-message.h
+include/evolution-data-server-%%VERSION%%/groupwise/e-gw-proxy.h
+include/evolution-data-server-%%VERSION%%/groupwise/e-gw-recur-utils.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-sendoptions.h
 include/evolution-data-server-%%VERSION%%/libebook/Evolution-DataServer-Addressbook.h
 include/evolution-data-server-%%VERSION%%/libebook/e-address-western.h
@@ -302,7 +306,7 @@ lib/libcamel-%%EVO_VERSION%%.so
 lib/libcamel-%%EVO_VERSION%%.so.0
 lib/libcamel-provider-%%EVO_VERSION%%.a
 lib/libcamel-provider-%%EVO_VERSION%%.so
-lib/libcamel-provider-%%EVO_VERSION%%.so.5
+lib/libcamel-provider-%%EVO_VERSION%%.so.6
 lib/libebook-%%EVO_VERSION%%.a
 lib/libebook-%%EVO_VERSION%%.so
 lib/libebook-%%EVO_VERSION%%.so.4
@@ -323,7 +327,7 @@ lib/libedataserverui-%%EVO_VERSION%%.so
 lib/libedataserverui-%%EVO_VERSION%%.so.5
 lib/libegroupwise-%%EVO_VERSION%%.a
 lib/libegroupwise-%%EVO_VERSION%%.so
-lib/libegroupwise-%%EVO_VERSION%%.so.7
+lib/libegroupwise-%%EVO_VERSION%%.so.8
 lib/libexchange-storage-%%EVO_VERSION%%.a
 lib/libexchange-storage-%%EVO_VERSION%%.so
 lib/libexchange-storage-%%EVO_VERSION%%.so.0