Update to 2.1.2.

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

9 files changed, 30 insertions, 283 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 6dcf2ac11..27fad43d9 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.1
@@ -32,7 +32,6 @@ CONFIGURE_ARGS=	--enable-nss=yes \
 		--with-nss-libs=${LOCALBASE}/lib \
 		--with-nspr-includes=${LOCALBASE}/include/nspr \
 		--with-nspr-libs=${LOCALBASE}/lib \
-		--enable-openssl=no \
 		--with-sub-version=" FreeBSD GNOME Team Port" \
 		--with-krb5=/usr
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -74,7 +73,6 @@ RUN_DEPENDS+=	spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 .endif
 
 post-install:
-	@${CHMOD} u+w ${PREFIX}/share/gnome/evolution/${EVO_VERSION}/default/C/mail/local/Inbox
 	@${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \
 		${PREFIX}/bin/evolution
 
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index b1dc23a11..0e4233a3c 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-2.1.1.tar.bz2) = 7c97a4fd6f0ea0d884eb158a51e4c2e2
-SIZE (gnome2/evolution-2.1.1.tar.bz2) = 14702774
+MD5 (gnome2/evolution-2.1.2.tar.bz2) = cf4d35121b51e2aa4b44940413ef3d0f
+SIZE (gnome2/evolution-2.1.2.tar.bz2) = 14003587
diff --git a/mail/evolution/files/patch-camel::camel-store.h b/mail/evolution/files/patch-camel::camel-store.h
deleted file mode 100644
index ee23828d6..000000000
--- a/mail/evolution/files/patch-camel::camel-store.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- camel/camel-store.h	2001/09/04 16:45:47	1.1
-+++ camel/camel-store.h	2001/09/04 16:46:32
-@@ -33,6 +33,7 @@
- #pragma }
- #endif /* __cplusplus }*/
- 
-+#include <sys/types.h>
- #include <camel/camel-object.h>
- #include <camel/camel-service.h>
- 
diff --git a/mail/evolution/files/patch-camel_Makefile.in b/mail/evolution/files/patch-camel_Makefile.in
deleted file mode 100644
index a4250e85c..000000000
--- a/mail/evolution/files/patch-camel_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- camel/Makefile.in.orig	Tue Dec 30 00:44:37 2003
-+++ camel/Makefile.in	Tue Dec 30 00:44:45 2003
-@@ -221,7 +221,7 @@
- soundsdir = @soundsdir@
- viewsdir = @viewsdir@
- 
--SUBDIRS = . providers tests
-+SUBDIRS = . providers
- 
- libcamelincludedir = $(privincludedir)/camel
- 
diff --git a/mail/evolution/files/patch-camel_camel-mime-utils.c b/mail/evolution/files/patch-camel_camel-mime-utils.c
deleted file mode 100644
index 33111196a..000000000
--- a/mail/evolution/files/patch-camel_camel-mime-utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- camel/camel-mime-utils.c.orig	Fri May  3 15:47:41 2002
-+++ camel/camel-mime-utils.c	Sun May  5 18:09:24 2002
-@@ -3388,6 +3388,8 @@
- 		}
- 		d(printf("named offset = %d\n", offset));
- 	}
-+
-+	tm.tm_isdst = -1;
- 
- 	t = mktime(&tm);
- #if defined(HAVE_TIMEZONE)
diff --git a/mail/evolution/files/patch-e-util_e-host-utils.c b/mail/evolution/files/patch-e-util_e-host-utils.c
deleted file mode 100644
index 3d92fc70f..000000000
--- a/mail/evolution/files/patch-e-util_e-host-utils.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- e-util/e-host-utils.c.orig	Tue Apr 13 15:19:43 2004
-+++ e-util/e-host-utils.c	Sun Oct  3 01:17:57 2004
-@@ -136,12 +136,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/mail/evolution/files/patch-e-util_e-msgport.c b/mail/evolution/files/patch-e-util_e-msgport.c
deleted file mode 100644
index 85bd48595..000000000
--- a/mail/evolution/files/patch-e-util_e-msgport.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- e-util/e-msgport.c.orig	Wed Jan 14 00:04:04 2004
-+++ e-util/e-msgport.c	Sun Sep 19 14:01:25 2004
-@@ -921,9 +921,13 @@
- 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 stack size. */
-+	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 +966,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 +982,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/mail/evolution/files/patch-mail_em-migrate.c b/mail/evolution/files/patch-mail_em-migrate.c
new file mode 100644
index 000000000..6aa2e9a13
--- /dev/null
+++ b/mail/evolution/files/patch-mail_em-migrate.c
@@ -0,0 +1,11 @@
+--- mail/em-migrate.c.orig	Tue Dec 21 15:09:30 2004
++++ mail/em-migrate.c	Tue Dec 21 15:09:46 2004
+@@ -1447,7 +1447,7 @@
+ 	ut.actime = st.st_atime;
+ 	ut.modtime = st.st_mtime;
+ 	utime (dest, &ut);
+-	chmod (dest, st.st_mode);
++	chmod (dest, st.st_mode | S_IWUSR);
+ 	
+ 	return 0;
+ 	
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 0b4fad140..3619b30f1 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,147 +1,6 @@
 bin/evolution
 bin/evolution-%%VERSION%%
 include/evolution-%%VERSION%%/calendar/gui/e-cal-config.h
