Update to 0.13.

16 files changed, 570 insertions, 556 deletions

diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index f797e1dc54c1..5db4470c5d6c 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	0.12
+PORTVERSION=	0.13
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
@@ -36,7 +36,7 @@ PLIST_SUB=	VERSION=${PORTVERSION}
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 	@find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '[^g]iconv.h' | \
diff --git a/mail/evolution-devel/distinfo b/mail/evolution-devel/distinfo
index a30b516e4038..a9d0a9fa59e2 100644
--- a/mail/evolution-devel/distinfo
+++ b/mail/evolution-devel/distinfo
@@ -1 +1 @@
-MD5 (evolution-0.12.tar.gz) = c5224f6dfa1154b3cce7c31d35c7a48f
+MD5 (evolution-0.13.tar.gz) = c35733ba57648c05d45a7ff9a054c577
diff --git a/mail/evolution-devel/files/patch-aa b/mail/evolution-devel/files/patch-aa
index 74028d1fe442..0ab8cde1b418 100644
--- a/mail/evolution-devel/files/patch-aa
+++ b/mail/evolution-devel/files/patch-aa
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Sep  4 17:59:26 2001
-+++ configure	Tue Sep  4 18:11:25 2001
-@@ -5667,7 +5667,7 @@
+--- configure.orig	Tue Sep 11 19:38:48 2001
++++ configure	Tue Sep 11 19:38:55 2001
+@@ -5554,7 +5554,7 @@
  
  CPPFLAGS_save="$CPPFLAGS"
  CPPFLAGS="$CPPFLAGS $DB3_CFLAGS"
@@ -12,7 +12,7 @@ $FreeBSD$
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -5741,7 +5741,7 @@
+@@ -5628,7 +5628,7 @@
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -21,7 +21,7 @@ $FreeBSD$
  fi
  rm -f conftest*
  
-@@ -5852,7 +5852,7 @@
+@@ -5739,7 +5739,7 @@
  
  echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6
  if test "$ac_cv_db3_lib_version_match" = no; then
@@ -30,29 +30,7 @@ $FreeBSD$
  fi
  
  CPPFLAGS="$CPPFLAGS_save"
-@@ -6333,8 +6333,8 @@
- fi
- 
- 
--THREADS_LIBS="$PTHREAD_LIB `glib-config --libs gthread`"
--THREADS_CFLAGS="`glib-config --cflags gthread`"
-+THREADS_LIBS="$PTHREAD_LIB `$GLIB_CONFIG --libs gthread`"
-+THREADS_CFLAGS="`$GLIB_CONFIG --cflags gthread`"
- 
- 
- 
-@@ -6894,8 +6894,8 @@
- 	fi
- 
- 
--GLIB_CFLAGS="`glib-config --cflags`"
--GLIB_LIBS="`glib-config --libs`"
-+GLIB_CFLAGS="`$GLIB_CONFIG --cflags`"
-+GLIB_LIBS="`$GLIB_CONFIG --libs`"
- 
- 
- 
-@@ -9415,10 +9415,10 @@
+@@ -9349,10 +9349,10 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/mail/evolution-devel/files/patch-filter::filter-input.c b/mail/evolution-devel/files/patch-filter::filter-input.c
deleted file mode 100644
index c25fab446a11..000000000000
--- a/mail/evolution-devel/files/patch-filter::filter-input.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- filter/filter-input.c	2001/09/04 16:51:06	1.1
-+++ filter/filter-input.c	2001/09/04 16:51:29
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <string.h>
-+#include <sys/types.h>
- #include <regex.h>
- #include <gtk/gtkobject.h>
- #include <gtk/gtkwidget.h>
diff --git a/mail/evolution-devel/files/patch-po::Makefile.in.in b/mail/evolution-devel/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..f2ce380397ca
--- /dev/null
+++ b/mail/evolution-devel/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2001/09/11 17:20:57	1.1
++++ po/Makefile.in.in	2001/09/11 17:21:24
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
diff --git a/mail/evolution-devel/files/patch-shell::e-shortcuts-view-model.c b/mail/evolution-devel/files/patch-shell::e-shortcuts-view-model.c
deleted file mode 100644
index f32c70d82e3d..000000000000
--- a/mail/evolution-devel/files/patch-shell::e-shortcuts-view-model.c
+++ /dev/null
@@ -1,140 +0,0 @@
-
-$FreeBSD$
-
---- shell/e-shortcuts-view-model.c	2001/09/04 16:22:15	1.1
-+++ shell/e-shortcuts-view-model.c	2001/09/04 16:30:50
-@@ -45,31 +45,71 @@
- };
- 
- 
-+/* Utility functions.  */
-+
-+static GdkPixbuf *
-+get_icon_for_item (EShortcutsViewModel *shortcuts_view_model,
-+		   const EShortcutItem *item,
-+		   gboolean want_mini)
-+{
-+	EShortcutsViewModelPrivate *priv;
-+
-+	priv = shortcuts_view_model->priv;
-+
-+	if (item->type != NULL) {
-+		EStorageSet *storage_set;
-+		EFolderTypeRegistry *folder_type_registry;
-+
-+		storage_set = e_shortcuts_get_storage_set (priv->shortcuts);
-+		folder_type_registry = e_storage_set_get_folder_type_registry (storage_set);
-+
-+		return e_folder_type_registry_get_icon_for_type (folder_type_registry,
-+								 item->type,
-+								 want_mini);
-+	}
-+
-+	g_print ("(%s is not a folder!)\n", item->name);
-+
-+	return NULL;
-+}
-+
-+
- /* View initialization.  */
- 
-+static char *
-+get_name_with_unread (const EShortcutItem *item)
-+{
-+	return g_strdup (item->name);
-+}
-+
- static void
- load_group_into_model (EShortcutsViewModel *shortcuts_view_model,
- 		       int group_num)
- {
- 	EShortcutsViewModelPrivate *priv;
--	EStorageSet *storage_set;
- 	const GSList *shortcut_list;
- 	const GSList *p;
- 
- 	priv = shortcuts_view_model->priv;
- 
--	storage_set = e_shortcuts_get_storage_set (priv->shortcuts);
--	g_assert (storage_set != NULL);
--
- 	shortcut_list = e_shortcuts_get_shortcuts_in_group (priv->shortcuts, group_num);
- 	if (shortcut_list == NULL)
- 		return;
- 
- 	for (p = shortcut_list; p != NULL; p = p->next) {
- 		const EShortcutItem *item;
-+		char *name_with_unread;
- 
- 		item = (const EShortcutItem *) p->data;
--		e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model), group_num, -1, item->uri, item->name);
-+		name_with_unread = get_name_with_unread (item);
-+
-+		e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model),
-+					   group_num, -1,
-+					   item->uri,
-+					   name_with_unread,
-+					   get_icon_for_item (shortcuts_view_model, item, FALSE));
-+
-+		g_free (name_with_unread);
- 	}
- }
- 
-@@ -153,6 +193,7 @@
- 	EShortcutsViewModel *shortcuts_view_model;
- 	EShortcutsViewModelPrivate *priv;
- 	const EShortcutItem *shortcut_item;
-+	char *name_with_unread;
- 
- 	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
- 	priv = shortcuts_view_model->priv;
-@@ -160,10 +201,14 @@
- 	shortcut_item = e_shortcuts_get_shortcut (priv->shortcuts, group_num, item_num);
- 	g_assert (shortcut_item != NULL);
- 
-+	name_with_unread = get_name_with_unread (shortcut_item);
- 	e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model),
- 				   group_num, item_num,
- 				   shortcut_item->uri,
--				   shortcut_item->name);
-+				   name_with_unread,
-+				   get_icon_for_item (shortcuts_view_model, shortcut_item, FALSE));
-+
-+	g_free (name_with_unread);
- }
- 
- static void
-@@ -187,6 +232,7 @@
- 	EShortcutsViewModel *shortcuts_view_model;
- 	EShortcutsViewModelPrivate *priv;
- 	const EShortcutItem *shortcut_item;
-+	char *name_with_unread;
- 
- 	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
- 	priv = shortcuts_view_model->priv;
-@@ -194,10 +240,14 @@
- 	shortcut_item = e_shortcuts_get_shortcut (priv->shortcuts, group_num, item_num);
- 	g_assert (shortcut_item != NULL);
- 
-+	name_with_unread = get_name_with_unread (shortcut_item);
- 	e_shortcut_model_update_item (E_SHORTCUT_MODEL (shortcuts_view_model),
- 				      group_num, item_num,
- 				      shortcut_item->uri,
--				      shortcut_item->name);
-+				      name_with_unread,
-+				      get_icon_for_item (shortcuts_view_model, shortcut_item, FALSE));
-+
-+	g_free (name_with_unread);
- }
- 
- 
-@@ -213,6 +263,9 @@
- 	priv = view_model->priv;
- 
- 	g_free (priv);
-+
-+	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-+		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
- }
- 
- 
diff --git a/mail/evolution-devel/files/patch-shell::e-shortcuts-view.c b/mail/evolution-devel/files/patch-shell::e-shortcuts-view.c
deleted file mode 100644
index 2ff7af4ec1b9..000000000000
--- a/mail/evolution-devel/files/patch-shell::e-shortcuts-view.c
+++ /dev/null
@@ -1,63 +0,0 @@
-
-$FreeBSD$
-
---- shell/e-shortcuts-view.c	2001/09/04 16:40:47	1.1
-+++ shell/e-shortcuts-view.c	2001/09/04 16:44:17
-@@ -86,47 +86,6 @@
- 	return colon + 1;
- }
- 
--/* Icon callback for the shortcut bar.  */
--static GdkPixbuf *
--icon_callback (EShortcutBar *shortcut_bar,
--	       const char *uri,
--	       gpointer data)
--{
--	EFolderTypeRegistry *folder_type_registry;
--	EShortcuts *shortcuts;
--	EStorageSet *storage_set;
--	EFolder *folder;
--	GdkPixbuf *pixbuf;
--	const char *type;
--
--	shortcuts = E_SHORTCUTS (data);
--
--	storage_set = e_shortcuts_get_storage_set (shortcuts);
--	folder_type_registry = e_storage_set_get_folder_type_registry (storage_set);
--
--	if (strcmp ("evolution:/My Evolution", uri) == 0) {
--		type = "My Evolution";
--	} else {
--		folder = e_storage_set_get_folder (storage_set,
--						   get_storage_set_path_from_uri (uri));
--
--		if (folder == NULL)
--			return NULL;
--		
--		type = e_folder_get_type_string (folder);
--		if (type == NULL)
--			return NULL;
--	}
--
--	/* FIXME mini icons?  */
--	pixbuf = e_folder_type_registry_get_icon_for_type (folder_type_registry, type, FALSE);
--
--	if (pixbuf != NULL)
--		gdk_pixbuf_ref (pixbuf);
--
--	return pixbuf;
--}
--
- 
- static void
- show_new_group_dialog (EShortcutsView *view)
-@@ -659,9 +618,6 @@
- 
- 	priv->shortcuts = shortcuts;
- 	gtk_object_ref (GTK_OBJECT (priv->shortcuts));
--
--	e_shortcut_bar_set_icon_callback (E_SHORTCUT_BAR (shortcuts_view), icon_callback,
--					  shortcuts);
- 
- 	e_shortcut_bar_set_model (E_SHORTCUT_BAR (shortcuts_view),
- 				  E_SHORTCUT_MODEL (e_shortcuts_view_model_new (shortcuts)));
diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist
index 87f6f87489bb..9a9b94ff4f69 100644
--- a/mail/evolution-devel/pkg-plist
+++ b/mail/evolution-devel/pkg-plist
@@ -90,6 +90,7 @@ include/camel/camel-sasl-digest-md5.h
 include/camel/camel-sasl-kerberos4.h
 include/camel/camel-sasl-login.h
 include/camel/camel-sasl-plain.h
