Presenting GNOME 2.14.1 for FreeBSD! Checkout

http://www.gnome.org/start/2.14/ for the official release notes, and a list
of all the gooides in this new release.  In particular, GNOME 2.14 focused
on performance, and they did not miss the mark.  There's some new eye candy,
but most of the big things are waiting until GNOME 2.16.  On the FreeBSD
side, we tried to clean up all the crashers we could.  In particular, we
really improved GNOME's 64-bit support.

The good news is that this release does not bring any big shared library
version bumps, so you can almost do a simple portupgrade to get to 2.14.
There are a few minor gotchas that will be documented in UPDATING shortly.

The FreeBSD GNOME Team would like th thank the following users for their
patches, feedback, and sometimes incessant complaing about crashes (you
know who you are).

Yasuda Keisuke <kysd@po.harenet.ne.jp>
Pascal Hofstee <caelian@gmail.com>
rmgls@wanadoo.fr
tmclaugh
Yuri Pankov <yuri.pankov@gmail.com>
sajd on #freebsd-gnome
ade
ankon on #FreeBSD-Gnome
mux
Pascal Hofstee <caelian@gmail.com>
QuiRK on #freebsd-gnome
Vladimir Timofeev <vovkasm@gmail.com>

16 files changed, 67 insertions, 282 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index b340807f2525..c3b8fcf019ab 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.64 2005/10/09 20:44:42 marcus Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.83 2006/04/13 07:52:30 bland Exp $
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	1.4.2.1
-PORTREVISION=	3
+PORTVERSION=	1.6.1
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -24,11 +23,11 @@ LIB_DEPENDS=	soup-2.2.8:${PORTSDIR}/devel/libsoup \
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnometarget libgnomeui \
 		ltverhack
 USE_OPENLDAP=	yes
-USE_REINPLACE=	yes
 USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static \
