Presenting GNOME 2.30.1 for FreeBSD. The offical release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.30/ . This release brings initial PackageKit support, Upower (replaces power management part of hal), cuse4bsd integration with HAL and cheese, and a faster Evolution. Sadly GNOME 2.30.x will be the last release with FreeBSD 6.X support. This will also be the last of the 2.x releases. The next release will be the highly-anticipated GNOME 3.0 which will bring with it a new UI experience. Currently, there are a few bugs with GNOME 2.30 that may be of note for our users. Be sure to consult the UPGRADING note or the 2.30 upgrade FAQ at http://www.freebsd.org/gnome/docs/faq230.html for specific upgrading instructions, and the up-to-date list of known issues. This release features commits by avl, ahze, bland, marcus, mezz, and myself. The FreeBSD GNOME Team would like to thank Anders F Bjorklund for doing the initual packagekit porting. And the following contributors & testers for there help with this release: Eric L. Chen Vladimir Grebenschikov Sergio de Almeida Lenzi DomiX walder crsd Kevin Oberman Michal Varga Pavel Plesov Bapt kevin and ITetcu for two exp-run PR: ports/143852 ports/145347 ports/144980 ports/145830 ports/145511
author: kwm <kwm@FreeBSD.org> 2010-05-11 05:19:08 +0800
committer: kwm <kwm@FreeBSD.org> 2010-05-11 05:19:08 +0800
commit: 6a2a890c5cd397f9f0287409c2aa0244d50f3573 (patch)
tree: fc02bcba8bfa155b5cf452d6bafe1cb06aca4848 /mail
parent: 0e415a93a0424a4b284c88c39b19d93d80b66c8a (diff)
download: freebsd-ports-gnome-6a2a890c5cd397f9f0287409c2aa0244d50f3573.tar.gz
freebsd-ports-gnome-6a2a890c5cd397f9f0287409c2aa0244d50f3573.tar.zst
freebsd-ports-gnome-6a2a890c5cd397f9f0287409c2aa0244d50f3573.zip
17 files changed, 634 insertions, 413 deletions
diff --git a/mail/contact-lookup-applet/Makefile b/mail/contact-lookup-applet/Makefile
index 113f6e8e6ef5..227b1f336717 100644
--- a/mail/contact-lookup-applet/Makefile
+++ b/mail/contact-lookup-applet/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	contact
 PORTVERSION=	0.17
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.burtonini.com/computing/
 PKGNAMESUFFIX=	-lookup-applet
@@ -17,7 +17,8 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gnome panel applet for easy Evolution contact book access
 
-USE_GNOME=	evolutiondataserver gnomehack gnomepanel gnomeprefix gnometarget
+USE_GNOME=	evolutiondataserver gnomehack gnomepanel gnomeprefix \
+		gnometarget libgnomeui
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 181ab4fbae4d..df2e6d5bec25 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.146 2009/10/18 05:41:36 marcus Exp $
+#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.158 2010/04/27 18:38:50 kwm Exp $
 #
 
 PORTNAME=	evolution-exchange
-PORTVERSION=	2.28.2
-PORTREVISION=	2
+PORTVERSION=	2.30.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -30,11 +29,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
 		--with-static-ldap=no \
-		--disable-compile-warnings \
 		--with-libdb=${LOCALBASE}
 
-EVO_VERSION=	2.28
-VERSION=	2.28
+EVO_VERSION=	2.30
+VERSION=	2.30
 PLIST_SUB=	VERSION=${VERSION} EVO_VERSION=${EVO_VERSION} \
 		EDS_VERSION="1.2"
 
@@ -42,6 +40,17 @@ GCONF_SCHEMAS=	apps_exchange_addressbook-${VERSION}.schemas
 
 .include <bsd.port.pre.mk>
 
+.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) || defined(NO_KERBEROS)
+HEIMDAL_HOME?=		${LOCALBASE}
+LIB_DEPENDS+=           krb5:${PORTSDIR}/security/heimdal
+CONFIGURE_ARGS+=        --with-krb5=${HEIMDAL_HOME} \
+			--with-krb5-includes=${HEIMDAL_HOME}/include
+KRB5_LIB=		`${HEIMDAL_HOME}/bin/krb5-config gssapi --libs`
+.elif !defined(NO_KERBEROS)
+CONFIGURE_ARGS+=        --with-krb5=/usr
+KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
+.endif
+
 .if ${ARCH} == "amd64"
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC"
 .endif
@@ -52,6 +61,7 @@ IGNORE=	build fails when ${LOCALBASE}/include/mapi.h exists in system, run pkg_i
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g' \
+		-e 's|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \
 		-e 's|-Wmissing-include-dirs||g' \
 		${WRKSRC}/configure
 
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index a12e36b8d9e9..e487b8720530 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.28.2.tar.bz2) = 82f70761960c7e9efdb24650c1b3229b
-SHA256 (gnome2/evolution-exchange-2.28.2.tar.bz2) = d7c8478656e2aff966531f3c2cdd988a1c07dc6343e691fc980d31820a615493
-SIZE (gnome2/evolution-exchange-2.28.2.tar.bz2) = 921637
+MD5 (gnome2/evolution-exchange-2.30.1.tar.bz2) = 9225241ba14d1e2183fe21078c7ed03e
+SHA256 (gnome2/evolution-exchange-2.30.1.tar.bz2) = f53904d90f058ef1bbe1c5d851590f3729d9b3489c80dad73edb46bbba2dae11
+SIZE (gnome2/evolution-exchange-2.30.1.tar.bz2) = 1330038
diff --git a/mail/evolution-exchange/files/patch-eplugin_exchange-operations.c b/mail/evolution-exchange/files/patch-eplugin_exchange-operations.c
new file mode 100644
index 000000000000..5c7706bad381
--- /dev/null
+++ b/mail/evolution-exchange/files/patch-eplugin_exchange-operations.c
@@ -0,0 +1,24 @@
+--- eplugin/exchange-operations.c.orig	2010-03-07 20:00:49.000000000 -0500
++++ eplugin/exchange-operations.c	2010-03-13 17:47:23.000000000 -0500
+@@ -304,3 +304,21 @@ is_exchange_personal_folder (ExchangeAcc
+ 	}
+ 	return FALSE;
+ }
++
++const char * g_module_check_init (gpointer module);
++const char *
++g_module_check_init (gpointer module) {
++	return NULL;
++}
++
++void g_module_unload (gpointer module);
++void
++g_module_unload (gpointer module) {
++	return;
++}
++
++GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *plugin);
++GtkWidget *
++e_plugin_lib_get_configure_widget (EPlugin *plugin) {
++	return NULL;
++}
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 76c0becb5fd8..6b429296db3b 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -1,81 +1,84 @@
 bin/exchange-connector-setup-%%VERSION%%
+lib/evolution/2.30/plugins/liborg-gnome-exchange-operations.a
+lib/evolution/2.30/plugins/liborg-gnome-exchange-operations.la
+lib/evolution/2.30/plugins/liborg-gnome-exchange-operations.so
+lib/evolution/2.30/plugins/org-gnome-exchange-operations.eplug
 lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.a
 lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.la
 lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.so
 lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.urls
-libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server
-libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage
-@comment %%DOCSDIR%%/E2kContext.html
-@comment %%DOCSDIR%%/E2kGlobalCatalog.html
-@comment %%DOCSDIR%%/E2kSecurityDescriptor.html
-@comment %%DOCSDIR%%/ch01.html
-@comment %%DOCSDIR%%/ch02.html
-@comment %%DOCSDIR%%/ch03.html
-@comment %%DOCSDIR%%/ch04.html
-@comment %%DOCSDIR%%/ch05.html
-@comment %%DOCSDIR%%/ch06.html
-@comment %%DOCSDIR%%/evolution-exchange-E2kAutoconfig.html
-@comment %%DOCSDIR%%/evolution-exchange-E2kContext-(private).html
-@comment %%DOCSDIR%%/evolution-exchange-E2kOperation-(private).html
-@comment %%DOCSDIR%%/evolution-exchange-E2kOperation.html
-@comment %%DOCSDIR%%/evolution-exchange-E2kProperties.html
-@comment %%DOCSDIR%%/evolution-exchange-E2kRestriction-(vaporware).html
-@comment %%DOCSDIR%%/evolution-exchange-E2kResult-(private).html
-@comment %%DOCSDIR%%/evolution-exchange-E2kSid.html
-@comment %%DOCSDIR%%/evolution-exchange-E2kUserDialog.html
-@comment %%DOCSDIR%%/evolution-exchange-MAPI.html
-@comment %%DOCSDIR%%/evolution-exchange-e2k-action.html
-@comment %%DOCSDIR%%/evolution-exchange-e2k-freebusy.html
-@comment %%DOCSDIR%%/evolution-exchange-e2k-http-utils.html
-@comment %%DOCSDIR%%/evolution-exchange-e2k-kerberos.html
-@comment %%DOCSDIR%%/evolution-exchange-e2k-restriction.html
-@comment %%DOCSDIR%%/evolution-exchange-e2k-result.html
-@comment %%DOCSDIR%%/evolution-exchange-e2k-rule.html
-@comment %%DOCSDIR%%/evolution-exchange-e2k-uri.html
-@comment %%DOCSDIR%%/evolution-exchange-e2k-utils.html
-@comment %%DOCSDIR%%/evolution-exchange-e2k-xml-utils.html
-@comment %%DOCSDIR%%/evolution-exchange-test-utils.html
-@comment %%DOCSDIR%%/evolution-exchange-xntlm-des.html
-@comment %%DOCSDIR%%/evolution-exchange-xntlm-md4.html
-@comment %%DOCSDIR%%/evolution-exchange-xntlm.html
-@comment %%DOCSDIR%%/evolution-exchange.devhelp
-@comment %%DOCSDIR%%/evolution-exchange.devhelp2
-@comment %%DOCSDIR%%/home.png
-@comment %%DOCSDIR%%/index.html
-@comment %%DOCSDIR%%/index.sgml
-@comment %%DOCSDIR%%/left.png
-@comment %%DOCSDIR%%/right.png
-@comment %%DOCSDIR%%/style.css
-@comment %%DOCSDIR%%/up.png
-@comment %%DOCSDIR%%/ximian-connector-autoconfig.html
-@comment %%DOCSDIR%%/ximian-connector-bug-private.html
-@comment %%DOCSDIR%%/ximian-connector-bug-xml.html
-@comment %%DOCSDIR%%/ximian-connector-calendar.html
-@comment %%DOCSDIR%%/ximian-connector-delegation.html
-@comment %%DOCSDIR%%/ximian-connector-favorites.html
-@comment %%DOCSDIR%%/ximian-connector-fba.html
-@comment %%DOCSDIR%%/ximian-connector-freebusy.html
-@comment %%DOCSDIR%%/ximian-connector-mail-threading.html
-@comment %%DOCSDIR%%/ximian-connector-mail.html
-@comment %%DOCSDIR%%/ximian-connector-ntlm.html
-@comment %%DOCSDIR%%/ximian-connector-oof.html
-@comment %%DOCSDIR%%/ximian-connector-other-users.html
-@comment %%DOCSDIR%%/ximian-connector-permissions.html
-@comment %%DOCSDIR%%/ximian-connnector-booking.html
-%%DATADIR%%/%%VERSION%%/glade/exchange-autoconfig-wizard.glade
-%%DATADIR%%/%%VERSION%%/glade/exchange-change-password.glade
-%%DATADIR%%/%%VERSION%%/glade/exchange-delegates.glade
-%%DATADIR%%/%%VERSION%%/glade/exchange-folder-tree.glade
-%%DATADIR%%/%%VERSION%%/glade/exchange-oof.glade
-%%DATADIR%%/%%VERSION%%/glade/exchange-passwd-expiry.glade
-%%DATADIR%%/%%VERSION%%/glade/exchange-permissions-dialog.glade
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendexchange.a
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendexchange.la
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendexchange.so
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendexchange.a
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendexchange.la
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendexchange.so
+%%DOCSDIR%%/E2kContext.html
+%%DOCSDIR%%/E2kGlobalCatalog.html
+%%DOCSDIR%%/E2kSecurityDescriptor.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/ch05.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/evolution-exchange-E2kAutoconfig.html
+%%DOCSDIR%%/evolution-exchange-E2kContext-(private).html
+%%DOCSDIR%%/evolution-exchange-E2kOperation-(private).html
+%%DOCSDIR%%/evolution-exchange-E2kOperation.html
+%%DOCSDIR%%/evolution-exchange-E2kProperties.html
+%%DOCSDIR%%/evolution-exchange-E2kRestriction-(vaporware).html
+%%DOCSDIR%%/evolution-exchange-E2kResult-(private).html
+%%DOCSDIR%%/evolution-exchange-E2kSid.html
+%%DOCSDIR%%/evolution-exchange-E2kUserDialog.html
+%%DOCSDIR%%/evolution-exchange-MAPI.html
+%%DOCSDIR%%/evolution-exchange-e2k-action.html
+%%DOCSDIR%%/evolution-exchange-e2k-freebusy.html
+%%DOCSDIR%%/evolution-exchange-e2k-http-utils.html
+%%DOCSDIR%%/evolution-exchange-e2k-kerberos.html
+%%DOCSDIR%%/evolution-exchange-e2k-restriction.html
+%%DOCSDIR%%/evolution-exchange-e2k-result.html
+%%DOCSDIR%%/evolution-exchange-e2k-rule.html
+%%DOCSDIR%%/evolution-exchange-e2k-uri.html
+%%DOCSDIR%%/evolution-exchange-e2k-utils.html
+%%DOCSDIR%%/evolution-exchange-e2k-xml-utils.html
+%%DOCSDIR%%/evolution-exchange-test-utils.html
+%%DOCSDIR%%/evolution-exchange-xntlm-des.html
+%%DOCSDIR%%/evolution-exchange-xntlm-md4.html
+%%DOCSDIR%%/evolution-exchange-xntlm.html
+%%DOCSDIR%%/evolution-exchange.devhelp
+%%DOCSDIR%%/evolution-exchange.devhelp2
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+%%DOCSDIR%%/ximian-connector-autoconfig.html
+%%DOCSDIR%%/ximian-connector-bug-private.html
+%%DOCSDIR%%/ximian-connector-bug-xml.html
+%%DOCSDIR%%/ximian-connector-calendar.html
+%%DOCSDIR%%/ximian-connector-delegation.html
+%%DOCSDIR%%/ximian-connector-favorites.html
+%%DOCSDIR%%/ximian-connector-fba.html
+%%DOCSDIR%%/ximian-connector-freebusy.html
+%%DOCSDIR%%/ximian-connector-mail-threading.html
+%%DOCSDIR%%/ximian-connector-mail.html
+%%DOCSDIR%%/ximian-connector-ntlm.html
+%%DOCSDIR%%/ximian-connector-oof.html
+%%DOCSDIR%%/ximian-connector-other-users.html
+%%DOCSDIR%%/ximian-connector-permissions.html
+%%DOCSDIR%%/ximian-connnector-booking.html
 %%DATADIR%%/%%VERSION%%/images/connector-mini.png
 %%DATADIR%%/%%VERSION%%/images/connector.png
 %%DATADIR%%/%%VERSION%%/images/exchange-delegates-48.png
 %%DATADIR%%/%%VERSION%%/images/exchange-oof-48.png
 %%DATADIR%%/%%VERSION%%/ui/ximian-connector.xml