-include/evolution-%%VERSION%%/camel/broken-date-parser.h
-include/evolution-%%VERSION%%/camel/camel-address.h
-include/evolution-%%VERSION%%/camel/camel-arg.h
-include/evolution-%%VERSION%%/camel/camel-block-file.h
-include/evolution-%%VERSION%%/camel/camel-certdb.h
-include/evolution-%%VERSION%%/camel/camel-charset-map.h
-include/evolution-%%VERSION%%/camel/camel-cipher-context.h
-include/evolution-%%VERSION%%/camel/camel-data-cache.h
-include/evolution-%%VERSION%%/camel/camel-data-wrapper.h
-include/evolution-%%VERSION%%/camel/camel-debug.h
-include/evolution-%%VERSION%%/camel/camel-digest-folder.h
-include/evolution-%%VERSION%%/camel/camel-digest-store.h
-include/evolution-%%VERSION%%/camel/camel-digest-summary.h
-include/evolution-%%VERSION%%/camel/camel-disco-diary.h
-include/evolution-%%VERSION%%/camel/camel-disco-folder.h
-include/evolution-%%VERSION%%/camel/camel-disco-store.h
-include/evolution-%%VERSION%%/camel/camel-exception-list.def
-include/evolution-%%VERSION%%/camel/camel-exception.h
-include/evolution-%%VERSION%%/camel/camel-file-utils.h
-include/evolution-%%VERSION%%/camel/camel-filter-driver.h
-include/evolution-%%VERSION%%/camel/camel-filter-search.h
-include/evolution-%%VERSION%%/camel/camel-folder-search.h
-include/evolution-%%VERSION%%/camel/camel-folder-summary.h
-include/evolution-%%VERSION%%/camel/camel-folder-thread.h
-include/evolution-%%VERSION%%/camel/camel-folder.h
-include/evolution-%%VERSION%%/camel/camel-gpg-context.h
-include/evolution-%%VERSION%%/camel/camel-http-stream.h
-include/evolution-%%VERSION%%/camel/camel-i18n.h
-include/evolution-%%VERSION%%/camel/camel-imap-command.h
-include/evolution-%%VERSION%%/camel/camel-imap-folder.h
-include/evolution-%%VERSION%%/camel/camel-imap-message-cache.h
-include/evolution-%%VERSION%%/camel/camel-imap-search.h
-include/evolution-%%VERSION%%/camel/camel-imap-store-summary.h
-include/evolution-%%VERSION%%/camel/camel-imap-store.h
-include/evolution-%%VERSION%%/camel/camel-imap-summary.h
-include/evolution-%%VERSION%%/camel/camel-imap-types.h
-include/evolution-%%VERSION%%/camel/camel-imap-utils.h
-include/evolution-%%VERSION%%/camel/camel-imap-wrapper.h
-include/evolution-%%VERSION%%/camel/camel-index.h
-include/evolution-%%VERSION%%/camel/camel-internet-address.h
-include/evolution-%%VERSION%%/camel/camel-junk-plugin.h
-include/evolution-%%VERSION%%/camel/camel-list-utils.h
-include/evolution-%%VERSION%%/camel/camel-local-folder.h
-include/evolution-%%VERSION%%/camel/camel-local-store.h
-include/evolution-%%VERSION%%/camel/camel-local-summary.h
-include/evolution-%%VERSION%%/camel/camel-lock-client.h
-include/evolution-%%VERSION%%/camel/camel-lock.h
-include/evolution-%%VERSION%%/camel/camel-maildir-folder.h
-include/evolution-%%VERSION%%/camel/camel-maildir-store.h
-include/evolution-%%VERSION%%/camel/camel-maildir-summary.h
-include/evolution-%%VERSION%%/camel/camel-mbox-folder.h
-include/evolution-%%VERSION%%/camel/camel-mbox-store.h
-include/evolution-%%VERSION%%/camel/camel-mbox-summary.h
-include/evolution-%%VERSION%%/camel/camel-medium.h
-include/evolution-%%VERSION%%/camel/camel-mh-folder.h
-include/evolution-%%VERSION%%/camel/camel-mh-store.h
-include/evolution-%%VERSION%%/camel/camel-mh-summary.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-basic.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-bestenc.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-canon.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-charset.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-crlf.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-enriched.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-from.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-gzip.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-html.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-index.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-linewrap.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-save.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-tohtml.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-windows.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter-yenc.h
-include/evolution-%%VERSION%%/camel/camel-mime-filter.h
-include/evolution-%%VERSION%%/camel/camel-mime-message.h
-include/evolution-%%VERSION%%/camel/camel-mime-parser.h
-include/evolution-%%VERSION%%/camel/camel-mime-part-utils.h
-include/evolution-%%VERSION%%/camel/camel-mime-part.h
-include/evolution-%%VERSION%%/camel/camel-mime-utils.h
-include/evolution-%%VERSION%%/camel/camel-movemail.h
-include/evolution-%%VERSION%%/camel/camel-multipart-encrypted.h
-include/evolution-%%VERSION%%/camel/camel-multipart-signed.h
-include/evolution-%%VERSION%%/camel/camel-multipart.h
-include/evolution-%%VERSION%%/camel/camel-nntp-folder.h
-include/evolution-%%VERSION%%/camel/camel-nntp-resp-codes.h
-include/evolution-%%VERSION%%/camel/camel-nntp-store-summary.h
-include/evolution-%%VERSION%%/camel/camel-nntp-store.h
-include/evolution-%%VERSION%%/camel/camel-nntp-stream.h
-include/evolution-%%VERSION%%/camel/camel-nntp-summary.h
-include/evolution-%%VERSION%%/camel/camel-object.h
-include/evolution-%%VERSION%%/camel/camel-operation.h
-include/evolution-%%VERSION%%/camel/camel-partition-table.h
-include/evolution-%%VERSION%%/camel/camel-pop3-engine.h
-include/evolution-%%VERSION%%/camel/camel-pop3-folder.h
-include/evolution-%%VERSION%%/camel/camel-pop3-store.h
-include/evolution-%%VERSION%%/camel/camel-pop3-stream.h
-include/evolution-%%VERSION%%/camel/camel-provider.h
-include/evolution-%%VERSION%%/camel/camel-sasl-anonymous.h
-include/evolution-%%VERSION%%/camel/camel-sasl-cram-md5.h
-include/evolution-%%VERSION%%/camel/camel-sasl-digest-md5.h
-include/evolution-%%VERSION%%/camel/camel-sasl-gssapi.h
-include/evolution-%%VERSION%%/camel/camel-sasl-kerberos4.h
-include/evolution-%%VERSION%%/camel/camel-sasl-login.h
-include/evolution-%%VERSION%%/camel/camel-sasl-ntlm.h
-include/evolution-%%VERSION%%/camel/camel-sasl-plain.h
-include/evolution-%%VERSION%%/camel/camel-sasl-popb4smtp.h
-include/evolution-%%VERSION%%/camel/camel-sasl.h
-include/evolution-%%VERSION%%/camel/camel-seekable-stream.h
-include/evolution-%%VERSION%%/camel/camel-seekable-substream.h
-include/evolution-%%VERSION%%/camel/camel-sendmail-transport.h
-include/evolution-%%VERSION%%/camel/camel-service.h
-include/evolution-%%VERSION%%/camel/camel-session.h
-include/evolution-%%VERSION%%/camel/camel-smime-context.h
-include/evolution-%%VERSION%%/camel/camel-smtp-transport.h
-include/evolution-%%VERSION%%/camel/camel-spool-folder.h
-include/evolution-%%VERSION%%/camel/camel-spool-store.h
-include/evolution-%%VERSION%%/camel/camel-spool-summary.h
-include/evolution-%%VERSION%%/camel/camel-store-summary.h
-include/evolution-%%VERSION%%/camel/camel-store.h
-include/evolution-%%VERSION%%/camel/camel-stream-buffer.h
-include/evolution-%%VERSION%%/camel/camel-stream-filter.h
-include/evolution-%%VERSION%%/camel/camel-stream-fs.h
-include/evolution-%%VERSION%%/camel/camel-stream-mem.h
-include/evolution-%%VERSION%%/camel/camel-stream-null.h
-include/evolution-%%VERSION%%/camel/camel-stream-process.h
-include/evolution-%%VERSION%%/camel/camel-stream.h
-include/evolution-%%VERSION%%/camel/camel-string-utils.h
-include/evolution-%%VERSION%%/camel/camel-tcp-stream-raw.h
-include/evolution-%%VERSION%%/camel/camel-tcp-stream-ssl.h
-include/evolution-%%VERSION%%/camel/camel-tcp-stream.h
-include/evolution-%%VERSION%%/camel/camel-text-index.h
-include/evolution-%%VERSION%%/camel/camel-transport.h
-include/evolution-%%VERSION%%/camel/camel-types.h
-include/evolution-%%VERSION%%/camel/camel-uid-cache.h
-include/evolution-%%VERSION%%/camel/camel-url-scanner.h
-include/evolution-%%VERSION%%/camel/camel-url.h
-include/evolution-%%VERSION%%/camel/camel-utf8.h
-include/evolution-%%VERSION%%/camel/camel-vee-folder.h
-include/evolution-%%VERSION%%/camel/camel-vee-store.h
-include/evolution-%%VERSION%%/camel/camel-vee-summary.h
-include/evolution-%%VERSION%%/camel/camel-vtrash-folder.h
-include/evolution-%%VERSION%%/camel/camel.h
 include/evolution-%%VERSION%%/e-conduit/e-pilot-map.h
 include/evolution-%%VERSION%%/e-conduit/e-pilot-util.h
 include/evolution-%%VERSION%%/e-util/e-account-list.h