@@ -42,7 +41,7 @@ CONFIGURE_ARGS=	--enable-static \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-PLIST_SUB=	VERSION="1.4" EVO_VERSION="1.2"
+PLIST_SUB=	VERSION="1.6" EVO_VERSION="1.2"
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index d66c170e581c..23bb7a7125c1 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-1.4.2.1.tar.bz2) = 8b058aff089cf3a6c13cc9f51f536ae8
-SHA256 (gnome2/evolution-data-server-1.4.2.1.tar.bz2) = 052f80b23551352c6f55ef2b4c970a416ec2e92fa4e5fd3bd267ce6eca1a9326
-SIZE (gnome2/evolution-data-server-1.4.2.1.tar.bz2) = 14234151
+MD5 (gnome2/evolution-data-server-1.6.1.tar.bz2) = d4def6cad1dc3508b8df55e7e794db49
+SHA256 (gnome2/evolution-data-server-1.6.1.tar.bz2) = 4536bbdba67eb4c51ca387c8d877eb868eb0bc60953b6185557307881f1009f6
+SIZE (gnome2/evolution-data-server-1.6.1.tar.bz2) = 7159551
diff --git a/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c
index 7383f939f4cd..b39a8fe3cc88 100644
--- a/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c
+++ b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c
@@ -1,6 +1,6 @@
---- libedataserver/e-msgport.c.orig	Thu Dec  2 22:33:06 2004
-+++ libedataserver/e-msgport.c	Wed Mar  9 14:31:46 2005
-@@ -921,9 +921,18 @@
+--- libedataserver/e-msgport.c.orig	Sat Dec 10 07:31:28 2005
++++ libedataserver/e-msgport.c	Mon Dec 19 02:19:10 2005
+@@ -1069,9 +1069,18 @@ thread_dispatch(void *din)
  void e_thread_put(EThread *e, EMsg *msg)
  {
  	pthread_t id;
@@ -19,14 +19,14 @@
  
  	/* the caller forgot to tell us what to do, well, we can't do anything can we */
  	if (e->received == NULL) {
-@@ -962,13 +971,14 @@
+@@ -1110,13 +1119,14 @@ void e_thread_put(EThread *e, EMsg *msg)
  		e_msgport_put(e->server_port, msg);
  		if (e->waiting == 0
  		    && g_list_length(e->id_list) < e->queue_limit
 -		    && pthread_create(&id, NULL, thread_dispatch, e) == 0) {
 +		    && pthread_create(&id, &attr, thread_dispatch, e) == 0) {
  			struct _thread_info *info = g_malloc0(sizeof(*info));
- 			t(printf("created NEW thread %ld\n", id));
+ 			t(printf("created NEW thread %" G_GUINT64_FORMAT "\n", e_util_pthread_id(id)));
  			info->id = id;
  			info->busy = TRUE;
  			e->id_list = g_list_append(e->id_list, info);
@@ -35,14 +35,15 @@
  		pthread_mutex_unlock(&e->mutex);
  		return;
  	}
-@@ -977,12 +987,13 @@
- 	if (e->id == E_THREAD_NONE) {
+@@ -1125,13 +1135,14 @@ void e_thread_put(EThread *e, EMsg *msg)
+ 	if (!e->have_thread) {
  		int err;
  
 -		if ((err = pthread_create(&e->id, NULL, thread_dispatch, e)) != 0) {
 +		if ((err = pthread_create(&e->id, &attr, thread_dispatch, e)) != 0) {
  			g_warning("Could not create dispatcher thread, message queued?: %s", strerror(err));
- 			e->id = E_THREAD_NONE;
+ 		} else {
+ 			e->have_thread = TRUE;
  		}
  	}
  
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 2f3d3d6ff5bb..000000000000
--- a/databases/evolution-data-server/files/patch-addressbook_backends_groupwise_e-book-backend-groupwise.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- addressbook/backends/groupwise/e-book-backend-groupwise.c.orig	Fri Sep  2 16:37:43 2005
-+++ addressbook/backends/groupwise/e-book-backend-groupwise.c	Thu Nov 10 09:55:01 2005
-@@ -2010,6 +2010,7 @@
- 	if (enable_debug)
- 		printf ("\nread contacts from cache for the ids found in summary\n");
- 	for (i = 0; i < ids->len; i ++) {
-+		EContact *contact;
- 		char *uid = g_ptr_array_index (ids, i);
- 
- 		g_mutex_lock (closure->mutex);
-@@ -2019,8 +2020,7 @@
- 		if (stopped)
- 			break;	
- 
--		EContact *contact = 
--			e_book_backend_cache_get_contact (priv->cache, uid);
-+		contact = e_book_backend_cache_get_contact (priv->cache, uid);
- 		e_data_book_view_notify_update (book_view, contact);
- 		g_object_unref (contact);
- 	}
-@@ -2697,6 +2697,13 @@
- 	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");
- 		
-@@ -2741,12 +2748,6 @@
- 				       server_last_sequence, server_last_po_rebuild_time);
- 		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-addressbook_backends_ldap_e-book-backend-ldap.c b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c
index c8262746ec0f..51f468867330 100644
--- a/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c
+++ b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c
@@ -11,55 +11,3 @@
  	E_STRING_PROP  (E_CONTACT_SPOUSE,      "spouseName"), 
  	E_STRING_PROP  (E_CONTACT_NOTE,        "note"), 
  	E_COMPLEX_PROP (E_CONTACT_ANNIVERSARY, "anniversary", anniversary_populate, anniversary_ber, anniversary_compare), 
-@@ -1698,8 +1698,9 @@
- 
- 	msg_type = ldap_msgtype (res);
- 	if (msg_type == LDAP_RES_SEARCH_ENTRY) {
-+		LDAPMessage *e;
- 		g_static_rec_mutex_lock (&eds_ldap_handler_lock);
--		LDAPMessage *e = ldap_first_entry(ldap, res);
-+		e = ldap_first_entry(ldap, res);
- 		g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
- 
- 		if (!e) {
-@@ -1908,13 +1909,14 @@
- 	   the op after either */
- 	msg_type = ldap_msgtype (res);
- 	if (msg_type == LDAP_RES_SEARCH_ENTRY) {
--		g_static_rec_mutex_lock (&eds_ldap_handler_lock);
--		LDAPMessage *e = ldap_first_entry (bl->priv->ldap, res);
--		g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
--
- 		EContact *contact;
- 		char *vcard;
- 
-+		LDAPMessage *e;
-+		g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-+		e = ldap_first_entry (bl->priv->ldap, res);
-+		g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
-+
- 		if (!e) {
- 			g_warning ("uh, this shouldn't happen");
- 			e_data_book_respond_get_contact (op->book,
-@@ -3470,8 +3472,9 @@
- 		g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
- 
- 		while (NULL != e) {
-+			EContact *contact;
- 			g_static_rec_mutex_lock (&eds_ldap_handler_lock);
--			EContact *contact = build_contact_from_entry (ldap, e, NULL);
-+			contact = build_contact_from_entry (ldap, e, NULL);
- 			g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
- 
- 			e_data_book_view_notify_update (view, contact);
-@@ -3709,8 +3712,9 @@
- 		g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
- 
- 		while (e != NULL) {
-+			EContact *contact;
- 			g_static_rec_mutex_lock (&eds_ldap_handler_lock);
--			EContact *contact = build_contact_from_entry (ldap, e, NULL);
-+			contact = build_contact_from_entry (ldap, e, NULL);
- 			g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
- 
- 			contact_list_op->contacts = g_list_prepend (contact_list_op->contacts, contact);
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 1f3e165afca9..000000000000
--- 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 Oct  3 11:05:43 2005
-+++ calendar/backends/groupwise/e-cal-backend-groupwise.c	Thu Nov 10 10:09:35 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-groupwise-folder.c b/databases/evolution-data-server/files/patch-camel-groupwise-folder.c
deleted file mode 100644
index 52e4ec88d080..000000000000
--- a/databases/evolution-data-server/files/patch-camel-groupwise-folder.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- camel/providers/groupwise/camel-groupwise-folder.c.orig	Mon Oct  3 14:10:05 2005
-+++ camel/providers/groupwise/camel-groupwise-folder.c	Thu Nov 10 05:26:17 2005
-@@ -1032,9 +1032,9 @@
- 		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);
- 
-@@ -1768,6 +1768,7 @@
- 			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*/
-@@ -1776,7 +1777,7 @@
- 			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-groupwise-utils.c b/databases/evolution-data-server/files/patch-camel-groupwise-utils.c
deleted file mode 100644
index 5478bec69c84..000000000000
--- a/databases/evolution-data-server/files/patch-camel-groupwise-utils.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- camel/providers/groupwise/camel-groupwise-utils.c.orig	Mon Oct  3 11:05:45 2005
-+++ camel/providers/groupwise/camel-groupwise-utils.c	Thu Nov 10 05:36:51 2005
-@@ -339,8 +339,9 @@
- 	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);
-@@ -430,9 +431,10 @@
- 			dw = camel_medium_get_content_object (CAMEL_MEDIUM (part));
- 			if (type->subtype && !strcmp (type->subtype, "alternative")) {
- 				CamelMimePart *temp_part;
-+				CamelDataWrapper *temp_dw;
- 				CamelStreamMem *temp_content = (CamelStreamMem *)camel_stream_mem_new ();
- 				temp_part = camel_multipart_get_part ((CamelMultipart *)dw, 1);
--				CamelDataWrapper *temp_dw = camel_data_wrapper_new ();
-+				temp_dw = camel_data_wrapper_new ();
- 				if (temp_part) {
- 					is_alternative = TRUE;
- 					temp_dw = camel_medium_get_content_object (CAMEL_MEDIUM (temp_part));
diff --git a/databases/evolution-data-server/files/patch-camel_Makefile.in b/databases/evolution-data-server/files/patch-camel_Makefile.in
deleted file mode 100644
index 8a2d2fdf6151..000000000000
--- a/databases/evolution-data-server/files/patch-camel_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- camel/Makefile.in.orig	Tue Nov 29 11:14:05 2005
-+++ camel/Makefile.in	Tue Nov 29 11:14:32 2005
-@@ -508,7 +508,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- weatherdatadir = @weatherdatadir@
--SUBDIRS = . providers tests
-+SUBDIRS = . providers
- @OS_WIN32_FALSE@LIBCAMEL_PLATFORM_DEP_SOURCES = \
- @OS_WIN32_FALSE@	camel-lock-client.c \
- @OS_WIN32_FALSE@	camel-stream-process.c
diff --git a/databases/evolution-data-server/files/patch-camel_providers_imap_camel-imap-utils.c b/databases/evolution-data-server/files/patch-camel_providers_imap_camel-imap-utils.c
deleted file mode 100644
index 00ea9a3d6b55..000000000000
--- a/databases/evolution-data-server/files/patch-camel_providers_imap_camel-imap-utils.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- camel/providers/imap/camel-imap-utils.c.orig	Tue Nov 29 03:03:43 2005
-+++ camel/providers/imap/camel-imap-utils.c	Sun Dec  4 23:13:35 2005
-@@ -371,7 +371,7 @@ imap_parse_list_response (CamelImapStore
- 		return FALSE;
- 	
- 	if (folder) {
--		char *astring;
-+		char *astring, *mailbox;
- 		
- 		/* get the folder name */
- 		word = imap_next_word (word);
-@@ -380,8 +380,6 @@ imap_parse_list_response (CamelImapStore
- 			return FALSE;
- 
- 		*folder = astring;
--
--		char *mailbox;
- 
- 		mailbox = imap_mailbox_decode (astring, strlen (astring));
- 		g_free (astring);
diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure
index fe88433c1287..91d8b09b92a8 100644
--- a/databases/evolution-data-server/files/patch-configure
+++ b/databases/evolution-data-server/files/patch-configure
@@ -1,8 +1,8 @@
---- configure.orig	Fri Jul 29 17:13:44 2005
-+++ configure	Fri Jul 29 17:15:52 2005
-@@ -23461,6 +23461,13 @@
-     DL_LIB=''
+--- configure.orig	Sun Dec 25 01:57:35 2005
++++ configure	Sun Dec 25 01:58:23 2005
+@@ -23542,6 +23542,14 @@
      SOFTOKN3_LIB=''
+     LIBEXECDIR_IN_SERVER_FILE='../../../libexec'
      ;;
 +*freebsd*)
 +    os_win32=no
@@ -10,11 +10,12 @@
 +    SOCKET_LIBS=''
 +    DL_LIB=''
 +    SOFTOKN3_LIB='-lsoftokn3'
++    LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
 +    ;;
  *)  os_win32=no
      NO_UNDEFINED=''
      SOCKET_LIBS=''
-@@ -27135,7 +27142,7 @@
+@@ -27317,7 +27325,7 @@
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -23,7 +24,7 @@
  
  int
  main ()
-@@ -27873,7 +27880,7 @@
+@@ -27565,7 +27573,7 @@
  	LDFLAGS_save="$LDFLAGS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@@ -32,7 +33,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
-@@ -31176,7 +31183,7 @@
+@@ -31483,7 +31491,7 @@
  imagesdir="$datadir/pixmaps/evolution-data-server-$BASE_VERSION"
  
  
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 19b5c0581307..000000000000
--- 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	Mon Oct  3 11:05:48 2005
-+++ libedataserverui/e-name-selector-entry.c	Thu Nov 10 10:23:46 2005
-@@ -1112,7 +1112,7 @@
- 	const gchar *text;
- 	gint         index_start, index_end;
- 	gint	     selection_start, selection_end;	
--	gunichar     str_context [2], str_b_context [2];;
-+	gunichar     str_context [2], str_b_context [2];
- 	gint         len;
- 	gint         i;
- 	gboolean     already_selected = FALSE;
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
deleted file mode 100644
index e366b774de97..000000000000
--- a/databases/evolution-data-server/files/patch-servers-exchange-storage-e-folder-exchange.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- servers/exchange/storage/e-folder-exchange.c.orig	Mon Oct  3 11:05:51 2005
-+++ servers/exchange/storage/e-folder-exchange.c	Thu Nov 10 05:04:23 2005
-@@ -744,11 +744,13 @@
- 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-connection.c b/databases/evolution-data-server/files/patch-servers-groupwise-e-gw-connection.c
deleted file mode 100644
index faa3ce120218..000000000000
--- 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	Mon Oct  3 11:05:51 2005
-+++ servers/groupwise/e-gw-connection.c	Thu Nov 10 00:32:44 2005
-@@ -1979,8 +1979,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 89201b2e7cb5..000000000000
--- 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	Mon Oct  3 14:46:42 2005
-+++ servers/groupwise/e-gw-item.c	Thu Nov 10 04:56:48 2005
-@@ -3019,8 +3019,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 e538af3a07d6..e3b1781b5d71 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -111,6 +111,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h
 include/evolution-data-server-%%VERSION%%/camel/camel.h
 include/evolution-data-server-%%VERSION%%/exchange/e-folder-exchange.h
 include/evolution-data-server-%%VERSION%%/exchange/e-folder.h
+include/evolution-data-server-%%VERSION%%/exchange/e-shell-marshal.h
 include/evolution-data-server-%%VERSION%%/exchange/e-storage.h
 include/evolution-data-server-%%VERSION%%/exchange/e2k-autoconfig.h
 include/evolution-data-server-%%VERSION%%/exchange/e2k-context.h
@@ -199,6 +200,7 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-account.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-categories.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-component-listener.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-module.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-util.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-db3-utils.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-dbhash.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-file-cache.h
@@ -216,8 +218,8 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-time-utils.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-trie.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-uid.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-url.h
-include/evolution-data-server-%%VERSION%%/libedataserver/e-util.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-hash-utils.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-utils.h
 include/evolution-data-server-%%VERSION%%/libedataserver/md5-utils.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-book-auth-util.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-categories-dialog.h
@@ -225,6 +227,7 @@ include/evolution-data-server-%%VERSION%%/libedataserverui/e-contact-store.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-destination-store.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-dialog.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-entry.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-list.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-model.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-passwords.h
@@ -280,6 +283,10 @@ lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.a
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.urls
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelhula.a
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelhula.la
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelhula.so
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelhula.urls
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.a
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.so
@@ -320,6 +327,9 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendldap.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.a
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.so
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcaldav.a
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcaldav.la
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcaldav.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.a
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.so
@@ -342,7 +352,7 @@ lib/libcamel-%%EVO_VERSION%%.so.0
 lib/libcamel-provider-%%EVO_VERSION%%.a
 lib/libcamel-provider-%%EVO_VERSION%%.la
 lib/libcamel-provider-%%EVO_VERSION%%.so
-lib/libcamel-provider-%%EVO_VERSION%%.so.6
+lib/libcamel-provider-%%EVO_VERSION%%.so.8
 lib/libebook-%%EVO_VERSION%%.a
 lib/libebook-%%EVO_VERSION%%.la
 lib/libebook-%%EVO_VERSION%%.so
@@ -362,7 +372,7 @@ lib/libedata-cal-%%EVO_VERSION%%.so.1
 lib/libedataserver-%%EVO_VERSION%%.a
 lib/libedataserver-%%EVO_VERSION%%.la
 lib/libedataserver-%%EVO_VERSION%%.so
-lib/libedataserver-%%EVO_VERSION%%.so.4
+lib/libedataserver-%%EVO_VERSION%%.so.7
 lib/libedataserverui-%%EVO_VERSION%%.a
 lib/libedataserverui-%%EVO_VERSION%%.la
 lib/libedataserverui-%%EVO_VERSION%%.so
@@ -370,11 +380,11 @@ lib/libedataserverui-%%EVO_VERSION%%.so.6
 lib/libegroupwise-%%EVO_VERSION%%.a
 lib/libegroupwise-%%EVO_VERSION%%.la
 lib/libegroupwise-%%EVO_VERSION%%.so
-lib/libegroupwise-%%EVO_VERSION%%.so.8
+lib/libegroupwise-%%EVO_VERSION%%.so.9
 lib/libexchange-storage-%%EVO_VERSION%%.a
 lib/libexchange-storage-%%EVO_VERSION%%.la
 lib/libexchange-storage-%%EVO_VERSION%%.so
-lib/libexchange-storage-%%EVO_VERSION%%.so.0
+lib/libexchange-storage-%%EVO_VERSION%%.so.1
 libdata/bonobo/servers/GNOME_Evolution_DataServer_%%EVO_VERSION%%.server
 libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
 libdata/pkgconfig/camel-provider-%%EVO_VERSION%%.pc
@@ -407,6 +417,7 @@ share/doc/libebook/libebook-e-book-async.html
 share/doc/libebook/libebook-e-book-query.html
 share/doc/libebook/libebook-e-book-types.html
 share/doc/libebook/libebook.devhelp
+share/doc/libebook/libebook.devhelp2
 share/doc/libebook/right.png
 share/doc/libebook/style.css
 share/doc/libebook/up.png
@@ -425,6 +436,7 @@ share/doc/libecal/libecal-e-cal-time-util.html
 share/doc/libecal/libecal-e-cal-types.html
 share/doc/libecal/libecal-e-cal-util.html
 share/doc/libecal/libecal.devhelp
+share/doc/libecal/libecal.devhelp2
 share/doc/libecal/right.png
 share/doc/libecal/style.css
 share/doc/libecal/up.png
@@ -437,7 +449,13 @@ share/doc/libedata-cal/home.png
 share/doc/libedata-cal/index.html
 share/doc/libedata-cal/index.sgml
 share/doc/libedata-cal/left.png
+share/doc/libedata-cal/libedata-cal-ECalBackendCache.html
+share/doc/libedata-cal/libedata-cal-ECalBackendFactory.html
+share/doc/libedata-cal/libedata-cal-ECalBackendSync.html
+share/doc/libedata-cal/libedata-cal-EDataCalFactory.html
+share/doc/libedata-cal/libedata-cal-e-cal-backend-util.html
 share/doc/libedata-cal/libedata-cal.devhelp
+share/doc/libedata-cal/libedata-cal.devhelp2
 share/doc/libedata-cal/right.png
 share/doc/libedata-cal/style.css
 share/doc/libedata-cal/up.png
@@ -448,6 +466,7 @@ share/doc/libedataserver/index.sgml
 share/doc/libedataserver/left.png
 share/doc/libedataserver/libedataserver-EAccount.html
 share/doc/libedataserver/libedataserver-EAccountList.html
+share/doc/libedataserver/libedataserver-EComponentListener.html
 share/doc/libedataserver/libedataserver-EFileCache.html
 share/doc/libedataserver/libedataserver-EIterator.html
 share/doc/libedataserver/libedataserver-EList.html
@@ -457,6 +476,7 @@ share/doc/libedataserver/libedataserver-ESource.html
 share/doc/libedataserver/libedataserver-ESourceGroup.html
 share/doc/libedataserver/libedataserver-ESourceList.html
 share/doc/libedataserver/libedataserver-e-categories.html
+share/doc/libedataserver/libedataserver-e-data-server-module.html
 share/doc/libedataserver/libedataserver-e-db3-utils.html
 share/doc/libedataserver/libedataserver-e-dbhash.html
 share/doc/libedataserver/libedataserver-e-iconv.html
@@ -467,8 +487,10 @@ share/doc/libedataserver/libedataserver-e-trie.html
 share/doc/libedataserver/libedataserver-e-uid.html
 share/doc/libedataserver/libedataserver-e-url.html
 share/doc/libedataserver/libedataserver-e-util.html
+share/doc/libedataserver/libedataserver-e-xml-hash-utils.html
 share/doc/libedataserver/libedataserver-md5-utils.html
 share/doc/libedataserver/libedataserver.devhelp
+share/doc/libedataserver/libedataserver.devhelp2
 share/doc/libedataserver/right.png
 share/doc/libedataserver/style.css
 share/doc/libedataserver/up.png
@@ -888,6 +910,7 @@ share/locale/cs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/cy/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/en_AU/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/en_CA/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -909,7 +932,9 @@ share/locale/id/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/is/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ka/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ku/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/lt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/lv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/mk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -934,13 +959,25 @@ share/locale/sq/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/sr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/sr@Latn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/tr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/wa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/xh/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/zh_HK/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrm share/gnome/pixmaps/evolution-data-server-%%VERSION%%
 @dirrm share/gnome/idl/evolution-data-server-%%EVO_VERSION%%
 @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific