8 files changed, 394 insertions, 269 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index d2402cec05b5..a5b7657194fa 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/mail/evolution/Makefile,v 1.76 2005/10/09 11:09:15 kwm Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTVERSION=	2.4.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,28 +23,30 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver gal2 \
+USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver \
 		gtkhtml3 desktopfileutils
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--enable-nss=yes \
 		--with-nss-includes=${LOCALBASE}/include/nss/nss \
 		--with-nss-libs=${LOCALBASE}/lib \
 		--with-nspr-includes=${LOCALBASE}/include/nspr \
 		--with-nspr-libs=${LOCALBASE}/lib \
+		--enable-mono=no \
 		--with-sub-version=" FreeBSD GNOME Team Port"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	apps_evolution_addressbook-${EVO_VERSION}.schemas \
 		apps_evolution_calendar-${EVO_VERSION}.schemas \
+		apps-evolution-mail-prompts-checkdefault-2.4.schemas \
 		apps_evolution_shell-${EVO_VERSION}.schemas \
 		evolution-mail-${EVO_VERSION}.schemas
 
-EVO_VERSION=	2.2
+EVO_VERSION=	2.4
 PLIST_SUB=	VERSION=${EVO_VERSION} \
-		PORTVERSION=2.2
+		PORTVERSION=2.4
 
 OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
 		LDAP "Enable LDAP support" on \
@@ -52,14 +54,18 @@ OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
 
 .include <bsd.port.pre.mk>
 
-.if exists(${X11BASE}/lib/libgstreamer-0.8.so.5) || \
-	defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
 WITH_GSTREAMER=	yes
+WITH_DBUS=	yes
 .endif
 
-#.if exists(${LOCALBASE}/lib/libdbus-glib-1.so)
-#WITH_DBUS=	yes
-#.endif
+.if exists(${LOCALBASE}/lib/libdbus-glib-1.so)
+WITH_DBUS=	yes
+.endif
+
+.if exists(${X11BASE}/lib/libgstreamer-0.8.so)
+WITH_GSTREAMER=	yes
+.endif
 
 .if defined(WITH_PILOT)
 LIB_DEPENDS+=	gpilotdconduit.2:${PORTSDIR}/palm/gnomepilot2
@@ -88,12 +94,12 @@ PLIST_SUB+=	GSTREAMER=""
 PLIST_SUB+=	GSTREAMER="@comment "
 .endif
 
-#.if defined(WITH_DBUS)
-#LIB_DEPENDS+=	dbus-glib-1.1:${PORTSDIR}/devel/dbus
-#PLIST_SUB+=	DBUS=""
-#.else
-#PLIST_SUB+=	DBUS="@comment "
-#.endif
+.if defined(WITH_DBUS)
+LIB_DEPENDS+=	dbus-glib-1.1:${PORTSDIR}/devel/dbus
+PLIST_SUB+=	DBUS=""
+.else
+PLIST_SUB+=	DBUS="@comment "
+.endif
 
 .if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \
 	exists(/usr/lib/libkrb5.so)
@@ -111,6 +117,9 @@ post-patch:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
 		s|%%EVO_VERSION%%|${EVO_VERSION}|' \
 		${FILESDIR}/evolibs.sh > ${WRKDIR}/evolibs.sh
+	@${REINPLACE_CMD} -e "s|gal-2.4|gal-2.6|g" \
+		${WRKSRC}/evolution-shell.pc.in \
+		${WRKSRC}/evolution-plugin.pc.in
 
 post-install:
 	@${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index b2c4c622874e..e98cf955b25b 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-2.2.3.tar.bz2) = 1e01511c78b2dd0dcb8cf83521c167af
-SIZE (gnome2/evolution-2.2.3.tar.bz2) = 10435908
+MD5 (gnome2/evolution-2.4.1.tar.bz2) = 13235405e08d14a54129e3a65548f58e
+SIZE (gnome2/evolution-2.4.1.tar.bz2) = 11543481
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index eadafd8477d1..0ad426b2d938 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,6 +1,21 @@
---- configure.orig	Wed Sep 29 14:06:43 2004
-+++ configure	Wed Sep 29 14:24:28 2004
-@@ -24206,6 +24206,7 @@
+--- configure.orig	Fri Jul 29 17:50:28 2005
++++ configure	Fri Jul 29 17:51:42 2005
+@@ -23657,6 +23657,14 @@
+     DL_LIB=''
+     SOFTOKN3_LIB=''
+     ;;
++*freebsd*) os_win32=no
++    NO_UNDEFINED=''
++    SOCKET_LIBS=''
++    SOEXT='.so'
++    SA_JUNK_PLUGIN=sa-junk-plugin
++    DL_LIB=''
++    SOFTOKN3_LIB='-lsoftokn3'
++    ;;
+ *)  os_win32=no
+     NO_UNDEFINED=''
+     SOCKET_LIBS=''
+@@ -26205,6 +26213,7 @@
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -8,7 +23,7 @@
  
  
  int