@@ -160,26 +19,20 @@ include/evolution-%%VERSION%%/e-util/e-folder-map.h
 include/evolution-%%VERSION%%/e-util/e-fsutils.h
 include/evolution-%%VERSION%%/e-util/e-gtk-utils.h
 include/evolution-%%VERSION%%/e-util/e-gui-utils.h
-include/evolution-%%VERSION%%/e-util/e-host-utils.h
 include/evolution-%%VERSION%%/e-util/e-html-utils.h
 include/evolution-%%VERSION%%/e-util/e-icon-factory.h
 include/evolution-%%VERSION%%/e-util/e-iterator.h
 include/evolution-%%VERSION%%/e-util/e-list-iterator.h
 include/evolution-%%VERSION%%/e-util/e-list.h
-include/evolution-%%VERSION%%/e-util/e-memory.h
 include/evolution-%%VERSION%%/e-util/e-menu.h
 include/evolution-%%VERSION%%/e-util/e-mktemp.h
-include/evolution-%%VERSION%%/e-util/e-msgport.h
 include/evolution-%%VERSION%%/e-util/e-passwords.h
-include/evolution-%%VERSION%%/e-util/e-path.h
 include/evolution-%%VERSION%%/e-util/e-plugin.h
 include/evolution-%%VERSION%%/e-util/e-popup.h
 include/evolution-%%VERSION%%/e-util/e-request.h