+include/camel/camel-sasl-popb4smtp.h
 include/camel/camel-sasl.h
 include/camel/camel-seekable-stream.h
 include/camel/camel-seekable-substream.h
@@ -155,7 +156,6 @@ include/evolution/importer/evolution-intelligent-importer.h
 include/evolution/shell/Evolution.h
 include/evolution/shell/e-folder-tree.h
 include/evolution/shell/evolution-activity-client.h
-include/evolution/shell/evolution-local-storage.h
 include/evolution/shell/evolution-session.h
 include/evolution/shell/evolution-shell-client.h
 include/evolution/shell/evolution-shell-component-client.h
@@ -166,6 +166,7 @@ include/evolution/shell/evolution-shell-view.h
 include/evolution/shell/evolution-storage-listener.h
 include/evolution/shell/evolution-storage-set-view-listener.h
 include/evolution/shell/evolution-storage.h
+include/evolution/shell/evolution-wizard.h
 include/evolution/wombat/wombat-client.h
 include/ical.h
 include/icalss.h
@@ -258,6 +259,7 @@ share/gnome/evolution/etspec/e-calendar-table.etspec
 share/gnome/evolution/etspec/e-storage-set-view.etspec
 share/gnome/evolution/etspec/meeting-page.etspec
 share/gnome/evolution/etspec/message-list.etspec
+share/gnome/evolution/etspec/subscribe-dialog.etspec
 share/gnome/evolution/filtertypes.xml
 share/gnome/evolution/glade/addressbook-config.glade
 share/gnome/evolution/glade/alarm-notify.glade
@@ -278,6 +280,8 @@ share/gnome/evolution/glade/e-msg-composer-attachment.glade
 share/gnome/evolution/glade/e-shell-folder-creation-dialog.glade
 share/gnome/evolution/glade/e-timezone-dialog.glade
 share/gnome/evolution/glade/event-page.glade
+share/gnome/evolution/glade/evolution-startup-wizard.glade
+share/gnome/evolution/glade/file-exists.glade
 share/gnome/evolution/glade/filter.glade
 share/gnome/evolution/glade/fulladdr.glade
 share/gnome/evolution/glade/fullname.glade
@@ -289,6 +293,7 @@ share/gnome/evolution/glade/meeting-page.glade
 share/gnome/evolution/glade/my-evolution.glade
 share/gnome/evolution/glade/recurrence-page.glade
 share/gnome/evolution/glade/select-names.glade
+share/gnome/evolution/glade/subscribe-dialog.glade
 share/gnome/evolution/glade/task-details-page.glade
 share/gnome/evolution/glade/task-page.glade
 share/gnome/evolution/vfoldertypes.xml
@@ -304,23 +309,235 @@ share/gnome/evolution/views/mail/galview.xml
 share/gnome/evolution/views/tasks/Tasks.galview
 share/gnome/evolution/views/tasks/With_Category.galview
 share/gnome/evolution/views/tasks/galview.xml
+share/gnome/help/evolution/C/aboutbook.html
+share/gnome/help/evolution/C/apx-authors.sgml
+share/gnome/help/evolution/C/apx-bugs.sgml
+share/gnome/help/evolution/C/apx-gloss.html
+share/gnome/help/evolution/C/apx-gloss.sgml
+share/gnome/help/evolution/C/authors.html
+share/gnome/help/evolution/C/bugs.html
+share/gnome/help/evolution/C/config-encryption.sgml
+share/gnome/help/evolution/C/config-prefs-cal.html
+share/gnome/help/evolution/C/config-prefs-contact.html
+share/gnome/help/evolution/C/config-prefs-general.html
+share/gnome/help/evolution/C/config-prefs.html
+share/gnome/help/evolution/C/config-prefs.sgml
+share/gnome/help/evolution/C/config-sync.html
+share/gnome/help/evolution/C/config-sync.sgml
+share/gnome/help/evolution/C/config.html
+share/gnome/help/evolution/C/contact-search.html
+share/gnome/help/evolution/C/docbook.css
+share/gnome/help/evolution/C/encryption.html
+share/gnome/help/evolution/C/evolution-faq.sgml
+share/gnome/help/evolution/C/evolution.sgml
+share/gnome/help/evolution/C/figures/calendar.png
+share/gnome/help/evolution/C/figures/config-cal.png
+share/gnome/help/evolution/C/figures/config-mail.png
+share/gnome/help/evolution/C/figures/contact-editor.png
+share/gnome/help/evolution/C/figures/contact.png
+share/gnome/help/evolution/C/figures/filter-assist-fig.png
+share/gnome/help/evolution/C/figures/filter-new-fig.png
+share/gnome/help/evolution/C/figures/full-1.png
+share/gnome/help/evolution/C/figures/full-2.png
+share/gnome/help/evolution/C/figures/full-3.png
+share/gnome/help/evolution/C/figures/full-4.png
+share/gnome/help/evolution/C/figures/full-5.png
+share/gnome/help/evolution/C/figures/full-6.png
+share/gnome/help/evolution/C/figures/full-7.png
+share/gnome/help/evolution/C/figures/mail-composer.png
+share/gnome/help/evolution/C/figures/mail-druid-pic.png
+share/gnome/help/evolution/C/figures/mail-inbox.png
+share/gnome/help/evolution/C/figures/mainwindow-pic.png
+share/gnome/help/evolution/C/figures/newmsg.png
+share/gnome/help/evolution/C/figures/print-dest.png
+share/gnome/help/evolution/C/figures/print-preview.png
+share/gnome/help/evolution/C/figures/replymsg.png
+share/gnome/help/evolution/C/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/C/index.html
+share/gnome/help/evolution/C/introduction.html
+share/gnome/help/evolution/C/ln20.html
+share/gnome/help/evolution/C/menuref.html
+share/gnome/help/evolution/C/menuref.sgml
+share/gnome/help/evolution/C/preface.sgml
+share/gnome/help/evolution/C/print-destination.html
+share/gnome/help/evolution/C/quickref-cal.html
+share/gnome/help/evolution/C/quickref-contact.html
+share/gnome/help/evolution/C/quickref-mail.html
+share/gnome/help/evolution/C/stylesheet-images/caution.gif
+share/gnome/help/evolution/C/stylesheet-images/home.gif
+share/gnome/help/evolution/C/stylesheet-images/important.gif
+share/gnome/help/evolution/C/stylesheet-images/next.gif
+share/gnome/help/evolution/C/stylesheet-images/note.gif
+share/gnome/help/evolution/C/stylesheet-images/prev.gif
+share/gnome/help/evolution/C/stylesheet-images/tip.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-blank.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-minus.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-plus.gif
+share/gnome/help/evolution/C/stylesheet-images/up.gif
+share/gnome/help/evolution/C/stylesheet-images/warning.gif
+share/gnome/help/evolution/C/topic.dat
+share/gnome/help/evolution/C/ui-intro.html
+share/gnome/help/evolution/C/usage-calendar-apts.html
+share/gnome/help/evolution/C/usage-calendar-multiple.html
+share/gnome/help/evolution/C/usage-calendar-todo.html
+share/gnome/help/evolution/C/usage-calendar.html
+share/gnome/help/evolution/C/usage-calendar.sgml
+share/gnome/help/evolution/C/usage-contact-automate.html
+share/gnome/help/evolution/C/usage-contact-organize.html
+share/gnome/help/evolution/C/usage-contact-sharing.html
+share/gnome/help/evolution/C/usage-contact.html
+share/gnome/help/evolution/C/usage-contact.sgml
+share/gnome/help/evolution/C/usage-encryption.sgml
+share/gnome/help/evolution/C/usage-exec-summary.html
+share/gnome/help/evolution/C/usage-exec-summary.sgml
+share/gnome/help/evolution/C/usage-mail-getnsend-get.html
+share/gnome/help/evolution/C/usage-mail-getnsend-send.html
+share/gnome/help/evolution/C/usage-mail-org.sgml
+share/gnome/help/evolution/C/usage-mail-organize-filters.html
+share/gnome/help/evolution/C/usage-mail-organize-folders.html
+share/gnome/help/evolution/C/usage-mail-organize-search.html
+share/gnome/help/evolution/C/usage-mail-organize-vfolders.html
+share/gnome/help/evolution/C/usage-mail-organize.html
+share/gnome/help/evolution/C/usage-mail-subscriptions.html
+share/gnome/help/evolution/C/usage-mail.html
+share/gnome/help/evolution/C/usage-mail.sgml
+share/gnome/help/evolution/C/usage-mainwindow.html
+share/gnome/help/evolution/C/usage-mainwindow.sgml
+share/gnome/help/evolution/C/usage-print.html
+share/gnome/help/evolution/C/usage-print.sgml
+share/gnome/help/evolution/C/usage-sync.html
+share/gnome/help/evolution/C/usage-sync.sgml
+share/gnome/help/evolution/C/usage.html
+share/gnome/help/evolution/no/aboutbook.html
+share/gnome/help/evolution/no/apx-authors.sgml
+share/gnome/help/evolution/no/apx-bugs.sgml
+share/gnome/help/evolution/no/apx-gloss.html
+share/gnome/help/evolution/no/apx-gloss.sgml
+share/gnome/help/evolution/no/authors.html
+share/gnome/help/evolution/no/bugs.html
+share/gnome/help/evolution/no/config-encryption.sgml
+share/gnome/help/evolution/no/config-prefs-cal.html
+share/gnome/help/evolution/no/config-prefs-contact.html
+share/gnome/help/evolution/no/config-prefs-general.html
+share/gnome/help/evolution/no/config-prefs.html
+share/gnome/help/evolution/no/config-prefs.sgml
+share/gnome/help/evolution/no/config-sync.html
+share/gnome/help/evolution/no/config-sync.sgml
+share/gnome/help/evolution/no/config.html
+share/gnome/help/evolution/no/contact-search.html
+share/gnome/help/evolution/no/docbook.css
+share/gnome/help/evolution/no/encryption.html
+share/gnome/help/evolution/no/evolution-faq.html
+share/gnome/help/evolution/no/evolution-faq.sgml
+share/gnome/help/evolution/no/evolution.sgml
+share/gnome/help/evolution/no/faq-debugging.html
+share/gnome/help/evolution/no/faq-get-and-compile.html
+share/gnome/help/evolution/no/faq-trouble.html
+share/gnome/help/evolution/no/figures/calendar.png
+share/gnome/help/evolution/no/figures/config-cal.png
+share/gnome/help/evolution/no/figures/config-mail.png
+share/gnome/help/evolution/no/figures/contact-editor.png
+share/gnome/help/evolution/no/figures/contact.png
+share/gnome/help/evolution/no/figures/filter-assist-fig.png
+share/gnome/help/evolution/no/figures/filter-new-fig.png
+share/gnome/help/evolution/no/figures/full-1.png
+share/gnome/help/evolution/no/figures/full-2.png
+share/gnome/help/evolution/no/figures/full-3.png
+share/gnome/help/evolution/no/figures/full-4.png
+share/gnome/help/evolution/no/figures/full-5.png
+share/gnome/help/evolution/no/figures/full-6.png
+share/gnome/help/evolution/no/figures/full-7.png
+share/gnome/help/evolution/no/figures/mail-composer.png
+share/gnome/help/evolution/no/figures/mail-druid-pic.png
+share/gnome/help/evolution/no/figures/mail-inbox.png
+share/gnome/help/evolution/no/figures/mainwindow-pic.png
+share/gnome/help/evolution/no/figures/newmsg.png
+share/gnome/help/evolution/no/figures/print-dest.png
+share/gnome/help/evolution/no/figures/print-preview.png
+share/gnome/help/evolution/no/figures/replymsg.png
+share/gnome/help/evolution/no/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/no/index.html
+share/gnome/help/evolution/no/introduction.html
+share/gnome/help/evolution/no/ln20.html
+share/gnome/help/evolution/no/menuref-cal-editor.html
+share/gnome/help/evolution/no/menuref-cal.html
+share/gnome/help/evolution/no/menuref-contact-editor.html
+share/gnome/help/evolution/no/menuref-mail-editor.html
+share/gnome/help/evolution/no/menuref.html
+share/gnome/help/evolution/no/menuref.sgml
+share/gnome/help/evolution/no/p2563.html
+share/gnome/help/evolution/no/preface.sgml
+share/gnome/help/evolution/no/print-destination.html
+share/gnome/help/evolution/no/quickref-commontasks.html
+share/gnome/help/evolution/no/stylesheet-images/caution.gif
+share/gnome/help/evolution/no/stylesheet-images/home.gif
+share/gnome/help/evolution/no/stylesheet-images/important.gif
+share/gnome/help/evolution/no/stylesheet-images/next.gif
+share/gnome/help/evolution/no/stylesheet-images/note.gif
+share/gnome/help/evolution/no/stylesheet-images/prev.gif
+share/gnome/help/evolution/no/stylesheet-images/tip.gif
+share/gnome/help/evolution/no/stylesheet-images/toc-blank.gif
+share/gnome/help/evolution/no/stylesheet-images/toc-minus.gif
+share/gnome/help/evolution/no/stylesheet-images/toc-plus.gif
+share/gnome/help/evolution/no/stylesheet-images/up.gif
+share/gnome/help/evolution/no/stylesheet-images/warning.gif
+share/gnome/help/evolution/no/topic.dat
+share/gnome/help/evolution/no/ui-intro.html
+share/gnome/help/evolution/no/usage-calendar-apts.html
+share/gnome/help/evolution/no/usage-calendar-multiple.html
+share/gnome/help/evolution/no/usage-calendar-todo.html
+share/gnome/help/evolution/no/usage-calendar.html
+share/gnome/help/evolution/no/usage-calendar.sgml
+share/gnome/help/evolution/no/usage-contact-automate.html
+share/gnome/help/evolution/no/usage-contact-cards.html
+share/gnome/help/evolution/no/usage-contact-organize.html
+share/gnome/help/evolution/no/usage-contact-sharing.html
+share/gnome/help/evolution/no/usage-contact.html
+share/gnome/help/evolution/no/usage-contact.sgml
+share/gnome/help/evolution/no/usage-encryption.sgml
+share/gnome/help/evolution/no/usage-exec-summary.html
+share/gnome/help/evolution/no/usage-exec-summary.sgml
+share/gnome/help/evolution/no/usage-mail-getnsend-get.html
+share/gnome/help/evolution/no/usage-mail-getnsend-send.html
+share/gnome/help/evolution/no/usage-mail-org.sgml
+share/gnome/help/evolution/no/usage-mail-organize-filters.html
+share/gnome/help/evolution/no/usage-mail-organize-folders.html
+share/gnome/help/evolution/no/usage-mail-organize-search.html
+share/gnome/help/evolution/no/usage-mail-organize-vfolders.html
+share/gnome/help/evolution/no/usage-mail-organize.html
+share/gnome/help/evolution/no/usage-mail-subscriptions.html
+share/gnome/help/evolution/no/usage-mail.html
+share/gnome/help/evolution/no/usage-mail.sgml
+share/gnome/help/evolution/no/usage-mainwindow.html
+share/gnome/help/evolution/no/usage-mainwindow.sgml
+share/gnome/help/evolution/no/usage-print.html
+share/gnome/help/evolution/no/usage-print.sgml
+share/gnome/help/evolution/no/usage-sync.html
+share/gnome/help/evolution/no/usage-sync.sgml
+share/gnome/help/evolution/no/usage.html
+share/gnome/help/evolution/no/x3360.html
 share/gnome/idl/Composer.idl
 share/gnome/idl/Evolution-Activity.idl
 share/gnome/idl/Evolution-Composer.idl
-share/gnome/idl/Evolution-Icon.idl
-share/gnome/idl/Evolution-LocalStorage.idl
 share/gnome/idl/Evolution-Offline.idl
 share/gnome/idl/Evolution-Session.idl
 share/gnome/idl/Evolution-Shell.idl
 share/gnome/idl/Evolution-ShellComponent.idl
 share/gnome/idl/Evolution-ShellComponentDnd.idl
 share/gnome/idl/Evolution-ShellView.idl
+share/gnome/idl/Evolution-Shortcuts.idl
 share/gnome/idl/Evolution-Storage.idl
 share/gnome/idl/Evolution-StorageSetView.idl
+share/gnome/idl/Evolution-Wizard.idl
+share/gnome/idl/Evolution-common.idl
 share/gnome/idl/Evolution.idl
 share/gnome/idl/GNOME_Evolution_Importer.idl
 share/gnome/idl/addressbook.idl
 share/gnome/idl/evolution-calendar.idl
+share/gnome/images/evolution/16_copy.png
+share/gnome/images/evolution/16_customize.png
+share/gnome/images/evolution/16_cut.png
+share/gnome/images/evolution/16_paste.png
 share/gnome/images/evolution/all_contacts.xpm
 share/gnome/images/evolution/apply-filters-16.xpm
 share/gnome/images/evolution/bcg.png
@@ -328,43 +545,35 @@ share/gnome/images/evolution/briefcase.png
 share/gnome/images/evolution/butterfly.png
 share/gnome/images/evolution/buttons/add-attachment.png
 share/gnome/images/evolution/buttons/add-service.png
+share/gnome/images/evolution/buttons/arrow-left-24.png
+share/gnome/images/evolution/buttons/arrow-right-24.png
 share/gnome/images/evolution/buttons/compose-message.png
 share/gnome/images/evolution/buttons/copy-message.png