-@@ -25772,7 +25773,7 @@
+@@ -27882,7 +27891,7 @@
  	LDFLAGS_save="$LDFLAGS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@@ -17,20 +32,7 @@
  	echo "$as_me:$LINENO: checking for Kerberos 5" >&5
  echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
  if test "${ac_cv_lib_kerberos5+set}" = set; then
-@@ -26928,10 +26929,10 @@
- Example: --with-nspr-libs=/usr/lib" >&2;}
-    { (exit 1); exit 1; }; }
-        				else
--	       				nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
-+				    nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
- 				fi
- 			else
--				nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
-+			    nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
- 			fi
- 
- 			echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5
-@@ -30807,7 +30808,7 @@
+@@ -33151,7 +33160,7 @@
  idldir="$datadir/idl/evolution-$BASE_VERSION"
  
  
diff --git a/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c b/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c
deleted file mode 100644
index 8d880e79f05a..000000000000
--- a/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- plugins/exchange-account-setup/exchange-account-setup.c.orig	Tue Mar  1 15:38:29 2005
-+++ plugins/exchange-account-setup/exchange-account-setup.c	Tue Mar  1 15:38:45 2005
-@@ -564,9 +564,10 @@
- org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data)
- {
- 	EMConfigTargetAccount *target_account;
--	target_account = (EMConfigTargetAccount *)data->config->target;
- 	const char *source_url;
- 	CamelURL *url;
-+
-+	target_account = (EMConfigTargetAccount *)data->config->target;
- 	
- 	source_url = e_account_get_string (target_account->account,  E_ACCOUNT_SOURCE_URL);
- 	url = camel_url_new (source_url, NULL);
diff --git a/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c b/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c
new file mode 100644
index 000000000000..4d8e131a6250
--- /dev/null
+++ b/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c
@@ -0,0 +1,10 @@
+--- plugins/groupwise-features/proxy-login.c.orig	Fri Jul 29 18:55:40 2005
++++ plugins/groupwise-features/proxy-login.c	Fri Jul 29 18:55:58 2005
+@@ -236,7 +236,6 @@ proxy_login_get_cnc (EAccount *account)
+ {
+ 	EGwConnection *cnc;
+ 	CamelURL *url;
+-	url = camel_url_new (account->source->url, NULL);
+ 	char *uri = NULL, *failed_auth = NULL, *key = NULL, *prompt = NULL, *password = NULL;
+ 	const char *use_ssl, *soap_port;
+ 
diff --git a/mail/evolution/files/patch-string_vuln b/mail/evolution/files/patch-string_vuln
deleted file mode 100644
index b9e9d2bd7ab6..000000000000
--- a/mail/evolution/files/patch-string_vuln
+++ /dev/null
@@ -1,62 +0,0 @@
---- calendar/gui/e-cal-component-preview.c.orig	Sat Aug 27 18:48:58 2005
-+++ calendar/gui/e-cal-component-preview.c	Sat Aug 27 18:49:14 2005
-@@ -284,7 +284,7 @@ write_html (GtkHTMLStream *stream, ECal 
- 					str = g_string_append_c (str, text.value[i]);
- 			}
- 
--			gtk_html_stream_printf (stream, str->str);
-+			gtk_html_stream_printf (stream, "%s", str->str);
- 			g_string_free (str, TRUE);
- 		}
- 
---- addressbook/gui/widgets/eab-contact-display.c.orig	Sat Aug 27 18:50:22 2005
-+++ addressbook/gui/widgets/eab-contact-display.c	Sat Aug 27 18:51:58 2005
-@@ -353,7 +353,7 @@ render_contact (GtkHTMLStream *html_stre
- 	accum_multival_attribute (accum, contact, _("Yahoo"), E_CONTACT_IM_YAHOO, YAHOO_ICON, 0);
- 
- 	if (accum->len > 0)
--		gtk_html_stream_printf (html_stream, accum->str);
-+		gtk_html_stream_printf (html_stream, "%s", accum->str);
- 
- 	end_block (html_stream);
- 
-@@ -368,7 +368,7 @@ render_contact (GtkHTMLStream *html_stre
- 
- 	if (accum->len > 0) {
- 		start_block (html_stream, _("work"));
--		gtk_html_stream_printf (html_stream, accum->str);
-+		gtk_html_stream_printf (html_stream, "%s", accum->str);
- 		end_block (html_stream);
- 	}
- 
-@@ -383,7 +383,7 @@ render_contact (GtkHTMLStream *html_stre
- 
- 	if (accum->len > 0) {
- 		start_block (html_stream, _("personal"));
--		gtk_html_stream_printf (html_stream, accum->str);
-+		gtk_html_stream_printf (html_stream, "%s", accum->str);
- 		end_block (html_stream);
- 	}
- 
---- calendar/gui/e-calendar-view.c.orig	Sat Aug 27 18:52:46 2005
-+++ calendar/gui/e-calendar-view.c	Sat Aug 27 18:53:10 2005
-@@ -1079,7 +1079,7 @@ on_save_as (EPopup *ep, EPopupItem *pite
- 		return;
- 	}
- 	
--	fprintf (file, ical_string);
-+	fprintf (file, "%s", ical_string);
- 	g_free (ical_string);
- 	fclose (file);
- 
---- calendar/gui/e-calendar-table.c.orig	Sat Aug 27 18:53:42 2005
-+++ calendar/gui/e-calendar-table.c	Sat Aug 27 18:53:58 2005
-@@ -1027,7 +1027,7 @@ e_calendar_table_on_save_as (EPopup *ep,
- 		return;
- 	}
- 	
--	fprintf (file, ical_string);
-+	fprintf (file, "%s", ical_string);
- 	g_free (ical_string);
- 	fclose (file);
- }
diff --git a/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c b/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c
deleted file mode 100644
index f2389bd047f1..000000000000
--- a/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- widgets/misc/e-multi-config-dialog.c.orig	Tue Nov 23 15:53:34 2004
-+++ widgets/misc/e-multi-config-dialog.c	Tue Nov 23 15:54:02 2004
-@@ -396,6 +396,7 @@
- {
- 	EMultiConfigDialogPrivate *priv;
- 	AtkObject *a11y;
-+	AtkObject *a11yPage;
- 	gint page_no;
- 
- 	g_return_if_fail (E_IS_MULTI_CONFIG_DIALOG (dialog));
-@@ -418,7 +419,7 @@
- 				  NULL);
- 
- 	a11y = gtk_widget_get_accessible (GTK_WIDGET(priv->notebook));
--	AtkObject *a11yPage = atk_object_ref_accessible_child (a11y, page_no);
-+	a11yPage = atk_object_ref_accessible_child (a11y, page_no);
- 	if (a11yPage != NULL) {
- 		if (atk_object_get_role (a11yPage) == ATK_ROLE_PAGE_TAB)
- 			atk_object_set_name (a11yPage, title);
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index aeaf77774108..c25dda375ffc 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,20 +1,45 @@
 bin/evolution
 bin/evolution-%%VERSION%%
 etc/rc.d/000.evolibs.sh
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-popup.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-registry.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-text.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-toggle.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-tree.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-vbox.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-click-to-add.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-column-header.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-factory.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-item-factory.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-item.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-tree-factory.h
+include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-tree.h
+include/evolution-%%VERSION%%/a11y/e-text/gal-a11y-e-text-factory.h
+include/evolution-%%VERSION%%/a11y/e-text/gal-a11y-e-text.h
+include/evolution-%%VERSION%%/a11y/gal-a11y-factory.h
+include/evolution-%%VERSION%%/a11y/gal-a11y-util.h
+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/gui/e-cal-config.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
 include/evolution-%%VERSION%%/e-util/e-account.h
 include/evolution-%%VERSION%%/e-util/e-bconf-map.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-categories-master-list-wombat.h
 include/evolution-%%VERSION%%/e-util/e-component-listener.h
 include/evolution-%%VERSION%%/e-util/e-config-listener.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-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-folder-map.h
 include/evolution-%%VERSION%%/e-util/e-fsutils.h
@@ -22,6 +47,8 @@ include/evolution-%%VERSION%%/e-util/e-gtk-utils.h
 include/evolution-%%VERSION%%/e-util/e-gui-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-iconv.h
+include/evolution-%%VERSION%%/e-util/e-import.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
@@ -30,58 +57,197 @@ include/evolution-%%VERSION%%/e-util/e-mktemp.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-signature-list.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-time-utils.h
 include/evolution-%%VERSION%%/e-util/e-uid.h
+include/evolution-%%VERSION%%/e-util/e-util-marshal.h
+include/evolution-%%VERSION%%/e-util/e-util.h
+include/evolution-%%VERSION%%/e-util/e-xml-utils.h
 include/evolution-%%VERSION%%/e-util/md5-utils.h
-include/evolution-%%VERSION%%/importer/GNOME_Evolution_Importer.h
-include/evolution-%%VERSION%%/importer/evolution-importer-client.h
-include/evolution-%%VERSION%%/importer/evolution-importer-listener.h
-include/evolution-%%VERSION%%/importer/evolution-importer.h
-include/evolution-%%VERSION%%/importer/evolution-intelligent-importer.h
+include/evolution-%%VERSION%%/mail/Evolution-Mail.h
+include/evolution-%%VERSION%%/mail/em-composer-utils.h
+include/evolution-%%VERSION%%/mail/em-config.h
+include/evolution-%%VERSION%%/mail/em-event.h
+include/evolution-%%VERSION%%/mail/em-folder-browser.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-stripsig-filter.h
+include/evolution-%%VERSION%%/mail/em-sync-stream.h
+include/evolution-%%VERSION%%/mail/em-utils.h
+include/evolution-%%VERSION%%/mail/em-vfs-stream.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-mt.h
+include/evolution-%%VERSION%%/mail/mail-ops.h
+include/evolution-%%VERSION%%/mail/mail-session.h
+include/evolution-%%VERSION%%/mail/mail-tools.h
+include/evolution-%%VERSION%%/mail/mail-vfolder.h
+include/evolution-%%VERSION%%/mail/message-list.h
+include/evolution-%%VERSION%%/menus/gal-define-views-dialog.h
+include/evolution-%%VERSION%%/menus/gal-define-views-model.h
+include/evolution-%%VERSION%%/menus/gal-view-collection.h
+include/evolution-%%VERSION%%/menus/gal-view-etable.h
+include/evolution-%%VERSION%%/menus/gal-view-factory-etable.h
+include/evolution-%%VERSION%%/menus/gal-view-factory.h
+include/evolution-%%VERSION%%/menus/gal-view-instance-save-as-dialog.h
+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-activity-handler.h
+include/evolution-%%VERSION%%/misc/e-attachment-bar.h
+include/evolution-%%VERSION%%/misc/e-attachment.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-clipped-label.h
+include/evolution-%%VERSION%%/misc/e-colors.h
+include/evolution-%%VERSION%%/misc/e-combo-button.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-expander.h
+include/evolution-%%VERSION%%/misc/e-gui-utils.h
+include/evolution-%%VERSION%%/misc/e-hsv-utils.h
+include/evolution-%%VERSION%%/misc/e-image-chooser.h
+include/evolution-%%VERSION%%/misc/e-info-label.h
+include/evolution-%%VERSION%%/misc/e-map.h
+include/evolution-%%VERSION%%/misc/e-multi-config-dialog.h
+%%PILOT:%%include/evolution-%%VERSION%%/misc/e-pilot-settings.h
+include/evolution-%%VERSION%%/misc/e-popup-menu.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-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-task-bar.h
+include/evolution-%%VERSION%%/misc/e-task-widget.h
+include/evolution-%%VERSION%%/misc/e-unicode.h
+include/evolution-%%VERSION%%/misc/e-url-entry.h
+include/evolution-%%VERSION%%/misc/gal-combo-box.h
+include/evolution-%%VERSION%%/misc/gal-combo-text.h
 include/evolution-%%VERSION%%/shell/Evolution.h
-include/evolution-%%VERSION%%/shell/e-shell-corba-icon-utils.h
 include/evolution-%%VERSION%%/shell/e-shell-utils.h
 include/evolution-%%VERSION%%/shell/e-user-creatable-items-handler.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%%/shell/evolution-wizard.h
-include/evolution-%%VERSION%%/widgets/e-activity-handler.h
-include/evolution-%%VERSION%%/widgets/e-calendar-item.h
-include/evolution-%%VERSION%%/widgets/e-calendar.h
-include/evolution-%%VERSION%%/widgets/e-cell-date-edit.h
-include/evolution-%%VERSION%%/widgets/e-cell-percent.h
-include/evolution-%%VERSION%%/widgets/e-cell-renderer-combo.h
-include/evolution-%%VERSION%%/widgets/e-charset-picker.h
-include/evolution-%%VERSION%%/widgets/e-clipped-label.h
-include/evolution-%%VERSION%%/widgets/e-combo-button.h
-include/evolution-%%VERSION%%/widgets/e-combo-cell-editable.h
-include/evolution-%%VERSION%%/widgets/e-config-page.h
-include/evolution-%%VERSION%%/widgets/e-dateedit.h
-include/evolution-%%VERSION%%/widgets/e-dropdown-button.h
-include/evolution-%%VERSION%%/widgets/e-error.h
-include/evolution-%%VERSION%%/widgets/e-expander.h
-include/evolution-%%VERSION%%/widgets/e-image-chooser.h
-include/evolution-%%VERSION%%/widgets/e-info-label.h
-include/evolution-%%VERSION%%/widgets/e-map.h
-include/evolution-%%VERSION%%/widgets/e-multi-config-dialog.h
-%%PILOT:%%include/evolution-%%VERSION%%/widgets/e-pilot-settings.h
-include/evolution-%%VERSION%%/widgets/e-search-bar.h
-include/evolution-%%VERSION%%/widgets/e-send-options.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
+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-float.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-progress.h
+include/evolution-%%VERSION%%/table/e-cell-size.h
+include/evolution-%%VERSION%%/table/e-cell-spin-button.h
+include/evolution-%%VERSION%%/table/e-cell-text.h
+include/evolution-%%VERSION%%/table/e-cell-toggle.h
+include/evolution-%%VERSION%%/table/e-cell-tree.h
+include/evolution-%%VERSION%%/table/e-cell-vbox.h
+include/evolution-%%VERSION%%/table/e-cell.h
+include/evolution-%%VERSION%%/table/e-table-click-to-add.h
+include/evolution-%%VERSION%%/table/e-table-col-dnd.h
+include/evolution-%%VERSION%%/table/e-table-col.h
+include/evolution-%%VERSION%%/table/e-table-column-specification.h
+include/evolution-%%VERSION%%/table/e-table-config.h
+include/evolution-%%VERSION%%/table/e-table-defines.h
+include/evolution-%%VERSION%%/table/e-table-extras.h
+include/evolution-%%VERSION%%/table/e-table-field-chooser-dialog.h
+include/evolution-%%VERSION%%/table/e-table-field-chooser-item.h
+include/evolution-%%VERSION%%/table/e-table-field-chooser.h
+include/evolution-%%VERSION%%/table/e-table-group-container.h
+include/evolution-%%VERSION%%/table/e-table-group-leaf.h
+include/evolution-%%VERSION%%/table/e-table-group.h
+include/evolution-%%VERSION%%/table/e-table-header-item.h
+include/evolution-%%VERSION%%/table/e-table-header-utils.h
+include/evolution-%%VERSION%%/table/e-table-header.h
+include/evolution-%%VERSION%%/table/e-table-item.h
+include/evolution-%%VERSION%%/table/e-table-memory-callbacks.h
+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
+include/evolution-%%VERSION%%/table/e-table-sorter.h
+include/evolution-%%VERSION%%/table/e-table-sorting-utils.h
+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%%/text/e-completion-callbacks.h
+include/evolution-%%VERSION%%/text/e-completion-match.h
+include/evolution-%%VERSION%%/text/e-completion-view.h
+include/evolution-%%VERSION%%/text/e-completion.h
+include/evolution-%%VERSION%%/text/e-entry.h
+include/evolution-%%VERSION%%/text/e-table-text-model.h
+include/evolution-%%VERSION%%/text/e-text-model-repos.h
+include/evolution-%%VERSION%%/text/e-text-model-uri.h
+include/evolution-%%VERSION%%/text/e-text-model.h
+include/evolution-%%VERSION%%/text/e-text.h
 lib/evolution/%%VERSION%%/components/libevolution-addressbook.so
 lib/evolution/%%VERSION%%/components/libevolution-calendar.so
 lib/evolution/%%VERSION%%/components/libevolution-mail.so
 %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.so
 %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.so
 %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.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%%/libeabutil.a
 lib/evolution/%%VERSION%%/libeabutil.so
 lib/evolution/%%VERSION%%/libeabutil.so.0
@@ -106,6 +272,12 @@ lib/evolution/%%VERSION%%/libeshell.so.0
 lib/evolution/%%VERSION%%/libessmime.a
 lib/evolution/%%VERSION%%/libessmime.so
 lib/evolution/%%VERSION%%/libessmime.so.0
+lib/evolution/%%VERSION%%/libetable.a
+lib/evolution/%%VERSION%%/libetable.so
+lib/evolution/%%VERSION%%/libetable.so.0
+lib/evolution/%%VERSION%%/libetext.a
+lib/evolution/%%VERSION%%/libetext.so
+lib/evolution/%%VERSION%%/libetext.so.0
 lib/evolution/%%VERSION%%/libetimezonedialog.a
 lib/evolution/%%VERSION%%/libetimezonedialog.so
 lib/evolution/%%VERSION%%/libetimezonedialog.so.0
@@ -118,12 +290,15 @@ lib/evolution/%%VERSION%%/libevolution-a11y.so.0
 lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.a
 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.so
+lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so.0
 lib/evolution/%%VERSION%%/libevolution-calendar-a11y.a
 lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so
 lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so.0
-lib/evolution/%%VERSION%%/libevolution-importer.a
-lib/evolution/%%VERSION%%/libevolution-importer.so
-lib/evolution/%%VERSION%%/libevolution-importer.so.0
+lib/evolution/%%VERSION%%/libevolution-calendar-importers.a
+lib/evolution/%%VERSION%%/libevolution-calendar-importers.so
+lib/evolution/%%VERSION%%/libevolution-calendar-importers.so.0
 lib/evolution/%%VERSION%%/libevolution-mail-importers.a
 lib/evolution/%%VERSION%%/libevolution-mail-importers.so
 lib/evolution/%%VERSION%%/libevolution-mail-importers.so.0
@@ -139,72 +314,71 @@ lib/evolution/%%VERSION%%/libfilter.so.0
 lib/evolution/%%VERSION%%/libmenus.a
 lib/evolution/%%VERSION%%/libmenus.so
 lib/evolution/%%VERSION%%/libmenus.so.0
+lib/evolution/%%VERSION%%/plugins/libmail-account-disable.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-groupwise.so
-%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-compose-send-options.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-account-settings.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-folder-unsubscribe.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.so
+%%DBUS%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-attachments.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-send-options.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-shared-folder.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-status-track.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-groupwise.eplug
-%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.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.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-evolution-bbdb.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-startup-wizard.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-account-setup.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-itip-formatter.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-mail-folder-unsubscribe.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-mail-account-disable.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.eplug
 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-mark-calendar-offline.eplug
+%%DBUS%%lib/evolution/%%VERSION%%/plugins/org-gnome-new-mail-notify.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-save-attachments.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-save-attachments.xml
+lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.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-send-options.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-shared-folder.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-status-track.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-subject-thread.eplug
 libdata/bonobo/servers/GNOME_Evolution_Addressbook_%%VERSION%%.server
-libdata/bonobo/servers/GNOME_Evolution_Addressbook_LDIF_Importer_%%VERSION%%.server
-libdata/bonobo/servers/GNOME_Evolution_Addressbook_VCard_Importer_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Calendar_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%%VERSION%%.server
-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/evolution-plugin-%%VERSION%%.pc
 libdata/pkgconfig/evolution-shell-%%VERSION%%.pc
@@ -225,16 +399,20 @@ 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
-share/gnome/evolution/%%VERSION%%/errors/addressbook-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/calendar-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/e-system-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/filter-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-itip-formatter-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-mailing-list-actions-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/org-gnome-shared-folder-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/mail-composer-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/mail-errors.xml
-share/gnome/evolution/%%VERSION%%/errors/shell-errors.xml
+share/gnome/evolution/%%VERSION%%/errors/addressbook.error
+share/gnome/evolution/%%VERSION%%/errors/calendar.error
+share/gnome/evolution/%%VERSION%%/errors/e-system.error
+share/gnome/evolution/%%VERSION%%/errors/filter.error
+share/gnome/evolution/%%VERSION%%/errors/mail-composer.error
+share/gnome/evolution/%%VERSION%%/errors/mail.error
+share/gnome/evolution/%%VERSION%%/errors/org-gnome-default-mailer.error
+share/gnome/evolution/%%VERSION%%/errors/org-gnome-exchange-operations.error
+share/gnome/evolution/%%VERSION%%/errors/org-gnome-itip-formatter.error
+share/gnome/evolution/%%VERSION%%/errors/org-gnome-mailing-list-actions.error
+share/gnome/evolution/%%VERSION%%/errors/org-gnome-proxy-errors.xml
+share/gnome/evolution/%%VERSION%%/errors/org-gnome-proxy-login-errors.xml
+share/gnome/evolution/%%VERSION%%/errors/org-gnome-shared-folder.errors.xml
+share/gnome/evolution/%%VERSION%%/errors/shell.error
 share/gnome/evolution/%%VERSION%%/etspec/e-addressbook-view.etspec
 share/gnome/evolution/%%VERSION%%/etspec/e-cal-list-view.etspec
 share/gnome/evolution/%%VERSION%%/etspec/e-calendar-table.etspec
@@ -245,32 +423,46 @@ share/gnome/evolution/%%VERSION%%/filtertypes.xml
 share/gnome/evolution/%%VERSION%%/glade/alarm-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/alarm-list-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/alarm-notify.glade
-share/gnome/evolution/%%VERSION%%/glade/cal-attachment.glade
 share/gnome/evolution/%%VERSION%%/glade/cal-prefs-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/contact-editor.glade
 share/gnome/evolution/%%VERSION%%/glade/contact-list-editor.glade
 share/gnome/evolution/%%VERSION%%/glade/e-active-connection-dialog.glade
+share/gnome/evolution/%%VERSION%%/glade/e-attachment.glade
 share/gnome/evolution/%%VERSION%%/glade/e-contact-print.glade
 share/gnome/evolution/%%VERSION%%/glade/e-delegate-dialog.glade
+share/gnome/evolution/%%VERSION%%/glade/e-foreign-folder-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/e-itip-control.glade
-share/gnome/evolution/%%VERSION%%/glade/e-msg-composer-attachment.glade
 share/gnome/evolution/%%VERSION%%/glade/e-send-options.glade
+share/gnome/evolution/%%VERSION%%/glade/e-table-config-no-group.glade
+share/gnome/evolution/%%VERSION%%/glade/e-table-config.glade
+share/gnome/evolution/%%VERSION%%/glade/e-table-field-chooser.glade
 share/gnome/evolution/%%VERSION%%/glade/e-timezone-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/eab-contact-commit-duplicate-detected.glade
 share/gnome/evolution/%%VERSION%%/glade/eab-contact-duplicate-detected.glade
 share/gnome/evolution/%%VERSION%%/glade/event-page.glade
-share/gnome/evolution/%%VERSION%%/glade/evolution-startup-wizard.glade
+share/gnome/evolution/%%VERSION%%/glade/exchange-change-password.glade
+share/gnome/evolution/%%VERSION%%/glade/exchange-delegates.glade
+share/gnome/evolution/%%VERSION%%/glade/exchange-folder-tree.glade
+share/gnome/evolution/%%VERSION%%/glade/exchange-permissions-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/filter.glade
 share/gnome/evolution/%%VERSION%%/glade/fulladdr.glade
 share/gnome/evolution/%%VERSION%%/glade/fullname.glade
+share/gnome/evolution/%%VERSION%%/glade/gal-categories.glade
+share/gnome/evolution/%%VERSION%%/glade/gal-define-views.glade
+share/gnome/evolution/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
+share/gnome/evolution/%%VERSION%%/glade/gal-view-new-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/goto-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/im.glade
 share/gnome/evolution/%%VERSION%%/glade/import.glade
+share/gnome/evolution/%%VERSION%%/glade/junk-settings.glade
 share/gnome/evolution/%%VERSION%%/glade/ldap-config.glade
 share/gnome/evolution/%%VERSION%%/glade/mail-config.glade
 share/gnome/evolution/%%VERSION%%/glade/mail-dialogs.glade
 share/gnome/evolution/%%VERSION%%/glade/meeting-page.glade
 share/gnome/evolution/%%VERSION%%/glade/properties.glade
+share/gnome/evolution/%%VERSION%%/glade/proxy-add-dialog.glade
+share/gnome/evolution/%%VERSION%%/glade/proxy-listing.glade
+share/gnome/evolution/%%VERSION%%/glade/proxy-login-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/recurrence-page.glade
 share/gnome/evolution/%%VERSION%%/glade/schedule-page.glade
 share/gnome/evolution/%%VERSION%%/glade/smime-ui.glade
@@ -327,73 +519,71 @@ share/gnome/evolution/%%VERSION%%/weather/category_weather_tstorm_16.png
 %%PILOT:%%share/gnome/gnome-pilot/conduits/e-address-%%VERSION%%.conduit
 %%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar-%%VERSION%%.conduit
 %%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo-%%VERSION%%.conduit
-share/gnome/help/evolution-%%PORTVERSION%%/C/evolution-%%PORTVERSION%%.xml
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/calendar.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/config-cal.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/config-mail.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/contact-editor.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/contact.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/contacts_mainwindow_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_account_info_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_contacteditor_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_email_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_gwreceive_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_identity_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_imapreceive_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_mail_callout_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_maildirreceive_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_mboxreceive_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_mereceive_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_mhreceive_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_newmess_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_popreceive_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_receive_setup2_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_receive_setup_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_rule_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_send_setup_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_timezone_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_usereceive_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-delegation.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-identity.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-receive-options.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/exchange-receive.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/filter-new-fig.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-1.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-2.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-3.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-4.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-5.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-6.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/full-7.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail-druid-pic.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail-inbox.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail-threaded.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mainwindow-pic.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/mail_mainwindow_a.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/newmsg.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/replymsg.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/schedule.png
-share/gnome/help/evolution-%%PORTVERSION%%/C/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution-%%VERSION%%/C/evolution-%%VERSION%%.xml
+share/gnome/help/evolution-%%VERSION%%/C/figures/calendar.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/config-cal.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/config-mail.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/contact-editor.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/contact.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_account_info_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_contacteditor_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_email_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_gwreceive_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_identity_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_imapreceive_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mail_callout_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mereceive_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mhreceive_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_newmess_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_popreceive_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_receive_setup_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_rule_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_send_setup_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_timezone_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/evo_usereceive_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-delegation.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-identity.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive-options.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/filter-new-fig.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/full-1.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/full-2.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/full-3.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/full-4.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/full-5.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/full-6.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/full-7.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/mail-druid-pic.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/mail-inbox.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/mail-threaded.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/mail_mainwindow_a.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/mainwindow-pic.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/newmsg.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/replymsg.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/schedule.png
+share/gnome/help/evolution-%%VERSION%%/C/figures/vfolder-createrule-fig.png
 share/gnome/idl/evolution-%%VERSION%%/Composer.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Component.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Composer.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-ConfigControl.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution-Offline.idl
+share/gnome/idl/evolution-%%VERSION%%/Evolution-Mail.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Shell.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution-Wizard.idl
-share/gnome/idl/evolution-%%VERSION%%/Evolution-common.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution.idl
-share/gnome/idl/evolution-%%VERSION%%/GNOME_Evolution_Importer.idl
 share/gnome/idl/evolution-%%VERSION%%/evolution-calendar.idl
 share/gnome/mime-info/evolution-%%VERSION%%.keys
 share/gnome/mime-info/evolution-%%VERSION%%.mime
-share/gnome/omf/evolution/evolution-%%PORTVERSION%%-C.omf
+share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf
 share/gnome/pixmaps/evolution-%%VERSION%%.png
 share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/bn/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
@@ -443,6 +633,8 @@ share/locale/sq/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sr/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sr@Latn/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/te/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/tr/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -452,9 +644,9 @@ share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/omf/evolution
 @dirrm share/gnome/idl/evolution-%%VERSION%%
-@dirrm share/gnome/help/evolution-%%PORTVERSION%%/C/figures
-@dirrm share/gnome/help/evolution-%%PORTVERSION%%/C
-@dirrm share/gnome/help/evolution-%%PORTVERSION%%
+@dirrm share/gnome/help/evolution-%%VERSION%%/C/figures
+@dirrm share/gnome/help/evolution-%%VERSION%%/C
+@dirrm share/gnome/help/evolution-%%VERSION%%
 @dirrm share/gnome/evolution/%%VERSION%%/weather
 @dirrm share/gnome/evolution/%%VERSION%%/views/tasks
 @dirrm share/gnome/evolution/%%VERSION%%/views/mail
@@ -494,18 +686,25 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm libexec/evolution/%%VERSION%%
 @dirrm libexec/evolution
 @dirrm lib/evolution/%%VERSION%%/plugins
-@dirrm lib/evolution/%%VERSION%%/evolution-calendar-importers
-@dirrm lib/evolution/%%VERSION%%/evolution-addressbook-importers
 %%PILOT:%%@dirrm lib/evolution/%%VERSION%%/conduits
 @dirrm lib/evolution/%%VERSION%%/components
 @dirrm lib/evolution/%%VERSION%%
 @dirrm lib/evolution
-@dirrm include/evolution-%%VERSION%%/widgets
+@dirrm include/evolution-%%VERSION%%/text
+@dirrm include/evolution-%%VERSION%%/table
 @dirrm include/evolution-%%VERSION%%/shell
-@dirrm include/evolution-%%VERSION%%/importer
+@dirrm include/evolution-%%VERSION%%/misc
+@dirrm include/evolution-%%VERSION%%/menus
+@dirrm include/evolution-%%VERSION%%/mail
 @dirrm include/evolution-%%VERSION%%/e-util
 @dirrm include/evolution-%%VERSION%%/e-conduit
 @dirrm include/evolution-%%VERSION%%/calendar/gui
 @dirrm include/evolution-%%VERSION%%/calendar
+@dirrm include/evolution-%%VERSION%%/addressbook/gui/widgets
+@dirrm include/evolution-%%VERSION%%/addressbook/gui
+@dirrm include/evolution-%%VERSION%%/addressbook
+@dirrm include/evolution-%%VERSION%%/a11y/e-text
+@dirrm include/evolution-%%VERSION%%/a11y/e-table
+@dirrm include/evolution-%%VERSION%%/a11y
 @dirrm include/evolution-%%VERSION%%
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true