Presenting GNOME 2.10 for FreeBSD!

The release notes can be found at
http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a
good idea of what has gone into this release overall.  However, a lot of
FreeBSD specific additions and fixes have been made.  For example, this
release offers fixed ACPI support as well as new CPU freqeuncy monitoring
support.  See the FreeBSD GNOME 2.10 upgrade page at
http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well
as a list of known issues and upgrade instructions.

GNOME 2.10, as well as all of our releases, would not be possible without
the great team that goes into porting and testign each and every component.
Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all
their work.  We would also like to thank our adventurous users that chose to
ride the walrus.  We'd especially like to thank the following users that
provided patches for GNOME 2.10:

ade
Yasuda Keisuke
Franz Klammer
Khairil Yusof
Radek Kozlowsk

And anyone else I may have accidentally omitted.

As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen
courtesy of Franz Klammer.  However, unlike GNOME 2.8, we've included all
of the FreeBSD GNOME splashscreen entries with gnomesession.  You can
use the deskutils/splashsetter port to choose the one you like best.

As always, GNOME users should _not_ use portupgrade alone to upgrade to
2.10.  Instead, get the gnome_upgrade.sh script from
http://www.FreeBSD.org/gnome/gnome_upgrade.sh.

Enjoy!

11 files changed, 431 insertions, 37 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index e3265639e59b..f7a5fde2ecf1 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -6,38 +6,50 @@
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	1.0.4
+PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The data backends for the Evolution integrated mail/PIM suite
 
-LIB_DEPENDS=	soup-2.2.7:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	soup-2.2.7:${PORTSDIR}/devel/libsoup \
+		nss3.1:${PORTSDIR}/security/nss
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnometarget libgnome
+USE_GNOME=	gnomeprefix gnomehack intlhack gnometarget libgnomeui
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-PLIST_SUB=	VERSION="1.0" EVO_VERSION="1.0"
+CONFIGURE_ARGS=	--enable-static \
+		--enable-nss=yes \
+		--with-nss-includes=${LOCALBASE}/include/nss/nss \
+		--with-nss-libs=${LOCALBASE}/lib \
+		--with-nspr-includes=${LOCALBASE}/include/nspr \
+		--with-nspr-libs=${LOCALBASE}/lib \
+		--with-krb5=/usr
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+
+PLIST_SUB=	VERSION="1.2" EVO_VERSION="1.2"
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 600012
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libedataserver_e-msgport.c
+.endif
 
 .if !defined(WITHOUT_LDAP)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-openldap=yes
-PLIST_SUB+=	LDAP=""
 .else
 CONFIGURE_ARGS+=--with-openldap=no
-PLIST_SUB+=	LDAP="@comment "
 .endif
 
 pre-everything::