-include/evolution-%%VERSION%%/e-util/e-sexp.h
 include/evolution-%%VERSION%%/e-util/e-signature-list.h
 include/evolution-%%VERSION%%/e-util/e-signature.h
 include/evolution-%%VERSION%%/e-util/e-time-utils.h
-include/evolution-%%VERSION%%/e-util/e-trie.h
 include/evolution-%%VERSION%%/e-util/e-uid.h
 include/evolution-%%VERSION%%/e-util/e-url.h
 include/evolution-%%VERSION%%/e-util/md5-utils.h
@@ -219,22 +72,6 @@ include/evolution-%%VERSION%%/widgets/e-search-bar.h
 include/evolution-%%VERSION%%/widgets/e-task-bar.h
 include/evolution-%%VERSION%%/widgets/e-task-widget.h
 include/evolution-%%VERSION%%/widgets/e-url-entry.h
-lib/evolution/%%VERSION%%/camel-providers/libcamelgroupwise.so
-lib/evolution/%%VERSION%%/camel-providers/libcamelgroupwise.urls
-lib/evolution/%%VERSION%%/camel-providers/libcamelimap.so
-lib/evolution/%%VERSION%%/camel-providers/libcamelimap.urls
-lib/evolution/%%VERSION%%/camel-providers/libcamelimap4.so
-lib/evolution/%%VERSION%%/camel-providers/libcamelimap4.urls
-lib/evolution/%%VERSION%%/camel-providers/libcamellocal.so
-lib/evolution/%%VERSION%%/camel-providers/libcamellocal.urls
-lib/evolution/%%VERSION%%/camel-providers/libcamelnntp.so
-lib/evolution/%%VERSION%%/camel-providers/libcamelnntp.urls
-lib/evolution/%%VERSION%%/camel-providers/libcamelpop3.so
-lib/evolution/%%VERSION%%/camel-providers/libcamelpop3.urls
-lib/evolution/%%VERSION%%/camel-providers/libcamelsendmail.so
-lib/evolution/%%VERSION%%/camel-providers/libcamelsendmail.urls
-lib/evolution/%%VERSION%%/camel-providers/libcamelsmtp.so
-lib/evolution/%%VERSION%%/camel-providers/libcamelsmtp.urls
 lib/evolution/%%VERSION%%/components/libevolution-addressbook.so
 lib/evolution/%%VERSION%%/components/libevolution-calendar.so
 lib/evolution/%%VERSION%%/components/libevolution-mail.so