+share/gnome/images/evolution/buttons/copy.png
+share/gnome/images/evolution/buttons/cut.png
 share/gnome/images/evolution/buttons/dayview.xpm
+share/gnome/images/evolution/buttons/delete-message.png
 share/gnome/images/evolution/buttons/fetch-mail.png
 share/gnome/images/evolution/buttons/forward.png
+share/gnome/images/evolution/buttons/goto-24.png
 share/gnome/images/evolution/buttons/monthview.xpm
 share/gnome/images/evolution/buttons/move-message.png
 share/gnome/images/evolution/buttons/new_appointment.png
+share/gnome/images/evolution/buttons/new_task.png
 share/gnome/images/evolution/buttons/next-message.png
+share/gnome/images/evolution/buttons/paste.png
 share/gnome/images/evolution/buttons/previous-message.png
 share/gnome/images/evolution/buttons/print-preview-24.png
 share/gnome/images/evolution/buttons/print.png
+share/gnome/images/evolution/buttons/receive-24.png
 share/gnome/images/evolution/buttons/reply-to-all.png
 share/gnome/images/evolution/buttons/reply.png
+share/gnome/images/evolution/buttons/save-24.png
 share/gnome/images/evolution/buttons/send-24-receive.png
 share/gnome/images/evolution/buttons/send-24.png
 share/gnome/images/evolution/buttons/weekview.xpm
 share/gnome/images/evolution/buttons/workweekview.xpm
 share/gnome/images/evolution/buttons/yearview.xpm
-share/gnome/images/evolution/categories/16_category_birthday.png
-share/gnome/images/evolution/categories/16_category_business.png
-share/gnome/images/evolution/categories/16_category_favorites.png
-share/gnome/images/evolution/categories/16_category_gifts.png
-share/gnome/images/evolution/categories/16_category_goals.png
-share/gnome/images/evolution/categories/16_category_holiday-cards.png
-share/gnome/images/evolution/categories/16_category_holiday.png
-share/gnome/images/evolution/categories/16_category_hot-contacts.png
-share/gnome/images/evolution/categories/16_category_ideas.png
-share/gnome/images/evolution/categories/16_category_international.png
-share/gnome/images/evolution/categories/16_category_key-customer.png
-share/gnome/images/evolution/categories/16_category_miscellaneous.png
-share/gnome/images/evolution/categories/16_category_personal.png
-share/gnome/images/evolution/categories/16_category_phonecalls.png
-share/gnome/images/evolution/categories/16_category_status.png
-share/gnome/images/evolution/categories/16_category_strategies.png
-share/gnome/images/evolution/categories/16_category_suppliers.png
-share/gnome/images/evolution/categories/16_category_time-and-expenses.png
 share/gnome/images/evolution/cellphone.png
 share/gnome/images/evolution/compose-message.png
 share/gnome/images/evolution/conduits/evo-16-address-conduit.png
@@ -379,7 +588,6 @@ share/gnome/images/evolution/configure_16_folder.xpm
 share/gnome/images/evolution/configure_16_mail.xpm
 share/gnome/images/evolution/contact-is-a-list.png
 share/gnome/images/evolution/copy_16_message.xpm
-share/gnome/images/evolution/delete_message.xpm
 share/gnome/images/evolution/edit.xpm
 share/gnome/images/evolution/empty.gif
 share/gnome/images/evolution/encrypt.xpm
@@ -403,12 +611,16 @@ share/gnome/images/evolution/evolution-trash-mini.png
 share/gnome/images/evolution/evolution-trash.png
 share/gnome/images/evolution/executive-summary-bg.png
 share/gnome/images/evolution/executive-summary-curve.png
+share/gnome/images/evolution/faq-16.png
 share/gnome/images/evolution/fetch-mail.png
 share/gnome/images/evolution/find_contact.xpm
 share/gnome/images/evolution/find_message.xpm
+share/gnome/images/evolution/folder-copy-16.png
+share/gnome/images/evolution/folder-move-16.png
 share/gnome/images/evolution/folder.xpm
 share/gnome/images/evolution/forward.xpm
 share/gnome/images/evolution/globe.png
+share/gnome/images/evolution/goto-16.png
 share/gnome/images/evolution/hide_deleted_messages.xpm
 share/gnome/images/evolution/hide_read_messages.xpm
 share/gnome/images/evolution/hide_selected_messages.xpm
@@ -419,13 +631,19 @@ share/gnome/images/evolution/ico-rdf.png
 share/gnome/images/evolution/ico-weather.png
 share/gnome/images/evolution/import.png
 share/gnome/images/evolution/import.xpm
+share/gnome/images/evolution/inbox-16.png
+share/gnome/images/evolution/inbox-full-16.png
 share/gnome/images/evolution/mail-config-druid-account-name.png
 share/gnome/images/evolution/mail-config-druid-identity.png
 share/gnome/images/evolution/mail-config-druid-receive.png
 share/gnome/images/evolution/mail-config-druid-send.png
 share/gnome/images/evolution/mail-config-druid.png
 share/gnome/images/evolution/malehead.png
+share/gnome/images/evolution/mark-as-important-16.png
 share/gnome/images/evolution/move_message.xpm
+share/gnome/images/evolution/myevo-appointments.png
+share/gnome/images/evolution/myevo-mail-summary.png
+share/gnome/images/evolution/myevo-post-it.png
 share/gnome/images/evolution/myweather-clouds.png
 share/gnome/images/evolution/myweather-fog.png
 share/gnome/images/evolution/myweather-rain.png
@@ -436,15 +654,23 @@ share/gnome/images/evolution/myweather-suncloud.png
 share/gnome/images/evolution/new-message.xpm
 share/gnome/images/evolution/new_appointment.xpm
 share/gnome/images/evolution/new_contact.xpm
+share/gnome/images/evolution/new_task-16.png
 share/gnome/images/evolution/offline.png
 share/gnome/images/evolution/online.png
+share/gnome/images/evolution/open-in-new-window-16.png
+share/gnome/images/evolution/outbox-16.png
+share/gnome/images/evolution/outbox-full-16.png
 share/gnome/images/evolution/pattern.png
 share/gnome/images/evolution/print-preview.xpm
 share/gnome/images/evolution/print.xpm
 share/gnome/images/evolution/rdf.png
 share/gnome/images/evolution/reply.xpm
 share/gnome/images/evolution/reply_to_all.xpm
+share/gnome/images/evolution/save-16.png
+share/gnome/images/evolution/save-as-16.png
 share/gnome/images/evolution/save.xpm
+share/gnome/images/evolution/search-16.png
+share/gnome/images/evolution/search-and-replace-16.png
 share/gnome/images/evolution/send-16.png
 share/gnome/images/evolution/send-later-16.png
 share/gnome/images/evolution/send-receive.xpm
@@ -460,9 +686,14 @@ share/gnome/images/evolution/service-up-disabled.png
 share/gnome/images/evolution/service-up.png
 share/gnome/images/evolution/show_all_messages.xpm
 share/gnome/images/evolution/splash.png
+share/gnome/images/evolution/talking-heads.png
+share/gnome/images/evolution/task.xpm
 share/gnome/images/evolution/thankyou.png
-share/gnome/images/evolution/undelete_message.xpm
+share/gnome/images/evolution/undelete_message-16.png
+share/gnome/images/evolution/wax-seal-broken.png
+share/gnome/images/evolution/wax-seal.png
 share/gnome/images/evolution/work_offline.xpm
+share/gnome/images/evolution/work_online-16.png
 share/gnome/images/evolution/world_map-960.png
 share/gnome/libical/zoneinfo/Africa/Abidjan.ics
 share/gnome/libical/zoneinfo/Africa/Accra.ics
@@ -855,6 +1086,8 @@ share/gnome/oaf/GNOME_Evolution_Pine_Intelligent_Importer.oaf
 share/gnome/oaf/GNOME_Evolution_Shell.oaf
 share/gnome/oaf/GNOME_Evolution_Summary.oaf
 share/gnome/oaf/GNOME_Evolution_Wombat.oaf
+share/gnome/omf/evolution/evolution-C.omf
+share/gnome/omf/evolution/evolution-no.omf
 share/gnome/pixmaps/evolution.png
 share/gnome/ui/evolution-addressbook.xml
 share/gnome/ui/evolution-calendar.xml
@@ -903,6 +1136,7 @@ share/locale/sl/LC_MESSAGES/evolution.mo
 share/locale/sv/LC_MESSAGES/evolution.mo
 share/locale/tr/LC_MESSAGES/evolution.mo
 share/locale/uk/LC_MESSAGES/evolution.mo
+@dirrm share/gnome/omf/evolution
 @dirrm share/gnome/libical/zoneinfo/Pacific
 @dirrm share/gnome/libical/zoneinfo/Indian
 @dirrm share/gnome/libical/zoneinfo/Europe
@@ -918,17 +1152,14 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm share/gnome/libical/zoneinfo
 @dirrm share/gnome/libical
 @dirrm share/gnome/images/evolution/conduits
-@dirrm share/gnome/images/evolution/categories
 @dirrm share/gnome/images/evolution/buttons
 @dirrm share/gnome/images/evolution
 @dirrm share/gnome/images