@@ -46,4 +58,4 @@ pre-everything::
 	@${ECHO_MSG} "	WITHOUT_LDAP	Disable LDAP support"
 	@${ECHO_MSG} ""
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index fc9fd81d63a0..6ac9d80baf96 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-data-server-1.0.4.tar.bz2) = 5c9c6cac9b65d392e50ea3214022cb5b
-SIZE (gnome2/evolution-data-server-1.0.4.tar.bz2) = 4792220
+MD5 (gnome2/evolution-data-server-1.2.0.tar.bz2) = 9a34499dc8e65af768ab1582803015ef
+SIZE (gnome2/evolution-data-server-1.2.0.tar.bz2) = 7427456
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
new file mode 100644
index 000000000000..7383f939f4cd
--- /dev/null
+++ b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c
@@ -0,0 +1,52 @@
+--- 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 @@
+ void e_thread_put(EThread *e, EMsg *msg)
+ {
+ 	pthread_t id;
++	pthread_attr_t attr;
+ 	EMsg *dmsg = NULL;
+ 
+ 	pthread_mutex_lock(&e->mutex);
++	pthread_attr_init(&attr);
++	/* Give us a 1 MB thread stacksize on 32-bit architectures, and
++	 * a 2 MB thread stacksize on 64-bit architectures. */
++	if (sizeof (void *) == 8) {
++		pthread_attr_setstacksize(&attr, 0x200000);
++	} else {
++		pthread_attr_setstacksize(&attr, 0x100000);
++	}
+ 
+ 	/* 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 @@
+ 		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));
+ 			info->id = id;
+ 			info->busy = TRUE;
+ 			e->id_list = g_list_append(e->id_list, info);
+ 		}
++		pthread_attr_destroy(&attr);
+ 		pthread_mutex_unlock(&e->mutex);
+ 		return;
+ 	}
+@@ -977,12 +987,13 @@
+ 	if (e->id == E_THREAD_NONE) {
+ 		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;
+ 		}
+ 	}
+ 
++	pthread_attr_destroy(&attr);
+ 	pthread_mutex_unlock(&e->mutex);
+ 
+ 	if (dmsg) {
diff --git a/databases/evolution-data-server/files/patch-calendar_libical_configure b/databases/evolution-data-server/files/patch-calendar_libical_configure
new file mode 100644
index 000000000000..19028e5d49fc
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-calendar_libical_configure
@@ -0,0 +1,11 @@
+--- calendar/libical/configure.orig	Sun Dec 26 16:54:57 2004
++++ calendar/libical/configure	Sun Dec 26 16:55:23 2004
+@@ -19736,7 +19736,7 @@
+ 
+ 
+ 
+-if test "x$USE_MAINTAINER_MODE" == xyes; then
++if test "x$USE_MAINTAINER_MODE" = xyes; then
+ 	DEV="yes"
+ 	echo "$as_me:$LINENO: result: Setting up for development: -Wall, flex, bison" >&5
+ echo "${ECHO_T}Setting up for development: -Wall, flex, bison" >&6
diff --git a/databases/evolution-data-server/files/patch-camel_Makefile.in b/databases/evolution-data-server/files/patch-camel_Makefile.in
new file mode 100644
index 000000000000..dfd4f33f61e2
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_Makefile.in
@@ -0,0 +1,11 @@
+--- camel/Makefile.in.orig	Tue Dec 21 13:46:00 2004
++++ camel/Makefile.in	Tue Dec 21 13:46:01 2004
+@@ -299,7 +299,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SUBDIRS = . providers tests
++SUBDIRS = . providers
+ 
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_in_files = camel.pc.in camel-provider.pc.in
diff --git a/databases/evolution-data-server/files/patch-camel_camel-net-utils.c b/databases/evolution-data-server/files/patch-camel_camel-net-utils.c
new file mode 100644
index 000000000000..17bddca39e31
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_camel-net-utils.c
@@ -0,0 +1,24 @@
+--- camel/camel-net-utils.c.orig	Tue Dec 21 13:38:52 2004
++++ camel/camel-net-utils.c	Tue Dec 21 13:40:34 2004
+@@ -143,12 +143,21 @@
+ 	case EAI_SERVICE:
+ 		return NO_DATA;
+ 		break;
++#ifdef EAI_ADDRFAMILY
+ 	case EAI_ADDRFAMILY:
+ 		return NO_ADDRESS;
+ 		break;
++#endif
++#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
+ 	case EAI_NODATA:
+ 		return NO_DATA;
+ 		break;
++#endif
++#ifdef EAI_NOFAMILY
++	case EAI_NOFAMILY:
++		return NO_ADDRESS;
++		break;
++#endif
+ 	case EAI_MEMORY:
+ 		return ENOMEM;
+ 		break;
diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure
index 4959297daf85..7bc7a9cdfb65 100644
--- a/databases/evolution-data-server/files/patch-configure
+++ b/databases/evolution-data-server/files/patch-configure
@@ -1,6 +1,36 @@
---- configure.orig	Thu Jan 29 16:02:10 2004
-+++ configure	Thu Jan 29 16:02:39 2004
-@@ -23783,7 +23783,7 @@
+--- configure.orig	Tue Dec 21 13:46:01 2004
++++ configure	Tue Dec 21 13:50:02 2004
+@@ -7894,10 +7894,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
+@@ -10011,6 +10011,7 @@
+ 		#include <sys/socket.h>
+ 		#include <netinet/in.h>
+ 		#include <netdb.h>
++		#include <stdio.h>
+ 
+ 
+ int
+@@ -10777,7 +10778,7 @@
+ 	LDFLAGS_save="$LDFLAGS"
+ 
+ 	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
+-	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
++	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
+ 	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
+@@ -29833,7 +29834,7 @@
  idldir="$datadir/idl/evolution-data-server-$BASE_VERSION"
  
  
@@ -8,4 +38,4 @@
 +serverdir="$prefix/libdata/bonobo/servers"
  
  
- 
+ extensiondir='${privlibdir}'/extensions
diff --git a/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c b/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c
new file mode 100644
index 000000000000..62532da02471
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c
@@ -0,0 +1,11 @@
+--- libedataserverui/e-source-option-menu.c.orig	Tue Nov 23 13:50:14 2004
++++ libedataserverui/e-source-option-menu.c	Tue Nov 23 13:50:33 2004
+@@ -24,6 +24,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/types.h>
++
+ #include <gtk/gtkmenu.h>
+ #include <gtk/gtkmenuitem.h>
+ 
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
new file mode 100644
index 000000000000..576ecea6ae3c
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000000..c865775dae15
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c
@@ -0,0 +1,22 @@
+--- 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 @@
+ 
+ 	/*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) ;
+@@ -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 39bfa12d14fc..fdb7596355ec 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -1,8 +1,119 @@
+include/evolution-data-server-%%VERSION%%/camel/broken-date-parser.h
+include/evolution-data-server-%%VERSION%%/camel/camel-address.h
+include/evolution-data-server-%%VERSION%%/camel/camel-arg.h
+include/evolution-data-server-%%VERSION%%/camel/camel-block-file.h
+include/evolution-data-server-%%VERSION%%/camel/camel-certdb.h
+include/evolution-data-server-%%VERSION%%/camel/camel-charset-map.h
+include/evolution-data-server-%%VERSION%%/camel/camel-cipher-context.h
+include/evolution-data-server-%%VERSION%%/camel/camel-data-cache.h
+include/evolution-data-server-%%VERSION%%/camel/camel-data-wrapper.h
+include/evolution-data-server-%%VERSION%%/camel/camel-debug.h
+include/evolution-data-server-%%VERSION%%/camel/camel-digest-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-digest-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-digest-summary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-disco-diary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-disco-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-disco-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-exception-list.def
+include/evolution-data-server-%%VERSION%%/camel/camel-exception.h
+include/evolution-data-server-%%VERSION%%/camel/camel-file-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-filter-driver.h
+include/evolution-data-server-%%VERSION%%/camel/camel-filter-search.h
+include/evolution-data-server-%%VERSION%%/camel/camel-folder-search.h
+include/evolution-data-server-%%VERSION%%/camel/camel-folder-summary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-folder-thread.h
+include/evolution-data-server-%%VERSION%%/camel/camel-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-gpg-context.h
+include/evolution-data-server-%%VERSION%%/camel/camel-http-stream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-i18n.h
+include/evolution-data-server-%%VERSION%%/camel/camel-index.h
+include/evolution-data-server-%%VERSION%%/camel/camel-internet-address.h
+include/evolution-data-server-%%VERSION%%/camel/camel-junk-plugin.h
+include/evolution-data-server-%%VERSION%%/camel/camel-list-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-lock-client.h
+include/evolution-data-server-%%VERSION%%/camel/camel-lock.h
+include/evolution-data-server-%%VERSION%%/camel/camel-nntp-address.h
+include/evolution-data-server-%%VERSION%%/camel/camel-medium.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-basic.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-bestenc.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-canon.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-charset.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-crlf.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-enriched.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-from.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-gzip.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-html.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-index.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-linewrap.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-save.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-tohtml.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-windows.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-yenc.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-message.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-parser.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-part-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-part.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-movemail.h
+include/evolution-data-server-%%VERSION%%/camel/camel-multipart-encrypted.h
+include/evolution-data-server-%%VERSION%%/camel/camel-multipart-signed.h
+include/evolution-data-server-%%VERSION%%/camel/camel-multipart.h
+include/evolution-data-server-%%VERSION%%/camel/camel-net-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-object.h
+include/evolution-data-server-%%VERSION%%/camel/camel-offline-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-offline-journal.h
+include/evolution-data-server-%%VERSION%%/camel/camel-offline-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-operation.h
+include/evolution-data-server-%%VERSION%%/camel/camel-partition-table.h
+include/evolution-data-server-%%VERSION%%/camel/camel-provider.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-anonymous.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-cram-md5.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-digest-md5.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-gssapi.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-kerberos4.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-login.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-ntlm.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-plain.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-popb4smtp.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl.h
+include/evolution-data-server-%%VERSION%%/camel/camel-search-private.h
+include/evolution-data-server-%%VERSION%%/camel/camel-seekable-stream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-seekable-substream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-service.h
+include/evolution-data-server-%%VERSION%%/camel/camel-session.h
+include/evolution-data-server-%%VERSION%%/camel/camel-smime-context.h
+include/evolution-data-server-%%VERSION%%/camel/camel-store-summary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-buffer.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-filter.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-fs.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-mem.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-null.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-process.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-string-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream-raw.h
+include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream-ssl.h
+include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-text-index.h
+include/evolution-data-server-%%VERSION%%/camel/camel-transport.h
+include/evolution-data-server-%%VERSION%%/camel/camel-types.h
+include/evolution-data-server-%%VERSION%%/camel/camel-uid-cache.h
+include/evolution-data-server-%%VERSION%%/camel/camel-url-scanner.h
+include/evolution-data-server-%%VERSION%%/camel/camel-url.h
+include/evolution-data-server-%%VERSION%%/camel/camel-utf8.h
+include/evolution-data-server-%%VERSION%%/camel/camel-vee-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-vee-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-vee-summary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-connection.h
 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-sendoptions.h
 include/evolution-data-server-%%VERSION%%/libebook/Evolution-DataServer-Addressbook.h
 include/evolution-data-server-%%VERSION%%/libebook/e-address-western.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book-listener.h
@@ -12,6 +123,7 @@ include/evolution-data-server-%%VERSION%%/libebook/e-book-view-listener.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book-view.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book.h
 include/evolution-data-server-%%VERSION%%/libebook/e-contact.h
+include/evolution-data-server-%%VERSION%%/libebook/e-destination.h
 include/evolution-data-server-%%VERSION%%/libebook/e-name-western-tables.h
 include/evolution-data-server-%%VERSION%%/libebook/e-name-western.h
 include/evolution-data-server-%%VERSION%%/libebook/e-vcard.h
@@ -26,6 +138,8 @@ include/evolution-data-server-%%VERSION%%/libecal/e-cal-view-listener.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-view.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal.h
 include/evolution-data-server-%%VERSION%%/libedata-book/Evolution-DataServer-Addressbook.h
+include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-cache.h
+include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-factory.h
 include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-sexp.h
 include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-summary.h
 include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-sync.h
@@ -36,6 +150,7 @@ include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-view.h
 include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/Evolution-DataServer-Calendar.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-cache.h
+include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-factory.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sexp.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sync.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-util.h
@@ -46,23 +161,42 @@ include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-view.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-account-list.h
 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-db3-utils.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-dbhash.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-file-cache.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-iconv.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-iterator.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-list-iterator.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-list.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-memory.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-msgport.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-sexp.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-source-group.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-source-list.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-source.h
+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/md5-utils.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-book-auth-util.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-categories-dialog.h
+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.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-model.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-passwords.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-option-menu.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector-dialog.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-tree-model-generator.h
 include/evolution-data-server-%%VERSION%%/libical/ical.h
 include/evolution-data-server-%%VERSION%%/libical/icalarray.h
 include/evolution-data-server-%%VERSION%%/libical/icalattach.h
@@ -107,32 +241,71 @@ include/evolution-data-server-%%VERSION%%/libical/sspm.h
 include/evolution-data-server-%%VERSION%%/libical/vcaltmp.h
 include/evolution-data-server-%%VERSION%%/libical/vcc.h
 include/evolution-data-server-%%VERSION%%/libical/vobject.h
-lib/libebook.a
-lib/libebook.so
-lib/libebook.so.8
-lib/libecal.a
-lib/libecal.so
-lib/libecal.so.9
-lib/libedata-book.a
-lib/libedata-book.so
-lib/libedata-book.so.1
-lib/libedata-cal.a
-lib/libedata-cal.so
-lib/libedata-cal.so.6
-lib/libedataserver.a
-lib/libedataserver.so
-lib/libedataserver.so.5
-lib/libegroupwise.a
-lib/libegroupwise.so
-lib/libegroupwise.so.7
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelgroupwise.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelgroupwise.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap4.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap4.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamellocal.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamellocal.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelnntp.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelnntp.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelpop3.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelpop3.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsendmail.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsendmail.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsmtp.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsmtp.urls
+lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendfile.so
+lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendgroupwise.so
+lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendldap.so
+lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendvcf.so
+lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendcontacts.so
+lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendfile.so
+lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendgroupwise.so
+lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendhttp.so
+lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendweather.so
+lib/libcamel-%%VERSION%%.a
+lib/libcamel-%%VERSION%%.so
+lib/libcamel-%%VERSION%%.so.0
+lib/libcamel-provider-%%VERSION%%.a
+lib/libcamel-provider-%%VERSION%%.so
+lib/libcamel-provider-%%VERSION%%.so.4
+lib/libebook-%%VERSION%%.a
+lib/libebook-%%VERSION%%.so
+lib/libebook-%%VERSION%%.so.4
+lib/libecal-%%VERSION%%.a
+lib/libecal-%%VERSION%%.so
+lib/libecal-%%VERSION%%.so.2
+lib/libedata-book-%%VERSION%%.a
+lib/libedata-book-%%VERSION%%.so
+lib/libedata-book-%%VERSION%%.so.2
+lib/libedata-cal-%%VERSION%%.a
+lib/libedata-cal-%%VERSION%%.so
+lib/libedata-cal-%%VERSION%%.so.3
+lib/libedataserver-%%VERSION%%.a
+lib/libedataserver-%%VERSION%%.so
+lib/libedataserver-%%VERSION%%.so.4
+lib/libedataserverui-%%VERSION%%.a
+lib/libedataserverui-%%VERSION%%.so
+lib/libedataserverui-%%VERSION%%.so.5
+lib/libegroupwise-%%VERSION%%.a
+lib/libegroupwise-%%VERSION%%.so
+lib/libegroupwise-%%VERSION%%.so.5
 libdata/bonobo/servers/GNOME_Evolution_DataServer_%%VERSION%%.server
+libdata/pkgconfig/camel-%%VERSION%%.pc
+libdata/pkgconfig/camel-provider-%%VERSION%%.pc
 libdata/pkgconfig/evolution-data-server-%%VERSION%%.pc
 libdata/pkgconfig/libebook-%%VERSION%%.pc
 libdata/pkgconfig/libecal-%%VERSION%%.pc
 libdata/pkgconfig/libedata-book-%%VERSION%%.pc
 libdata/pkgconfig/libedata-cal-%%VERSION%%.pc
 libdata/pkgconfig/libedataserver-%%VERSION%%.pc
+libdata/pkgconfig/libedataserverui-%%VERSION%%.pc
 libdata/pkgconfig/libegroupwise-%%VERSION%%.pc
+libexec/camel-index-control-%%VERSION%%
+libexec/camel-lock-helper-%%VERSION%%
 libexec/evolution-data-server-%%VERSION%%
 share/doc/libebook/EBook.html
 share/doc/libebook/EBookListener.html
@@ -172,7 +345,10 @@ share/doc/libecal/libecal.devhelp
 share/doc/libecal/right.png
 share/doc/libecal/style.css
 share/doc/libecal/up.png
-%%LDAP%%share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema
+share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema
+share/gnome/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade
+share/gnome/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade
+share/gnome/evolution-data-server-%%VERSION%%/weather/Locations.xml
 share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Abidjan.ics
 share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Accra.ics
 share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Addis_Ababa.ics
@@ -555,12 +731,31 @@ share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/zones.tab
 share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer-Addressbook.idl
 share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer-Calendar.idl
 share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer.idl
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_birthday_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_business_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_favorites_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_gifts_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_goals_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_holiday-cards_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_holiday_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_hot-contacts_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_ideas_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_international_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_key-customer_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_miscellaneous_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_personal_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_phonecalls_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_status_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_strategies_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_suppliers_16.png
+share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_time-and-expenses_16.png
 share/locale/am/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/ar/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/be/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/bn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+share/locale/bs/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/ca/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/cs/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/cy/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
@@ -579,14 +774,19 @@ share/locale/fr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/ga/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/gl/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/gu/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+share/locale/he/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+share/locale/hi/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/hr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/hu/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/id/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+share/locale/is/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/it/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/ja/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/ko/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/lt/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/lv/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+share/locale/mk/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+share/locale/ml/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/mn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/ms/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/nb/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
@@ -608,8 +808,10 @@ share/locale/sv/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/tr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/uk/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/vi/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+share/locale/wa/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
+@dirrm share/gnome/pixmaps/evolution-data-server-%%VERSION%%
 @dirrm share/gnome/idl/evolution-data-server-%%VERSION%%
 @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific
 @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian
@@ -625,14 +827,21 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America
 @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa
 @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo
+@dirrm share/gnome/evolution-data-server-%%VERSION%%/weather
+@dirrm share/gnome/evolution-data-server-%%VERSION%%/glade
 @dirrm share/gnome/evolution-data-server-%%VERSION%%
 @dirrm share/doc/libecal
 @dirrm share/doc/libebook
+@dirrm lib/evolution-data-server-%%VERSION%%/extensions
+@dirrm lib/evolution-data-server-%%VERSION%%/camel-providers
+@dirrm lib/evolution-data-server-%%VERSION%%
 @dirrm include/evolution-data-server-%%VERSION%%/libical
+@dirrm include/evolution-data-server-%%VERSION%%/libedataserverui
 @dirrm include/evolution-data-server-%%VERSION%%/libedataserver
 @dirrm include/evolution-data-server-%%VERSION%%/libedata-cal
 @dirrm include/evolution-data-server-%%VERSION%%/libedata-book
 @dirrm include/evolution-data-server-%%VERSION%%/libecal
 @dirrm include/evolution-data-server-%%VERSION%%/libebook
 @dirrm include/evolution-data-server-%%VERSION%%/groupwise
+@dirrm include/evolution-data-server-%%VERSION%%/camel
 @dirrm include/evolution-data-server-%%VERSION%%