+share/evolution/%%VERSION%%/errors/org-gnome-exchange-operations.error
 share/locale/ar/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/as/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/ast/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/bn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -90,6 +93,7 @@ share/locale/dz/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/en_CA/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/en@shaw/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/et/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/eu/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -148,10 +152,9 @@ share/locale/zh_HK/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 @dirrm %%DATADIR%%/%%VERSION%%/ui
 @dirrm %%DATADIR%%/%%VERSION%%/images
-@dirrm %%DATADIR%%/%%VERSION%%/glade
 @dirrm %%DATADIR%%/%%VERSION%%
 @dirrm %%DATADIR%%
-@comment @dirrm %%DOCSDIR%%
+@dirrm %%DOCSDIR%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -172,6 +175,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
index acbc1c8b3048..59aaace063a4 100644
--- a/mail/evolution-mapi/Makefile
+++ b/mail/evolution-mapi/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution-mapi/Makefile,v 1.5 2009/10/19 18:17:14 kwm Exp $
+#   $MCom: ports/mail/evolution-mapi/Makefile,v 1.14 2010/04/28 08:29:07 kwm Exp $
 #
 
 PORTNAME=	evolution-mapi
-PORTVERSION=	0.28.2
-PORTREVISION=	3
+PORTVERSION=	0.30.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -31,7 +30,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-EVO_VERSION=	2.28
+EVO_VERSION=	2.30
 EDS_VERSION=	1.2
 PLIST_SUB=	EVO_VERSION=${EVO_VERSION} EDS_VERSION=${EDS_VERSION}
 
diff --git a/mail/evolution-mapi/distinfo b/mail/evolution-mapi/distinfo
index 1d324b56366b..5faa59ed4e99 100644
--- a/mail/evolution-mapi/distinfo
+++ b/mail/evolution-mapi/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-mapi-0.28.2.tar.bz2) = 6f1c61b28778983806d39214f717810f
-SHA256 (gnome2/evolution-mapi-0.28.2.tar.bz2) = 02be73656e0793388540f9eca2922742f8f87caba6a54fee2cbf09ea0f9f2b2b
-SIZE (gnome2/evolution-mapi-0.28.2.tar.bz2) = 482959
+MD5 (gnome2/evolution-mapi-0.30.1.tar.bz2) = 73577721e07b2a7f15f9c6dfefe7d4e0
+SHA256 (gnome2/evolution-mapi-0.30.1.tar.bz2) = b435225156cb533469c359e9ee659d4bbc21a72860ed15f6faa6835d305c1e9b
+SIZE (gnome2/evolution-mapi-0.30.1.tar.bz2) = 493037
diff --git a/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c b/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c
new file mode 100644
index 000000000000..b4123235e567
--- /dev/null
+++ b/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c
@@ -0,0 +1,24 @@
+--- src/account-setup-eplugin/exchange-mapi-account-setup.c.orig	2010-03-08 04:03:24.000000000 -0500
++++ src/account-setup-eplugin/exchange-mapi-account-setup.c	2010-03-13 17:49:17.000000000 -0500
+@@ -696,3 +696,21 @@ exchange_mapi_cal_commit (EPlugin *epl, 
+ 	// Update the folder list in the plugin and ExchangeMAPIFolder
+ 	return;
+ }
++
++const char *g_module_check_init (gpointer module);
++const char *
++g_module_check_init (gpointer module) {
++	return NULL;
++}
++
++void g_module_unload (gpointer module);
++void
++g_module_unload (gpointer module) {
++	return;
++}
++
++GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *plugin);
++GtkWidget *
++e_plugin_lib_get_configure_widget (EPlugin *plugin) {
++	return NULL;
++}
diff --git a/mail/evolution-mapi/pkg-plist b/mail/evolution-mapi/pkg-plist
index 26dcf1428520..6c21313f1fdc 100644
--- a/mail/evolution-mapi/pkg-plist
+++ b/mail/evolution-mapi/pkg-plist
@@ -21,7 +21,9 @@ lib/libexchangemapi-1.0.la
 lib/libexchangemapi-1.0.so
 lib/libexchangemapi-1.0.so.0
 share/locale/as/LC_MESSAGES/evolution-mapi.mo
+share/locale/ast/LC_MESSAGES/evolution-mapi.mo
 share/locale/bg/LC_MESSAGES/evolution-mapi.mo
+share/locale/bn/LC_MESSAGES/evolution-mapi.mo
 share/locale/bn_IN/LC_MESSAGES/evolution-mapi.mo
 share/locale/ca/LC_MESSAGES/evolution-mapi.mo
 share/locale/ca@valencia/LC_MESSAGES/evolution-mapi.mo
@@ -30,6 +32,7 @@ share/locale/da/LC_MESSAGES/evolution-mapi.mo
 share/locale/de/LC_MESSAGES/evolution-mapi.mo
 share/locale/el/LC_MESSAGES/evolution-mapi.mo
 share/locale/en_GB/LC_MESSAGES/evolution-mapi.mo
+share/locale/en@shaw/LC_MESSAGES/evolution-mapi.mo
 share/locale/es/LC_MESSAGES/evolution-mapi.mo
 share/locale/et/LC_MESSAGES/evolution-mapi.mo
 share/locale/eu/LC_MESSAGES/evolution-mapi.mo
@@ -45,9 +48,11 @@ share/locale/ja/LC_MESSAGES/evolution-mapi.mo
 share/locale/kn/LC_MESSAGES/evolution-mapi.mo
 share/locale/ko/LC_MESSAGES/evolution-mapi.mo
 share/locale/lt/LC_MESSAGES/evolution-mapi.mo
+share/locale/lv/LC_MESSAGES/evolution-mapi.mo
 share/locale/mai/LC_MESSAGES/evolution-mapi.mo
 share/locale/ml/LC_MESSAGES/evolution-mapi.mo
 share/locale/mr/LC_MESSAGES/evolution-mapi.mo
+share/locale/ms/LC_MESSAGES/evolution-mapi.mo
 share/locale/nb/LC_MESSAGES/evolution-mapi.mo
 share/locale/nl/LC_MESSAGES/evolution-mapi.mo
 share/locale/or/LC_MESSAGES/evolution-mapi.mo
@@ -75,27 +80,27 @@ share/locale/zh_TW/LC_MESSAGES/evolution-mapi.mo
 libdata/pkgconfig/libexchangemapi-1.0.pc
 share/evolution-data-server-%%EVO_VERSION%%/mapi/tz-mapi-to-ical
 share/evolution-data-server-%%EVO_VERSION%%/mapi/tz-ical-to-mapi
-@dirrmtry share/local/zh_TW/LC_MESSAGES
-@dirrmtry share/local/zh_TW
-@dirrmtry share/local/zh_HK/LC_MESSAGES
-@dirrmtry share/local/zh_HK
-@dirrmtry share/local/zh_CN/LC_MESSAGES
-@dirrmtry share/local/zh_CN
-@dirrmtry share/local/te/LC_MESSAGES
-@dirrmtry share/local/te
-@dirrmtry share/local/sr@latin/LC_MESSAGES
-@dirrmtry share/local/sr@latin
-@dirrmtry share/local/si/LC_MESSAGES
-@dirrmtry share/local/si
-@dirrmtry share/local/mr/LC_MESSAGES
-@dirrmtry share/local/mr
-@dirrmtry share/local/mai/LC_MESSAGES
-@dirrmtry share/local/mai
-@dirrmtry share/local/ca@valencia/LC_MESSAGES
-@dirrmtry share/local/ca@valencia
-@dirrmtry share/local/bn_IN/LC_MESSAGES
-@dirrmtry share/local/bn_IN
-@dirrmtry share/local/as/LC_MESSAGES
-@dirrmtry share/local/as
 @dirrm share/evolution-data-server-%%EVO_VERSION%%/mapi
 @dirrm include/evolution-data-server-%%EVO_VERSION%%/mapi
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 0fc09666494e..f5ad5b489615 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.204 2009/10/18 05:39:30 marcus Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.222 2010/04/27 12:12:48 kwm Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.28.2
-PORTREVISION=	2
+PORTVERSION=	2.30.1.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,7 +15,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An integrated mail, calendar and address book distributed suite
 