-@dirrm share/gnome/html/evolution-devel-guide
-@dirrm share/gnome/html/evolution-cal-util
-@dirrm share/gnome/html/evolution-cal-client
-@dirrm share/gnome/help/evolution/C/evolution-guide/stylesheet-images
-@dirrm share/gnome/help/evolution/C/evolution-guide/fig
-@dirrm share/gnome/help/evolution/C/evolution-guide
-@dirrm share/gnome/help/evolution/C/evolution-faq
+@dirrm share/gnome/help/evolution/no/stylesheet-images
+@dirrm share/gnome/help/evolution/no/figures
+@dirrm share/gnome/help/evolution/no
+@dirrm share/gnome/help/evolution/C/stylesheet-images
+@dirrm share/gnome/help/evolution/C/figures
 @dirrm share/gnome/help/evolution/C
 @dirrm share/gnome/help/evolution
 @dirrm share/gnome/evolution/views/tasks
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index f797e1dc54c1..5db4470c5d6c 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution
-PORTVERSION=	0.12
+PORTVERSION=	0.13
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/evolution
@@ -36,7 +36,7 @@ PLIST_SUB=	VERSION=${PORTVERSION}
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 	@find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '[^g]iconv.h' | \
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index a30b516e4038..a9d0a9fa59e2 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1 +1 @@
-MD5 (evolution-0.12.tar.gz) = c5224f6dfa1154b3cce7c31d35c7a48f
+MD5 (evolution-0.13.tar.gz) = c35733ba57648c05d45a7ff9a054c577
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 74028d1fe442..0ab8cde1b418 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Sep  4 17:59:26 2001
-+++ configure	Tue Sep  4 18:11:25 2001
-@@ -5667,7 +5667,7 @@
+--- configure.orig	Tue Sep 11 19:38:48 2001
++++ configure	Tue Sep 11 19:38:55 2001
+@@ -5554,7 +5554,7 @@
  
  CPPFLAGS_save="$CPPFLAGS"
  CPPFLAGS="$CPPFLAGS $DB3_CFLAGS"
@@ -12,7 +12,7 @@ $FreeBSD$
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -5741,7 +5741,7 @@
+@@ -5628,7 +5628,7 @@
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -21,7 +21,7 @@ $FreeBSD$
  fi
  rm -f conftest*
  
-@@ -5852,7 +5852,7 @@
+@@ -5739,7 +5739,7 @@
  
  echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6
  if test "$ac_cv_db3_lib_version_match" = no; then
@@ -30,29 +30,7 @@ $FreeBSD$
  fi
  
  CPPFLAGS="$CPPFLAGS_save"
-@@ -6333,8 +6333,8 @@
- fi
- 
- 
--THREADS_LIBS="$PTHREAD_LIB `glib-config --libs gthread`"
--THREADS_CFLAGS="`glib-config --cflags gthread`"
-+THREADS_LIBS="$PTHREAD_LIB `$GLIB_CONFIG --libs gthread`"
-+THREADS_CFLAGS="`$GLIB_CONFIG --cflags gthread`"
- 
- 
- 
-@@ -6894,8 +6894,8 @@
- 	fi
- 
- 
--GLIB_CFLAGS="`glib-config --cflags`"
--GLIB_LIBS="`glib-config --libs`"
-+GLIB_CFLAGS="`$GLIB_CONFIG --cflags`"
-+GLIB_LIBS="`$GLIB_CONFIG --libs`"
- 
- 
- 
-@@ -9415,10 +9415,10 @@
+@@ -9349,10 +9349,10 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/mail/evolution/files/patch-filter::filter-input.c b/mail/evolution/files/patch-filter::filter-input.c
deleted file mode 100644
index c25fab446a11..000000000000
--- a/mail/evolution/files/patch-filter::filter-input.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- filter/filter-input.c	2001/09/04 16:51:06	1.1
-+++ filter/filter-input.c	2001/09/04 16:51:29
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <string.h>
-+#include <sys/types.h>
- #include <regex.h>
- #include <gtk/gtkobject.h>
- #include <gtk/gtkwidget.h>
diff --git a/mail/evolution/files/patch-po::Makefile.in.in b/mail/evolution/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..f2ce380397ca
--- /dev/null
+++ b/mail/evolution/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2001/09/11 17:20:57	1.1
++++ po/Makefile.in.in	2001/09/11 17:21:24
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
diff --git a/mail/evolution/files/patch-shell::e-shortcuts-view-model.c b/mail/evolution/files/patch-shell::e-shortcuts-view-model.c
deleted file mode 100644
index f32c70d82e3d..000000000000
--- a/mail/evolution/files/patch-shell::e-shortcuts-view-model.c
+++ /dev/null
@@ -1,140 +0,0 @@
-
-$FreeBSD$
-
---- shell/e-shortcuts-view-model.c	2001/09/04 16:22:15	1.1
-+++ shell/e-shortcuts-view-model.c	2001/09/04 16:30:50
-@@ -45,31 +45,71 @@
- };
- 
- 
-+/* Utility functions.  */
-+
-+static GdkPixbuf *
-+get_icon_for_item (EShortcutsViewModel *shortcuts_view_model,
-+		   const EShortcutItem *item,
-+		   gboolean want_mini)
-+{
-+	EShortcutsViewModelPrivate *priv;
-+
-+	priv = shortcuts_view_model->priv;
-+
-+	if (item->type != NULL) {
-+		EStorageSet *storage_set;
-+		EFolderTypeRegistry *folder_type_registry;
-+
-+		storage_set = e_shortcuts_get_storage_set (priv->shortcuts);
-+		folder_type_registry = e_storage_set_get_folder_type_registry (storage_set);
-+
-+		return e_folder_type_registry_get_icon_for_type (folder_type_registry,
-+								 item->type,
-+								 want_mini);
-+	}
-+
-+	g_print ("(%s is not a folder!)\n", item->name);
-+
-+	return NULL;
-+}
-+
-+
- /* View initialization.  */
- 
-+static char *
-+get_name_with_unread (const EShortcutItem *item)
-+{
-+	return g_strdup (item->name);
-+}
-+
- static void
- load_group_into_model (EShortcutsViewModel *shortcuts_view_model,
- 		       int group_num)
- {
- 	EShortcutsViewModelPrivate *priv;
--	EStorageSet *storage_set;
- 	const GSList *shortcut_list;
- 	const GSList *p;
- 
- 	priv = shortcuts_view_model->priv;
- 
--	storage_set = e_shortcuts_get_storage_set (priv->shortcuts);
--	g_assert (storage_set != NULL);
--
- 	shortcut_list = e_shortcuts_get_shortcuts_in_group (priv->shortcuts, group_num);
- 	if (shortcut_list == NULL)
- 		return;
- 
- 	for (p = shortcut_list; p != NULL; p = p->next) {
- 		const EShortcutItem *item;
-+		char *name_with_unread;
- 
- 		item = (const EShortcutItem *) p->data;
--		e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model), group_num, -1, item->uri, item->name);
-+		name_with_unread = get_name_with_unread (item);
-+
-+		e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model),
-+					   group_num, -1,
-+					   item->uri,
-+					   name_with_unread,
-+					   get_icon_for_item (shortcuts_view_model, item, FALSE));
-+
-+		g_free (name_with_unread);
- 	}
- }
- 
-@@ -153,6 +193,7 @@
- 	EShortcutsViewModel *shortcuts_view_model;
- 	EShortcutsViewModelPrivate *priv;
- 	const EShortcutItem *shortcut_item;
-+	char *name_with_unread;
- 
- 	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
- 	priv = shortcuts_view_model->priv;
-@@ -160,10 +201,14 @@
- 	shortcut_item = e_shortcuts_get_shortcut (priv->shortcuts, group_num, item_num);
- 	g_assert (shortcut_item != NULL);
- 
-+	name_with_unread = get_name_with_unread (shortcut_item);
- 	e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model),
- 				   group_num, item_num,
- 				   shortcut_item->uri,
--				   shortcut_item->name);
-+				   name_with_unread,
-+				   get_icon_for_item (shortcuts_view_model, shortcut_item, FALSE));
-+
-+	g_free (name_with_unread);
- }
- 
- static void
-@@ -187,6 +232,7 @@
- 	EShortcutsViewModel *shortcuts_view_model;
- 	EShortcutsViewModelPrivate *priv;
- 	const EShortcutItem *shortcut_item;
-+	char *name_with_unread;
- 
- 	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
- 	priv = shortcuts_view_model->priv;
-@@ -194,10 +240,14 @@
- 	shortcut_item = e_shortcuts_get_shortcut (priv->shortcuts, group_num, item_num);
- 	g_assert (shortcut_item != NULL);
- 
-+	name_with_unread = get_name_with_unread (shortcut_item);
- 	e_shortcut_model_update_item (E_SHORTCUT_MODEL (shortcuts_view_model),
- 				      group_num, item_num,
- 				      shortcut_item->uri,
--				      shortcut_item->name);
-+				      name_with_unread,
-+				      get_icon_for_item (shortcuts_view_model, shortcut_item, FALSE));
-+
-+	g_free (name_with_unread);
- }
- 
- 
-@@ -213,6 +263,9 @@
- 	priv = view_model->priv;
- 
- 	g_free (priv);
-+
-+	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-+		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
- }
- 
- 
diff --git a/mail/evolution/files/patch-shell::e-shortcuts-view.c b/mail/evolution/files/patch-shell::e-shortcuts-view.c
deleted file mode 100644
index 2ff7af4ec1b9..000000000000
--- a/mail/evolution/files/patch-shell::e-shortcuts-view.c
+++ /dev/null
@@ -1,63 +0,0 @@
-
-$FreeBSD$
-
---- shell/e-shortcuts-view.c	2001/09/04 16:40:47	1.1
-+++ shell/e-shortcuts-view.c	2001/09/04 16:44:17
-@@ -86,47 +86,6 @@
- 	return colon + 1;
- }
- 
--/* Icon callback for the shortcut bar.  */
--static GdkPixbuf *
--icon_callback (EShortcutBar *shortcut_bar,
--	       const char *uri,
--	       gpointer data)
--{
--	EFolderTypeRegistry *folder_type_registry;
--	EShortcuts *shortcuts;
--	EStorageSet *storage_set;
--	EFolder *folder;
--	GdkPixbuf *pixbuf;
--	const char *type;
--
--	shortcuts = E_SHORTCUTS (data);
--
--	storage_set = e_shortcuts_get_storage_set (shortcuts);
--	folder_type_registry = e_storage_set_get_folder_type_registry (storage_set);
--
--	if (strcmp ("evolution:/My Evolution", uri) == 0) {
--		type = "My Evolution";
--	} else {
--		folder = e_storage_set_get_folder (storage_set,
--						   get_storage_set_path_from_uri (uri));
--
--		if (folder == NULL)
--			return NULL;
--		
--		type = e_folder_get_type_string (folder);
--		if (type == NULL)
--			return NULL;
--	}
--
--	/* FIXME mini icons?  */
--	pixbuf = e_folder_type_registry_get_icon_for_type (folder_type_registry, type, FALSE);
--
--	if (pixbuf != NULL)
--		gdk_pixbuf_ref (pixbuf);
--
--	return pixbuf;
--}
--
- 
- static void
- show_new_group_dialog (EShortcutsView *view)
-@@ -659,9 +618,6 @@
- 
- 	priv->shortcuts = shortcuts;
- 	gtk_object_ref (GTK_OBJECT (priv->shortcuts));
--
--	e_shortcut_bar_set_icon_callback (E_SHORTCUT_BAR (shortcuts_view), icon_callback,
--					  shortcuts);
- 
- 	e_shortcut_bar_set_model (E_SHORTCUT_BAR (shortcuts_view),
- 				  E_SHORTCUT_MODEL (e_shortcuts_view_model_new (shortcuts)));
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 87f6f87489bb..9a9b94ff4f69 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -90,6 +90,7 @@ include/camel/camel-sasl-digest-md5.h
 include/camel/camel-sasl-kerberos4.h
 include/camel/camel-sasl-login.h
 include/camel/camel-sasl-plain.h
