diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index c7dda7526dc..7ee5a2e52d2 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,24 +1,23 @@
-# $OpenBSD: Makefile,v 1.21 2007/10/28 07:56:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.22 2007/11/21 16:10:23 jasper Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		data backends for the Evolution mail/PIM suite
 
 GNOME_PROJECT=		evolution-data-server
-GNOME_VERSION=		1.10.2
+GNOME_VERSION=		1.12.1
 
-PKGNAME=		${DISTNAME}p2
 CATEGORIES=		databases
-SHARED_LIBS +=	edataserver-1.2      9.0      # .9.0
-SHARED_LIBS +=	egroupwise-1.2       13.0     # .13.0
+SHARED_LIBS +=	edataserver-1.2      10.0     # .10.0
+SHARED_LIBS +=	egroupwise-1.2       13.1     # .13.1
 SHARED_LIBS +=	exchange-storage-1.2 3.0      # .3.0
-SHARED_LIBS +=	camel-1.2            10.0     # .10.0
-SHARED_LIBS +=	camel-provider-1.2   10.0     # .10.0
-SHARED_LIBS +=	ebook-1.2            9.1      # .9.1
-SHARED_LIBS +=	edata-book-1.2       6.0      # .6.0
-SHARED_LIBS +=	ecal-1.2             7.1      # .7.1
-SHARED_LIBS +=	edata-cal-1.2        6.1      # .6.1
-SHARED_LIBS +=	edataserverui-1.2    8.1      # .8.1
+SHARED_LIBS +=	camel-1.2            10.1     # .10.1
+SHARED_LIBS +=	camel-provider-1.2   10.1     # .10.1
+SHARED_LIBS +=	ebook-1.2            10.0     # .10.0
+SHARED_LIBS +=	edata-book-1.2       6.1      # .6.1
+SHARED_LIBS +=	ecal-1.2             7.2      # .7.2
+SHARED_LIBS +=	edata-cal-1.2        6.2      # .6.2
+SHARED_LIBS +=	edataserverui-1.2    8.2      # .8.2
 
 HOMEPAGE=		http://www.gnome.org/projects/evolution/
 
@@ -27,13 +26,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=	ORBit-2 ORBitCosNaming-2 X11 Xau Xcursor Xdmcp Xext \
-		Xfixes Xi Xinerama Xrandr Xrender asn1 atk-1.0 audiofile \
-		bonobo-2 bonobo-activation c cairo com_err crypto dbus-1 \
-		dbus-glib-1 esd expat fontconfig freetype gconf-2 glib-2.0 \
+WANTLIB=	ORBit-2 ORBitCosNaming-2 X11 Xau Xcomposite Xcursor \
+		Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender \
+		asn1 atk-1.0 audiofile bonobo-2 bonobo-activation c \
+		cairo com_err crypto dbus-1 dbus-glib-1 esd expat fontconfig \
+		freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 \
 		glitz gmodule-2.0 gnomevfs-2 gobject-2.0 gssapi gthread-2.0 \
-		krb5 m nspr4 pango-1.0 pangocairo-1.0 pangoft2-1.0 plc4 plds4 \
-		png popt pthread sasl2 ssl util xml2 z
+		gtk-x11-2.0 krb5 m nspr4 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
+		pcre plc4 plds4 png popt pthread sasl2 ssl util xml2 z
 
 MODULES=		devel/gettext \
 			lang/python \
@@ -41,25 +41,28 @@ MODULES=		devel/gettext \
 
 BUILD_DEPENDS=		:bison-*:devel/bison \
 			:libgnomeui-*:x11/gnome/libgnomeui
-LIB_DEPENDS= 		ldap,lber::databases/openldap \
+LIB_DEPENDS= 		db::databases/db/v4 \
+			ldap,lber::databases/openldap \
 			glade-2.0::devel/libglade2 \
 			soup-2.2.>=7.0::devel/libsoup \
-			gnome-2::x11/gnome/libgnome \
-			gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \
-			nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss
+			nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss \
+			gnome-2::x11/gnome/libgnome
+			
 
 USE_X11=		Yes
 YACC=			bison
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/evolution-data-server \
-			--with-openldap=${LOCALBASE} \
 			--enable-gnome-keyring=no \
 			--enable-nss=yes \
 			--enable-smime=yes \
+			--with-broken-spool=no \
 			--with-krb5 \
 			--with-krb5-libs=/usr/lib \