-LIB_DEPENDS=	nss3.1:${PORTSDIR}/security/nss
+LIB_DEPENDS=	nss3.1:${PORTSDIR}/security/nss \
+		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
+		gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview
 RUN_DEPENDS=	${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
 
 USE_BZIP2=	yes
@@ -24,8 +25,10 @@ USE_GMAKE=	yes
 USE_BISON=	build
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \
-		desktopfileutils gnomedocutils ltasneededhack gnomedesktop
+		desktopfileutils gnomedocutils ltasneededhack gnomedesktop \
+		libgnomecanvas
 USE_AUTOTOOLS=	libtool:22
+USE_GSTREAMER=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
@@ -48,12 +51,13 @@ GCONF_SCHEMAS=	apps_evolution_addressbook.schemas \
 		bogo-junk-plugin.schemas \
 		evolution-mail.schemas
 
-EVO_VERSION=	2.28
+EVO_VERSION=	2.30
 PLIST_SUB=	VERSION=${EVO_VERSION} \
 		PORTVERSION=2.12
 
 OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
 		LDAP "Enable LDAP support" on \
+		CANBERRA "Enable canberra plugin" on \
 		SPAMASSASSIN "Enable SpamAssassin spam filtering" off
 
 .include <bsd.port.pre.mk>
@@ -65,9 +69,9 @@ USE_LDCONFIG=	${PREFIX}/lib/evolution/${EVO_VERSION}
 LIB_DEPENDS+=	gpilotdconduit.2:${PORTSDIR}/palm/gnome-pilot
 CONFIGURE_ARGS+=	--with-pisock=${LOCALBASE} \
 			--enable-pilot-conduits=yes
-PLIST_SUB+=	PILOT:=""
+PLIST_SUB+=	PILOT=""
 .else
-PLIST_SUB+=	PILOT:="@comment "
+PLIST_SUB+=	PILOT="@comment "
 .endif
 
 .if !defined(WITHOUT_LDAP)
@@ -81,26 +85,47 @@ CONFIGURE_ARGS+=--with-openldap=no
 RUN_DEPENDS+=	spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 .endif
 
-.if !defined(NO_KERBEROS) && exists(/usr/lib/libkrb5.so)
-CONFIGURE_ARGS+=	--with-krb5=/usr
-.else
+.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) || defined(NO_KERBEROS)
+HEIMDAL_HOME?=		${LOCALBASE}
 LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
-.if defined(HEIMDAL_HOME)
-CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include
-.else
-CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} \
+			--with-krb5-includes=${HEIMDAL_HOME}/include
+KRB5_LIB=		`${HEIMDAL_HOME}/bin/krb5-config gssapi --libs`
+.elif !defined(NO_KERBEROS)
+CONFIGURE_ARGS+=	--with-krb5=/usr
+KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
 .endif
+
+.if defined(WITH_CANBERRA)
+LIB_DEPENDS+=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+CONFIGURE_ARGS+=--enable-canberra=yes
+PLIST_SUB+=	CANBERRA=""
+.else
+CONFIGURE_ARGS+=--enable-canberra=no
+PLIST_SUB+=	CANBERRA="@comment "
 .endif
 
+# needs newer libpst version 0.6.41 or higher
+#.if defined (WITH_PST)
+#CONFIGURE_ARGS+=	--enable-pst-import
+#BUILD_DEPENDS+=		lspst:${PORTSDIR}/mail/libpst
+#RUN_DEPENDS+=		lspst:${PORTSDIR}/mail/libpst
+#PLIST_SUB+=		PST=""
+#.else
+CONFIGURE_ARGS+=	--disable-pst-import
+PLIST_SUB+=		PST="@comment "
+#.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \
+	    	-e 's|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \
+		-e 's|-Wl,--no-undefined||g' \
 		-e 's|-Wmissing-include-dirs||g' \
 	    	${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|stdlib.n|stdlib.h|' \