@@ -244,9 +81,6 @@ lib/evolution/%%VERSION%%/components/libevolution-mail.so
 lib/evolution/%%VERSION%%/evolution-addressbook-importers/libevolution-addressbook-ldif-importer.so
 lib/evolution/%%VERSION%%/evolution-addressbook-importers/libevolution-addressbook-vcard-importer.so
 lib/evolution/%%VERSION%%/evolution-calendar-importers/libevolution-calendar-importers.so
-lib/evolution/%%VERSION%%/libcamel.a
-lib/evolution/%%VERSION%%/libcamel.so
-lib/evolution/%%VERSION%%/libcamel.so.0
 lib/evolution/%%VERSION%%/libeconduit.a
 lib/evolution/%%VERSION%%/libeconduit.so
 lib/evolution/%%VERSION%%/libeconduit.so.0
@@ -281,8 +115,10 @@ lib/evolution/%%VERSION%%/libevolution-widgets-a11y.a
 lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so
 lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so.0
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-gw-account-setup.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml
 libdata/bonobo/servers/GNOME_Evolution_Addressbook_%%VERSION%%.server
@@ -295,10 +131,8 @@ libdata/bonobo/servers/GNOME_Evolution_Calendar_Importer_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Mail_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Mail_Importers_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Shell_%%VERSION%%.server
-libdata/pkgconfig/camel-%%VERSION%%.pc
+libdata/pkgconfig/evolution-plugin-%%VERSION%%.pc
 libdata/pkgconfig/evolution-shell-%%VERSION%%.pc