-			--with-krb5-includes=/usr/include/kerberosV
+			--with-krb5-includes=/usr/include/kerberosV \
+			--with-libdb="${PREFIX}/lib" \
+			--with-openldap=${LOCALBASE}
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 884e41ad645..19dc9ff9c28 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,5 +1,5 @@
-MD5 (evolution-data-server-1.10.2.tar.bz2) = eQ38l6kX3/g4Tct8rUL4fw==
-RMD160 (evolution-data-server-1.10.2.tar.bz2) = H8WRUzhCejBuRqHDe/yRP6BZNqM=
-SHA1 (evolution-data-server-1.10.2.tar.bz2) = A2Tb8YMG+fNs2uN3A/R1ccsqk/4=
-SHA256 (evolution-data-server-1.10.2.tar.bz2) = 3Jdy+SgYwYRhJ98yUkyqpMJmRgr1u9DiJU0Nuk+jZDI=
-SIZE (evolution-data-server-1.10.2.tar.bz2) = 7122238
+MD5 (evolution-data-server-1.12.1.tar.bz2) = W02FXtHOqqt9sUtQEztSUg==
+RMD160 (evolution-data-server-1.12.1.tar.bz2) = 6iTy46d+FtzNTDmNVYaIQYoGE7I=
+SHA1 (evolution-data-server-1.12.1.tar.bz2) = PZHIfCV+4IC68PGC3UYHl1L0J+0=
+SHA256 (evolution-data-server-1.12.1.tar.bz2) = GpMX2kRd0J1xCflrOzpqe/qWIRfdYy/5c1v39zD/AHk=
+SIZE (evolution-data-server-1.12.1.tar.bz2) = 7465117
diff --git a/databases/evolution-data-server/patches/patch-addressbook_backends_file_e-book-backend-file_c b/databases/evolution-data-server/patches/patch-addressbook_backends_file_e-book-backend-file_c
new file mode 100644
index 00000000000..7b49000cafd
--- /dev/null
+++ b/databases/evolution-data-server/patches/patch-addressbook_backends_file_e-book-backend-file_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-addressbook_backends_file_e-book-backend-file_c,v 1.1 2007/11/21 16:10:24 jasper Exp $
+--- addressbook/backends/file/e-book-backend-file.c.orig	Sun Oct 28 15:29:26 2007
++++ addressbook/backends/file/e-book-backend-file.c	Sun Oct 28 15:30:02 2007
+@@ -32,7 +32,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <errno.h>
+-#include "db.h"
++#include <db4/db.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ 
diff --git a/databases/evolution-data-server/patches/patch-addressbook_backends_groupwise_e-book-backend-groupwise_c b/databases/evolution-data-server/patches/patch-addressbook_backends_groupwise_e-book-backend-groupwise_c
new file mode 100644
index 00000000000..1d356ce7441
--- /dev/null
+++ b/databases/evolution-data-server/patches/patch-addressbook_backends_groupwise_e-book-backend-groupwise_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-addressbook_backends_groupwise_e-book-backend-groupwise_c,v 1.6 2007/11/21 16:10:24 jasper Exp $
+--- addressbook/backends/groupwise/e-book-backend-groupwise.c.orig	Sun Oct 28 15:31:57 2007
++++ addressbook/backends/groupwise/e-book-backend-groupwise.c	Sun Oct 28 15:32:13 2007
+@@ -31,7 +31,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include "db.h"
++#include <db4/db.h>
+ 
+ #include <glib.h>
+ #include <glib/gstdio.h>
diff --git a/databases/evolution-data-server/patches/patch-addressbook_libedata-book_e-book-backend-db-cache_c b/databases/evolution-data-server/patches/patch-addressbook_libedata-book_e-book-backend-db-cache_c
new file mode 100644
index 00000000000..119cd9cabf0
--- /dev/null
+++ b/databases/evolution-data-server/patches/patch-addressbook_libedata-book_e-book-backend-db-cache_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-addressbook_libedata-book_e-book-backend-db-cache_c,v 1.1 2007/11/21 16:10:24 jasper Exp $
+--- addressbook/libedata-book/e-book-backend-db-cache.c.orig	Sun Oct 28 15:25:15 2007
++++ addressbook/libedata-book/e-book-backend-db-cache.c	Sun Oct 28 15:27:20 2007
+@@ -23,6 +23,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <db4/db.h>
+ #include <string.h>
+ #include "e-book-backend-db-cache.h"
+ #include "e-book-backend.h"
diff --git a/databases/evolution-data-server/patches/patch-calendar_libical_src_libical_icaltz-util_c b/databases/evolution-data-server/patches/patch-calendar_libical_src_libical_icaltz-util_c
new file mode 100644
index 00000000000..f0207f8932b
--- /dev/null
+++ b/databases/evolution-data-server/patches/patch-calendar_libical_src_libical_icaltz-util_c
@@ -0,0 +1,19 @@
+$OpenBSD: patch-calendar_libical_src_libical_icaltz-util_c,v 1.1 2007/11/21 16:10:24 jasper Exp $
+--- calendar/libical/src/libical/icaltz-util.c.orig	Sun Oct 28 15:36:00 2007
++++ calendar/libical/src/libical/icaltz-util.c	Sun Oct 28 19:44:04 2007
+@@ -23,6 +23,15 @@
+ #include <string.h>
+ #if defined(sun) && defined(__SVR4)
+ #include <sys/byteorder.h>
++#elif defined(__OpenBSD__)
++#include <sys/endian.h>
++#include <sys/types.h>
++#define __BYTE_ORDER	_BYTE_ORDER
++#define __LITTLE_ENDIAN	_LITTLE_ENDIAN
++#define __BIG_ENDIAN	_BIG_ENDIAN
++#define bswap_16	swap16
++#define bswap_32	swap32
++#define bswap_64	swap64
+ #else
+ #include <byteswap.h>
+ #include <endian.h>
diff --git a/databases/evolution-data-server/patches/patch-camel_camel-provider_h b/databases/evolution-data-server/patches/patch-camel_camel-provider_h
deleted file mode 100644
index cc64649ad7e..00000000000
--- a/databases/evolution-data-server/patches/patch-camel_camel-provider_h
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-camel_camel-provider_h,v 1.1 2007/07/11 22:13:05 martynas Exp $
---- camel/camel-provider.h.orig	Mon Apr  9 15:42:48 2007
-+++ camel/camel-provider.h	Fri Jun 29 19:03:12 2007
-@@ -85,6 +85,7 @@ extern char *camel_provider_type_name[CAMEL_NUM_PROVID
- #define CAMEL_URL_PART_HOST	 (1 << 3)
- #define CAMEL_URL_PART_PORT	 (1 << 4)
- #define CAMEL_URL_PART_PATH	 (1 << 5)
-+#define CAMEL_URL_PART_PATH_DIR  (1 << 6)
- 
- #define CAMEL_URL_PART_NEED	       8
- #define CAMEL_URL_PART_HIDDEN	(CAMEL_URL_PART_NEED + 8)
-@@ -108,6 +109,7 @@ extern char *camel_provider_type_name[CAMEL_NUM_PROVID
- #define CAMEL_URL_NEED_HOST	 (CAMEL_URL_PART_HOST << CAMEL_URL_PART_NEED)
- #define CAMEL_URL_NEED_PORT	 (CAMEL_URL_PART_PORT << CAMEL_URL_PART_NEED)
- #define CAMEL_URL_NEED_PATH	 (CAMEL_URL_PART_PATH << CAMEL_URL_PART_NEED)
-+#define CAMEL_URL_NEED_PATH_DIR  (CAMEL_URL_PART_PATH_DIR << CAMEL_URL_PART_NEED)
- 
- #define CAMEL_URL_HIDDEN_USER	 (CAMEL_URL_PART_USER << CAMEL_URL_PART_HIDDEN)
- #define CAMEL_URL_HIDDEN_AUTH	 (CAMEL_URL_PART_AUTH << CAMEL_URL_PART_HIDDEN)
diff --git a/databases/evolution-data-server/patches/patch-camel_providers_imap_camel-imap-folder_c b/databases/evolution-data-server/patches/patch-camel_providers_imap_camel-imap-folder_c
deleted file mode 100644
index 5f31d819877..00000000000
--- a/databases/evolution-data-server/patches/patch-camel_providers_imap_camel-imap-folder_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-camel_providers_imap_camel-imap-folder_c,v 1.1 2007/07/11 22:13:05 martynas Exp $
---- camel/providers/imap/camel-imap-folder.c.orig	Mon Apr  9 15:42:39 2007
-+++ camel/providers/imap/camel-imap-folder.c	Fri Jun 29 19:02:53 2007
-@@ -655,7 +655,7 @@ imap_rescan (CamelFolder *folder, int exists, CamelExc
- 		uid = g_datalist_get_data (&data, "UID");
- 		flags = GPOINTER_TO_UINT (g_datalist_get_data (&data, "FLAGS"));
- 		
--		if (!uid || !seq || seq > summary_len) {
-+		if (!uid || !seq || seq > summary_len || seq < 0) {
- 			g_datalist_clear (&data);
- 			continue;
- 		}
-@@ -2789,7 +2789,7 @@ parse_fetch_response (CamelImapFolder *imap_folder, ch
- 		
- 		if (*response != '*' || *(response + 1) != ' ')
- 			return NULL;
--		seq = strtol (response + 2, &response, 10);
-+		seq = strtoul (response + 2, &response, 10);
- 		if (seq == 0)
- 			return NULL;
- 		if (g_ascii_strncasecmp (response, " FETCH (", 8) != 0)
diff --git a/databases/evolution-data-server/patches/patch-camel_providers_local_camel-local-provider_c b/databases/evolution-data-server/patches/patch-camel_providers_local_camel-local-provider_c
deleted file mode 100644
index 75a9745913a..00000000000
--- a/databases/evolution-data-server/patches/patch-camel_providers_local_camel-local-provider_c
+++ /dev/null
@@ -1,87 +0,0 @@
-$OpenBSD: patch-camel_providers_local_camel-local-provider_c,v 1.1 2007/07/11 22:13:05 martynas Exp $
---- camel/providers/local/camel-local-provider.c.orig	Mon Apr  9 15:42:41 2007
-+++ camel/providers/local/camel-local-provider.c	Fri Jun 29 19:03:12 2007
-@@ -55,7 +55,7 @@ static CamelProvider mh_provider = {
- 	N_("For storing local mail in MH-like mail directories."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
--	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
- 	mh_conf_entries,
- 	/* ... */
- };
-@@ -73,7 +73,7 @@ static CamelProvider mbox_provider = {
- 	N_("For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
--	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR |CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
- 	mbox_conf_entries,
- 	/* ... */
- };
-@@ -95,7 +95,7 @@ static CamelProvider maildir_provider = {
- 	N_("For storing local mail in maildir directories."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
--	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
- 	maildir_conf_entries,
- 	/* ... */
- };
-@@ -109,9 +109,9 @@ static CamelProviderConfEntry spool_conf_entries[] = {
- 	{ CAMEL_PROVIDER_CONF_END }
- };
- 
--static CamelProvider spool_provider = {
-+static CamelProvider spool_file_provider = {
- 	"spool",
--	N_("Standard Unix mbox spool or directory"),
-+	N_("Standard Unix mbox spool file"),
- 	N_("For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."),
- 	"mail",
- 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
-@@ -120,6 +120,17 @@ static CamelProvider spool_provider = {
- 	/* ... */
- };
- 
-+static CamelProvider spool_directory_provider = {
-+	"spooldir",
-+	N_("Standard Unix mbox spool directory"),
-+	N_("For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."),
-+	"mail",
-+	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
-+	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
-+	spool_conf_entries,
-+	/* ... */
-+};
-+
- #endif
- 
- /* build a canonical 'path' */
-@@ -233,13 +244,19 @@ void camel_provider_module_init(void)
- 	camel_provider_register(&mbox_provider);
- 
- #ifndef G_OS_WIN32
--	spool_conf_entries[0].value = path;  /* default path - same as mbox */
--	spool_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
--	spool_provider.url_hash = local_url_hash;
--	spool_provider.url_equal = local_url_equal;
--	spool_provider.translation_domain = GETTEXT_PACKAGE;
--	camel_provider_register(&spool_provider);
--	
-+	spool_conf_entries[0].value = path;  /* default path - same as mbox; it's for both file and directory */
-+	spool_file_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
-+	spool_file_provider.url_hash = local_url_hash;
-+	spool_file_provider.url_equal = local_url_equal;
-+	spool_file_provider.translation_domain = GETTEXT_PACKAGE;
-+	camel_provider_register(&spool_file_provider);
-+
-+	spool_directory_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();
-+	spool_directory_provider.url_hash = local_url_hash;
-+	spool_directory_provider.url_equal = local_url_equal;
-+	spool_directory_provider.translation_domain = GETTEXT_PACKAGE;
-+	camel_provider_register(&spool_directory_provider);
-+
- 	path = getenv("MAILDIR");
- 	maildir_conf_entries[0].value = path ? path : "";  /* default path */
- 	maildir_provider.object_types[CAMEL_PROVIDER_STORE] = camel_maildir_store_get_type ();
diff --git a/databases/evolution-data-server/patches/patch-configure b/databases/evolution-data-server/patches/patch-configure
index 53145aed2bc..482d63f652d 100644
--- a/databases/evolution-data-server/patches/patch-configure
+++ b/databases/evolution-data-server/patches/patch-configure
@@ -1,12 +1,22 @@
-$OpenBSD: patch-configure,v 1.3 2007/07/12 10:27:46 ajacoutot Exp $
---- configure.orig	Mon May 28 09:47:47 2007
-+++ configure	Thu Jul 12 10:36:57 2007
-@@ -29041,7 +29041,7 @@ if test "x${with_krb5}" != "xno"; then
+$OpenBSD: patch-configure,v 1.4 2007/11/21 16:10:24 jasper Exp $
+--- configure.orig	Sun Oct 14 19:45:52 2007
++++ configure	Wed Nov 21 13:41:43 2007
+@@ -27390,7 +27390,7 @@ if test "x${with_krb5}" != "xno"; then
  	LDFLAGS_save="$LDFLAGS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
 -	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
 +	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi"
+ 	sunlibs="-lkrb5 -lgss"
  	{ 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
+@@ -27409,8 +27409,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ int
+ main ()
+ {
+-krb5_init_context
+-  ;
++krb5_init_context;
+   return 0;
+ }
+ _ACEOF
diff --git a/databases/evolution-data-server/patches/patch-libedataserver_e-db3-utils_c b/databases/evolution-data-server/patches/patch-libedataserver_e-db3-utils_c
new file mode 100644
index 00000000000..5f9932a4445
--- /dev/null
+++ b/databases/evolution-data-server/patches/patch-libedataserver_e-db3-utils_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-libedataserver_e-db3-utils_c,v 1.1 2007/11/21 16:10:24 jasper Exp $
+--- libedataserver/e-db3-utils.c.orig	Sun Oct 28 11:39:17 2007
++++ libedataserver/e-db3-utils.c	Sun Oct 28 11:40:14 2007
+@@ -14,7 +14,7 @@
+ #include <glib.h>
+ #include <glib/gstdio.h>
+ 
+-#include "db.h"
++#include <db4/db.h>
+ 
+ #include "e-db3-utils.h"
+ 
diff --git a/databases/evolution-data-server/patches/patch-libedataserver_e-dbhash_c b/databases/evolution-data-server/patches/patch-libedataserver_e-dbhash_c
new file mode 100644
index 00000000000..b97044f1e5e
--- /dev/null
+++ b/databases/evolution-data-server/patches/patch-libedataserver_e-dbhash_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-libedataserver_e-dbhash_c,v 1.1 2007/11/21 16:10:24 jasper Exp $
+--- libedataserver/e-dbhash.c.orig	Sun Oct 28 11:37:41 2007
++++ libedataserver/e-dbhash.c	Sun Oct 28 11:38:48 2007
+@@ -12,7 +12,7 @@
+ 
+ #include <string.h>
+ #include <fcntl.h>
+-#include "db.h"
++#include <db4/db.h>
+ #include "md5-utils.h"
+ 
+ struct _EDbHashPrivate 
diff --git a/databases/evolution-data-server/patches/patch-servers_groupwise_e-gw-connection_c b/databases/evolution-data-server/patches/patch-servers_groupwise_e-gw-connection_c
deleted file mode 100644
index 4ec1b760843..00000000000
--- a/databases/evolution-data-server/patches/patch-servers_groupwise_e-gw-connection_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-servers_groupwise_e-gw-connection_c,v 1.2 2007/05/17 14:40:53 jasper Exp $
---- servers/groupwise/e-gw-connection.c.orig	Wed Jan  3 11:09:26 2007
-+++ servers/groupwise/e-gw-connection.c	Sun Apr 22 21:11:41 2007
-@@ -1996,8 +1996,8 @@ e_gw_connection_get_categories (EGwConnection *cnc, GH
- 	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/pkg/PLIST b/databases/evolution-data-server/pkg/PLIST
index c203738d3db..d79ab6ef86d 100644
--- a/databases/evolution-data-server/pkg/PLIST
+++ b/databases/evolution-data-server/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2007/10/28 07:56:01 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.9 2007/11/21 16:10:24 jasper Exp $
 include/evolution-data-server-${R}/
 include/evolution-data-server-${R}/camel/
 include/evolution-data-server-${R}/camel/broken-date-parser.h
@@ -27,13 +27,16 @@ include/evolution-data-server-${R}/camel/camel-folder-summary.h
 include/evolution-data-server-${R}/camel/camel-folder-thread.h
 include/evolution-data-server-${R}/camel/camel-folder.h
 include/evolution-data-server-${R}/camel/camel-gpg-context.h
+include/evolution-data-server-${R}/camel/camel-html-parser.h
 include/evolution-data-server-${R}/camel/camel-http-stream.h
 include/evolution-data-server-${R}/camel/camel-i18n.h
+include/evolution-data-server-${R}/camel/camel-iconv.h
 include/evolution-data-server-${R}/camel/camel-index.h
 include/evolution-data-server-${R}/camel/camel-internet-address.h
 include/evolution-data-server-${R}/camel/camel-junk-plugin.h
 include/evolution-data-server-${R}/camel/camel-list-utils.h
 include/evolution-data-server-${R}/camel/camel-lock-client.h
+include/evolution-data-server-${R}/camel/camel-lock-helper.h
 include/evolution-data-server-${R}/camel/camel-lock.h
 include/evolution-data-server-${R}/camel/camel-medium.h
 include/evolution-data-server-${R}/camel/camel-mime-filter-basic.h
@@ -63,6 +66,7 @@ include/evolution-data-server-${R}/camel/camel-multipart-encrypted.h
 include/evolution-data-server-${R}/camel/camel-multipart-signed.h
 include/evolution-data-server-${R}/camel/camel-multipart.h
 include/evolution-data-server-${R}/camel/camel-net-utils.h
+include/evolution-data-server-${R}/camel/camel-news-address.h
 include/evolution-data-server-${R}/camel/camel-nntp-address.h
 include/evolution-data-server-${R}/camel/camel-object.h
 include/evolution-data-server-${R}/camel/camel-offline-folder.h
@@ -70,6 +74,7 @@ include/evolution-data-server-${R}/camel/camel-offline-journal.h
 include/evolution-data-server-${R}/camel/camel-offline-store.h
 include/evolution-data-server-${R}/camel/camel-operation.h
 include/evolution-data-server-${R}/camel/camel-partition-table.h
+include/evolution-data-server-${R}/camel/camel-process.h
 include/evolution-data-server-${R}/camel/camel-provider.h
 include/evolution-data-server-${R}/camel/camel-sasl-anonymous.h
 include/evolution-data-server-${R}/camel/camel-sasl-cram-md5.h
@@ -116,7 +121,6 @@ include/evolution-data-server-${R}/camel/camel.h
 include/evolution-data-server-${R}/exchange/
 include/evolution-data-server-${R}/exchange/e-folder-exchange.h
 include/evolution-data-server-${R}/exchange/e-folder.h
-include/evolution-data-server-${R}/exchange/e-shell-marshal.h
 include/evolution-data-server-${R}/exchange/e-storage.h
 include/evolution-data-server-${R}/exchange/e2k-autoconfig.h
 include/evolution-data-server-${R}/exchange/e2k-context.h
@@ -158,28 +162,21 @@ include/evolution-data-server-${R}/groupwise/e-gw-proxy.h
 include/evolution-data-server-${R}/groupwise/e-gw-recur-utils.h
 include/evolution-data-server-${R}/groupwise/e-gw-sendoptions.h
 include/evolution-data-server-${R}/libebook/
-include/evolution-data-server-${R}/libebook/Evolution-DataServer-Addressbook.h
 include/evolution-data-server-${R}/libebook/e-address-western.h
-include/evolution-data-server-${R}/libebook/e-book-listener.h
 include/evolution-data-server-${R}/libebook/e-book-query.h
 include/evolution-data-server-${R}/libebook/e-book-types.h
-include/evolution-data-server-${R}/libebook/e-book-view-listener.h
 include/evolution-data-server-${R}/libebook/e-book-view.h
 include/evolution-data-server-${R}/libebook/e-book.h
 include/evolution-data-server-${R}/libebook/e-contact.h
 include/evolution-data-server-${R}/libebook/e-destination.h
-include/evolution-data-server-${R}/libebook/e-name-western-tables.h
 include/evolution-data-server-${R}/libebook/e-name-western.h
 include/evolution-data-server-${R}/libebook/e-vcard.h
 include/evolution-data-server-${R}/libecal/
-include/evolution-data-server-${R}/libecal/Evolution-DataServer-Calendar.h
 include/evolution-data-server-${R}/libecal/e-cal-component.h
-include/evolution-data-server-${R}/libecal/e-cal-listener.h
 include/evolution-data-server-${R}/libecal/e-cal-recur.h
 include/evolution-data-server-${R}/libecal/e-cal-time-util.h
 include/evolution-data-server-${R}/libecal/e-cal-types.h
 include/evolution-data-server-${R}/libecal/e-cal-util.h
-include/evolution-data-server-${R}/libecal/e-cal-view-listener.h
 include/evolution-data-server-${R}/libecal/e-cal-view.h
 include/evolution-data-server-${R}/libecal/e-cal.h
 include/evolution-data-server-${R}/libedata-book/
@@ -217,6 +214,7 @@ include/evolution-data-server-${R}/libedataserver/e-data-server-util.h
 include/evolution-data-server-${R}/libedataserver/e-db3-utils.h
 include/evolution-data-server-${R}/libedataserver/e-dbhash.h
 include/evolution-data-server-${R}/libedataserver/e-file-cache.h
+include/evolution-data-server-${R}/libedataserver/e-flag.h
 include/evolution-data-server-${R}/libedataserver/e-iconv.h
 include/evolution-data-server-${R}/libedataserver/e-iterator.h
 include/evolution-data-server-${R}/libedataserver/e-list-iterator.h
@@ -286,6 +284,7 @@ include/evolution-data-server-${R}/libical/icalssyacc.h
 include/evolution-data-server-${R}/libical/icaltime.h
 include/evolution-data-server-${R}/libical/icaltimezone.h
 include/evolution-data-server-${R}/libical/icaltypes.h
+include/evolution-data-server-${R}/libical/icaltz-util.h
 include/evolution-data-server-${R}/libical/icalvalue.h
 include/evolution-data-server-${R}/libical/icalvcal.h
 include/evolution-data-server-${R}/libical/port.h
@@ -413,399 +412,92 @@ share/evolution-data-server-${R}/glade/e-categories-dialog.glade
 share/evolution-data-server-${R}/glade/e-name-selector-dialog.glade
 share/evolution-data-server-${R}/weather/
 share/evolution-data-server-${R}/weather/Locations.xml
-share/evolution-data-server-${R}/zoneinfo/
-share/evolution-data-server-${R}/zoneinfo/Africa/
-share/evolution-data-server-${R}/zoneinfo/Africa/Abidjan.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Accra.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Addis_Ababa.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Algiers.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Asmera.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Bamako.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Bangui.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Banjul.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Bissau.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Blantyre.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Brazzaville.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Bujumbura.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Cairo.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Casablanca.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Ceuta.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Conakry.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Dakar.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Dar_es_Salaam.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Djibouti.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Douala.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/El_Aaiun.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Freetown.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Gaborone.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Harare.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Johannesburg.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Kampala.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Khartoum.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Kigali.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Kinshasa.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Lagos.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Libreville.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Lome.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Luanda.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Lubumbashi.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Lusaka.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Malabo.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Maputo.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Maseru.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Mbabane.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Mogadishu.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Monrovia.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Nairobi.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Ndjamena.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Niamey.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Nouakchott.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Ouagadougou.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Porto-Novo.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Sao_Tome.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Timbuktu.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Tripoli.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Tunis.ics
-share/evolution-data-server-${R}/zoneinfo/Africa/Windhoek.ics
-share/evolution-data-server-${R}/zoneinfo/America/
-share/evolution-data-server-${R}/zoneinfo/America/Adak.ics
-share/evolution-data-server-${R}/zoneinfo/America/Anchorage.ics
-share/evolution-data-server-${R}/zoneinfo/America/Anguilla.ics
-share/evolution-data-server-${R}/zoneinfo/America/Antigua.ics
-share/evolution-data-server-${R}/zoneinfo/America/Araguaina.ics
-share/evolution-data-server-${R}/zoneinfo/America/Aruba.ics
-share/evolution-data-server-${R}/zoneinfo/America/Asuncion.ics
-share/evolution-data-server-${R}/zoneinfo/America/Barbados.ics
-share/evolution-data-server-${R}/zoneinfo/America/Belem.ics
-share/evolution-data-server-${R}/zoneinfo/America/Belize.ics
-share/evolution-data-server-${R}/zoneinfo/America/Boa_Vista.ics
-share/evolution-data-server-${R}/zoneinfo/America/Bogota.ics
-share/evolution-data-server-${R}/zoneinfo/America/Boise.ics
-share/evolution-data-server-${R}/zoneinfo/America/Buenos_Aires.ics
-share/evolution-data-server-${R}/zoneinfo/America/Cambridge_Bay.ics
-share/evolution-data-server-${R}/zoneinfo/America/Cancun.ics
-share/evolution-data-server-${R}/zoneinfo/America/Caracas.ics
-share/evolution-data-server-${R}/zoneinfo/America/Catamarca.ics
-share/evolution-data-server-${R}/zoneinfo/America/Cayenne.ics
-share/evolution-data-server-${R}/zoneinfo/America/Cayman.ics
-share/evolution-data-server-${R}/zoneinfo/America/Chicago.ics
-share/evolution-data-server-${R}/zoneinfo/America/Chihuahua.ics
-share/evolution-data-server-${R}/zoneinfo/America/Cordoba.ics
-share/evolution-data-server-${R}/zoneinfo/America/Costa_Rica.ics
-share/evolution-data-server-${R}/zoneinfo/America/Cuiaba.ics
-share/evolution-data-server-${R}/zoneinfo/America/Curacao.ics
-share/evolution-data-server-${R}/zoneinfo/America/Danmarkshavn.ics
-share/evolution-data-server-${R}/zoneinfo/America/Dawson.ics
-share/evolution-data-server-${R}/zoneinfo/America/Dawson_Creek.ics
-share/evolution-data-server-${R}/zoneinfo/America/Denver.ics
-share/evolution-data-server-${R}/zoneinfo/America/Detroit.ics
-share/evolution-data-server-${R}/zoneinfo/America/Dominica.ics
-share/evolution-data-server-${R}/zoneinfo/America/Edmonton.ics
-share/evolution-data-server-${R}/zoneinfo/America/Eirunepe.ics
-share/evolution-data-server-${R}/zoneinfo/America/El_Salvador.ics
-share/evolution-data-server-${R}/zoneinfo/America/Fortaleza.ics
-share/evolution-data-server-${R}/zoneinfo/America/Glace_Bay.ics
-share/evolution-data-server-${R}/zoneinfo/America/Godthab.ics
-share/evolution-data-server-${R}/zoneinfo/America/Goose_Bay.ics
-share/evolution-data-server-${R}/zoneinfo/America/Grand_Turk.ics
-share/evolution-data-server-${R}/zoneinfo/America/Grenada.ics
-share/evolution-data-server-${R}/zoneinfo/America/Guadeloupe.ics
-share/evolution-data-server-${R}/zoneinfo/America/Guatemala.ics
-share/evolution-data-server-${R}/zoneinfo/America/Guayaquil.ics
-share/evolution-data-server-${R}/zoneinfo/America/Guyana.ics
-share/evolution-data-server-${R}/zoneinfo/America/Halifax.ics
-share/evolution-data-server-${R}/zoneinfo/America/Havana.ics
-share/evolution-data-server-${R}/zoneinfo/America/Hermosillo.ics
-share/evolution-data-server-${R}/zoneinfo/America/Indiana/
-share/evolution-data-server-${R}/zoneinfo/America/Indiana/Indianapolis.ics
-share/evolution-data-server-${R}/zoneinfo/America/Indiana/Knox.ics
-share/evolution-data-server-${R}/zoneinfo/America/Indiana/Marengo.ics
-share/evolution-data-server-${R}/zoneinfo/America/Indiana/Vevay.ics
-share/evolution-data-server-${R}/zoneinfo/America/Indianapolis.ics
-share/evolution-data-server-${R}/zoneinfo/America/Inuvik.ics
-share/evolution-data-server-${R}/zoneinfo/America/Iqaluit.ics
-share/evolution-data-server-${R}/zoneinfo/America/Jamaica.ics
-share/evolution-data-server-${R}/zoneinfo/America/Jujuy.ics
-share/evolution-data-server-${R}/zoneinfo/America/Juneau.ics
-share/evolution-data-server-${R}/zoneinfo/America/Kentucky/
-share/evolution-data-server-${R}/zoneinfo/America/Kentucky/Louisville.ics
-share/evolution-data-server-${R}/zoneinfo/America/Kentucky/Monticello.ics
-share/evolution-data-server-${R}/zoneinfo/America/La_Paz.ics
-share/evolution-data-server-${R}/zoneinfo/America/Lima.ics
-share/evolution-data-server-${R}/zoneinfo/America/Los_Angeles.ics
-share/evolution-data-server-${R}/zoneinfo/America/Louisville.ics
-share/evolution-data-server-${R}/zoneinfo/America/Maceio.ics
-share/evolution-data-server-${R}/zoneinfo/America/Managua.ics
-share/evolution-data-server-${R}/zoneinfo/America/Manaus.ics
-share/evolution-data-server-${R}/zoneinfo/America/Martinique.ics
-share/evolution-data-server-${R}/zoneinfo/America/Mazatlan.ics
-share/evolution-data-server-${R}/zoneinfo/America/Mendoza.ics
-share/evolution-data-server-${R}/zoneinfo/America/Menominee.ics
-share/evolution-data-server-${R}/zoneinfo/America/Merida.ics
-share/evolution-data-server-${R}/zoneinfo/America/Mexico_City.ics
-share/evolution-data-server-${R}/zoneinfo/America/Miquelon.ics
-share/evolution-data-server-${R}/zoneinfo/America/Monterrey.ics
-share/evolution-data-server-${R}/zoneinfo/America/Montevideo.ics
-share/evolution-data-server-${R}/zoneinfo/America/Montreal.ics
-share/evolution-data-server-${R}/zoneinfo/America/Montserrat.ics
-share/evolution-data-server-${R}/zoneinfo/America/Nassau.ics
-share/evolution-data-server-${R}/zoneinfo/America/New_York.ics
-share/evolution-data-server-${R}/zoneinfo/America/Nipigon.ics
-share/evolution-data-server-${R}/zoneinfo/America/Nome.ics
-share/evolution-data-server-${R}/zoneinfo/America/Noronha.ics
-share/evolution-data-server-${R}/zoneinfo/America/North_Dakota/
-share/evolution-data-server-${R}/zoneinfo/America/North_Dakota/Center.ics
-share/evolution-data-server-${R}/zoneinfo/America/Panama.ics
-share/evolution-data-server-${R}/zoneinfo/America/Pangnirtung.ics
-share/evolution-data-server-${R}/zoneinfo/America/Paramaribo.ics
-share/evolution-data-server-${R}/zoneinfo/America/Phoenix.ics
-share/evolution-data-server-${R}/zoneinfo/America/Port-au-Prince.ics
-share/evolution-data-server-${R}/zoneinfo/America/Port_of_Spain.ics
-share/evolution-data-server-${R}/zoneinfo/America/Porto_Velho.ics
-share/evolution-data-server-${R}/zoneinfo/America/Puerto_Rico.ics
-share/evolution-data-server-${R}/zoneinfo/America/Rainy_River.ics
-share/evolution-data-server-${R}/zoneinfo/America/Rankin_Inlet.ics
-share/evolution-data-server-${R}/zoneinfo/America/Recife.ics
-share/evolution-data-server-${R}/zoneinfo/America/Regina.ics
-share/evolution-data-server-${R}/zoneinfo/America/Rio_Branco.ics
-share/evolution-data-server-${R}/zoneinfo/America/Rosario.ics
-share/evolution-data-server-${R}/zoneinfo/America/Santiago.ics
-share/evolution-data-server-${R}/zoneinfo/America/Santo_Domingo.ics
-share/evolution-data-server-${R}/zoneinfo/America/Sao_Paulo.ics
-share/evolution-data-server-${R}/zoneinfo/America/Scoresbysund.ics
-share/evolution-data-server-${R}/zoneinfo/America/Shiprock.ics
-share/evolution-data-server-${R}/zoneinfo/America/St_Johns.ics
-share/evolution-data-server-${R}/zoneinfo/America/St_Kitts.ics
-share/evolution-data-server-${R}/zoneinfo/America/St_Lucia.ics
-share/evolution-data-server-${R}/zoneinfo/America/St_Thomas.ics
-share/evolution-data-server-${R}/zoneinfo/America/St_Vincent.ics
-share/evolution-data-server-${R}/zoneinfo/America/Swift_Current.ics
-share/evolution-data-server-${R}/zoneinfo/America/Tegucigalpa.ics
-share/evolution-data-server-${R}/zoneinfo/America/Thule.ics
-share/evolution-data-server-${R}/zoneinfo/America/Thunder_Bay.ics
-share/evolution-data-server-${R}/zoneinfo/America/Tijuana.ics
-share/evolution-data-server-${R}/zoneinfo/America/Tortola.ics
-share/evolution-data-server-${R}/zoneinfo/America/Vancouver.ics
-share/evolution-data-server-${R}/zoneinfo/America/Whitehorse.ics
-share/evolution-data-server-${R}/zoneinfo/America/Winnipeg.ics
-share/evolution-data-server-${R}/zoneinfo/America/Yakutat.ics
-share/evolution-data-server-${R}/zoneinfo/America/Yellowknife.ics
-share/evolution-data-server-${R}/zoneinfo/Antarctica/
-share/evolution-data-server-${R}/zoneinfo/Antarctica/Casey.ics
-share/evolution-data-server-${R}/zoneinfo/Antarctica/Davis.ics
-share/evolution-data-server-${R}/zoneinfo/Antarctica/DumontDUrville.ics
-share/evolution-data-server-${R}/zoneinfo/Antarctica/Mawson.ics
-share/evolution-data-server-${R}/zoneinfo/Antarctica/McMurdo.ics
-share/evolution-data-server-${R}/zoneinfo/Antarctica/Palmer.ics
-share/evolution-data-server-${R}/zoneinfo/Antarctica/South_Pole.ics
-share/evolution-data-server-${R}/zoneinfo/Antarctica/Syowa.ics
-share/evolution-data-server-${R}/zoneinfo/Antarctica/Vostok.ics
-share/evolution-data-server-${R}/zoneinfo/Arctic/
-share/evolution-data-server-${R}/zoneinfo/Arctic/Longyearbyen.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/
-share/evolution-data-server-${R}/zoneinfo/Asia/Aden.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Almaty.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Amman.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Anadyr.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Aqtau.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Aqtobe.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Ashgabat.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Baghdad.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Bahrain.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Baku.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Bangkok.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Beirut.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Bishkek.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Brunei.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Calcutta.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Choibalsan.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Chongqing.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Chungking.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Colombo.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Damascus.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Dhaka.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Dili.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Dubai.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Dushanbe.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Gaza.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Harbin.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Hong_Kong.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Hovd.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Irkutsk.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Istanbul.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Jakarta.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Jayapura.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Jerusalem.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Kabul.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Kamchatka.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Karachi.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Kashgar.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Katmandu.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Krasnoyarsk.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Kuala_Lumpur.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Kuching.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Kuwait.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Macao.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Magadan.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Manila.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Muscat.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Nicosia.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Novosibirsk.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Omsk.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Phnom_Penh.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Pontianak.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Pyongyang.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Qatar.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Rangoon.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Riyadh.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Saigon.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Sakhalin.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Samarkand.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Seoul.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Shanghai.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Singapore.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Taipei.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Tashkent.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Tbilisi.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Tehran.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Thimphu.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Tokyo.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Ujung_Pandang.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Ulaanbaatar.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Urumqi.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Vientiane.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Vladivostok.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Yakutsk.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Yekaterinburg.ics
-share/evolution-data-server-${R}/zoneinfo/Asia/Yerevan.ics
-share/evolution-data-server-${R}/zoneinfo/Atlantic/
-share/evolution-data-server-${R}/zoneinfo/Atlantic/Azores.ics
-share/evolution-data-server-${R}/zoneinfo/Atlantic/Bermuda.ics
-share/evolution-data-server-${R}/zoneinfo/Atlantic/Canary.ics
-share/evolution-data-server-${R}/zoneinfo/Atlantic/Cape_Verde.ics
-share/evolution-data-server-${R}/zoneinfo/Atlantic/Faeroe.ics
-share/evolution-data-server-${R}/zoneinfo/Atlantic/Jan_Mayen.ics
-share/evolution-data-server-${R}/zoneinfo/Atlantic/Madeira.ics
-share/evolution-data-server-${R}/zoneinfo/Atlantic/Reykjavik.ics
-share/evolution-data-server-${R}/zoneinfo/Atlantic/South_Georgia.ics
-share/evolution-data-server-${R}/zoneinfo/Atlantic/St_Helena.ics
-share/evolution-data-server-${R}/zoneinfo/Atlantic/Stanley.ics
-share/evolution-data-server-${R}/zoneinfo/Australia/
-share/evolution-data-server-${R}/zoneinfo/Australia/Adelaide.ics
-share/evolution-data-server-${R}/zoneinfo/Australia/Brisbane.ics
-share/evolution-data-server-${R}/zoneinfo/Australia/Broken_Hill.ics
-share/evolution-data-server-${R}/zoneinfo/Australia/Darwin.ics
-share/evolution-data-server-${R}/zoneinfo/Australia/Hobart.ics
-share/evolution-data-server-${R}/zoneinfo/Australia/Lindeman.ics
-share/evolution-data-server-${R}/zoneinfo/Australia/Lord_Howe.ics
-share/evolution-data-server-${R}/zoneinfo/Australia/Melbourne.ics
-share/evolution-data-server-${R}/zoneinfo/Australia/Perth.ics
-share/evolution-data-server-${R}/zoneinfo/Australia/Sydney.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/
-share/evolution-data-server-${R}/zoneinfo/Europe/Amsterdam.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Andorra.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Athens.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Belfast.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Belgrade.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Berlin.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Bratislava.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Brussels.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Bucharest.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Budapest.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Chisinau.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Copenhagen.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Dublin.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Gibraltar.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Helsinki.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Istanbul.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Kaliningrad.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Kiev.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Lisbon.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Ljubljana.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/London.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Luxembourg.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Madrid.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Malta.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Minsk.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Monaco.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Moscow.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Nicosia.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Oslo.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Paris.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Prague.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Riga.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Rome.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Samara.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/San_Marino.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Sarajevo.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Simferopol.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Skopje.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Sofia.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Stockholm.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Tallinn.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Tirane.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Uzhgorod.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Vaduz.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Vatican.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Vienna.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Vilnius.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Warsaw.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Zagreb.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Zaporozhye.ics
-share/evolution-data-server-${R}/zoneinfo/Europe/Zurich.ics
-share/evolution-data-server-${R}/zoneinfo/Indian/
-share/evolution-data-server-${R}/zoneinfo/Indian/Antananarivo.ics
-share/evolution-data-server-${R}/zoneinfo/Indian/Chagos.ics
-share/evolution-data-server-${R}/zoneinfo/Indian/Christmas.ics
-share/evolution-data-server-${R}/zoneinfo/Indian/Cocos.ics
-share/evolution-data-server-${R}/zoneinfo/Indian/Comoro.ics
-share/evolution-data-server-${R}/zoneinfo/Indian/Kerguelen.ics
-share/evolution-data-server-${R}/zoneinfo/Indian/Mahe.ics
-share/evolution-data-server-${R}/zoneinfo/Indian/Maldives.ics
-share/evolution-data-server-${R}/zoneinfo/Indian/Mauritius.ics
-share/evolution-data-server-${R}/zoneinfo/Indian/Mayotte.ics
-share/evolution-data-server-${R}/zoneinfo/Indian/Reunion.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/
-share/evolution-data-server-${R}/zoneinfo/Pacific/Apia.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Auckland.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Chatham.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Easter.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Efate.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Enderbury.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Fakaofo.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Fiji.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Funafuti.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Galapagos.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Gambier.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Guadalcanal.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Guam.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Honolulu.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Johnston.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Kiritimati.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Kosrae.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Kwajalein.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Majuro.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Marquesas.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Midway.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Nauru.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Niue.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Norfolk.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Noumea.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Pago_Pago.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Palau.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Pitcairn.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Ponape.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Port_Moresby.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Rarotonga.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Saipan.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Tahiti.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Tarawa.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Tongatapu.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Truk.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Wake.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Wallis.ics
-share/evolution-data-server-${R}/zoneinfo/Pacific/Yap.ics
-share/evolution-data-server-${R}/zoneinfo/zones.tab
+share/gtk-doc/html/camel/
+share/gtk-doc/html/camel/Addresses.html
+share/gtk-doc/html/camel/ClassTree.html
+share/gtk-doc/html/camel/Crypto.html
+share/gtk-doc/html/camel/Filters.html
+share/gtk-doc/html/camel/Folders.html
+share/gtk-doc/html/camel/Fundamentals.html
+share/gtk-doc/html/camel/MIME.html
+share/gtk-doc/html/camel/Services.html
+share/gtk-doc/html/camel/Streams.html
+share/gtk-doc/html/camel/camel-CamelAddress.html
+share/gtk-doc/html/camel/camel-CamelCipherContext.html
+share/gtk-doc/html/camel/camel-CamelDataWrapper.html
+share/gtk-doc/html/camel/camel-CamelFolder.html
+share/gtk-doc/html/camel/camel-CamelFolderSummary.html
+share/gtk-doc/html/camel/camel-CamelGpgContext.html
+share/gtk-doc/html/camel/camel-CamelInternetAddress.html
+share/gtk-doc/html/camel/camel-CamelMedium.html
+share/gtk-doc/html/camel/camel-CamelMimeFilter.html
+share/gtk-doc/html/camel/camel-CamelMimeFilterBasic.html
+share/gtk-doc/html/camel/camel-CamelMimeFilterBestenc.html
+share/gtk-doc/html/camel/camel-CamelMimeFilterCRLF.html
+share/gtk-doc/html/camel/camel-CamelMimeFilterCanon.html
+share/gtk-doc/html/camel/camel-CamelMimeFilterCharset.html
+share/gtk-doc/html/camel/camel-CamelMimeFilterEnriched.html
+share/gtk-doc/html/camel/camel-CamelMimeFilterFrom.html
+share/gtk-doc/html/camel/camel-CamelMimeFilterHTML.html
+share/gtk-doc/html/camel/camel-CamelMimeFilterIndex.html
+share/gtk-doc/html/camel/camel-CamelMimeFilterPgp.html
+share/gtk-doc/html/camel/camel-CamelMimeFilterSave.html
+share/gtk-doc/html/camel/camel-CamelMimeFilterToHTML.html
+share/gtk-doc/html/camel/camel-CamelMimeFilterWindows.html
+share/gtk-doc/html/camel/camel-CamelMimeFilterYenc.html
+share/gtk-doc/html/camel/camel-CamelMimeMessage.html
+share/gtk-doc/html/camel/camel-CamelMimeParser.html
+share/gtk-doc/html/camel/camel-CamelMimePart.html
+share/gtk-doc/html/camel/camel-CamelMultipart.html
+share/gtk-doc/html/camel/camel-CamelMultipartEncrypted.html
+share/gtk-doc/html/camel/camel-CamelMultipartSigned.html
+share/gtk-doc/html/camel/camel-CamelObject.html
+share/gtk-doc/html/camel/camel-CamelOfflineFolder.html
+share/gtk-doc/html/camel/camel-CamelOfflineJournal.html
+share/gtk-doc/html/camel/camel-CamelOfflineStore.html
+share/gtk-doc/html/camel/camel-CamelSasl.html
+share/gtk-doc/html/camel/camel-CamelSaslAnonymous.html
+share/gtk-doc/html/camel/camel-CamelSaslCramMd5.html
+share/gtk-doc/html/camel/camel-CamelSaslDigestMd5.html
+share/gtk-doc/html/camel/camel-CamelSaslGssapi.html
+share/gtk-doc/html/camel/camel-CamelSaslKerberos4.html
+share/gtk-doc/html/camel/camel-CamelSaslLogin.html
+share/gtk-doc/html/camel/camel-CamelSaslNTLM.html
+share/gtk-doc/html/camel/camel-CamelSaslPlain.html
+share/gtk-doc/html/camel/camel-CamelSeekableStream.html
+share/gtk-doc/html/camel/camel-CamelSeekableSubstream.html
+share/gtk-doc/html/camel/camel-CamelService.html
+share/gtk-doc/html/camel/camel-CamelSession.html
+share/gtk-doc/html/camel/camel-CamelStore.html
+share/gtk-doc/html/camel/camel-CamelStoreSummary.html
+share/gtk-doc/html/camel/camel-CamelStream.html
+share/gtk-doc/html/camel/camel-CamelStreamBuffer.html
+share/gtk-doc/html/camel/camel-CamelStreamFilter.html
+share/gtk-doc/html/camel/camel-CamelStreamFs.html
+share/gtk-doc/html/camel/camel-CamelStreamMem.html
+share/gtk-doc/html/camel/camel-CamelStreamNull.html
+share/gtk-doc/html/camel/camel-CamelStreamVFS.html
+share/gtk-doc/html/camel/camel-CamelTcpStream.html
+share/gtk-doc/html/camel/camel-CamelTcpStreamRaw.html
+share/gtk-doc/html/camel/camel-CamelTcpStreamSSL.html
+share/gtk-doc/html/camel/camel-CamelTransport.html
+share/gtk-doc/html/camel/camel-CamelVTrashFolder.html
+share/gtk-doc/html/camel/camel-CamelVeeFolder.html
+share/gtk-doc/html/camel/camel-camel-exception.html
+share/gtk-doc/html/camel/camel-camel-operation.html
+share/gtk-doc/html/camel/camel-camel-provider.html
+share/gtk-doc/html/camel/camel-camel-url.html
+share/gtk-doc/html/camel/camel.devhelp
+share/gtk-doc/html/camel/camel.devhelp2
+share/gtk-doc/html/camel/classes.html
+share/gtk-doc/html/camel/home.png
+share/gtk-doc/html/camel/index.html
+share/gtk-doc/html/camel/index.sgml
+share/gtk-doc/html/camel/ix01.html
+share/gtk-doc/html/camel/left.png
+share/gtk-doc/html/camel/right.png
+share/gtk-doc/html/camel/style.css
+share/gtk-doc/html/camel/up.png
 share/gtk-doc/html/libebook/
 share/gtk-doc/html/libebook/EBook.html
 share/gtk-doc/html/libebook/EBookListener.html
@@ -867,7 +559,6 @@ share/gtk-doc/html/libedata-book/ix01.html
 share/gtk-doc/html/libedata-book/left.png
 share/gtk-doc/html/libedata-book/libedata-book-EDataBookFactory.html
 share/gtk-doc/html/libedata-book/libedata-book-e-book-backend-db-cache.html
-share/gtk-doc/html/libedata-book/libedata-book-e-data-book-marshal.html
 share/gtk-doc/html/libedata-book/libedata-book-ximian-vcard.html
 share/gtk-doc/html/libedata-book/libedata-book.devhelp
 share/gtk-doc/html/libedata-book/libedata-book.devhelp2
@@ -912,6 +603,7 @@ share/gtk-doc/html/libedataserver/index.html
 share/gtk-doc/html/libedataserver/index.sgml
 share/gtk-doc/html/libedataserver/ix01.html
 share/gtk-doc/html/libedataserver/left.png
+share/gtk-doc/html/libedataserver/libedataserver-EFlag.html
 share/gtk-doc/html/libedataserver/libedataserver-ESExp.html
 share/gtk-doc/html/libedataserver/libedataserver-e-categories.html
 share/gtk-doc/html/libedataserver/libedataserver-e-data-server-module.html
@@ -965,6 +657,7 @@ share/idl/evolution-data-server-1.2/Evolution-DataServer-Calendar.idl
 share/idl/evolution-data-server-1.2/Evolution-DataServer.idl
 share/locale/am/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/ar/LC_MESSAGES/evolution-data-server-${R}.mo
+share/locale/as/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/az/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/be/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/bg/LC_MESSAGES/evolution-data-server-${R}.mo
@@ -1014,6 +707,7 @@ share/locale/nb/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/ne/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/nl/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/nn/LC_MESSAGES/evolution-data-server-${R}.mo
+share/locale/oc/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/or/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/pa/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/pl/LC_MESSAGES/evolution-data-server-${R}.mo
@@ -1029,6 +723,7 @@ share/locale/sr/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/sr@Latn/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/sv/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/ta/LC_MESSAGES/evolution-data-server-${R}.mo
+share/locale/te/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/th/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/tr/LC_MESSAGES/evolution-data-server-${R}.mo
 share/locale/uk/LC_MESSAGES/evolution-data-server-${R}.mo