+include/camel/camel-sasl-popb4smtp.h
 include/camel/camel-sasl.h
 include/camel/camel-seekable-stream.h
 include/camel/camel-seekable-substream.h
@@ -155,7 +156,6 @@ include/evolution/importer/evolution-intelligent-importer.h
 include/evolution/shell/Evolution.h
 include/evolution/shell/e-folder-tree.h
 include/evolution/shell/evolution-activity-client.h
-include/evolution/shell/evolution-local-storage.h
 include/evolution/shell/evolution-session.h
 include/evolution/shell/evolution-shell-client.h
 include/evolution/shell/evolution-shell-component-client.h
@@ -166,6 +166,7 @@ include/evolution/shell/evolution-shell-view.h
 include/evolution/shell/evolution-storage-listener.h
 include/evolution/shell/evolution-storage-set-view-listener.h
 include/evolution/shell/evolution-storage.h
+include/evolution/shell/evolution-wizard.h
 include/evolution/wombat/wombat-client.h
 include/ical.h
 include/icalss.h
@@ -258,6 +259,7 @@ share/gnome/evolution/etspec/e-calendar-table.etspec
 share/gnome/evolution/etspec/e-storage-set-view.etspec
 share/gnome/evolution/etspec/meeting-page.etspec
 share/gnome/evolution/etspec/message-list.etspec
+share/gnome/evolution/etspec/subscribe-dialog.etspec
 share/gnome/evolution/filtertypes.xml
 share/gnome/evolution/glade/addressbook-config.glade
 share/gnome/evolution/glade/alarm-notify.glade
@@ -278,6 +280,8 @@ share/gnome/evolution/glade/e-msg-composer-attachment.glade
 share/gnome/evolution/glade/e-shell-folder-creation-dialog.glade
 share/gnome/evolution/glade/e-timezone-dialog.glade
 share/gnome/evolution/glade/event-page.glade
+share/gnome/evolution/glade/evolution-startup-wizard.glade
+share/gnome/evolution/glade/file-exists.glade
 share/gnome/evolution/glade/filter.glade
 share/gnome/evolution/glade/fulladdr.glade
 share/gnome/evolution/glade/fullname.glade
@@ -289,6 +293,7 @@ share/gnome/evolution/glade/meeting-page.glade
 share/gnome/evolution/glade/my-evolution.glade
 share/gnome/evolution/glade/recurrence-page.glade
 share/gnome/evolution/glade/select-names.glade
+share/gnome/evolution/glade/subscribe-dialog.glade
 share/gnome/evolution/glade/task-details-page.glade
 share/gnome/evolution/glade/task-page.glade
 share/gnome/evolution/vfoldertypes.xml
@@ -304,23 +309,235 @@ share/gnome/evolution/views/mail/galview.xml
 share/gnome/evolution/views/tasks/Tasks.galview
 share/gnome/evolution/views/tasks/With_Category.galview
 share/gnome/evolution/views/tasks/galview.xml