-libexec/evolution/%%VERSION%%/camel/camel-index-control
-libexec/evolution/%%VERSION%%/camel/camel-lock-helper
 libexec/evolution/%%VERSION%%/csv2vcard
 libexec/evolution/%%VERSION%%/evolution-addressbook-clean
 libexec/evolution/%%VERSION%%/evolution-addressbook-export
@@ -308,6 +142,9 @@ share/gnome/applications/evolution-%%VERSION%%.desktop
 @exec update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/evolution/%%VERSION%%/addresstypes.xml
 share/gnome/evolution/%%VERSION%%/default/C/mail/local/Inbox
+share/gnome/evolution/%%VERSION%%/default/ja/mail/local/Inbox
+share/gnome/evolution/%%VERSION%%/default/nl/mail/local/Inbox
+share/gnome/evolution/%%VERSION%%/default/zh_CN/mail/local/Inbox
 share/gnome/evolution/%%VERSION%%/ecps/medbook.ecps
 share/gnome/evolution/%%VERSION%%/ecps/phonelist.ecps
 share/gnome/evolution/%%VERSION%%/ecps/smallbook.ecps
@@ -479,6 +316,7 @@ share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/cy/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -546,13 +384,21 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/evolution/%%VERSION%%/etspec
 @dirrm share/gnome/evolution/%%VERSION%%/errors
 @dirrm share/gnome/evolution/%%VERSION%%/ecps
+@dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN
+@dirrm share/gnome/evolution/%%VERSION%%/default/nl/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/nl/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/nl
+@dirrm share/gnome/evolution/%%VERSION%%/default/ja/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/ja/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/ja
 @dirrm share/gnome/evolution/%%VERSION%%/default/C/mail/local
 @dirrm share/gnome/evolution/%%VERSION%%/default/C/mail
 @dirrm share/gnome/evolution/%%VERSION%%/default/C
 @dirrm share/gnome/evolution/%%VERSION%%/default
 @dirrm share/gnome/evolution/%%VERSION%%
 @dirrm share/gnome/evolution
-@dirrm libexec/evolution/%%VERSION%%/camel
 @dirrm libexec/evolution/%%VERSION%%
 @dirrm libexec/evolution
 @dirrm lib/evolution/%%VERSION%%/plugins
@@ -560,7 +406,6 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm lib/evolution/%%VERSION%%/evolution-addressbook-importers
 %%PILOT:%%@dirrm lib/evolution/%%VERSION%%/conduits
 @dirrm lib/evolution/%%VERSION%%/components
-@dirrm lib/evolution/%%VERSION%%/camel-providers
 @dirrm lib/evolution/%%VERSION%%
 @dirrm lib/evolution
 @dirrm include/evolution-%%VERSION%%/widgets
@@ -568,7 +413,6 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm include/evolution-%%VERSION%%/importer
 @dirrm include/evolution-%%VERSION%%/e-util
 @dirrm include/evolution-%%VERSION%%/e-conduit
-@dirrm include/evolution-%%VERSION%%/camel
 @dirrm include/evolution-%%VERSION%%/calendar/gui
 @dirrm include/evolution-%%VERSION%%/calendar
 @dirrm include/evolution-%%VERSION%%