Update to 1.4.1, and axe all the C99ism patches.

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

9 files changed, 4 insertions, 145 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 3bdb3993b..68ad3d036 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.61 2005/09/05 17:02:12 kwm Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.62 2005/09/09 20:11:17 marcus Exp $
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTVERSION=	1.4.1
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 1b9db7d7d..a6047853e 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-data-server-1.4.0.tar.bz2) = a15991d5f0112b43c18fa99dfccfec1b
-SIZE (gnome2/evolution-data-server-1.4.0.tar.bz2) = 14304129
+MD5 (gnome2/evolution-data-server-1.4.1.tar.bz2) = af8f53c4ea524df861a6f2eb1ea75ad9
+SIZE (gnome2/evolution-data-server-1.4.1.tar.bz2) = 14175490
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
deleted file mode 100644
index 3d2557a26..000000000
--- a/databases/evolution-data-server/files/patch-addressbook_backends_groupwise_e-book-backend-groupwise.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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
deleted file mode 100644
index 44fffa38d..000000000
--- a/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- calendar/backends/groupwise/e-cal-backend-groupwise.c.orig	Mon Sep  5 06:15:23 2005
-+++ calendar/backends/groupwise/e-cal-backend-groupwise.c	Mon Sep  5 18:10:49 2005
-@@ -322,11 +322,12 @@
- 
- 	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
deleted file mode 100644
index 67fde3fa4..000000000
--- a/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-folder.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- camel/providers/groupwise/camel-groupwise-folder.c.orig	Mon Aug  8 05:12:44 2005
-+++ camel/providers/groupwise/camel-groupwise-folder.c	Mon Aug  8 20:42:33 2005
-@@ -929,10 +929,11 @@ gw_update_cache ( CamelFolder *folder, G
- 		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);
- 
- 		cache_stream  = camel_data_cache_get (gw_folder->cache, "cache", id, ex);
-@@ -1609,6 +1610,7 @@ groupwise_transfer_messages_to (CamelFol
- 			const char *old_uid = (const char*)uids->pdata[index];
- 			char **tmp;
- 			guint32 temp_flags = 0;
-+			CamelGroupwiseMessageInfo *dest_info;
- 			CamelGroupwiseMessageInfo *src_info = (CamelGroupwiseMessageInfo *)camel_folder_summary_uid (source->summary, (const char*)uids->pdata[index]);
- 			
- 			/* we don't want to blindly copy the info: reset some flags not suitable for destination*/
-@@ -1617,7 +1619,7 @@ groupwise_transfer_messages_to (CamelFol
- 			else if (!strcmp(destination->full_name, JUNK_FOLDER))
- 				camel_folder_set_message_flags (source, old_uid, CAMEL_MESSAGE_JUNK, CAMEL_GW_MESSAGE_JUNK);
- 
--			CamelGroupwiseMessageInfo *dest_info = (CamelGroupwiseMessageInfo *)camel_message_info_clone((CamelMessageInfo *)src_info);
-+			dest_info = (CamelGroupwiseMessageInfo *)camel_message_info_clone((CamelMessageInfo *)src_info);
- 			tmp = g_strsplit (old_uid, ":", -1);
- 			dest_info->info.uid = g_strdup_printf ("%s:%s",tmp[0], dest_container_id);
- 			temp_flags = camel_folder_get_message_flags (source, (const char *)uids->pdata[index]);
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
deleted file mode 100644
index fc435dcb5..000000000
--- a/databases/evolution-data-server/files/patch-camel_providers_groupwise_camel-groupwise-utils.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- camel/providers/groupwise/camel-groupwise-utils.c.orig	Fri Aug 19 08:56:58 2005
-+++ camel/providers/groupwise/camel-groupwise-utils.c	Tue Aug 23 13:14:06 2005
-@@ -333,8 +333,9 @@ send_as_attachment (EGwConnection *cnc, 
- 	attachment->name = g_strdup (filename ? filename : "");
- 	if (!g_ascii_strncasecmp (attachment->contentType, RFC_822, strlen (RFC_822))) {
- 		char *temp_id = NULL, *id = NULL;
-+		int len;
- 		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
deleted file mode 100644
index d2ba67877..000000000
--- a/databases/evolution-data-server/files/patch-libedataserverui_e-name-selector-entry.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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_groupwise_e-gw-connection.c b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c
deleted file mode 100644
index 576ecea6a..000000000
--- a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- servers/groupwise/e-gw-connection.c.orig	Tue Mar  8 03:50:29 2005
-+++ servers/groupwise/e-gw-connection.c	Tue Mar  8 03:50:40 2005
-@@ -1764,8 +1764,8 @@
- 	EGwConnectionPrivate *priv;
-         SoupSoapParameter *param, *subparam, *second_level_child;
- 	char *id, *name;
--        g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT);
- 	static GStaticMutex connecting = G_STATIC_MUTEX_INIT;
-+        g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT);
- 
- 	priv = cnc->priv;
- 	g_static_mutex_lock (&connecting);
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
deleted file mode 100644
index 1cb317a25..000000000
--- a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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) {
--		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) ;