+share/gnome/help/evolution/C/aboutbook.html
+share/gnome/help/evolution/C/apx-authors.sgml
+share/gnome/help/evolution/C/apx-bugs.sgml
+share/gnome/help/evolution/C/apx-gloss.html
+share/gnome/help/evolution/C/apx-gloss.sgml
+share/gnome/help/evolution/C/authors.html
+share/gnome/help/evolution/C/bugs.html
+share/gnome/help/evolution/C/config-encryption.sgml
+share/gnome/help/evolution/C/config-prefs-cal.html
+share/gnome/help/evolution/C/config-prefs-contact.html
+share/gnome/help/evolution/C/config-prefs-general.html
+share/gnome/help/evolution/C/config-prefs.html
+share/gnome/help/evolution/C/config-prefs.sgml
+share/gnome/help/evolution/C/config-sync.html
+share/gnome/help/evolution/C/config-sync.sgml
+share/gnome/help/evolution/C/config.html
+share/gnome/help/evolution/C/contact-search.html
+share/gnome/help/evolution/C/docbook.css
+share/gnome/help/evolution/C/encryption.html
+share/gnome/help/evolution/C/evolution-faq.sgml
+share/gnome/help/evolution/C/evolution.sgml
+share/gnome/help/evolution/C/figures/calendar.png
+share/gnome/help/evolution/C/figures/config-cal.png
+share/gnome/help/evolution/C/figures/config-mail.png
+share/gnome/help/evolution/C/figures/contact-editor.png
+share/gnome/help/evolution/C/figures/contact.png
+share/gnome/help/evolution/C/figures/filter-assist-fig.png
+share/gnome/help/evolution/C/figures/filter-new-fig.png
+share/gnome/help/evolution/C/figures/full-1.png
+share/gnome/help/evolution/C/figures/full-2.png
+share/gnome/help/evolution/C/figures/full-3.png
+share/gnome/help/evolution/C/figures/full-4.png
+share/gnome/help/evolution/C/figures/full-5.png
+share/gnome/help/evolution/C/figures/full-6.png
+share/gnome/help/evolution/C/figures/full-7.png
+share/gnome/help/evolution/C/figures/mail-composer.png
+share/gnome/help/evolution/C/figures/mail-druid-pic.png
+share/gnome/help/evolution/C/figures/mail-inbox.png
+share/gnome/help/evolution/C/figures/mainwindow-pic.png
+share/gnome/help/evolution/C/figures/newmsg.png
+share/gnome/help/evolution/C/figures/print-dest.png
+share/gnome/help/evolution/C/figures/print-preview.png
+share/gnome/help/evolution/C/figures/replymsg.png
+share/gnome/help/evolution/C/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/C/index.html
+share/gnome/help/evolution/C/introduction.html
+share/gnome/help/evolution/C/ln20.html
+share/gnome/help/evolution/C/menuref.html
+share/gnome/help/evolution/C/menuref.sgml
+share/gnome/help/evolution/C/preface.sgml
+share/gnome/help/evolution/C/print-destination.html
+share/gnome/help/evolution/C/quickref-cal.html
+share/gnome/help/evolution/C/quickref-contact.html
+share/gnome/help/evolution/C/quickref-mail.html
+share/gnome/help/evolution/C/stylesheet-images/caution.gif
+share/gnome/help/evolution/C/stylesheet-images/home.gif
+share/gnome/help/evolution/C/stylesheet-images/important.gif
+share/gnome/help/evolution/C/stylesheet-images/next.gif
+share/gnome/help/evolution/C/stylesheet-images/note.gif
+share/gnome/help/evolution/C/stylesheet-images/prev.gif
+share/gnome/help/evolution/C/stylesheet-images/tip.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-blank.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-minus.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-plus.gif
+share/gnome/help/evolution/C/stylesheet-images/up.gif
+share/gnome/help/evolution/C/stylesheet-images/warning.gif
+share/gnome/help/evolution/C/topic.dat
+share/gnome/help/evolution/C/ui-intro.html
+share/gnome/help/evolution/C/usage-calendar-apts.html
+share/gnome/help/evolution/C/usage-calendar-multiple.html
+share/gnome/help/evolution/C/usage-calendar-todo.html
+share/gnome/help/evolution/C/usage-calendar.html
+share/gnome/help/evolution/C/usage-calendar.sgml
+share/gnome/help/evolution/C/usage-contact-automate.html
+share/gnome/help/evolution/C/usage-contact-organize.html
+share/gnome/help/evolution/C/usage-contact-sharing.html
+share/gnome/help/evolution/C/usage-contact.html
+share/gnome/help/evolution/C/usage-contact.sgml
+share/gnome/help/evolution/C/usage-encryption.sgml
+share/gnome/help/evolution/C/usage-exec-summary.html
+share/gnome/help/evolution/C/usage-exec-summary.sgml
+share/gnome/help/evolution/C/usage-mail-getnsend-get.html
+share/gnome/help/evolution/C/usage-mail-getnsend-send.html
+share/gnome/help/evolution/C/usage-mail-org.sgml
+share/gnome/help/evolution/C/usage-mail-organize-filters.html
+share/gnome/help/evolution/C/usage-mail-organize-folders.html
+share/gnome/help/evolution/C/usage-mail-organize-search.html
+share/gnome/help/evolution/C/usage-mail-organize-vfolders.html
+share/gnome/help/evolution/C/usage-mail-organize.html
+share/gnome/help/evolution/C/usage-mail-subscriptions.html
+share/gnome/help/evolution/C/usage-mail.html
+share/gnome/help/evolution/C/usage-mail.sgml
+share/gnome/help/evolution/C/usage-mainwindow.html
+share/gnome/help/evolution/C/usage-mainwindow.sgml
+share/gnome/help/evolution/C/usage-print.html
+share/gnome/help/evolution/C/usage-print.sgml
+share/gnome/help/evolution/C/usage-sync.html
+share/gnome/help/evolution/C/usage-sync.sgml
+share/gnome/help/evolution/C/usage.html
+share/gnome/help/evolution/no/aboutbook.html
+share/gnome/help/evolution/no/apx-authors.sgml
+share/gnome/help/evolution/no/apx-bugs.sgml
+share/gnome/help/evolution/no/apx-gloss.html
+share/gnome/help/evolution/no/apx-gloss.sgml
+share/gnome/help/evolution/no/authors.html
+share/gnome/help/evolution/no/bugs.html
+share/gnome/help/evolution/no/config-encryption.sgml
+share/gnome/help/evolution/no/config-prefs-cal.html
+share/gnome/help/evolution/no/config-prefs-contact.html
+share/gnome/help/evolution/no/config-prefs-general.html
+share/gnome/help/evolution/no/config-prefs.html
+share/gnome/help/evolution/no/config-prefs.sgml
+share/gnome/help/evolution/no/config-sync.html
+share/gnome/help/evolution/no/config-sync.sgml
+share/gnome/help/evolution/no/config.html
+share/gnome/help/evolution/no/contact-search.html
+share/gnome/help/evolution/no/docbook.css
+share/gnome/help/evolution/no/encryption.html
+share/gnome/help/evolution/no/evolution-faq.html
+share/gnome/help/evolution/no/evolution-faq.sgml
+share/gnome/help/evolution/no/evolution.sgml
+share/gnome/help/evolution/no/faq-debugging.html
+share/gnome/help/evolution/no/faq-get-and-compile.html
+share/gnome/help/evolution/no/faq-trouble.html
+share/gnome/help/evolution/no/figures/calendar.png
+share/gnome/help/evolution/no/figures/config-cal.png
+share/gnome/help/evolution/no/figures/config-mail.png
+share/gnome/help/evolution/no/figures/contact-editor.png
+share/gnome/help/evolution/no/figures/contact.png
+share/gnome/help/evolution/no/figures/filter-assist-fig.png
+share/gnome/help/evolution/no/figures/filter-new-fig.png
+share/gnome/help/evolution/no/figures/full-1.png
+share/gnome/help/evolution/no/figures/full-2.png
+share/gnome/help/evolution/no/figures/full-3.png
+share/gnome/help/evolution/no/figures/full-4.png
+share/gnome/help/evolution/no/figures/full-5.png
+share/gnome/help/evolution/no/figures/full-6.png
+share/gnome/help/evolution/no/figures/full-7.png
+share/gnome/help/evolution/no/figures/mail-composer.png
+share/gnome/help/evolution/no/figures/mail-druid-pic.png
+share/gnome/help/evolution/no/figures/mail-inbox.png
+share/gnome/help/evolution/no/figures/mainwindow-pic.png
+share/gnome/help/evolution/no/figures/newmsg.png
+share/gnome/help/evolution/no/figures/print-dest.png
+share/gnome/help/evolution/no/figures/print-preview.png
+share/gnome/help/evolution/no/figures/replymsg.png
+share/gnome/help/evolution/no/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/no/index.html
+share/gnome/help/evolution/no/introduction.html
+share/gnome/help/evolution/no/ln20.html
+share/gnome/help/evolution/no/menuref-cal-editor.html
+share/gnome/help/evolution/no/menuref-cal.html
+share/gnome/help/evolution/no/menuref-contact-editor.html
+share/gnome/help/evolution/no/menuref-mail-editor.html
+share/gnome/help/evolution/no/menuref.html
+share/gnome/help/evolution/no/menuref.sgml
+share/gnome/help/evolution/no/p2563.html
+share/gnome/help/evolution/no/preface.sgml
+share/gnome/help/evolution/no/print-destination.html
+share/gnome/help/evolution/no/quickref-commontasks.html
+share/gnome/help/evolution/no/stylesheet-images/caution.gif
+share/gnome/help/evolution/no/stylesheet-images/home.gif
+share/gnome/help/evolution/no/stylesheet-images/important.gif
+share/gnome/help/evolution/no/stylesheet-images/next.gif
+share/gnome/help/evolution/no/stylesheet-images/note.gif
+share/gnome/help/evolution/no/stylesheet-images/prev.gif
+share/gnome/help/evolution/no/stylesheet-images/tip.gif
+share/gnome/help/evolution/no/stylesheet-images/toc-blank.gif
+share/gnome/help/evolution/no/stylesheet-images/toc-minus.gif
+share/gnome/help/evolution/no/stylesheet-images/toc-plus.gif
+share/gnome/help/evolution/no/stylesheet-images/up.gif
+share/gnome/help/evolution/no/stylesheet-images/warning.gif
+share/gnome/help/evolution/no/topic.dat
+share/gnome/help/evolution/no/ui-intro.html
+share/gnome/help/evolution/no/usage-calendar-apts.html
+share/gnome/help/evolution/no/usage-calendar-multiple.html
+share/gnome/help/evolution/no/usage-calendar-todo.html
+share/gnome/help/evolution/no/usage-calendar.html
+share/gnome/help/evolution/no/usage-calendar.sgml
+share/gnome/help/evolution/no/usage-contact-automate.html
+share/gnome/help/evolution/no/usage-contact-cards.html
+share/gnome/help/evolution/no/usage-contact-organize.html
+share/gnome/help/evolution/no/usage-contact-sharing.html
+share/gnome/help/evolution/no/usage-contact.html
+share/gnome/help/evolution/no/usage-contact.sgml
+share/gnome/help/evolution/no/usage-encryption.sgml
+share/gnome/help/evolution/no/usage-exec-summary.html
+share/gnome/help/evolution/no/usage-exec-summary.sgml
+share/gnome/help/evolution/no/usage-mail-getnsend-get.html
+share/gnome/help/evolution/no/usage-mail-getnsend-send.html
+share/gnome/help/evolution/no/usage-mail-org.sgml
+share/gnome/help/evolution/no/usage-mail-organize-filters.html
+share/gnome/help/evolution/no/usage-mail-organize-folders.html
+share/gnome/help/evolution/no/usage-mail-organize-search.html
+share/gnome/help/evolution/no/usage-mail-organize-vfolders.html
+share/gnome/help/evolution/no/usage-mail-organize.html
+share/gnome/help/evolution/no/usage-mail-subscriptions.html
+share/gnome/help/evolution/no/usage-mail.html
+share/gnome/help/evolution/no/usage-mail.sgml
+share/gnome/help/evolution/no/usage-mainwindow.html
+share/gnome/help/evolution/no/usage-mainwindow.sgml
+share/gnome/help/evolution/no/usage-print.html
+share/gnome/help/evolution/no/usage-print.sgml
+share/gnome/help/evolution/no/usage-sync.html
+share/gnome/help/evolution/no/usage-sync.sgml
+share/gnome/help/evolution/no/usage.html
+share/gnome/help/evolution/no/x3360.html
 share/gnome/idl/Composer.idl
 share/gnome/idl/Evolution-Activity.idl
 share/gnome/idl/Evolution-Composer.idl
-share/gnome/idl/Evolution-Icon.idl
-share/gnome/idl/Evolution-LocalStorage.idl
 share/gnome/idl/Evolution-Offline.idl
 share/gnome/idl/Evolution-Session.idl
 share/gnome/idl/Evolution-Shell.idl
 share/gnome/idl/Evolution-ShellComponent.idl
 share/gnome/idl/Evolution-ShellComponentDnd.idl
 share/gnome/idl/Evolution-ShellView.idl
+share/gnome/idl/Evolution-Shortcuts.idl
 share/gnome/idl/Evolution-Storage.idl
 share/gnome/idl/Evolution-StorageSetView.idl
+share/gnome/idl/Evolution-Wizard.idl
+share/gnome/idl/Evolution-common.idl
 share/gnome/idl/Evolution.idl
 share/gnome/idl/GNOME_Evolution_Importer.idl
 share/gnome/idl/addressbook.idl
 share/gnome/idl/evolution-calendar.idl
+share/gnome/images/evolution/16_copy.png
+share/gnome/images/evolution/16_customize.png
+share/gnome/images/evolution/16_cut.png
+share/gnome/images/evolution/16_paste.png
 share/gnome/images/evolution/all_contacts.xpm
 share/gnome/images/evolution/apply-filters-16.xpm
 share/gnome/images/evolution/bcg.png
@@ -328,43 +545,35 @@ share/gnome/images/evolution/briefcase.png
 share/gnome/images/evolution/butterfly.png
 share/gnome/images/evolution/buttons/add-attachment.png
 share/gnome/images/evolution/buttons/add-service.png
+share/gnome/images/evolution/buttons/arrow-left-24.png
+share/gnome/images/evolution/buttons/arrow-right-24.png
 share/gnome/images/evolution/buttons/compose-message.png
 share/gnome/images/evolution/buttons/copy-message.png
+share/gnome/images/evolution/buttons/copy.png
+share/gnome/images/evolution/buttons/cut.png
 share/gnome/images/evolution/buttons/dayview.xpm
+share/gnome/images/evolution/buttons/delete-message.png
 share/gnome/images/evolution/buttons/fetch-mail.png
 share/gnome/images/evolution/buttons/forward.png
