Update to 2.3.5.1.

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

7 files changed, 188 insertions, 83 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 6e62907c0..3bf6e4e77 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.67 2005/07/02 04:53:04 marcus Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.68 2005/07/03 22:20:16 kwm Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.3.4
+PORTVERSION=	2.3.5.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index febdfe077..ac890b844 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-2.3.4.tar.bz2) = 0f1a008691ba134b4b3379681965c83a
-SIZE (gnome2/evolution-2.3.4.tar.bz2) = 11121736
+MD5 (gnome2/evolution-2.3.5.1.tar.bz2) = 2271c695677a8bf8c3c96ec883a05d12
+SIZE (gnome2/evolution-2.3.5.1.tar.bz2) = 11097610
diff --git a/mail/evolution/files/patch-a11y_e-table_gal-a11y-e-cell-text.c b/mail/evolution/files/patch-a11y_e-table_gal-a11y-e-cell-text.c
new file mode 100644
index 000000000..4006abeb3
--- /dev/null
+++ b/mail/evolution/files/patch-a11y_e-table_gal-a11y-e-cell-text.c
@@ -0,0 +1,30 @@
+--- a11y/e-table/gal-a11y-e-cell-text.c.orig	Wed Jul 13 02:57:57 2005
++++ a11y/e-table/gal-a11y-e-cell-text.c	Wed Jul 13 02:58:28 2005
+@@ -152,11 +152,12 @@ ect_get_character_at_offset (AtkText *te
+ 	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
+ 	gunichar ret_val;
+ 	gchar *at_offset;
++	gchar *full_text;
+ 
+ 	if (!ect_check (text))
+ 		return -1;
+ 
+-	gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
++	full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
+ 	at_offset = g_utf8_offset_to_pointer (full_text, offset);
+ 	ret_val = g_utf8_get_char_validated (at_offset, -1);
+ 	g_free (full_text);
+@@ -236,11 +237,12 @@ ect_get_character_count (AtkText *text)
+ {
+ 	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
+ 	gint ret_val;
++	gchar *full_text;
+ 
+ 	if (!ect_check (text))
+ 		return -1;
+ 
+-	gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
++	full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
+ 
+ 	ret_val = g_utf8_strlen (full_text, -1);
+ 	g_free (full_text);
diff --git a/mail/evolution/files/patch-a11y_e-table_gal-a11y-e-cell-vbox.c b/mail/evolution/files/patch-a11y_e-table_gal-a11y-e-cell-vbox.c
new file mode 100644
index 000000000..852d561b6
--- /dev/null
+++ b/mail/evolution/files/patch-a11y_e-table_gal-a11y-e-cell-vbox.c
@@ -0,0 +1,46 @@
+--- a11y/e-table/gal-a11y-e-cell-vbox.c.orig	Wed Jul 13 02:59:24 2005
++++ a11y/e-table/gal-a11y-e-cell-vbox.c	Wed Jul 13 03:00:36 2005
+@@ -35,8 +35,9 @@ static AtkComponentIface *component_pare
+ static gint
+ ecv_get_n_children (AtkObject *a11y)
+ {
++	GalA11yECellVbox *gaev;
+ 	g_return_val_if_fail (GAL_A11Y_IS_E_CELL_VBOX (a11y), 0);
+-	GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y);
++	gaev = GAL_A11Y_E_CELL_VBOX (a11y);
+ 	return (gaev->a11y_subcell_count);
+ }
+ 
+@@ -68,9 +69,10 @@ ecv_ref_child (AtkObject *a11y, gint i)
+ 	if (i < gaev->a11y_subcell_count) {
+ 		if (gaev->a11y_subcells[i] == NULL) {
+ 			gint model_col, row;
++			ECellView *subcell_view;
+ 			row = gaec->row;
+ 			model_col = ecvv->model_cols[i];
+-			ECellView *subcell_view = ecvv->subcell_views[i];
++			subcell_view = ecvv->subcell_views[i];
+ 			ret = gal_a11y_e_cell_registry_get_object (NULL,
+ 				gaec->item,
+ 				subcell_view,
+@@ -204,14 +206,17 @@ AtkObject *gal_a11y_e_cell_vbox_new	(ETa
+ 					 int         row)
+ {
+ 	AtkObject *a11y;
++	GalA11yECell *gaec;
++	GalA11yECellVbox *gaev;
++	ECellVboxView *ecvv;
+ 
+ 	a11y = g_object_new (gal_a11y_e_cell_vbox_get_type (), NULL);
+ 	
+ 	gal_a11y_e_cell_construct (a11y, item, cell_view, parent, model_col, view_col, row);
+ 
+-	GalA11yECell *gaec = GAL_A11Y_E_CELL (a11y);
+-	GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y);
+-	ECellVboxView *ecvv = (ECellVboxView *) (gaec->cell_view);
++	gaec = GAL_A11Y_E_CELL (a11y);
++	gaev = GAL_A11Y_E_CELL_VBOX (a11y);
++	ecvv = (ECellVboxView *) (gaec->cell_view);
+ 	gaev->a11y_subcell_count = ecvv->subcell_view_count; 
+ 	gaev->a11y_subcells = g_malloc0 (sizeof(AtkObject *)*gaev->a11y_subcell_count);
+ 	return a11y;
diff --git a/mail/evolution/files/patch-calendar_gui_gnome-cal.c b/mail/evolution/files/patch-calendar_gui_gnome-cal.c
new file mode 100644
index 000000000..1187e3ed9
--- /dev/null
+++ b/mail/evolution/files/patch-calendar_gui_gnome-cal.c
@@ -0,0 +1,13 @@
+--- calendar/gui/gnome-cal.c.orig	Wed Jul 13 03:25:16 2005
++++ calendar/gui/gnome-cal.c	Wed Jul 13 03:25:38 2005
+@@ -3409,8 +3409,9 @@ gnome_calendar_edit_appointment (GnomeCa
+ 		return;
+ 	
+ 	for (l = gcal->priv->clients_list[E_CAL_SOURCE_TYPE_EVENT]; l != NULL; l = l->next) {
++		ESource *client_src;
+ 		client = l->data;
+-		ESource *client_src = e_cal_get_source (client);
++		client_src = e_cal_get_source (client);
+ 
+ 		if (!strcmp (src_uid, e_source_peek_uid (client_src)))
+ 			break;
diff --git a/mail/evolution/files/patch-plugins_proxy-login_proxy-login.c b/mail/evolution/files/patch-plugins_proxy-login_proxy-login.c
new file mode 100644
index 000000000..f2fb5c6d4
--- /dev/null
+++ b/mail/evolution/files/patch-plugins_proxy-login_proxy-login.c
@@ -0,0 +1,10 @@
+--- plugins/proxy-login/proxy-login.c.orig	Wed Jul 13 17:26:56 2005
++++ plugins/proxy-login/proxy-login.c	Wed Jul 13 17:27:15 2005
+@@ -237,7 +237,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/pkg-plist b/mail/evolution/pkg-plist
index e3a5c5de4..fd49969c2 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -69,11 +69,6 @@ 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/em-composer-utils.h
 include/evolution-%%VERSION%%/mail/em-config.h
 include/evolution-%%VERSION%%/mail/em-event.h
@@ -91,6 +86,7 @@ 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
@@ -118,6 +114,8 @@ 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
@@ -143,6 +141,7 @@ 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
+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
@@ -242,9 +241,6 @@ 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
@@ -287,12 +283,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
@@ -308,62 +307,68 @@ 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
-%%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-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-default-mailer.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-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
-%%DBUS%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.so
+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-print-message.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-proxy.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-subject-thread.so
+lib/evolution/%%VERSION%%/plugins/libproxy-login.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.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.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-default-mailer.eplug
 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-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-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-print-message.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.xml
+lib/evolution/%%VERSION%%/plugins/org-gnome-proxy-login.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-proxy.eplug
+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
 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
@@ -393,6 +398,8 @@ share/gnome/evolution/%%VERSION%%/errors/mail.error
 share/gnome/evolution/%%VERSION%%/errors/org-gnome-default-mailer.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
@@ -405,15 +412,14 @@ 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-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
@@ -432,11 +438,15 @@ 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
@@ -493,53 +503,53 @@ 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
@@ -548,11 +558,10 @@ share/gnome/idl/evolution-%%VERSION%%/Evolution-Mail.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Offline.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Shell.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
@@ -617,9 +626,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
@@ -659,8 +668,6 @@ 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%%
@@ -671,7 +678,6 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm include/evolution-%%VERSION%%/misc
 @dirrm include/evolution-%%VERSION%%/menus
 @dirrm include/evolution-%%VERSION%%/mail
-@dirrm include/evolution-%%VERSION%%/importer
 @dirrm include/evolution-%%VERSION%%/e-util
 @dirrm include/evolution-%%VERSION%%/e-conduit
 @dirrm include/evolution-%%VERSION%%/calendar/gui