-	    	${WRKSRC}/iconv-detect.c
 	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
 		${WRKSRC}/plugins/bogo-junk-plugin/bf-junk-filter.c
 	@${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/bin|g' \
 		${WRKSRC}/plugins/sa-junk-plugin/em-junk-filter.c
+	@${SH} ${FILESDIR}/fix-plugins.sh ${WRKSRC}
 
 .include <bsd.port.post.mk>
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index e30524673a40..7909a60152dd 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.28.2.tar.bz2) = 2af2e699cd8a46b8f7b9baec3184f685
-SHA256 (gnome2/evolution-2.28.2.tar.bz2) = 1f4a50127e3af085b0a074dcdfa0595bdf8925aeee295901c33805c3ff0c2603
-SIZE (gnome2/evolution-2.28.2.tar.bz2) = 29735192
+MD5 (gnome2/evolution-2.30.1.1.tar.bz2) = b5f1552d23e46dc043b2262e42c69eea
+SHA256 (gnome2/evolution-2.30.1.1.tar.bz2) = 98cedb97e8fbd38d281140a01b0357f950e73431ea440f3932134e92790004f9
+SIZE (gnome2/evolution-2.30.1.1.tar.bz2) = 30619565
diff --git a/mail/evolution/files/fix-plugins.sh b/mail/evolution/files/fix-plugins.sh
new file mode 100644
index 000000000000..76216fa1ab67
--- /dev/null
+++ b/mail/evolution/files/fix-plugins.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+plugin_srcs="addressbook-file/addressbook-file.c attachment-reminder/attachment-reminder.c audio-inline/audio-inline.c backup-restore/backup-restore.c bbdb/bbdb.c bogo-junk-plugin/bf-junk-filter.c caldav/caldav-source.c calendar-file/calendar-file.c calendar-http/calendar-http.c calendar-weather/calendar-weather.c contacts-map/contacts-map.c default-mailer/default-mailer.c default-source/default-source.c email-custom-header/email-custom-header.c external-editor/external-editor.c face/face.c google-account-setup/google-source.c groupwise-features/install-shared.c hula-account-setup/hula-account-setup.c image-inline/image-inline.c imap-features/imap-headers.c itip-formatter/itip-formatter.c mail-notification/mail-notification.c mail-to-task/mail-to-task.c mailing-list-actions/mailing-list-actions.c mark-all-read/mark-all-read.c plugin-manager/plugin-manager.c prefer-plain/prefer-plain.c profiler/profiler.c pst-import/pst-importer.c publish-calendar/publish-calendar.c sa-junk-plugin/em-junk-filter.c save-calendar/save-calendar.c startup-wizard/startup-wizard.c subject-thread/subject-thread.c templates/templates.c tnef-attachments/tnef-plugin.c vcard-inline/vcard-inline.c webdav-account-setup/webdav-contacts-source.c"
+
+module_srcs="addressbook/evolution-module-addressbook.c calendar/evolution-module-calendar.c mail/evolution-module-mail.c plugin-lib/evolution-module-plugin-lib.c plugin-mono/evolution-module-plugin-mono.c plugin-python/evolution-module-plugin-python.c"
+
+WRKSRC=$1
+
+for i in ${plugin_srcs}; do
+    if [ ! -f ${WRKSRC}/plugins/${i} ]; then
+	echo "WARNING: Failed to find plugin source file ${WRKSRC}/plugins/${i}"
+	continue
+    fi
+    cp ${WRKSRC}/plugins/${i} ${WRKSRC}/plugins/${i}.bak
+    printf "const char * g_module_check_init (gpointer module);\n" >> ${WRKSRC}/plugins/${i}
+    printf "const char *\ng_module_check_init (gpointer module) {\n\treturn NULL;\n}\n" >> ${WRKSRC}/plugins/${i}
+    printf "void g_module_unload (gpointer module);\n" >> ${WRKSRC}/plugins/${i}
+    printf "void\ng_module_unload (gpointer module) {\n\treturn;\n}\n" >> ${WRKSRC}/plugins/${i}
+    dir=$(dirname ${WRKSRC}/plugins/${i})
+    if ! grep -q e_plugin_lib_enable ${dir}/*.c; then
+	printf "#include <e-util/e-config.h>\n" >> ${WRKSRC}/plugins/${i}
+	printf "gint e_plugin_lib_enable (EPlugin *ep, gint enable);\n" >> ${WRKSRC}/plugins/${i}
+	printf "gint\ne_plugin_lib_enable (EPlugin *ep, gint enable) {\n\treturn 0;\n}\n" >> ${WRKSRC}/plugins/${i}
+    fi
+    if ! grep -q e_plugin_lib_get_configure_widget ${dir}/*.c; then
+	printf "#include <e-util/e-config.h>\n" >> ${WRKSRC}/plugins/${i}
+	printf "GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *plugin);\n" >> ${WRKSRC}/plugins/${i}
+	printf "GtkWidget *\ne_plugin_lib_get_configure_widget (EPlugin *plugin) {\n\treturn NULL;\n}" >> ${WRKSRC}/plugins/${i}
+    fi
+done
+
+for i in ${module_srcs}; do
+    if [ ! -f ${WRKSRC}/modules/${i} ]; then
+	echo "WARNING: Failed to find module source file ${WRKSRC}/modules/${i}"
+	continue
+    fi
+    cp ${WRKSRC}/modules/${i} ${WRKSRC}/modules/${i}.bak
+    dir=$(dirname ${WRKSRC}/modules/${i})
+    if ! grep -q g_module_check_init ${dir}/*.c; then
+        printf "const char * g_module_check_init (gpointer module);\n" >> ${WRKSRC}/modules/${i}
+        printf "const char *\ng_module_check_init (gpointer module) {\n\treturn NULL;\n}\n" >> ${WRKSRC}/modules/${i}
+    fi
+    if ! grep g_module_unload ${dir}/*.c; then
+        printf "void g_module_unload (gpointer module);\n" >> ${WRKSRC}/modules/${i}
+        printf "void\ng_module_unload (gpointer module) {\n\treturn;\n}\n" >> ${WRKSRC}/modules/${i}
+    fi
+done
+
+
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 44b3591906fe..3b9eb70943d4 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,10 +1,20 @@
---- configure.orig	2009-08-24 11:10:44.000000000 +0200
-+++ configure	2009-08-24 11:13:05.000000000 +0200
-@@ -16389,6 +16389,16 @@ case "$host" in
- 	SOFTOKN3_LIB=''
- 	HAL_REQUIREMENT=''
+--- configure.orig	2009-12-26 20:42:20.000000000 +0100
++++ configure	2009-12-26 20:49:17.000000000 +0100
+@@ -4329,7 +4329,7 @@
+ 	-Wdeclaration-after-statement
+ 	-Werror-implicit-function-declaration
+ 	-Wformat-security -Winit-self
+-	-Wmissing-declarations -Wmissing-include-dirs
++	-Wmissing-declarations 
+ 	-Wmissing-noreturn -Wnested-externs -Wpointer-arith
+ 	-Wredundant-decls -Wundef -Wwrite-strings"
+   flags_supported=""
+@@ -16441,6 +16441,16 @@
+ 	CHAMPLAIN_REQUIREMENT=''
+ 	GEOCLUE_REQUIREMENT=''
  	;;
-+*freebsd*) os_win32=no
++*freebsd*)
++	os_win32=no
 +	NO_UNDEFINED=''
 +	SOCKET_LIBS=''
 +	SOEXT='.so'
@@ -12,12 +22,11 @@
 +	BF_JUNK_PLUGIN=bogo-junk-plugin
 +	DL_LIB=''
 +	SOFTOKN3_LIB='-lsoftokn3'
-+	HAL_REQUIREMENT='hal'
 +	;;
  *)
  	os_win32=no
- 	NO_UNDEFINED=''
-@@ -18403,6 +18413,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 	NO_UNDEFINED='-no-undefined'
+@@ -18544,6 +18554,7 @@
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -25,21 +34,3 @@
  
  		#define BUFSIZE (sizeof(struct hostent)+10)
  
-@@ -22101,7 +22112,7 @@ if test "x${with_krb5}" != "xno"; then
- 	LIBS_save="$LIBS"
- 
- 	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
--	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
-+	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
- 	sunlibs="-lkrb5 -lgss"
- 	{ $as_echo "$as_me:$LINENO: checking for Kerberos 5" >&5
- $as_echo_n "checking for Kerberos 5... " >&6; }
-@@ -30112,7 +30123,7 @@ componentdir="$privlibdir/components"
- idldir='${datadir}'/idl/evolution-$BASE_VERSION
- 
- 
--serverdir="$libdir/bonobo/servers"
-+serverdir="$prefix/libdata/bonobo/servers"
- 
- 
- evolutionuidir="$privdatadir/ui"
diff --git a/mail/evolution/files/patch-mail_em-migrate.c b/mail/evolution/files/patch-mail_em-migrate.c
deleted file mode 100644
index e2df9c618799..000000000000
--- a/mail/evolution/files/patch-mail_em-migrate.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mail/em-migrate.c.orig	2007-12-15 16:58:56.000000000 +0100
-+++ mail/em-migrate.c	2007-12-21 16:17:32.000000000 +0100
-@@ -1493,7 +1493,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/files/patch-modules_addressbook_evolution-module-addressbook.c b/mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c
new file mode 100644
index 000000000000..0df6bd970168
--- /dev/null
+++ b/mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c
@@ -0,0 +1,19 @@
+--- modules/addressbook/evolution-module-addressbook.c.orig	2010-04-11 12:47:18.000000000 -0400
++++ modules/addressbook/evolution-module-addressbook.c	2010-04-11 12:48:06.000000000 -0400
+@@ -47,3 +47,16 @@ G_MODULE_EXPORT void
+ e_module_unload (GTypeModule *type_module)
+ {
+ }
++
++G_MODULE_EXPORT const gchar *
++g_module_check_init (GModule *module)
++{
++	/* FIXME Until addressbook is split into a module library and a
++	 *       reusable shared library, prevent the module from
++	 *       being unloaded.  Unloading the module resets all
++	 *       static variables, which screws up foo_get_type()
++	 *       functions among other things. */
++	g_module_make_resident (module);
++
++	return NULL;
++}
diff --git a/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in b/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in
deleted file mode 100644
index 2ecb540021ca..000000000000
--- a/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/exchange-operations/Makefile.in.orig	2008-04-27 23:58:09.000000000 -0400
-+++ plugins/exchange-operations/Makefile.in	2008-04-28 00:02:31.000000000 -0400
-@@ -463,6 +463,7 @@ liborg_gnome_exchange_operations_la_LIBA
- 	$(top_builddir)/calendar/gui/libevolution-calendar.la 	\
- 	$(top_builddir)/mail/libevolution-mail.la 		\
- 	$(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \
-+	-Wl,--no-as-needed,$(top_builddir)/addressbook/gui/component/.libs/libevolution-addressbook.so \
- 	$(CAMEL_EXCHANGE_LIBS)					\
- 	$(EVOLUTION_MAIL_LIBS)
- 
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 7f20b345c6c8..970e077c7316 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,15 +1,18 @@
 bin/evolution
+bin/evolution-alarm-notify
+bin/evolution-settings
+etc/xdg/autostart/evolution-alarm-notify.desktop
 include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-config.h
-include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-menu.h
-include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-popup.h
+include/evolution-%%VERSION%%/calendar/common/authentication.h
+%%PILOT%%include/evolution-%%VERSION%%/calendar/conduits/common/libecalendar-common-conduit.h
 include/evolution-%%VERSION%%/calendar/gui/cal-editor-utils.h
-include/evolution-%%VERSION%%/calendar/gui/cal-search-bar.h
 include/evolution-%%VERSION%%/calendar/gui/calendar-config-keys.h
 include/evolution-%%VERSION%%/calendar/gui/calendar-config.h
+include/evolution-%%VERSION%%/calendar/gui/calendar-view-factory.h
+include/evolution-%%VERSION%%/calendar/gui/calendar-view.h
 include/evolution-%%VERSION%%/calendar/gui/comp-util.h
 include/evolution-%%VERSION%%/calendar/gui/dialogs/alarm-dialog.h
 include/evolution-%%VERSION%%/calendar/gui/dialogs/alarm-list-dialog.h
-include/evolution-%%VERSION%%/calendar/gui/dialogs/cal-attachment-select-file.h
 include/evolution-%%VERSION%%/calendar/gui/dialogs/cal-prefs-dialog.h
 include/evolution-%%VERSION%%/calendar/gui/dialogs/calendar-setup.h
 include/evolution-%%VERSION%%/calendar/gui/dialogs/cancel-comp.h
@@ -36,18 +39,15 @@ include/evolution-%%VERSION%%/calendar/gui/dialogs/task-details-page.h
 include/evolution-%%VERSION%%/calendar/gui/dialogs/task-editor.h
 include/evolution-%%VERSION%%/calendar/gui/dialogs/task-page.h
 include/evolution-%%VERSION%%/calendar/gui/e-alarm-list.h
-include/evolution-%%VERSION%%/calendar/gui/e-attachment-handler-calendar.h
 include/evolution-%%VERSION%%/calendar/gui/e-cal-config.h
 include/evolution-%%VERSION%%/calendar/gui/e-cal-event.h
+include/evolution-%%VERSION%%/calendar/gui/e-cal-list-view.h
 include/evolution-%%VERSION%%/calendar/gui/e-cal-model-calendar.h
 include/evolution-%%VERSION%%/calendar/gui/e-cal-model.h
-include/evolution-%%VERSION%%/calendar/gui/e-cal-popup.h
+include/evolution-%%VERSION%%/calendar/gui/e-calendar-selector.h
 include/evolution-%%VERSION%%/calendar/gui/e-calendar-view.h
 include/evolution-%%VERSION%%/calendar/gui/e-cell-date-edit-text.h
-include/evolution-%%VERSION%%/calendar/gui/e-comp-editor-registry.h
-include/evolution-%%VERSION%%/calendar/gui/e-date-edit-config.h
 include/evolution-%%VERSION%%/calendar/gui/e-date-time-list.h
-include/evolution-%%VERSION%%/calendar/gui/e-day-view-config.h
 include/evolution-%%VERSION%%/calendar/gui/e-day-view-layout.h
 include/evolution-%%VERSION%%/calendar/gui/e-day-view-main-item.h
 include/evolution-%%VERSION%%/calendar/gui/e-day-view-time-item.h
@@ -60,16 +60,15 @@ include/evolution-%%VERSION%%/calendar/gui/e-meeting-time-sel-item.h
 include/evolution-%%VERSION%%/calendar/gui/e-meeting-time-sel.h
 include/evolution-%%VERSION%%/calendar/gui/e-meeting-types.h
 include/evolution-%%VERSION%%/calendar/gui/e-meeting-utils.h
-include/evolution-%%VERSION%%/calendar/gui/e-mini-calendar-config.h
 include/evolution-%%VERSION%%/calendar/gui/e-select-names-editable.h
 include/evolution-%%VERSION%%/calendar/gui/e-select-names-renderer.h
 include/evolution-%%VERSION%%/calendar/gui/e-timezone-entry.h
-include/evolution-%%VERSION%%/calendar/gui/e-week-view-config.h
 include/evolution-%%VERSION%%/calendar/gui/e-week-view-event-item.h
 include/evolution-%%VERSION%%/calendar/gui/e-week-view-layout.h
 include/evolution-%%VERSION%%/calendar/gui/e-week-view-main-item.h
 include/evolution-%%VERSION%%/calendar/gui/e-week-view-titles-item.h
 include/evolution-%%VERSION%%/calendar/gui/e-week-view.h
+include/evolution-%%VERSION%%/calendar/gui/gnome-cal.h
 include/evolution-%%VERSION%%/calendar/gui/goto.h
 include/evolution-%%VERSION%%/calendar/gui/itip-utils.h
 include/evolution-%%VERSION%%/calendar/gui/misc.h
@@ -88,60 +87,85 @@ include/evolution-%%VERSION%%/composer/e-composer-text-header.h
 include/evolution-%%VERSION%%/composer/e-msg-composer.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-utils.h
+include/evolution-%%VERSION%%/e-util/e-activity.h
+include/evolution-%%VERSION%%/e-util/e-alert-activity.h
+include/evolution-%%VERSION%%/e-util/e-alert-dialog.h
+include/evolution-%%VERSION%%/e-util/e-alert.h
 include/evolution-%%VERSION%%/e-util/e-bconf-map.h
 include/evolution-%%VERSION%%/e-util/e-binding.h
 include/evolution-%%VERSION%%/e-util/e-bit-array.h
 include/evolution-%%VERSION%%/e-util/e-categories-config.h
+include/evolution-%%VERSION%%/e-util/e-charset.h
 include/evolution-%%VERSION%%/e-util/e-config.h
-include/evolution-%%VERSION%%/e-util/e-corba-utils.h
-include/evolution-%%VERSION%%/e-util/e-cursor.h
 include/evolution-%%VERSION%%/e-util/e-datetime-format.h
 include/evolution-%%VERSION%%/e-util/e-dialog-utils.h
 include/evolution-%%VERSION%%/e-util/e-dialog-widgets.h
-include/evolution-%%VERSION%%/e-util/e-error.h
 include/evolution-%%VERSION%%/e-util/e-event.h
+include/evolution-%%VERSION%%/e-util/e-extensible.h
+include/evolution-%%VERSION%%/e-util/e-extension.h
+include/evolution-%%VERSION%%/e-util/e-file-utils.h
 include/evolution-%%VERSION%%/e-util/e-folder-map.h
-include/evolution-%%VERSION%%/e-util/e-fsutils.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-io-activity.h
 include/evolution-%%VERSION%%/e-util/e-import.h
 include/evolution-%%VERSION%%/e-util/e-logger.h
 include/evolution-%%VERSION%%/e-util/e-marshal.h
-include/evolution-%%VERSION%%/e-util/e-menu.h
 include/evolution-%%VERSION%%/e-util/e-mktemp.h
+include/evolution-%%VERSION%%/e-util/e-module.h
 include/evolution-%%VERSION%%/e-util/e-non-intrusive-error-dialog.h
 include/evolution-%%VERSION%%/e-util/e-plugin-ui.h
+include/evolution-%%VERSION%%/e-util/e-plugin-util.h
 include/evolution-%%VERSION%%/e-util/e-plugin.h
-include/evolution-%%VERSION%%/e-util/e-popup.h
 include/evolution-%%VERSION%%/e-util/e-print.h
 include/evolution-%%VERSION%%/e-util/e-profile-event.h
-include/evolution-%%VERSION%%/e-util/e-request.h
+include/evolution-%%VERSION%%/e-util/e-selection.h
 include/evolution-%%VERSION%%/e-util/e-signature-list.h
+include/evolution-%%VERSION%%/e-util/e-signature-utils.h
 include/evolution-%%VERSION%%/e-util/e-signature.h
 include/evolution-%%VERSION%%/e-util/e-sorter-array.h
 include/evolution-%%VERSION%%/e-util/e-sorter.h
 include/evolution-%%VERSION%%/e-util/e-text-event-processor-emacs-like.h
 include/evolution-%%VERSION%%/e-util/e-text-event-processor-types.h
 include/evolution-%%VERSION%%/e-util/e-text-event-processor.h
-include/evolution-%%VERSION%%/e-util/e-util-labels.h
+include/evolution-%%VERSION%%/e-util/e-timeout-activity.h
+include/evolution-%%VERSION%%/e-util/e-ui-manager.h
+include/evolution-%%VERSION%%/e-util/e-unicode.h
 include/evolution-%%VERSION%%/e-util/e-util.h
 include/evolution-%%VERSION%%/e-util/e-xml-utils.h
-include/evolution-%%VERSION%%/filter/filter-code.h
-include/evolution-%%VERSION%%/filter/filter-colour.h
-include/evolution-%%VERSION%%/filter/filter-datespec.h
-include/evolution-%%VERSION%%/filter/filter-element.h
-include/evolution-%%VERSION%%/filter/filter-file.h
-include/evolution-%%VERSION%%/filter/filter-input.h
-include/evolution-%%VERSION%%/filter/filter-int.h
-include/evolution-%%VERSION%%/filter/filter-option.h
-include/evolution-%%VERSION%%/filter/filter-part.h
-include/evolution-%%VERSION%%/filter/filter-rule.h
-include/evolution-%%VERSION%%/filter/rule-context.h
-include/evolution-%%VERSION%%/filter/rule-editor.h
-include/evolution-%%VERSION%%/mail/Evolution-Mail.h
+include/evolution-%%VERSION%%/e-util/gconf-bridge.h
+include/evolution-%%VERSION%%/em-format/em-format-quote.h
+include/evolution-%%VERSION%%/em-format/em-format.h
+include/evolution-%%VERSION%%/em-format/em-stripsig-filter.h
+include/evolution-%%VERSION%%/filter/e-filter-code.h
+include/evolution-%%VERSION%%/filter/e-filter-color.h
+include/evolution-%%VERSION%%/filter/e-filter-datespec.h
+include/evolution-%%VERSION%%/filter/e-filter-element.h
+include/evolution-%%VERSION%%/filter/e-filter-file.h
+include/evolution-%%VERSION%%/filter/e-filter-input.h
+include/evolution-%%VERSION%%/filter/e-filter-int.h
+include/evolution-%%VERSION%%/filter/e-filter-option.h
+include/evolution-%%VERSION%%/filter/e-filter-part.h
+include/evolution-%%VERSION%%/filter/e-filter-rule.h
+include/evolution-%%VERSION%%/filter/e-rule-context.h
+include/evolution-%%VERSION%%/filter/e-rule-editor.h
 include/evolution-%%VERSION%%/mail/e-mail-attachment-bar.h
-include/evolution-%%VERSION%%/mail/e-mail-search-bar.h
-include/evolution-%%VERSION%%/mail/e-searching-tokenizer.h
+include/evolution-%%VERSION%%/mail/e-mail-backend.h
+include/evolution-%%VERSION%%/mail/e-mail-browser.h
+include/evolution-%%VERSION%%/mail/e-mail-display.h
+include/evolution-%%VERSION%%/mail/e-mail-label-action.h
+include/evolution-%%VERSION%%/mail/e-mail-label-dialog.h
+include/evolution-%%VERSION%%/mail/e-mail-label-list-store.h
+include/evolution-%%VERSION%%/mail/e-mail-label-manager.h
+include/evolution-%%VERSION%%/mail/e-mail-label-tree-view.h
+include/evolution-%%VERSION%%/mail/e-mail-local.h
+include/evolution-%%VERSION%%/mail/e-mail-migrate.h
+include/evolution-%%VERSION%%/mail/e-mail-reader-utils.h
+include/evolution-%%VERSION%%/mail/e-mail-reader.h
+include/evolution-%%VERSION%%/mail/e-mail-sidebar.h
+include/evolution-%%VERSION%%/mail/e-mail-store.h
+include/evolution-%%VERSION%%/mail/e-mail-tag-editor.h
 include/evolution-%%VERSION%%/mail/em-account-editor.h
 include/evolution-%%VERSION%%/mail/em-composer-utils.h
 include/evolution-%%VERSION%%/mail/em-config.h
@@ -151,30 +175,27 @@ include/evolution-%%VERSION%%/mail/em-filter-editor.h
 include/evolution-%%VERSION%%/mail/em-filter-folder-element.h
 include/evolution-%%VERSION%%/mail/em-filter-rule.h
 include/evolution-%%VERSION%%/mail/em-filter-source-element.h
-include/evolution-%%VERSION%%/mail/em-folder-browser.h
+include/evolution-%%VERSION%%/mail/em-folder-properties.h
+include/evolution-%%VERSION%%/mail/em-folder-selection-button.h
+include/evolution-%%VERSION%%/mail/em-folder-selector.h
 include/evolution-%%VERSION%%/mail/em-folder-tree-model.h
 include/evolution-%%VERSION%%/mail/em-folder-tree.h
 include/evolution-%%VERSION%%/mail/em-folder-utils.h
-include/evolution-%%VERSION%%/mail/em-folder-view.h
 include/evolution-%%VERSION%%/mail/em-format-hook.h
 include/evolution-%%VERSION%%/mail/em-format-html-display.h
 include/evolution-%%VERSION%%/mail/em-format-html-print.h
 include/evolution-%%VERSION%%/mail/em-format-html.h
-include/evolution-%%VERSION%%/mail/em-format-quote.h
-include/evolution-%%VERSION%%/mail/em-format.h
 include/evolution-%%VERSION%%/mail/em-html-stream.h
-include/evolution-%%VERSION%%/mail/em-icon-stream.h
 include/evolution-%%VERSION%%/mail/em-inline-filter.h
-include/evolution-%%VERSION%%/mail/em-junk-hook.h
-include/evolution-%%VERSION%%/mail/em-menu.h
-include/evolution-%%VERSION%%/mail/em-message-browser.h
-include/evolution-%%VERSION%%/mail/em-popup.h
+include/evolution-%%VERSION%%/mail/em-junk.h
 include/evolution-%%VERSION%%/mail/em-search-context.h
-include/evolution-%%VERSION%%/mail/em-stripsig-filter.h
+include/evolution-%%VERSION%%/mail/em-subscribe-editor.h
 include/evolution-%%VERSION%%/mail/em-sync-stream.h
 include/evolution-%%VERSION%%/mail/em-utils.h
+include/evolution-%%VERSION%%/mail/em-vfolder-context.h
+include/evolution-%%VERSION%%/mail/em-vfolder-editor.h
+include/evolution-%%VERSION%%/mail/em-vfolder-rule.h
 include/evolution-%%VERSION%%/mail/mail-autofilter.h
-include/evolution-%%VERSION%%/mail/mail-component.h
 include/evolution-%%VERSION%%/mail/mail-config.h
 include/evolution-%%VERSION%%/mail/mail-folder-cache.h
 include/evolution-%%VERSION%%/mail/mail-mt.h
@@ -195,7 +216,10 @@ include/evolution-%%VERSION%%/menus/gal-view-instance.h
 include/evolution-%%VERSION%%/menus/gal-view-new-dialog.h
 include/evolution-%%VERSION%%/menus/gal-view.h
 include/evolution-%%VERSION%%/misc/e-account-combo-box.h
-include/evolution-%%VERSION%%/misc/e-activity-handler.h
+include/evolution-%%VERSION%%/misc/e-account-manager.h
+include/evolution-%%VERSION%%/misc/e-account-tree-view.h
+include/evolution-%%VERSION%%/misc/e-action-combo-box.h
+include/evolution-%%VERSION%%/misc/e-activity-proxy.h
 include/evolution-%%VERSION%%/misc/e-attachment-button.h
 include/evolution-%%VERSION%%/misc/e-attachment-dialog.h
 include/evolution-%%VERSION%%/misc/e-attachment-handler-image.h
@@ -207,65 +231,77 @@ include/evolution-%%VERSION%%/misc/e-attachment-store.h
 include/evolution-%%VERSION%%/misc/e-attachment-tree-view.h
 include/evolution-%%VERSION%%/misc/e-attachment-view.h
 include/evolution-%%VERSION%%/misc/e-attachment.h
+include/evolution-%%VERSION%%/misc/e-buffer-tagger.h
 include/evolution-%%VERSION%%/misc/e-calendar-item.h
 include/evolution-%%VERSION%%/misc/e-calendar.h
 include/evolution-%%VERSION%%/misc/e-canvas-background.h
 include/evolution-%%VERSION%%/misc/e-canvas-utils.h
 include/evolution-%%VERSION%%/misc/e-canvas-vbox.h
 include/evolution-%%VERSION%%/misc/e-canvas.h
-include/evolution-%%VERSION%%/misc/e-cell-date-edit.h
-include/evolution-%%VERSION%%/misc/e-cell-percent.h
 include/evolution-%%VERSION%%/misc/e-cell-renderer-combo.h
-include/evolution-%%VERSION%%/misc/e-charset-picker.h
-include/evolution-%%VERSION%%/misc/e-colors.h
-include/evolution-%%VERSION%%/misc/e-combo-button.h
+include/evolution-%%VERSION%%/misc/e-charset-combo-box.h
 include/evolution-%%VERSION%%/misc/e-combo-cell-editable.h
-include/evolution-%%VERSION%%/misc/e-config-page.h
-include/evolution-%%VERSION%%/misc/e-cursors.h
 include/evolution-%%VERSION%%/misc/e-dateedit.h
-include/evolution-%%VERSION%%/misc/e-dropdown-button.h
-include/evolution-%%VERSION%%/misc/e-filter-bar.h
-include/evolution-%%VERSION%%/misc/e-gui-utils.h
+include/evolution-%%VERSION%%/misc/e-focus-tracker.h
+include/evolution-%%VERSION%%/misc/e-hinted-entry.h
 include/evolution-%%VERSION%%/misc/e-hsv-utils.h
-include/evolution-%%VERSION%%/misc/e-icon-entry.h
 include/evolution-%%VERSION%%/misc/e-image-chooser.h
-include/evolution-%%VERSION%%/misc/e-info-label.h
+include/evolution-%%VERSION%%/misc/e-import-assistant.h
 include/evolution-%%VERSION%%/misc/e-map.h
-include/evolution-%%VERSION%%/misc/e-multi-config-dialog.h
+include/evolution-%%VERSION%%/misc/e-menu-tool-action.h
+include/evolution-%%VERSION%%/misc/e-menu-tool-button.h
 include/evolution-%%VERSION%%/misc/e-online-button.h
-%%PILOT:%%include/evolution-%%VERSION%%/misc/e-pilot-settings.h
+include/evolution-%%VERSION%%/misc/e-paned.h
+%%PILOT%%include/evolution-%%VERSION%%/misc/e-pilot-settings.h
+include/evolution-%%VERSION%%/misc/e-popup-action.h
 include/evolution-%%VERSION%%/misc/e-popup-menu.h
+include/evolution-%%VERSION%%/misc/e-preferences-window.h
+include/evolution-%%VERSION%%/misc/e-preview-pane.h
 include/evolution-%%VERSION%%/misc/e-printable.h
-include/evolution-%%VERSION%%/misc/e-reflow-model.h
-include/evolution-%%VERSION%%/misc/e-reflow.h
 include/evolution-%%VERSION%%/misc/e-search-bar.h
+include/evolution-%%VERSION%%/misc/e-searching-tokenizer.h
+include/evolution-%%VERSION%%/misc/e-selectable.h
 include/evolution-%%VERSION%%/misc/e-selection-model-array.h
 include/evolution-%%VERSION%%/misc/e-selection-model-simple.h
 include/evolution-%%VERSION%%/misc/e-selection-model.h
 include/evolution-%%VERSION%%/misc/e-send-options.h
 include/evolution-%%VERSION%%/misc/e-signature-combo-box.h
+include/evolution-%%VERSION%%/misc/e-signature-editor.h
+include/evolution-%%VERSION%%/misc/e-signature-manager.h
+include/evolution-%%VERSION%%/misc/e-signature-preview.h
+include/evolution-%%VERSION%%/misc/e-signature-script-dialog.h
+include/evolution-%%VERSION%%/misc/e-signature-tree-view.h
 include/evolution-%%VERSION%%/misc/e-spinner.c
 include/evolution-%%VERSION%%/misc/e-spinner.h
-include/evolution-%%VERSION%%/misc/e-task-bar.h
-include/evolution-%%VERSION%%/misc/e-task-widget.h
-include/evolution-%%VERSION%%/misc/e-unicode.h
+include/evolution-%%VERSION%%/misc/e-web-view.h
 include/evolution-%%VERSION%%/misc/e-url-entry.h
-include/evolution-%%VERSION%%/shell/Evolution.h
-include/evolution-%%VERSION%%/shell/e-component-view.h
-include/evolution-%%VERSION%%/shell/e-user-creatable-items-handler.h
+include/evolution-%%VERSION%%/misc/ea-calendar-cell.h
+include/evolution-%%VERSION%%/misc/ea-calendar-item.h
+include/evolution-%%VERSION%%/misc/ea-cell-table.h
+include/evolution-%%VERSION%%/misc/ea-widgets.h
+include/evolution-%%VERSION%%/shell/e-shell-backend.h
+include/evolution-%%VERSION%%/shell/e-shell-common.h
+include/evolution-%%VERSION%%/shell/e-shell-content.h
+include/evolution-%%VERSION%%/shell/e-shell-searchbar.h
+include/evolution-%%VERSION%%/shell/e-shell-settings.h
+include/evolution-%%VERSION%%/shell/e-shell-sidebar.h
+include/evolution-%%VERSION%%/shell/e-shell-switcher.h
+include/evolution-%%VERSION%%/shell/e-shell-taskbar.h
+include/evolution-%%VERSION%%/shell/e-shell-utils.h
+include/evolution-%%VERSION%%/shell/e-shell-view.h
+include/evolution-%%VERSION%%/shell/e-shell-window-actions.h
+include/evolution-%%VERSION%%/shell/e-shell-window.h
+include/evolution-%%VERSION%%/shell/e-shell.h
 include/evolution-%%VERSION%%/shell/es-event.h
-include/evolution-%%VERSION%%/shell/es-menu.h
-include/evolution-%%VERSION%%/shell/evolution-component.h
-include/evolution-%%VERSION%%/shell/evolution-config-control.h
-include/evolution-%%VERSION%%/shell/evolution-listener.h
-include/evolution-%%VERSION%%/shell/evolution-shell-component-utils.h
 include/evolution-%%VERSION%%/table/e-cell-checkbox.h
 include/evolution-%%VERSION%%/table/e-cell-combo.h
 include/evolution-%%VERSION%%/table/e-cell-date.h
+include/evolution-%%VERSION%%/table/e-cell-date-edit.h
 include/evolution-%%VERSION%%/table/e-cell-hbox.h
 include/evolution-%%VERSION%%/table/e-cell-number.h
 include/evolution-%%VERSION%%/table/e-cell-pixbuf.h
 include/evolution-%%VERSION%%/table/e-cell-popup.h
+include/evolution-%%VERSION%%/table/e-cell-percent.h
 include/evolution-%%VERSION%%/table/e-cell-size.h
 include/evolution-%%VERSION%%/table/e-cell-text.h
 include/evolution-%%VERSION%%/table/e-cell-toggle.h
@@ -294,10 +330,8 @@ include/evolution-%%VERSION%%/table/e-table-memory-store.h
 include/evolution-%%VERSION%%/table/e-table-memory.h
 include/evolution-%%VERSION%%/table/e-table-model.h
 include/evolution-%%VERSION%%/table/e-table-one.h
-include/evolution-%%VERSION%%/table/e-table-scrolled.h
 include/evolution-%%VERSION%%/table/e-table-search.h
 include/evolution-%%VERSION%%/table/e-table-selection-model.h
-include/evolution-%%VERSION%%/table/e-table-simple.h
 include/evolution-%%VERSION%%/table/e-table-sort-info.h
 include/evolution-%%VERSION%%/table/e-table-sorted-variable.h
 include/evolution-%%VERSION%%/table/e-table-sorted.h
@@ -307,46 +341,62 @@ include/evolution-%%VERSION%%/table/e-table-specification.h
 include/evolution-%%VERSION%%/table/e-table-state.h
 include/evolution-%%VERSION%%/table/e-table-subset-variable.h
 include/evolution-%%VERSION%%/table/e-table-subset.h
-include/evolution-%%VERSION%%/table/e-table-tooltip.h
 include/evolution-%%VERSION%%/table/e-table-utils.h
 include/evolution-%%VERSION%%/table/e-table-without.h
 include/evolution-%%VERSION%%/table/e-table.h
 include/evolution-%%VERSION%%/table/e-tree-memory-callbacks.h
 include/evolution-%%VERSION%%/table/e-tree-memory.h
 include/evolution-%%VERSION%%/table/e-tree-model.h
-include/evolution-%%VERSION%%/table/e-tree-scrolled.h
 include/evolution-%%VERSION%%/table/e-tree-selection-model.h
 include/evolution-%%VERSION%%/table/e-tree-sorted.h
 include/evolution-%%VERSION%%/table/e-tree-table-adapter.h
 include/evolution-%%VERSION%%/table/e-tree.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-cell-popup.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-cell-registry.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-cell-text.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-cell-toggle.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-cell-tree.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-cell-vbox.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-cell.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-table-click-to-add-factory.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-table-click-to-add.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-table-column-header.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-table-factory.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-table-item-factory.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-table-item.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-table.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-tree-factory.h
+include/evolution-%%VERSION%%/table/gal-a11y-e-tree.h
+include/evolution-%%VERSION%%/text/e-reflow-model.h
+include/evolution-%%VERSION%%/text/e-reflow.h
 include/evolution-%%VERSION%%/text/e-text-model-repos.h
 include/evolution-%%VERSION%%/text/e-text-model.h
 include/evolution-%%VERSION%%/text/e-text.h
-lib/evolution/%%VERSION%%/components/libevolution-addressbook.a
-lib/evolution/%%VERSION%%/components/libevolution-addressbook.la
-lib/evolution/%%VERSION%%/components/libevolution-addressbook.so
-lib/evolution/%%VERSION%%/components/libevolution-calendar.a
-lib/evolution/%%VERSION%%/components/libevolution-calendar.la
-lib/evolution/%%VERSION%%/components/libevolution-calendar.so
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.a
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.la
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.so
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.a
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.la
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.so
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.a
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.la
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.so
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.a
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.la
-%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.so
-lib/evolution/%%VERSION%%/components/libevolution-mail.a
-lib/evolution/%%VERSION%%/components/libevolution-mail.la
-lib/evolution/%%VERSION%%/components/libevolution-mail.so
+include/evolution-%%VERSION%%/text/gal-a11y-e-text-factory.h
+include/evolution-%%VERSION%%/text/gal-a11y-e-text.h
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.a
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.la
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.so
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.a
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.la
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.so
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_common_conduit.a
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_common_conduit.la
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_common_conduit.so
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.a
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.la
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.so
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.a
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.la
+%%PILOT%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.so
 lib/evolution/%%VERSION%%/libeabutil.a
 lib/evolution/%%VERSION%%/libeabutil.la
 lib/evolution/%%VERSION%%/libeabutil.so
 lib/evolution/%%VERSION%%/libeabutil.so.0
+lib/evolution/%%VERSION%%/libcomposer.a
+lib/evolution/%%VERSION%%/libcomposer.la
+lib/evolution/%%VERSION%%/libcomposer.so
+lib/evolution/%%VERSION%%/libcomposer.so.0
 lib/evolution/%%VERSION%%/libeconduit.a
 lib/evolution/%%VERSION%%/libeconduit.la
 lib/evolution/%%VERSION%%/libeconduit.so
@@ -359,10 +409,10 @@ lib/evolution/%%VERSION%%/libecontactlisteditor.a
 lib/evolution/%%VERSION%%/libecontactlisteditor.la
 lib/evolution/%%VERSION%%/libecontactlisteditor.so
 lib/evolution/%%VERSION%%/libecontactlisteditor.so.0
-lib/evolution/%%VERSION%%/libefilterbar.a
-lib/evolution/%%VERSION%%/libefilterbar.la
-lib/evolution/%%VERSION%%/libefilterbar.so
-lib/evolution/%%VERSION%%/libefilterbar.so.0
+lib/evolution/%%VERSION%%/libemformat.a
+lib/evolution/%%VERSION%%/libemformat.la
+lib/evolution/%%VERSION%%/libemformat.so
+lib/evolution/%%VERSION%%/libemformat.so.0
 lib/evolution/%%VERSION%%/libemiscwidgets.a
 lib/evolution/%%VERSION%%/libemiscwidgets.la
 lib/evolution/%%VERSION%%/libemiscwidgets.so
@@ -395,42 +445,34 @@ lib/evolution/%%VERSION%%/libevolution-a11y.a
 lib/evolution/%%VERSION%%/libevolution-a11y.la
 lib/evolution/%%VERSION%%/libevolution-a11y.so
 lib/evolution/%%VERSION%%/libevolution-a11y.so.0
-lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.a
-lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.la
-lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.so
-lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.so.0
 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.a
 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.la
 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so
 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so.0
-lib/evolution/%%VERSION%%/libevolution-cal-shared.a
-lib/evolution/%%VERSION%%/libevolution-cal-shared.la
-lib/evolution/%%VERSION%%/libevolution-cal-shared.so
-lib/evolution/%%VERSION%%/libevolution-cal-shared.so.0
-lib/evolution/%%VERSION%%/libevolution-calendar-a11y.a
-lib/evolution/%%VERSION%%/libevolution-calendar-a11y.la
-lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so
-lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so.0
+lib/evolution/%%VERSION%%/libevolution-calendar.a
+lib/evolution/%%VERSION%%/libevolution-calendar.la
+lib/evolution/%%VERSION%%/libevolution-calendar.so
+lib/evolution/%%VERSION%%/libevolution-calendar.so.0
 lib/evolution/%%VERSION%%/libevolution-calendar-importers.a
 lib/evolution/%%VERSION%%/libevolution-calendar-importers.la
 lib/evolution/%%VERSION%%/libevolution-calendar-importers.so
 lib/evolution/%%VERSION%%/libevolution-calendar-importers.so.0
+lib/evolution/%%VERSION%%/libevolution-mail.a
+lib/evolution/%%VERSION%%/libevolution-mail.la
+lib/evolution/%%VERSION%%/libevolution-mail.so
+lib/evolution/%%VERSION%%/libevolution-mail.so.0
 lib/evolution/%%VERSION%%/libevolution-mail-importers.a
 lib/evolution/%%VERSION%%/libevolution-mail-importers.la
 lib/evolution/%%VERSION%%/libevolution-mail-importers.so
 lib/evolution/%%VERSION%%/libevolution-mail-importers.so.0
-lib/evolution/%%VERSION%%/libevolution-mail-shared.a
-lib/evolution/%%VERSION%%/libevolution-mail-shared.la
-lib/evolution/%%VERSION%%/libevolution-mail-shared.so
-lib/evolution/%%VERSION%%/libevolution-mail-shared.so.0
+lib/evolution/%%VERSION%%/libevolution-mail-settings.a
+lib/evolution/%%VERSION%%/libevolution-mail-settings.la
+lib/evolution/%%VERSION%%/libevolution-mail-settings.so
+lib/evolution/%%VERSION%%/libevolution-mail-settings.so.0
 lib/evolution/%%VERSION%%/libevolution-smime.a
 lib/evolution/%%VERSION%%/libevolution-smime.la
 lib/evolution/%%VERSION%%/libevolution-smime.so
 lib/evolution/%%VERSION%%/libevolution-smime.so.0
-lib/evolution/%%VERSION%%/libevolution-widgets-a11y.a
-lib/evolution/%%VERSION%%/libevolution-widgets-a11y.la
-lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so
-lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so.0
 lib/evolution/%%VERSION%%/libfilter.a
 lib/evolution/%%VERSION%%/libfilter.la
 lib/evolution/%%VERSION%%/libfilter.so
@@ -439,13 +481,24 @@ lib/evolution/%%VERSION%%/libmenus.a
 lib/evolution/%%VERSION%%/libmenus.la
 lib/evolution/%%VERSION%%/libmenus.so
 lib/evolution/%%VERSION%%/libmenus.so.0
-lib/evolution/%%VERSION%%/plugins/attachment-reminder.glade
-lib/evolution/%%VERSION%%/plugins/libmail-account-disable.a
-lib/evolution/%%VERSION%%/plugins/libmail-account-disable.la
-lib/evolution/%%VERSION%%/plugins/libmail-account-disable.so
+lib/evolution/%%VERSION%%/modules/libevolution-module-addressbook.a
+lib/evolution/%%VERSION%%/modules/libevolution-module-addressbook.la
+lib/evolution/%%VERSION%%/modules/libevolution-module-addressbook.so
+lib/evolution/%%VERSION%%/modules/libevolution-module-calendar.a
+lib/evolution/%%VERSION%%/modules/libevolution-module-calendar.la
+lib/evolution/%%VERSION%%/modules/libevolution-module-calendar.so
+lib/evolution/%%VERSION%%/modules/libevolution-module-mail.a
+lib/evolution/%%VERSION%%/modules/libevolution-module-mail.la
+lib/evolution/%%VERSION%%/modules/libevolution-module-mail.so
+lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.a
+lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.la
+lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.a
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.so
@@ -461,9 +514,6 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.a
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.so
@@ -491,15 +541,12 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.a
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.a
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-image-inline.a
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-image-inline.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-image-inline.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.so
@@ -533,9 +580,6 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.a
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
@@ -546,14 +590,13 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-bogo-junk-plugin.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-copy-tool.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-default-mailer.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-email-custom-header.eplug
@@ -563,49 +606,79 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-caldav.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-google.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-startup-wizard.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-webdav.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-ab-subscription.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-cal-subscription.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-operations.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-tasks-subscription.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-folder-permissions.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-folder-subscription.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-groupwise-features.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-gw-account-setup.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-image-inline.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-imap-features.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-itip-formatter.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-mail-account-disable.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mail-notification.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-mark-all-read.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-prefer-plain.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-sa-junk-plugin.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-select-one-source.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-subject-thread.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-templates.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-vcard-inline.eplug
-lib/evolution/%%VERSION%%/plugins/templates.glade
-libdata/bonobo/servers/GNOME_Evolution_Addressbook.server
-libdata/bonobo/servers/GNOME_Evolution_Calendar.server
-libdata/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server
-libdata/bonobo/servers/GNOME_Evolution_Mail.server
-libdata/bonobo/servers/GNOME_Evolution_Shell.server
+libdata/pkgconfig/evolution-calendar.pc
+libdata/pkgconfig/evolution-mail.pc
 libdata/pkgconfig/evolution-plugin.pc
 libdata/pkgconfig/evolution-shell.pc
 libexec/evolution/%%VERSION%%/csv2vcard
 libexec/evolution/%%VERSION%%/evolution-addressbook-clean
 libexec/evolution/%%VERSION%%/evolution-addressbook-export
-libexec/evolution/%%VERSION%%/evolution-alarm-notify
 libexec/evolution/%%VERSION%%/evolution-backup
 libexec/evolution/%%VERSION%%/killev
 share/applications/evolution.desktop
+share/applications/evolution-settings.desktop
+share/doc/eshell/EShell.html
+share/doc/eshell/EShellBackend.html
+share/doc/eshell/EShellContent.html
+share/doc/eshell/EShellSearchbar.html
+share/doc/eshell/EShellSettings.html
+share/doc/eshell/EShellSidebar.html
+share/doc/eshell/EShellSwitcher.html
+share/doc/eshell/EShellTaskbar.html
+share/doc/eshell/EShellView.html
+share/doc/eshell/EShellWindow.html
+share/doc/eshell/ch01.html
+share/doc/eshell/ch02.html
+share/doc/eshell/ch03.html
+share/doc/eshell/ch04.html
+share/doc/eshell/eshell-Action-Groups.html
+share/doc/eshell/eshell-Bit-Arrays-(Legacy).html
+share/doc/eshell/eshell-Categories.html
+share/doc/eshell/eshell-Container-for-Signatures.html
+share/doc/eshell/eshell-Date-and-Time-Formatting.html
+share/doc/eshell/eshell-Dialog-Utilities-(Legacy).html
+share/doc/eshell/eshell-Error-Logging.html
+share/doc/eshell/eshell-GConf-Bridge.html
+share/doc/eshell/eshell-GObject-Property-Bindings.html
+share/doc/eshell/eshell-Generic-Module-Loader.html
+share/doc/eshell/eshell-Icon-Utilities-(Legacy).html
+share/doc/eshell/eshell-Mail-Accounts.html
+share/doc/eshell/eshell-Miscellaneous-Utilities.html
+share/doc/eshell/eshell-More-Signature-Utilities.html
+share/doc/eshell/eshell-Personalized-Signatures.html
+share/doc/eshell/eshell-Printing.html
+share/doc/eshell/eshell-Reading-and-Writing-XML.html
+share/doc/eshell/eshell-Selections.html
+share/doc/eshell/eshell-Shell-Actions.html
+share/doc/eshell/eshell-Shell-Utilities.html
+share/doc/eshell/eshell-Text-to-HTML-Conversion.html
+share/doc/eshell/eshell-User-Alert-Handling.html
+share/doc/eshell/eshell.devhelp
+share/doc/eshell/eshell.devhelp2
+share/doc/eshell/home.png
+share/doc/eshell/index.html
+share/doc/eshell/index.sgml
+share/doc/eshell/ix01.html
+share/doc/eshell/left.png
+share/doc/eshell/right.png
+share/doc/eshell/style.css
+share/doc/eshell/up.png
 %%DATADIR%%/%%VERSION%%/addresstypes.xml
 %%DATADIR%%/%%VERSION%%/caltypes.xml
 %%DATADIR%%/%%VERSION%%/default/C/mail/local/Inbox
@@ -641,7 +714,6 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-attachment-reminder.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-backup-restore.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-default-mailer.error
-%%DATADIR%%/%%VERSION%%/errors/org-gnome-exchange-operations.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-itip-formatter.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-mail-retract.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-mailing-list-actions.error
@@ -657,55 +729,6 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/etspec/e-memo-table.etspec
 %%DATADIR%%/%%VERSION%%/etspec/message-list.etspec
 %%DATADIR%%/%%VERSION%%/filtertypes.xml
-%%DATADIR%%/%%VERSION%%/glade/alarm-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/alarm-list-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/alarm-notify.glade
-%%DATADIR%%/%%VERSION%%/glade/cal-prefs-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/contact-editor.glade
-%%DATADIR%%/%%VERSION%%/glade/contact-list-editor.glade
-%%DATADIR%%/%%VERSION%%/glade/e-active-connection-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/e-delegate-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/e-foreign-folder-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/e-itip-control.glade
-%%DATADIR%%/%%VERSION%%/glade/e-send-options.glade
-%%DATADIR%%/%%VERSION%%/glade/e-table-config.glade
-%%DATADIR%%/%%VERSION%%/glade/e-table-field-chooser.glade
-%%DATADIR%%/%%VERSION%%/glade/e-timezone-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/eab-contact-commit-duplicate-detected.glade
-%%DATADIR%%/%%VERSION%%/glade/eab-contact-duplicate-detected.glade
-%%DATADIR%%/%%VERSION%%/glade/email-custom-header.glade
-%%DATADIR%%/%%VERSION%%/glade/event-page.glade
-%%DATADIR%%/%%VERSION%%/glade/exchange-change-password.glade
-%%DATADIR%%/%%VERSION%%/glade/exchange-delegates.glade
-%%DATADIR%%/%%VERSION%%/glade/exchange-folder-tree.glade
-%%DATADIR%%/%%VERSION%%/glade/exchange-oof.glade
-%%DATADIR%%/%%VERSION%%/glade/exchange-passwd-expiry.glade
-%%DATADIR%%/%%VERSION%%/glade/exchange-permissions-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/exchange-send-options.glade
-%%DATADIR%%/%%VERSION%%/glade/filter.glade
-%%DATADIR%%/%%VERSION%%/glade/fullname.glade
-%%DATADIR%%/%%VERSION%%/glade/gal-define-views.glade
-%%DATADIR%%/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/gal-view-new-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/goto-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/imap-headers.glade
-%%DATADIR%%/%%VERSION%%/glade/import.glade
-%%DATADIR%%/%%VERSION%%/glade/junk-settings.glade
-%%DATADIR%%/%%VERSION%%/glade/ldap-config.glade
-%%DATADIR%%/%%VERSION%%/glade/mail-config.glade
-%%DATADIR%%/%%VERSION%%/glade/mail-dialogs.glade
-%%DATADIR%%/%%VERSION%%/glade/memo-page.glade
-%%DATADIR%%/%%VERSION%%/glade/org-gnome-email-custom-header.glade
-%%DATADIR%%/%%VERSION%%/glade/properties.glade
-%%DATADIR%%/%%VERSION%%/glade/proxy-add-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/proxy-listing.glade
-%%DATADIR%%/%%VERSION%%/glade/proxy-login-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/publish-calendar.glade
-%%DATADIR%%/%%VERSION%%/glade/recurrence-page.glade
-%%DATADIR%%/%%VERSION%%/glade/schedule-page.glade
-%%DATADIR%%/%%VERSION%%/glade/smime-ui.glade
-%%DATADIR%%/%%VERSION%%/glade/task-details-page.glade
-%%DATADIR%%/%%VERSION%%/glade/task-page.glade
 %%DATADIR%%/%%VERSION%%/help/quickref/C/quickref.pdf
 %%DATADIR%%/%%VERSION%%/help/quickref/ca/quickref.pdf
 %%DATADIR%%/%%VERSION%%/help/quickref/cs/quickref.pdf
@@ -728,6 +751,29 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/view-calendar-month.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/view-calendar-week.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/view-calendar-workweek.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_bell.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_contact-list.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_insert-note.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-filters-apply.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-flag-for-followup-done.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-flag-for-followup.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-open-multiple.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-unread-multiple.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_new-24h-appointment.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_new-meeting.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_notes.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_people.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_shared-by-me.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_shared-to-me.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_show-all.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_task-assigned-to.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_task-assigned.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_task-recurring.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_task.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_timezone.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_todo.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_video-conferencing.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_view-details.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/apps/contact-editor.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-inbox.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-outbox.png
@@ -739,6 +785,15 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-month.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-week.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-workweek.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_contact-list.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_insert-note.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-filters-apply.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-open-multiple.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-unread-multiple.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_new-24h-appointment.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_new-meeting.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_notes.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_people.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/apps/contact-editor.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places/mail-inbox.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places/mail-outbox.png
@@ -782,16 +837,51 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/searchtypes.xml
 %%DATADIR%%/%%VERSION%%/sounds/default_alarm.wav
 %%DATADIR%%/%%VERSION%%/tasktypes.xml
-%%DATADIR%%/%%VERSION%%/ui/evolution-addressbook.xml
-%%DATADIR%%/%%VERSION%%/ui/evolution-calendar.xml
+%%DATADIR%%/%%VERSION%%/ui/alarm-dialog.ui
+%%DATADIR%%/%%VERSION%%/ui/alarm-list-dialog.ui
+%%DATADIR%%/%%VERSION%%/ui/alarm-notify.ui
+%%DATADIR%%/%%VERSION%%/ui/cal-prefs-dialog.ui
+%%DATADIR%%/%%VERSION%%/ui/contact-editor.ui
+%%DATADIR%%/%%VERSION%%/ui/contact-list-editor.ui
+%%DATADIR%%/%%VERSION%%/ui/e-delegate-dialog.ui
+%%DATADIR%%/%%VERSION%%/ui/e-itip-control.ui
+%%DATADIR%%/%%VERSION%%/ui/e-send-options.ui
+%%DATADIR%%/%%VERSION%%/ui/e-table-config.ui
+%%DATADIR%%/%%VERSION%%/ui/e-timezone-dialog.ui
+%%DATADIR%%/%%VERSION%%/ui/eab-contact-commit-duplicate-detected.ui
+%%DATADIR%%/%%VERSION%%/ui/eab-contact-duplicate-detected.ui
+%%DATADIR%%/%%VERSION%%/ui/event-page.ui
+%%DATADIR%%/%%VERSION%%/ui/evolution-calendars.ui
 %%DATADIR%%/%%VERSION%%/ui/evolution-composer.ui
-%%DATADIR%%/%%VERSION%%/ui/evolution-mail-global.xml
-%%DATADIR%%/%%VERSION%%/ui/evolution-mail-list.xml
-%%DATADIR%%/%%VERSION%%/ui/evolution-mail-message.xml
-%%DATADIR%%/%%VERSION%%/ui/evolution-mail-messagedisplay.xml
-%%DATADIR%%/%%VERSION%%/ui/evolution-memos.xml
-%%DATADIR%%/%%VERSION%%/ui/evolution-tasks.xml
-%%DATADIR%%/%%VERSION%%/ui/evolution.xml
+%%DATADIR%%/%%VERSION%%/ui/evolution-contacts.ui
+%%DATADIR%%/%%VERSION%%/ui/evolution-mail-reader.ui
+%%DATADIR%%/%%VERSION%%/ui/evolution-mail.ui
+%%DATADIR%%/%%VERSION%%/ui/evolution-memos.ui
+%%DATADIR%%/%%VERSION%%/ui/evolution-shell.ui
+%%DATADIR%%/%%VERSION%%/ui/evolution-tasks.ui
+%%DATADIR%%/%%VERSION%%/ui/filter.ui
+%%DATADIR%%/%%VERSION%%/ui/fullname.ui
+%%DATADIR%%/%%VERSION%%/ui/gal-define-views.ui
+%%DATADIR%%/%%VERSION%%/ui/gal-view-instance-save-as-dialog.ui
+%%DATADIR%%/%%VERSION%%/ui/gal-view-new-dialog.ui
+%%DATADIR%%/%%VERSION%%/ui/goto-dialog.ui
+%%DATADIR%%/%%VERSION%%/ui/imap-headers.ui
+%%DATADIR%%/%%VERSION%%/ui/junk-settings.ui
+%%DATADIR%%/%%VERSION%%/ui/ldap-config.ui
+%%DATADIR%%/%%VERSION%%/ui/mail-config.ui
+%%DATADIR%%/%%VERSION%%/ui/mail-dialogs.ui
+%%DATADIR%%/%%VERSION%%/ui/memo-page.ui
+%%DATADIR%%/%%VERSION%%/ui/org-gnome-email-custom-header.ui
+%%DATADIR%%/%%VERSION%%/ui/properties.ui
+%%DATADIR%%/%%VERSION%%/ui/proxy-add-dialog.ui
+%%DATADIR%%/%%VERSION%%/ui/proxy-listing.ui
+%%DATADIR%%/%%VERSION%%/ui/proxy-login-dialog.ui
+%%DATADIR%%/%%VERSION%%/ui/publish-calendar.ui
+%%DATADIR%%/%%VERSION%%/ui/recurrence-page.ui
+%%DATADIR%%/%%VERSION%%/ui/schedule-page.ui
+%%DATADIR%%/%%VERSION%%/ui/smime-ui.ui
+%%DATADIR%%/%%VERSION%%/ui/task-details-page.ui
+%%DATADIR%%/%%VERSION%%/ui/task-page.ui
 %%DATADIR%%/%%VERSION%%/vfoldertypes.xml
 %%DATADIR%%/%%VERSION%%/views/addressbook/Address_Cards.galview
 %%DATADIR%%/%%VERSION%%/views/addressbook/By_Company.galview
@@ -814,13 +904,6 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/views/tasks/With_DueDate.galview
 %%DATADIR%%/%%VERSION%%/views/tasks/With_Status.galview
 %%DATADIR%%/%%VERSION%%/views/tasks/galview.xml
-%%DATADIR%%/%%VERSION%%/weather/category_weather_cloudy_16.png
-%%DATADIR%%/%%VERSION%%/weather/category_weather_fog_16.png
-%%DATADIR%%/%%VERSION%%/weather/category_weather_partly_cloudy_16.png
-%%DATADIR%%/%%VERSION%%/weather/category_weather_rain_16.png
-%%DATADIR%%/%%VERSION%%/weather/category_weather_snow_16.png
-%%DATADIR%%/%%VERSION%%/weather/category_weather_sun_16.png
-%%DATADIR%%/%%VERSION%%/weather/category_weather_tstorm_16.png
 share/gnome/help/evolution/C/evolution.xml
 share/gnome/help/evolution/C/figures/attach_reminder_a.png
 share/gnome/help/evolution/C/figures/calendar_preference_display.png
@@ -1625,6 +1708,10 @@ share/gnome/help/evolution/sv/figures/quick_add_a.png
 share/gnome/help/evolution/sv/figures/quick_reference.png
 share/gnome/help/evolution/sv/figures/stock_search.png
 share/gnome/help/evolution/sv/figures/ver_view_a.png
+%%PILOT%%share/gnome-pilot/conduits/e-address.conduit
+%%PILOT%%share/gnome-pilot/conduits/e-calendar.conduit
+%%PILOT%%share/gnome-pilot/conduits/e-memo.conduit
+%%PILOT%%share/gnome-pilot/conduits/e-todo.conduit
 share/icons/hicolor/16x16/apps/evolution-mail.png
 share/icons/hicolor/16x16/apps/evolution-memos.png
 share/icons/hicolor/16x16/apps/evolution-tasks.png
@@ -1646,23 +1733,17 @@ share/icons/hicolor/48x48/apps/evolution-memos.png
 share/icons/hicolor/48x48/apps/evolution-tasks.png
 share/icons/hicolor/48x48/apps/evolution.png
 share/icons/hicolor/scalable/apps/evolution.svg
-share/idl/evolution-%%VERSION%%/Evolution-Component.idl
-share/idl/evolution-%%VERSION%%/Evolution-ConfigControl.idl
-share/idl/evolution-%%VERSION%%/Evolution-Mail.idl
-share/idl/evolution-%%VERSION%%/Evolution-Shell.idl
-share/idl/evolution-%%VERSION%%/Evolution.idl
-share/idl/evolution-%%VERSION%%/evolution-calendar.idl
 share/locale/af/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/as/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ast/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/be@latin/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bn_IN/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/br/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ca@valencia/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -1675,6 +1756,7 @@ share/locale/el/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/en_AU/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/en_CA/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/en@shaw/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/et/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/eu/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -1705,6 +1787,7 @@ share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/mr/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ms/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/nb/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/nds/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ne/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/nn/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -1751,7 +1834,6 @@ share/omf/evolution/evolution-oc.omf
 share/omf/evolution/evolution-ru.omf
 share/omf/evolution/evolution-sv.omf
 @dirrm share/omf/evolution
-@dirrm share/idl/evolution-%%VERSION%%
 @dirrm share/gnome/help/evolution/sv/figures
 @dirrm share/gnome/help/evolution/sv
 @dirrm share/gnome/help/evolution/ru/figures
@@ -1777,7 +1859,6 @@ share/omf/evolution/evolution-sv.omf
 @dirrm share/gnome/help/evolution/C/figures
 @dirrm share/gnome/help/evolution/C
 @dirrm share/gnome/help/evolution
-@dirrm %%DATADIR%%/%%VERSION%%/weather
 @dirrm %%DATADIR%%/%%VERSION%%/views/tasks
 @dirrm %%DATADIR%%/%%VERSION%%/views/memos
 @dirrm %%DATADIR%%/%%VERSION%%/views/mail
@@ -1825,7 +1906,6 @@ share/omf/evolution/evolution-sv.omf
 @dirrm %%DATADIR%%/%%VERSION%%/help/quickref/C
 @dirrm %%DATADIR%%/%%VERSION%%/help/quickref
 @dirrm %%DATADIR%%/%%VERSION%%/help
-@dirrm %%DATADIR%%/%%VERSION%%/glade
 @dirrm %%DATADIR%%/%%VERSION%%/etspec
 @dirrm %%DATADIR%%/%%VERSION%%/errors
 @dirrm %%DATADIR%%/%%VERSION%%/ecps
@@ -1895,11 +1975,13 @@ share/omf/evolution/evolution-sv.omf
 @dirrm %%DATADIR%%/%%VERSION%%/default
 @dirrm %%DATADIR%%/%%VERSION%%
 @dirrm %%DATADIR%%
+@dirrm share/doc/eshell
 @dirrmtry share/applications
 @dirrm libexec/evolution/%%VERSION%%
 @dirrm libexec/evolution
 @dirrm lib/evolution/%%VERSION%%/plugins
-@dirrm lib/evolution/%%VERSION%%/components
+@dirrm lib/evolution/%%VERSION%%/modules
+%%PILOT%%@dirrm lib/evolution/%%VERSION%%/conduits
 @dirrm lib/evolution/%%VERSION%%
 @dirrm lib/evolution
 @dirrm include/evolution-%%VERSION%%/text
@@ -1909,11 +1991,15 @@ share/omf/evolution/evolution-sv.omf
 @dirrm include/evolution-%%VERSION%%/menus
 @dirrm include/evolution-%%VERSION%%/mail
 @dirrm include/evolution-%%VERSION%%/filter
+@dirrm include/evolution-%%VERSION%%/em-format
 @dirrm include/evolution-%%VERSION%%/e-util
 @dirrm include/evolution-%%VERSION%%/e-conduit
 @dirrm include/evolution-%%VERSION%%/composer
 @dirrm include/evolution-%%VERSION%%/calendar/gui/dialogs
 @dirrm include/evolution-%%VERSION%%/calendar/gui
+@dirrm include/evolution-%%VERSION%%/calendar/common
+%%PILOT%%@dirrm include/evolution-%%VERSION%%/calendar/conduits/common
+%%PILOT%%@dirrm include/evolution-%%VERSION%%/calendar/conduits
 @dirrm include/evolution-%%VERSION%%/calendar
 @dirrm include/evolution-%%VERSION%%/addressbook/gui/widgets
 @dirrm include/evolution-%%VERSION%%/addressbook/gui
@@ -1935,12 +2021,16 @@ share/omf/evolution/evolution-sv.omf
 @dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mai/LC_MESSAGES
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
author	kwm <kwm@FreeBSD.org>	2010-05-11 05:19:08 +0800
committer	kwm <kwm@FreeBSD.org>	2010-05-11 05:19:08 +0800
commit	6a2a890c5cd397f9f0287409c2aa0244d50f3573 (patch)
tree	fc02bcba8bfa155b5cf452d6bafe1cb06aca4848 /mail
parent	0e415a93a0424a4b284c88c39b19d93d80b66c8a (diff)
download	freebsd-ports-gnome-6a2a890c5cd397f9f0287409c2aa0244d50f3573.tar.gz freebsd-ports-gnome-6a2a890c5cd397f9f0287409c2aa0244d50f3573.tar.zst freebsd-ports-gnome-6a2a890c5cd397f9f0287409c2aa0244d50f3573.zip