+share/gnome/images/evolution/buttons/goto-24.png
 share/gnome/images/evolution/buttons/monthview.xpm
 share/gnome/images/evolution/buttons/move-message.png
 share/gnome/images/evolution/buttons/new_appointment.png
+share/gnome/images/evolution/buttons/new_task.png
 share/gnome/images/evolution/buttons/next-message.png
+share/gnome/images/evolution/buttons/paste.png
 share/gnome/images/evolution/buttons/previous-message.png
 share/gnome/images/evolution/buttons/print-preview-24.png
 share/gnome/images/evolution/buttons/print.png
+share/gnome/images/evolution/buttons/receive-24.png
 share/gnome/images/evolution/buttons/reply-to-all.png
 share/gnome/images/evolution/buttons/reply.png
+share/gnome/images/evolution/buttons/save-24.png
 share/gnome/images/evolution/buttons/send-24-receive.png
 share/gnome/images/evolution/buttons/send-24.png
 share/gnome/images/evolution/buttons/weekview.xpm
 share/gnome/images/evolution/buttons/workweekview.xpm
 share/gnome/images/evolution/buttons/yearview.xpm
-share/gnome/images/evolution/categories/16_category_birthday.png
-share/gnome/images/evolution/categories/16_category_business.png
-share/gnome/images/evolution/categories/16_category_favorites.png
-share/gnome/images/evolution/categories/16_category_gifts.png
-share/gnome/images/evolution/categories/16_category_goals.png
-share/gnome/images/evolution/categories/16_category_holiday-cards.png
-share/gnome/images/evolution/categories/16_category_holiday.png
-share/gnome/images/evolution/categories/16_category_hot-contacts.png
-share/gnome/images/evolution/categories/16_category_ideas.png
-share/gnome/images/evolution/categories/16_category_international.png
-share/gnome/images/evolution/categories/16_category_key-customer.png
-share/gnome/images/evolution/categories/16_category_miscellaneous.png
-share/gnome/images/evolution/categories/16_category_personal.png
-share/gnome/images/evolution/categories/16_category_phonecalls.png
-share/gnome/images/evolution/categories/16_category_status.png
-share/gnome/images/evolution/categories/16_category_strategies.png
-share/gnome/images/evolution/categories/16_category_suppliers.png
-share/gnome/images/evolution/categories/16_category_time-and-expenses.png
 share/gnome/images/evolution/cellphone.png
 share/gnome/images/evolution/compose-message.png
 share/gnome/images/evolution/conduits/evo-16-address-conduit.png
@@ -379,7 +588,6 @@ share/gnome/images/evolution/configure_16_folder.xpm
 share/gnome/images/evolution/configure_16_mail.xpm
 share/gnome/images/evolution/contact-is-a-list.png
 share/gnome/images/evolution/copy_16_message.xpm
-share/gnome/images/evolution/delete_message.xpm
 share/gnome/images/evolution/edit.xpm
 share/gnome/images/evolution/empty.gif
 share/gnome/images/evolution/encrypt.xpm
@@ -403,12 +611,16 @@ share/gnome/images/evolution/evolution-trash-mini.png
 share/gnome/images/evolution/evolution-trash.png
 share/gnome/images/evolution/executive-summary-bg.png
 share/gnome/images/evolution/executive-summary-curve.png
+share/gnome/images/evolution/faq-16.png
 share/gnome/images/evolution/fetch-mail.png
 share/gnome/images/evolution/find_contact.xpm
 share/gnome/images/evolution/find_message.xpm
+share/gnome/images/evolution/folder-copy-16.png
+share/gnome/images/evolution/folder-move-16.png
 share/gnome/images/evolution/folder.xpm
 share/gnome/images/evolution/forward.xpm
 share/gnome/images/evolution/globe.png
+share/gnome/images/evolution/goto-16.png
 share/gnome/images/evolution/hide_deleted_messages.xpm
 share/gnome/images/evolution/hide_read_messages.xpm
 share/gnome/images/evolution/hide_selected_messages.xpm
@@ -419,13 +631,19 @@ share/gnome/images/evolution/ico-rdf.png
 share/gnome/images/evolution/ico-weather.png
 share/gnome/images/evolution/import.png
 share/gnome/images/evolution/import.xpm
+share/gnome/images/evolution/inbox-16.png
+share/gnome/images/evolution/inbox-full-16.png
 share/gnome/images/evolution/mail-config-druid-account-name.png
 share/gnome/images/evolution/mail-config-druid-identity.png
 share/gnome/images/evolution/mail-config-druid-receive.png
 share/gnome/images/evolution/mail-config-druid-send.png
 share/gnome/images/evolution/mail-config-druid.png
 share/gnome/images/evolution/malehead.png
+share/gnome/images/evolution/mark-as-important-16.png
 share/gnome/images/evolution/move_message.xpm
+share/gnome/images/evolution/myevo-appointments.png
+share/gnome/images/evolution/myevo-mail-summary.png
+share/gnome/images/evolution/myevo-post-it.png
 share/gnome/images/evolution/myweather-clouds.png
 share/gnome/images/evolution/myweather-fog.png
 share/gnome/images/evolution/myweather-rain.png
@@ -436,15 +654,23 @@ share/gnome/images/evolution/myweather-suncloud.png
 share/gnome/images/evolution/new-message.xpm
 share/gnome/images/evolution/new_appointment.xpm
 share/gnome/images/evolution/new_contact.xpm
+share/gnome/images/evolution/new_task-16.png
 share/gnome/images/evolution/offline.png
 share/gnome/images/evolution/online.png
+share/gnome/images/evolution/open-in-new-window-16.png
+share/gnome/images/evolution/outbox-16.png
+share/gnome/images/evolution/outbox-full-16.png
 share/gnome/images/evolution/pattern.png
 share/gnome/images/evolution/print-preview.xpm
 share/gnome/images/evolution/print.xpm
 share/gnome/images/evolution/rdf.png
 share/gnome/images/evolution/reply.xpm
 share/gnome/images/evolution/reply_to_all.xpm
+share/gnome/images/evolution/save-16.png
+share/gnome/images/evolution/save-as-16.png
 share/gnome/images/evolution/save.xpm
+share/gnome/images/evolution/search-16.png
+share/gnome/images/evolution/search-and-replace-16.png
 share/gnome/images/evolution/send-16.png
 share/gnome/images/evolution/send-later-16.png
 share/gnome/images/evolution/send-receive.xpm
@@ -460,9 +686,14 @@ share/gnome/images/evolution/service-up-disabled.png
 share/gnome/images/evolution/service-up.png
 share/gnome/images/evolution/show_all_messages.xpm
 share/gnome/images/evolution/splash.png
+share/gnome/images/evolution/talking-heads.png
+share/gnome/images/evolution/task.xpm
 share/gnome/images/evolution/thankyou.png
-share/gnome/images/evolution/undelete_message.xpm
+share/gnome/images/evolution/undelete_message-16.png
+share/gnome/images/evolution/wax-seal-broken.png
+share/gnome/images/evolution/wax-seal.png
 share/gnome/images/evolution/work_offline.xpm
+share/gnome/images/evolution/work_online-16.png
 share/gnome/images/evolution/world_map-960.png
 share/gnome/libical/zoneinfo/Africa/Abidjan.ics
 share/gnome/libical/zoneinfo/Africa/Accra.ics
@@ -855,6 +1086,8 @@ share/gnome/oaf/GNOME_Evolution_Pine_Intelligent_Importer.oaf
 share/gnome/oaf/GNOME_Evolution_Shell.oaf
 share/gnome/oaf/GNOME_Evolution_Summary.oaf
 share/gnome/oaf/GNOME_Evolution_Wombat.oaf
+share/gnome/omf/evolution/evolution-C.omf
+share/gnome/omf/evolution/evolution-no.omf
 share/gnome/pixmaps/evolution.png
 share/gnome/ui/evolution-addressbook.xml
 share/gnome/ui/evolution-calendar.xml
@@ -903,6 +1136,7 @@ share/locale/sl/LC_MESSAGES/evolution.mo
 share/locale/sv/LC_MESSAGES/evolution.mo
 share/locale/tr/LC_MESSAGES/evolution.mo
 share/locale/uk/LC_MESSAGES/evolution.mo
+@dirrm share/gnome/omf/evolution
 @dirrm share/gnome/libical/zoneinfo/Pacific
 @dirrm share/gnome/libical/zoneinfo/Indian
 @dirrm share/gnome/libical/zoneinfo/Europe
@@ -918,17 +1152,14 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm share/gnome/libical/zoneinfo
 @dirrm share/gnome/libical
 @dirrm share/gnome/images/evolution/conduits
-@dirrm share/gnome/images/evolution/categories
 @dirrm share/gnome/images/evolution/buttons
 @dirrm share/gnome/images/evolution
 @dirrm share/gnome/images
-@dirrm share/gnome/html/evolution-devel-guide
-@dirrm share/gnome/html/evolution-cal-util
-@dirrm share/gnome/html/evolution-cal-client
-@dirrm share/gnome/help/evolution/C/evolution-guide/stylesheet-images
-@dirrm share/gnome/help/evolution/C/evolution-guide/fig
-@dirrm share/gnome/help/evolution/C/evolution-guide
-@dirrm share/gnome/help/evolution/C/evolution-faq
+@dirrm share/gnome/help/evolution/no/stylesheet-images
+@dirrm share/gnome/help/evolution/no/figures
+@dirrm share/gnome/help/evolution/no
+@dirrm share/gnome/help/evolution/C/stylesheet-images
+@dirrm share/gnome/help/evolution/C/figures
 @dirrm share/gnome/help/evolution/C
 @dirrm share/gnome/help/evolution
 @dirrm share/gnome/evolution/views/tasks