- major update evolution to 2.30.0.1

mail/evolution/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.97 2010/04/09 09:02:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.98 2010/04/22 16:30:02 jasper Exp $
 
 COMMENT-main=		integrated email and PIM software for GNOME
 COMMENT-plugins=	additionnal plugins for evolution
 
 GNOME_PROJECT=		evolution
-GNOME_VERSION=		2.28.3.1
+GNOME_VERSION=		2.30.0.1
 
 # Only get the first x.y which is needed in the PLIST.
 # NOTE: when major version changes, increment EVO_VERSION accordingly 
@@ -28,7 +28,7 @@ HOMEPAGE=		http://www.gnome.org/projects/evolution/
 MAINTAINER=		Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
 			Antoine Jacoutot <ajacoutot@openbsd.org>
 
-SO_VERSION=		5.0
+SO_VERSION=		6.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
 .for _lib in eutil econduit evolution-a11y evolution-calendar-a11y \
@@ -36,7 +36,8 @@ evolution-widgets-a11y evolution-addressbook-a11y etable etext emiscwidgets \
 efilterbar etimezonedialog menus eshell filter essmime evolution-smime eabutil \
 evolution-addressbook-importers econtacteditor econtactlisteditor \
 evolution-calendar-importers evolution-mail-importers evolution-cal-shared \
-evolution-mail-shared
+evolution-mail-shared emformat composer evolution-mail evolution-calendar \
+evolution-mail-settings
 SHARED_LIBS+=	${_lib}	${SO_VERSION}
 .endfor
 
@@ -46,27 +47,27 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite
-WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
-WANTLIB += Xrender art_lgpl_2 asn1 atk-1.0 avahi-client avahi-common
-WANTLIB += avahi-glib bonobo-2 bonobo-activation bonoboui-2 c
-WANTLIB += cairo com_err crypto dbus-1 dbus-glib-1 enchant execinfo
-WANTLIB += expat fontconfig freetype gailutil gcrypt gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0
-WANTLIB += gnome-2 gnome-keyring gnomecanvas-2 gnomevfs-2 gnutls
-WANTLIB += gobject-2.0 gpg-error gssapi gthread-2.0 gtk-x11-2.0
-WANTLIB += ical krb5 m nspr4 pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pcre pixman-1 plc4 plds4 png popt pthread pthread-stubs
-WANTLIB += sqlite3 ssl startup-notification-1 stdc++ tasn1 util
-WANTLIB += xcb xcb-atom xcb-aux xcb-event xml2 z
+WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 asn1
+WANTLIB += atk-1.0 c cairo com_err crypto dbus-1 dbus-glib-1
+WANTLIB += eggdbus-1 enchant execinfo expat fontconfig freetype
+WANTLIB += gailutil gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 glitz gmodule-2.0 gnome-keyring gnomecanvas-2
+WANTLIB += gnutls gobject-2.0 gpg-error gssapi gthread-2.0 gtk-x11-2.0
+WANTLIB += ical krb5 m nspr4 pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 plc4 plds4
+WANTLIB += png pthread pthread-stubs sqlite3 startup-notification-1
+WANTLIB += stdc++ tasn1 xcb xcb-atom xcb-aux xcb-event xcb-render
+WANTLIB += xcb-render-util xml2 z
 
-WANTLIB-main= ${WANTLIB}
-WANTLIB-main += db icalss icalvcal
 
-WANTLIB-plugins= ${WANTLIB}
+WANTLIB-main  = ${WANTLIB}
+WANTLIB-main += db gweather icalss icalvcal ogg
+
+WANTLIB-plugins  = ${WANTLIB}
 WANTLIB-plugins += camel-1.2 camel-provider-1.2 ebook-1.2 ecal-1.2 edataserver-1.2
-WANTLIB-plugins += edataserverui-1.2 gnome-desktop-2 gnomeui-2 gtkhtml-3.14 
-WANTLIB-plugins += gtkhtml-editor nss3 smime3 softokn3 soup-2.4 ssl3
+WANTLIB-plugins += edataserverui-1.2 gnome-desktop-2 gtkhtml-3.14 gtkhtml-editor
+WANTLIB-plugins += notify nss3 smime3 soup-2.4 ssl3
 
 MULTI_PACKAGES=		-main -plugins
 
@@ -79,23 +80,29 @@ BUILD_DEPENDS=		::devel/bison \
 			::x11/gnome/icon-theme \
 			::devel/iso-codes
 
+LIB_DEPENDS=		canberra::audio/libcanberra \
+			unique-1.0::devel/libunique
+
 RUN_DEPENDS-main=	${RUN_DEPENDS} \
 			::x11/hicolor-icon-theme \
 			::x11/gnome/icon-theme
 LIB_DEPENDS-main=	${LIB_DEPENDS} \
 			pst::converters/libpst \
-			camel-1.2,camel-provider-1.2,ebackend-1.2,ebook-1.2,ecal-1.2,edataserver-1.2,edataserverui-1.2,egroupwise-1.2,gdata-1.2,gdata-google-1.2,exchange-storage-1.2.>=3::databases/evolution-data-server \
+			camel-1.2,camel-provider-1.2,ebackend-1.2,ebook-1.2,ecal-1.2,edataserver-1.2,edataserverui-1.2,egroupwise-1.2,gdata-1.2,gdata-google-1.2::databases/evolution-data-server \
 			ldap.>=7::databases/openldap \
 			notify.>=2::devel/libnotify \
 			soup-2.4::devel/libsoup \
+			gtkimageview::graphics/gtkimageview \
 			nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss \
 			gnome-desktop-2::x11/gnome/desktop \
-			gnomeui-2::x11/gnome/libgnomeui \
-			gtkhtml-3.14.>=1.0,gtkhtml-editor::www/gtkhtml3
+			gtkhtml-3.14.>=1.0,gtkhtml-editor::www/gtkhtml3 \
+			canberra-gtk::audio/libcanberra \
+			vorbis,vorbisfile::audio/libvorbis \
+			ltdl::devel/libtool,-ltdl
 
 LIB_DEPENDS-plugins=	${LIB_DEPENDS} \
 			gstreamer-0.10::multimedia/gstreamer-0.10/core \
-			lib/evolution/${R}/emiscwidgets,lib/evolution/${R}/eutil,lib/evolution/${R}/evolution-mail-shared:${PKGNAME-main}:mail/evolution,-main
+			lib/evolution/${R}/emiscwidgets,lib/evolution/${R}/eutil:${PKGNAME-main}:mail/evolution,-main
 # needed for the audio-inline plugin
 RUN_DEPENDS-plugins=	::multimedia/gstreamer-0.10/plugins-good
 
@@ -111,8 +118,6 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--disable-pilot-conduits \
 			--enable-nss=yes \
 			--enable-smime=yes \
-			--enable-default-binary \
-			--enable-exchange \
 			--enable-plugins=all \
 			--disable-mono \
 			--with-openldap="${LOCALBASE}" \
@@ -122,10 +127,10 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--disable-nm \
 			--disable-python
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${TRUEPREFIX}/lib/evolution/${R}/components:${TRUEPREFIX}/lib/evolution/${R}:${TRUEPREFIX}/lib"
+			LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${TRUEPREFIX}/lib/evolution/${R}/components:${TRUEPREFIX}/lib/evolution/${R}:${TRUEPREFIX}/lib" \
+			PTHREAD_LIB="-pthread"
 
 # ltasneededhack in bsd.gnome.mk from FreeBSD ports
-# (+patch-plugins_exchange-operations_Makefile_in)
 LIBTOOL=	${WRKDIR}/bin/libtool
 post-patch:
 	sed '/^archive_cmds=/s/-shared/-shared -Wl,--as-needed/ ; \
@@ -136,16 +141,8 @@ post-patch:
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/plugins/bogo-junk-plugin/bf-junk-filter.c \
 		${WRKSRC}/plugins/sa-junk-plugin/em-junk-filter.c
-	# XXX see patch-plugins_exchange-operations_Makefile_in
-	ln -sf ../../addressbook/gui/component/.libs/libevolution-addressbook.so \
-		 ${WRKBUILD}/plugins/exchange-operations/libevolution-addressbook.so
 
 post-install:
 	find ${PREFIX}/share/evolution/${R}/default -perm 444 -exec chmod 644 {} \;
-	# XXX there is a circular linking dependency with some plugins
-	# https://bugzilla.gnome.org/show_bug.cgi?id=599336
-	mv ${PREFIX}/bin/evolution ${PREFIX}/bin/evolution.bin
-	${SUBST_CMD} -c ${FILESDIR}/evolution.sh ${WRKBUILD}/evolution.sh
-	${INSTALL_SCRIPT} ${WRKBUILD}/evolution.sh ${PREFIX}/bin/evolution
 
 .include <bsd.port.mk>

mail/evolution/distinfo

@@ -1,5 +1,5 @@
-MD5 (evolution-2.28.3.1.tar.bz2) = Pdzv3LywQFU5PFR5ksLz2g==
-RMD160 (evolution-2.28.3.1.tar.bz2) = RCx7RyyvlLoKoau+JTuBDRWRGk8=
-SHA1 (evolution-2.28.3.1.tar.bz2) = QSyL5z5INEStaaStjBWw25Ug/go=
-SHA256 (evolution-2.28.3.1.tar.bz2) = n9pBsJlLG7jRGfWUWX93u0rxqINYijn3qB7HousY9f0=
-SIZE (evolution-2.28.3.1.tar.bz2) = 29765375
+MD5 (evolution-2.30.0.1.tar.bz2) = WXRv0xTe7S/qf8XafZL/Fw==
+RMD160 (evolution-2.30.0.1.tar.bz2) = QHNA9YfYRm4B/5j1xKXRKamEijU=
+SHA1 (evolution-2.30.0.1.tar.bz2) = PaZkuF+rMISvXxuDWNf1okgzyA0=
+SHA256 (evolution-2.30.0.1.tar.bz2) = TgaDVmUta/Hb4qzI6e7V350oPqcd402BtEHSuyrEcAk=
+SIZE (evolution-2.30.0.1.tar.bz2) = 30346757

mail/evolution/patches/patch-configure

@@ -1,7 +1,16 @@
-$OpenBSD: patch-configure,v 1.13 2010/03/21 10:42:53 ajacoutot Exp $
---- configure.orig	Mon Mar  1 12:50:15 2010
-+++ configure	Tue Mar  2 12:26:17 2010
-@@ -20086,9 +20086,6 @@ LIBS=$ac_check_lib_save_LIBS
+$OpenBSD: patch-configure,v 1.14 2010/04/22 16:30:02 jasper Exp $
+--- configure.orig	Tue Mar 30 13:25:24 2010
++++ configure	Thu Apr 22 13:11:06 2010
+@@ -4353,8 +4353,6 @@ $as_echo "$as_me: WARNING: unsupported compiler flags:
+ AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
+ 
+ 
+-LDFLAGS="$LDFLAGS -Wl,--no-undefined"
+-
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+   { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+@@ -18863,9 +18861,6 @@ LIBS=$ac_check_lib_save_LIBS
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5
  $as_echo "$ac_cv_lib_resolv_res_query" >&6; }
@@ -11,38 +20,12 @@ $OpenBSD: patch-configure,v 1.13 2010/03/21 10:42:53 ajacoutot Exp $
  
  		{ $as_echo "$as_me:$LINENO: checking for bind in -lsocket" >&5
  $as_echo_n "checking for bind in -lsocket... " >&6; }
-@@ -20473,13 +20470,13 @@ _ACEOF
+@@ -21066,7 +21061,7 @@ $as_echo_n "checking for Kerberos 5... " >&6; }
+ 		LIBS_save="$LIBS"
  
- 
- 	PTHREAD_LIB=""
--	{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-+	{ $as_echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
-+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+ 		mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
+-		heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
++		heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi"
+ 		sunlibs="-lkrb5 -lgss"
+ 		if test "${ac_cv_lib_kerberos5+set}" = set; then
    $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -20539,7 +20536,7 @@ fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
- $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
- if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
--  PTHREAD_LIB="-lpthread"
-+  PTHREAD_LIB="-pthread"
- else
-   { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
- $as_echo_n "checking for pthread_create in -lpthreads... " >&6; }
-@@ -22104,7 +22101,7 @@ if test "x${with_krb5}" != "xno"; then
- 	LIBS_save="$LIBS"
- 
- 	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
--	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
-+	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi"
- 	sunlibs="-lkrb5 -lgss"
- 	{ $as_echo "$as_me:$LINENO: checking for Kerberos 5" >&5
- $as_echo_n "checking for Kerberos 5... " >&6; }

mail/evolution/patches/patch-m4_evo_krb5_support_m4

@@ -0,0 +1,12 @@
+$OpenBSD: patch-m4_evo_krb5_support_m4,v 1.1 2010/04/22 16:30:02 jasper Exp $
+--- m4/evo_krb5_support.m4.orig	Thu Apr 22 12:36:11 2010
++++ m4/evo_krb5_support.m4	Thu Apr 22 12:36:18 2010
+@@ -27,7 +27,7 @@ AC_DEFUN([EVO_KRB5_SUPPORT],[
+ 		LIBS_save="$LIBS"
+ 
+ 		mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
+-		heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
++		heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi"
+ 		sunlibs="-lkrb5 -lgss"
+ 		AC_CACHE_VAL([ac_cv_lib_kerberos5],
+ 		[

mail/evolution/patches/patch-mail_e-mail-migrate_c

@@ -1,4 +1,4 @@
-$OpenBSD: patch-mail_em-migrate_c,v 1.2 2009/10/13 22:07:04 jasper Exp $
+$OpenBSD: patch-mail_e-mail-migrate_c,v 1.1 2010/04/22 16:30:02 jasper Exp $
 
 from pkgsrc:
 Fix permissions of files copied into the user directory from the data
@@ -6,14 +6,14 @@ directory, otherwise, the sample Inbox folder is copied with mode 444
 and you get multiple warnings from Evolution saying that it can't update
 the folder.
 
---- mail/em-migrate.c.orig	Fri Aug  7 10:46:51 2009
-+++ mail/em-migrate.c	Tue Oct 13 15:30:41 2009
-@@ -1416,7 +1416,7 @@ cp (const gchar *src, const gchar *dest, gboolean show
+--- mail/e-mail-migrate.c.orig	Thu Apr 22 12:37:17 2010
++++ mail/e-mail-migrate.c	Thu Apr 22 12:37:41 2010
+@@ -1427,7 +1427,7 @@ cp (const gchar *src, const gchar *dest, gboolean show
  	ut.actime = st.st_atime;
  	ut.modtime = st.st_mtime;
  	utime (dest, &ut);
 -	chmod (dest, st.st_mode);
 +	chmod (dest, st.st_mode | S_IWUSR);
  
- 	return 0;
+ 	return TRUE;
  

mail/evolution/patches/patch-mail_em-utils_h

@@ -1,6 +1,6 @@
-$OpenBSD: patch-mail_em-utils_h,v 1.2 2009/10/13 22:07:04 jasper Exp $
---- mail/em-utils.h.orig	Tue Oct 13 15:18:12 2009
-+++ mail/em-utils.h	Tue Oct 13 15:18:30 2009
+$OpenBSD: patch-mail_em-utils_h,v 1.3 2010/04/22 16:30:02 jasper Exp $
+--- mail/em-utils.h.orig	Thu Apr 22 12:38:49 2010
++++ mail/em-utils.h	Thu Apr 22 12:39:00 2010
 @@ -23,8 +23,8 @@
  #ifndef __EM_UTILS_H__
  #define __EM_UTILS_H__
@@ -8,6 +8,6 @@ $OpenBSD: patch-mail_em-utils_h,v 1.2 2009/10/13 22:07:04 jasper Exp $
 -#include <gtk/gtk.h>
  #include <sys/types.h>
 +#include <gtk/gtk.h>
- 
- #include <mail/em-format.h>
- 
+ #include <camel/camel-exception.h>
+ #include <camel/camel-folder.h>
+ #include <camel/camel-internet-address.h>

mail/evolution/patches/patch-mail_message-list_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-mail_message-list_c,v 1.8 2009/10/13 22:07:04 jasper Exp $
---- mail/message-list.c.orig	Tue Oct 13 15:19:10 2009
-+++ mail/message-list.c	Tue Oct 13 15:21:26 2009
-@@ -2613,6 +2613,11 @@ clear_tree (MessageList *ml, gboolean tfree)
+$OpenBSD: patch-mail_message-list_c,v 1.9 2010/04/22 16:30:02 jasper Exp $
+--- mail/message-list.c.orig	Wed Mar 17 12:14:53 2010
++++ mail/message-list.c	Thu Apr 22 12:53:49 2010
+@@ -2844,6 +2844,11 @@ clear_tree (MessageList *ml, gboolean tfree)
  	ml->tree_root = e_tree_memory_node_insert (E_TREE_MEMORY(etm), NULL, 0, NULL);
  	if (tfree)
  		e_tree_model_rebuilt (E_TREE_MODEL(etm));
@@ -13,7 +13,7 @@ $OpenBSD: patch-mail_message-list_c,v 1.8 2009/10/13 22:07:04 jasper Exp $
  #ifdef TIMEIT
  	gettimeofday(&end, NULL);
  	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-@@ -3214,6 +3219,10 @@ mail_folder_hide_by_flag (CamelFolder *folder, Message
+@@ -3445,6 +3450,10 @@ mail_folder_hide_by_flag (CamelFolder *folder, Message
  	CamelFolderChangeInfo *newchanges, *oldchanges = *changes;
  	CamelMessageInfo *info;
  	gint i;

mail/evolution/patches/patch-plugins_caldav_caldav-source_c

@@ -1,15 +0,0 @@
-$OpenBSD: patch-plugins_caldav_caldav-source_c,v 1.2 2009/10/13 22:07:04 jasper Exp $
-
-Allow '@' in username in CalDav.
-See http://bugzilla.gnome.org/show_bug.cgi?id=503662
-
---- plugins/caldav/caldav-source.c.orig	Tue Oct 13 15:22:20 2009
-+++ plugins/caldav/caldav-source.c	Tue Oct 13 15:23:28 2009
-@@ -215,6 +215,7 @@ user_changed (GtkEntry *editable, ESource *source)
- 		e_source_set_property (source, "auth", "1");
- 	} else {
- 		e_source_set_property (source, "auth", NULL);
-+		euri->user = NULL;
- 	}
- 
- 	e_source_set_property (source, "username", user);

mail/evolution/patches/patch-plugins_exchange-operations_Makefile_in

@@ -1,15 +0,0 @@
-$OpenBSD: patch-plugins_exchange-operations_Makefile_in,v 1.6 2009/11/14 16:33:16 ajacoutot Exp $
-
-ltasneededhack is not enough for the exchange-operations plugin and
-without this hack, evolution will take up to 60 secs to start.
-
---- plugins/exchange-operations/Makefile.in.orig	Sun Oct 18 04:22:46 2009
-+++ plugins/exchange-operations/Makefile.in	Fri Nov 13 17:06:21 2009
-@@ -496,6 +496,7 @@ liborg_gnome_exchange_operations_la_LIBADD = \
- 	$(top_builddir)/calendar/gui/libevolution-calendar.la 	\
- 	$(top_builddir)/mail/libevolution-mail.la 		\
- 	$(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \
-+	-Wl,--no-as-needed,libevolution-addressbook.so \
- 	$(CAMEL_EXCHANGE_LIBS)					\
- 	$(EVOLUTION_MAIL_LIBS)
- 

mail/evolution/patches/patch-plugins_sa-junk-plugin_em-junk-filter_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-plugins_sa-junk-plugin_em-junk-filter_c,v 1.2 2009/10/13 22:07:04 jasper Exp $
---- plugins/sa-junk-plugin/em-junk-filter.c.orig	Tue Oct 13 15:24:03 2009
-+++ plugins/sa-junk-plugin/em-junk-filter.c	Tue Oct 13 15:24:24 2009
-@@ -88,8 +88,8 @@ static volatile gboolean em_junk_sa_local_only;
+$OpenBSD: patch-plugins_sa-junk-plugin_em-junk-filter_c,v 1.3 2010/04/22 16:30:02 jasper Exp $
+--- plugins/sa-junk-plugin/em-junk-filter.c.orig	Mon Nov 30 06:19:29 2009
++++ plugins/sa-junk-plugin/em-junk-filter.c	Thu Apr 22 12:53:49 2010
+@@ -87,8 +87,8 @@ static volatile gboolean em_junk_sa_local_only;
  static volatile gboolean em_junk_sa_use_daemon;
  static gchar * em_junk_sa_preferred_socket_path;
  

mail/evolution/patches/patch-shell_main_c

@@ -1,12 +1,12 @@
-$OpenBSD: patch-shell_main_c,v 1.6 2009/10/13 22:07:04 jasper Exp $
---- shell/main.c.orig	Mon Jul 13 09:45:14 2009
-+++ shell/main.c	Tue Oct 13 15:30:41 2009
-@@ -648,7 +648,7 @@ main (gint argc, gchar **argv)
- 		filename = g_build_filename (EVOLUTION_TOOLSDIR,
- 					     "killev",
- 					     NULL);
--		execl (filename, "killev", NULL);
-+		execl (filename, "killev", (void *)NULL);
- 		/* Not reached */
- 		exit (0);
- 	}
+$OpenBSD: patch-shell_main_c,v 1.7 2010/04/22 16:30:02 jasper Exp $
+--- shell/main.c.orig	Thu Apr 22 12:43:03 2010
++++ shell/main.c	Thu Apr 22 12:43:31 2010
+@@ -358,7 +358,7 @@ shell_force_shutdown (void)
+ 	gchar *filename;
+ 
+ 	filename = g_build_filename (EVOLUTION_TOOLSDIR, "killev", NULL);
+-	execl (filename, "killev", NULL);
++	execl (filename, "killev", (void *)NULL);
+ 
+ 	g_assert_not_reached ();
+ }

mail/evolution/patches/patch-widgets_e-timezone-dialog_e-timezone-dialog_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-widgets_e-timezone-dialog_e-timezone-dialog_c,v 1.7 2009/10/13 22:07:04 jasper Exp $
---- widgets/e-timezone-dialog/e-timezone-dialog.c.orig	Tue Oct 13 15:25:09 2009
-+++ widgets/e-timezone-dialog/e-timezone-dialog.c	Tue Oct 13 15:25:50 2009
-@@ -321,7 +321,6 @@ e_timezone_dialog_construct (ETimezoneDialog *etd)
+$OpenBSD: patch-widgets_e-timezone-dialog_e-timezone-dialog_c,v 1.8 2010/04/22 16:30:02 jasper Exp $
+--- widgets/e-timezone-dialog/e-timezone-dialog.c.orig	Mon Feb 22 07:41:57 2010
++++ widgets/e-timezone-dialog/e-timezone-dialog.c	Thu Apr 22 12:53:49 2010
+@@ -327,7 +327,6 @@ e_timezone_dialog_construct (ETimezoneDialog *etd)
  	return NULL;
  }
  
@@ -9,7 +9,7 @@ $OpenBSD: patch-widgets_e-timezone-dialog_e-timezone-dialog_c,v 1.7 2009/10/13 2
  static gint
  get_local_offset (void)
  {
-@@ -334,10 +333,11 @@ get_local_offset (void)
+@@ -340,10 +339,11 @@ get_local_offset (void)
  	t_gmt = mktime (&gmt);
  	t_local = mktime (&local);
  	diff = t_local - t_gmt;

mail/evolution/pkg/PFRAG.shared-main

@@ -1,12 +1,10 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.4 2009/11/14 16:33:16 ajacoutot Exp $
-lib/evolution/${R}/components/libevolution-addressbook.so
-lib/evolution/${R}/components/libevolution-calendar.so
-lib/evolution/${R}/components/libevolution-mail.so
+@comment $OpenBSD: PFRAG.shared-main,v 1.5 2010/04/22 16:30:02 jasper Exp $
+@lib lib/evolution/${R}/libcomposer.so.${LIBcomposer_VERSION}
 @lib lib/evolution/${R}/libeabutil.so.${LIBeabutil_VERSION}
 @lib lib/evolution/${R}/libeconduit.so.${LIBeconduit_VERSION}
 @lib lib/evolution/${R}/libecontacteditor.so.${LIBecontacteditor_VERSION}
 @lib lib/evolution/${R}/libecontactlisteditor.so.${LIBecontactlisteditor_VERSION}
-@lib lib/evolution/${R}/libefilterbar.so.${LIBefilterbar_VERSION}
+@lib lib/evolution/${R}/libemformat.so.${LIBemformat_VERSION}
 @lib lib/evolution/${R}/libemiscwidgets.so.${LIBemiscwidgets_VERSION}
 @lib lib/evolution/${R}/libeshell.so.${LIBeshell_VERSION}
 @lib lib/evolution/${R}/libessmime.so.${LIBessmime_VERSION}
@@ -15,18 +13,19 @@ lib/evolution/${R}/components/libevolution-mail.so
 @lib lib/evolution/${R}/libetimezonedialog.so.${LIBetimezonedialog_VERSION}
 @lib lib/evolution/${R}/libeutil.so.${LIBeutil_VERSION}
 @lib lib/evolution/${R}/libevolution-a11y.so.${LIBevolution-a11y_VERSION}
-@lib lib/evolution/${R}/libevolution-addressbook-a11y.so.${LIBevolution-addressbook-a11y_VERSION}
 @lib lib/evolution/${R}/libevolution-addressbook-importers.so.${LIBevolution-addressbook-importers_VERSION}
-@lib lib/evolution/${R}/libevolution-cal-shared.so.${LIBevolution-cal-shared_VERSION}
-@lib lib/evolution/${R}/libevolution-calendar-a11y.so.${LIBevolution-calendar-a11y_VERSION}
 @lib lib/evolution/${R}/libevolution-calendar-importers.so.${LIBevolution-calendar-importers_VERSION}
+@lib lib/evolution/${R}/libevolution-calendar.so.${LIBevolution-calendar_VERSION}
 @lib lib/evolution/${R}/libevolution-mail-importers.so.${LIBevolution-mail-importers_VERSION}
-@lib lib/evolution/${R}/libevolution-mail-shared.so.${LIBevolution-mail-shared_VERSION}
+@lib lib/evolution/${R}/libevolution-mail-settings.so.${LIBevolution-mail-settings_VERSION}
+@lib lib/evolution/${R}/libevolution-mail.so.${LIBevolution-mail_VERSION}
 @lib lib/evolution/${R}/libevolution-smime.so.${LIBevolution-smime_VERSION}
-@lib lib/evolution/${R}/libevolution-widgets-a11y.so.${LIBevolution-widgets-a11y_VERSION}
 @lib lib/evolution/${R}/libfilter.so.${LIBfilter_VERSION}
 @lib lib/evolution/${R}/libmenus.so.${LIBmenus_VERSION}
-lib/evolution/${R}/plugins/libmail-account-disable.so
+lib/evolution/${R}/modules/libevolution-module-addressbook.so
+lib/evolution/${R}/modules/libevolution-module-calendar.so
+lib/evolution/${R}/modules/libevolution-module-mail.so
+lib/evolution/${R}/modules/libevolution-module-plugin-lib.so
 lib/evolution/${R}/plugins/liborg-gnome-addressbook-file.so
 lib/evolution/${R}/plugins/liborg-gnome-bogo-junk-plugin.so
 lib/evolution/${R}/plugins/liborg-gnome-calendar-file.so
@@ -37,9 +36,8 @@ lib/evolution/${R}/plugins/liborg-gnome-evolution-caldav.so
 lib/evolution/${R}/plugins/liborg-gnome-evolution-google.so
 lib/evolution/${R}/plugins/liborg-gnome-evolution-startup-wizard.so
 lib/evolution/${R}/plugins/liborg-gnome-evolution-webdav.so
-lib/evolution/${R}/plugins/liborg-gnome-exchange-operations.so
 lib/evolution/${R}/plugins/liborg-gnome-groupwise-features.so
-lib/evolution/${R}/plugins/liborg-gnome-gw-account-setup.so
+lib/evolution/${R}/plugins/liborg-gnome-image-inline.so
 lib/evolution/${R}/plugins/liborg-gnome-imap-features.so
 lib/evolution/${R}/plugins/liborg-gnome-itip-formatter.so
 lib/evolution/${R}/plugins/liborg-gnome-mark-all-read.so

mail/evolution/pkg/PFRAG.shared-plugins

@@ -1,7 +1,6 @@
-@comment $OpenBSD: PFRAG.shared-plugins,v 1.2 2009/10/13 22:07:04 jasper Exp $
+@comment $OpenBSD: PFRAG.shared-plugins,v 1.3 2010/04/22 16:30:02 jasper Exp $
 lib/evolution/${R}/plugins/liborg-gnome-audio-inline.so
 lib/evolution/${R}/plugins/liborg-gnome-backup-restore.so
-lib/evolution/${R}/plugins/liborg-gnome-copy-tool.so
 lib/evolution/${R}/plugins/liborg-gnome-default-mailer.so
 lib/evolution/${R}/plugins/liborg-gnome-email-custom-header.so
 lib/evolution/${R}/plugins/liborg-gnome-evolution-attachment-reminder.so
@@ -11,6 +10,5 @@ lib/evolution/${R}/plugins/liborg-gnome-mail-to-task.so
 lib/evolution/${R}/plugins/liborg-gnome-mailing-list-actions.so
 lib/evolution/${R}/plugins/liborg-gnome-prefer-plain.so
 lib/evolution/${R}/plugins/liborg-gnome-save-calendar.so
-lib/evolution/${R}/plugins/liborg-gnome-select-one-source.so
 lib/evolution/${R}/plugins/liborg-gnome-subject-thread.so
 lib/evolution/${R}/plugins/liborg-gnome-templates.so

mail/evolution/pkg/PLIST-main

@@ -1,26 +1,27 @@
-@comment $OpenBSD: PLIST-main,v 1.10 2010/03/21 10:42:53 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.11 2010/04/22 16:30:02 jasper Exp $
 @pkgpath mail/evolution
 %%SHARED%%
-bin/evolution
-@bin bin/evolution.bin
+@bin bin/evolution-alarm-notify
+@bin bin/evolution-settings
+@bin bin/evolution
 include/evolution-${R}/
 include/evolution-${R}/addressbook/
 include/evolution-${R}/addressbook/gui/
 include/evolution-${R}/addressbook/gui/widgets/
 include/evolution-${R}/addressbook/gui/widgets/eab-config.h
-include/evolution-${R}/addressbook/gui/widgets/eab-menu.h
-include/evolution-${R}/addressbook/gui/widgets/eab-popup.h
 include/evolution-${R}/calendar/
+include/evolution-${R}/calendar/common/
+include/evolution-${R}/calendar/common/authentication.h
 include/evolution-${R}/calendar/gui/
 include/evolution-${R}/calendar/gui/cal-editor-utils.h
-include/evolution-${R}/calendar/gui/cal-search-bar.h
 include/evolution-${R}/calendar/gui/calendar-config-keys.h
 include/evolution-${R}/calendar/gui/calendar-config.h
+include/evolution-${R}/calendar/gui/calendar-view-factory.h
+include/evolution-${R}/calendar/gui/calendar-view.h
 include/evolution-${R}/calendar/gui/comp-util.h
 include/evolution-${R}/calendar/gui/dialogs/
 include/evolution-${R}/calendar/gui/dialogs/alarm-dialog.h
 include/evolution-${R}/calendar/gui/dialogs/alarm-list-dialog.h
-include/evolution-${R}/calendar/gui/dialogs/cal-attachment-select-file.h
 include/evolution-${R}/calendar/gui/dialogs/cal-prefs-dialog.h
 include/evolution-${R}/calendar/gui/dialogs/calendar-setup.h
 include/evolution-${R}/calendar/gui/dialogs/cancel-comp.h
@@ -47,18 +48,15 @@ include/evolution-${R}/calendar/gui/dialogs/task-details-page.h
 include/evolution-${R}/calendar/gui/dialogs/task-editor.h
 include/evolution-${R}/calendar/gui/dialogs/task-page.h
 include/evolution-${R}/calendar/gui/e-alarm-list.h
-include/evolution-${R}/calendar/gui/e-attachment-handler-calendar.h
 include/evolution-${R}/calendar/gui/e-cal-config.h
 include/evolution-${R}/calendar/gui/e-cal-event.h
+include/evolution-${R}/calendar/gui/e-cal-list-view.h
 include/evolution-${R}/calendar/gui/e-cal-model-calendar.h
 include/evolution-${R}/calendar/gui/e-cal-model.h
-include/evolution-${R}/calendar/gui/e-cal-popup.h
+include/evolution-${R}/calendar/gui/e-calendar-selector.h
 include/evolution-${R}/calendar/gui/e-calendar-view.h
 include/evolution-${R}/calendar/gui/e-cell-date-edit-text.h
-include/evolution-${R}/calendar/gui/e-comp-editor-registry.h
-include/evolution-${R}/calendar/gui/e-date-edit-config.h
 include/evolution-${R}/calendar/gui/e-date-time-list.h
-include/evolution-${R}/calendar/gui/e-day-view-config.h
 include/evolution-${R}/calendar/gui/e-day-view-layout.h
 include/evolution-${R}/calendar/gui/e-day-view-main-item.h
 include/evolution-${R}/calendar/gui/e-day-view-time-item.h
@@ -71,16 +69,15 @@ include/evolution-${R}/calendar/gui/e-meeting-time-sel-item.h
 include/evolution-${R}/calendar/gui/e-meeting-time-sel.h
 include/evolution-${R}/calendar/gui/e-meeting-types.h
 include/evolution-${R}/calendar/gui/e-meeting-utils.h
-include/evolution-${R}/calendar/gui/e-mini-calendar-config.h
 include/evolution-${R}/calendar/gui/e-select-names-editable.h
 include/evolution-${R}/calendar/gui/e-select-names-renderer.h
 include/evolution-${R}/calendar/gui/e-timezone-entry.h
-include/evolution-${R}/calendar/gui/e-week-view-config.h
 include/evolution-${R}/calendar/gui/e-week-view-event-item.h
 include/evolution-${R}/calendar/gui/e-week-view-layout.h
 include/evolution-${R}/calendar/gui/e-week-view-main-item.h
 include/evolution-${R}/calendar/gui/e-week-view-titles-item.h
 include/evolution-${R}/calendar/gui/e-week-view.h
+include/evolution-${R}/calendar/gui/gnome-cal.h
 include/evolution-${R}/calendar/gui/goto.h
 include/evolution-${R}/calendar/gui/itip-utils.h
 include/evolution-${R}/calendar/gui/misc.h
@@ -102,62 +99,86 @@ include/evolution-${R}/e-conduit/
 include/evolution-${R}/e-conduit/e-pilot-map.h
 include/evolution-${R}/e-conduit/e-pilot-util.h
 include/evolution-${R}/e-util/
+include/evolution-${R}/e-util/e-account-utils.h
+include/evolution-${R}/e-util/e-activity.h
+include/evolution-${R}/e-util/e-alert-activity.h
+include/evolution-${R}/e-util/e-alert-dialog.h
+include/evolution-${R}/e-util/e-alert.h
 include/evolution-${R}/e-util/e-bconf-map.h
 include/evolution-${R}/e-util/e-binding.h
 include/evolution-${R}/e-util/e-bit-array.h
 include/evolution-${R}/e-util/e-categories-config.h
+include/evolution-${R}/e-util/e-charset.h
 include/evolution-${R}/e-util/e-config.h
-include/evolution-${R}/e-util/e-corba-utils.h
-include/evolution-${R}/e-util/e-cursor.h
 include/evolution-${R}/e-util/e-datetime-format.h
 include/evolution-${R}/e-util/e-dialog-utils.h
 include/evolution-${R}/e-util/e-dialog-widgets.h
-include/evolution-${R}/e-util/e-error.h
 include/evolution-${R}/e-util/e-event.h
+include/evolution-${R}/e-util/e-file-utils.h
 include/evolution-${R}/e-util/e-folder-map.h
-include/evolution-${R}/e-util/e-fsutils.h
 include/evolution-${R}/e-util/e-html-utils.h
 include/evolution-${R}/e-util/e-icon-factory.h
 include/evolution-${R}/e-util/e-import.h
+include/evolution-${R}/e-util/e-io-activity.h
 include/evolution-${R}/e-util/e-logger.h
 include/evolution-${R}/e-util/e-marshal.h
-include/evolution-${R}/e-util/e-menu.h
 include/evolution-${R}/e-util/e-mktemp.h
+include/evolution-${R}/e-util/e-module.h
 include/evolution-${R}/e-util/e-non-intrusive-error-dialog.h
 include/evolution-${R}/e-util/e-plugin-ui.h
+include/evolution-${R}/e-util/e-plugin-util.h
 include/evolution-${R}/e-util/e-plugin.h
-include/evolution-${R}/e-util/e-popup.h
 include/evolution-${R}/e-util/e-print.h
 include/evolution-${R}/e-util/e-profile-event.h
-include/evolution-${R}/e-util/e-request.h
+include/evolution-${R}/e-util/e-selection.h
 include/evolution-${R}/e-util/e-signature-list.h
+include/evolution-${R}/e-util/e-signature-utils.h
 include/evolution-${R}/e-util/e-signature.h
 include/evolution-${R}/e-util/e-sorter-array.h
 include/evolution-${R}/e-util/e-sorter.h
 include/evolution-${R}/e-util/e-text-event-processor-emacs-like.h
 include/evolution-${R}/e-util/e-text-event-processor-types.h
 include/evolution-${R}/e-util/e-text-event-processor.h
-include/evolution-${R}/e-util/e-util-labels.h
+include/evolution-${R}/e-util/e-timeout-activity.h
+include/evolution-${R}/e-util/e-ui-manager.h
+include/evolution-${R}/e-util/e-unicode.h
 include/evolution-${R}/e-util/e-util.h
 include/evolution-${R}/e-util/e-xml-utils.h
+include/evolution-${R}/e-util/gconf-bridge.h
+include/evolution-${R}/em-format/
+include/evolution-${R}/em-format/em-format-quote.h
+include/evolution-${R}/em-format/em-format.h
+include/evolution-${R}/em-format/em-stripsig-filter.h
 include/evolution-${R}/filter/
-include/evolution-${R}/filter/filter-code.h
-include/evolution-${R}/filter/filter-colour.h
-include/evolution-${R}/filter/filter-datespec.h
-include/evolution-${R}/filter/filter-element.h
-include/evolution-${R}/filter/filter-file.h
-include/evolution-${R}/filter/filter-input.h
-include/evolution-${R}/filter/filter-int.h
-include/evolution-${R}/filter/filter-option.h
-include/evolution-${R}/filter/filter-part.h
-include/evolution-${R}/filter/filter-rule.h
-include/evolution-${R}/filter/rule-context.h
-include/evolution-${R}/filter/rule-editor.h
+include/evolution-${R}/filter/e-filter-code.h
+include/evolution-${R}/filter/e-filter-color.h
+include/evolution-${R}/filter/e-filter-datespec.h
+include/evolution-${R}/filter/e-filter-element.h
+include/evolution-${R}/filter/e-filter-file.h
+include/evolution-${R}/filter/e-filter-input.h
+include/evolution-${R}/filter/e-filter-int.h
+include/evolution-${R}/filter/e-filter-option.h
+include/evolution-${R}/filter/e-filter-part.h
+include/evolution-${R}/filter/e-filter-rule.h
+include/evolution-${R}/filter/e-rule-context.h
+include/evolution-${R}/filter/e-rule-editor.h
 include/evolution-${R}/mail/
-include/evolution-${R}/mail/Evolution-Mail.h
 include/evolution-${R}/mail/e-mail-attachment-bar.h
-include/evolution-${R}/mail/e-mail-search-bar.h
-include/evolution-${R}/mail/e-searching-tokenizer.h
+include/evolution-${R}/mail/e-mail-backend.h
+include/evolution-${R}/mail/e-mail-browser.h
+include/evolution-${R}/mail/e-mail-display.h
+include/evolution-${R}/mail/e-mail-label-action.h
+include/evolution-${R}/mail/e-mail-label-dialog.h
+include/evolution-${R}/mail/e-mail-label-list-store.h
+include/evolution-${R}/mail/e-mail-label-manager.h
+include/evolution-${R}/mail/e-mail-label-tree-view.h
+include/evolution-${R}/mail/e-mail-local.h
+include/evolution-${R}/mail/e-mail-migrate.h
+include/evolution-${R}/mail/e-mail-reader-utils.h
+include/evolution-${R}/mail/e-mail-reader.h
+include/evolution-${R}/mail/e-mail-sidebar.h
+include/evolution-${R}/mail/e-mail-store.h
+include/evolution-${R}/mail/e-mail-tag-editor.h
 include/evolution-${R}/mail/em-account-editor.h
 include/evolution-${R}/mail/em-composer-utils.h
 include/evolution-${R}/mail/em-config.h
@@ -167,30 +188,27 @@ include/evolution-${R}/mail/em-filter-editor.h
 include/evolution-${R}/mail/em-filter-folder-element.h
 include/evolution-${R}/mail/em-filter-rule.h
 include/evolution-${R}/mail/em-filter-source-element.h
-include/evolution-${R}/mail/em-folder-browser.h
+include/evolution-${R}/mail/em-folder-properties.h
+include/evolution-${R}/mail/em-folder-selection-button.h
+include/evolution-${R}/mail/em-folder-selector.h
 include/evolution-${R}/mail/em-folder-tree-model.h
 include/evolution-${R}/mail/em-folder-tree.h
 include/evolution-${R}/mail/em-folder-utils.h
-include/evolution-${R}/mail/em-folder-view.h
 include/evolution-${R}/mail/em-format-hook.h
 include/evolution-${R}/mail/em-format-html-display.h
 include/evolution-${R}/mail/em-format-html-print.h
 include/evolution-${R}/mail/em-format-html.h
-include/evolution-${R}/mail/em-format-quote.h
-include/evolution-${R}/mail/em-format.h
 include/evolution-${R}/mail/em-html-stream.h
-include/evolution-${R}/mail/em-icon-stream.h
 include/evolution-${R}/mail/em-inline-filter.h
-include/evolution-${R}/mail/em-junk-hook.h
-include/evolution-${R}/mail/em-menu.h
-include/evolution-${R}/mail/em-message-browser.h
-include/evolution-${R}/mail/em-popup.h
+include/evolution-${R}/mail/em-junk.h
 include/evolution-${R}/mail/em-search-context.h
-include/evolution-${R}/mail/em-stripsig-filter.h
+include/evolution-${R}/mail/em-subscribe-editor.h
 include/evolution-${R}/mail/em-sync-stream.h
 include/evolution-${R}/mail/em-utils.h
+include/evolution-${R}/mail/em-vfolder-context.h
+include/evolution-${R}/mail/em-vfolder-editor.h
+include/evolution-${R}/mail/em-vfolder-rule.h
 include/evolution-${R}/mail/mail-autofilter.h
-include/evolution-${R}/mail/mail-component.h
 include/evolution-${R}/mail/mail-config.h
 include/evolution-${R}/mail/mail-folder-cache.h
 include/evolution-${R}/mail/mail-mt.h
@@ -213,7 +231,10 @@ include/evolution-${R}/menus/gal-view-new-dialog.h
 include/evolution-${R}/menus/gal-view.h
 include/evolution-${R}/misc/
 include/evolution-${R}/misc/e-account-combo-box.h
-include/evolution-${R}/misc/e-activity-handler.h
+include/evolution-${R}/misc/e-account-manager.h
+include/evolution-${R}/misc/e-account-tree-view.h
+include/evolution-${R}/misc/e-action-combo-box.h
+include/evolution-${R}/misc/e-activity-proxy.h
 include/evolution-${R}/misc/e-attachment-button.h
 include/evolution-${R}/misc/e-attachment-dialog.h
 include/evolution-${R}/misc/e-attachment-handler-image.h
@@ -225,64 +246,76 @@ include/evolution-${R}/misc/e-attachment-store.h
 include/evolution-${R}/misc/e-attachment-tree-view.h
 include/evolution-${R}/misc/e-attachment-view.h
 include/evolution-${R}/misc/e-attachment.h
+include/evolution-${R}/misc/e-buffer-tagger.h
 include/evolution-${R}/misc/e-calendar-item.h
 include/evolution-${R}/misc/e-calendar.h
 include/evolution-${R}/misc/e-canvas-background.h
 include/evolution-${R}/misc/e-canvas-utils.h
 include/evolution-${R}/misc/e-canvas-vbox.h
 include/evolution-${R}/misc/e-canvas.h
-include/evolution-${R}/misc/e-cell-date-edit.h
-include/evolution-${R}/misc/e-cell-percent.h
 include/evolution-${R}/misc/e-cell-renderer-combo.h
-include/evolution-${R}/misc/e-charset-picker.h
-include/evolution-${R}/misc/e-colors.h
-include/evolution-${R}/misc/e-combo-button.h
+include/evolution-${R}/misc/e-charset-combo-box.h
 include/evolution-${R}/misc/e-combo-cell-editable.h
-include/evolution-${R}/misc/e-config-page.h
-include/evolution-${R}/misc/e-cursors.h
 include/evolution-${R}/misc/e-dateedit.h
-include/evolution-${R}/misc/e-dropdown-button.h
-include/evolution-${R}/misc/e-filter-bar.h
-include/evolution-${R}/misc/e-gui-utils.h
+include/evolution-${R}/misc/e-focus-tracker.h
+include/evolution-${R}/misc/e-hinted-entry.h
 include/evolution-${R}/misc/e-hsv-utils.h
-include/evolution-${R}/misc/e-icon-entry.h
 include/evolution-${R}/misc/e-image-chooser.h
-include/evolution-${R}/misc/e-info-label.h
+include/evolution-${R}/misc/e-import-assistant.h
 include/evolution-${R}/misc/e-map.h
-include/evolution-${R}/misc/e-multi-config-dialog.h
+include/evolution-${R}/misc/e-menu-tool-action.h
+include/evolution-${R}/misc/e-menu-tool-button.h
 include/evolution-${R}/misc/e-online-button.h
+include/evolution-${R}/misc/e-paned.h
+include/evolution-${R}/misc/e-popup-action.h
 include/evolution-${R}/misc/e-popup-menu.h
+include/evolution-${R}/misc/e-preferences-window.h
+include/evolution-${R}/misc/e-preview-pane.h
 include/evolution-${R}/misc/e-printable.h
-include/evolution-${R}/misc/e-reflow-model.h
-include/evolution-${R}/misc/e-reflow.h
 include/evolution-${R}/misc/e-search-bar.h
+include/evolution-${R}/misc/e-searching-tokenizer.h
+include/evolution-${R}/misc/e-selectable.h
 include/evolution-${R}/misc/e-selection-model-array.h
 include/evolution-${R}/misc/e-selection-model-simple.h
 include/evolution-${R}/misc/e-selection-model.h
 include/evolution-${R}/misc/e-send-options.h
 include/evolution-${R}/misc/e-signature-combo-box.h
+include/evolution-${R}/misc/e-signature-editor.h
+include/evolution-${R}/misc/e-signature-manager.h
+include/evolution-${R}/misc/e-signature-preview.h
+include/evolution-${R}/misc/e-signature-script-dialog.h
+include/evolution-${R}/misc/e-signature-tree-view.h
 include/evolution-${R}/misc/e-spinner.c
 include/evolution-${R}/misc/e-spinner.h
-include/evolution-${R}/misc/e-task-bar.h
-include/evolution-${R}/misc/e-task-widget.h
-include/evolution-${R}/misc/e-unicode.h
 include/evolution-${R}/misc/e-url-entry.h
+include/evolution-${R}/misc/e-web-view.h
+include/evolution-${R}/misc/ea-calendar-cell.h
+include/evolution-${R}/misc/ea-calendar-item.h
+include/evolution-${R}/misc/ea-cell-table.h
+include/evolution-${R}/misc/ea-widgets.h
 include/evolution-${R}/shell/
-include/evolution-${R}/shell/Evolution.h
-include/evolution-${R}/shell/e-component-view.h
-include/evolution-${R}/shell/e-user-creatable-items-handler.h
+include/evolution-${R}/shell/e-shell-backend.h
+include/evolution-${R}/shell/e-shell-common.h
+include/evolution-${R}/shell/e-shell-content.h
+include/evolution-${R}/shell/e-shell-searchbar.h
+include/evolution-${R}/shell/e-shell-settings.h
+include/evolution-${R}/shell/e-shell-sidebar.h
+include/evolution-${R}/shell/e-shell-switcher.h
+include/evolution-${R}/shell/e-shell-taskbar.h
+include/evolution-${R}/shell/e-shell-utils.h
+include/evolution-${R}/shell/e-shell-view.h
+include/evolution-${R}/shell/e-shell-window-actions.h
+include/evolution-${R}/shell/e-shell-window.h
+include/evolution-${R}/shell/e-shell.h
 include/evolution-${R}/shell/es-event.h
-include/evolution-${R}/shell/es-menu.h
-include/evolution-${R}/shell/evolution-component.h
-include/evolution-${R}/shell/evolution-config-control.h
-include/evolution-${R}/shell/evolution-listener.h
-include/evolution-${R}/shell/evolution-shell-component-utils.h
 include/evolution-${R}/table/
 include/evolution-${R}/table/e-cell-checkbox.h
 include/evolution-${R}/table/e-cell-combo.h
+include/evolution-${R}/table/e-cell-date-edit.h
 include/evolution-${R}/table/e-cell-date.h
 include/evolution-${R}/table/e-cell-hbox.h
 include/evolution-${R}/table/e-cell-number.h
+include/evolution-${R}/table/e-cell-percent.h
 include/evolution-${R}/table/e-cell-pixbuf.h
 include/evolution-${R}/table/e-cell-popup.h
 include/evolution-${R}/table/e-cell-size.h
@@ -313,10 +346,8 @@ include/evolution-${R}/table/e-table-memory-store.h
 include/evolution-${R}/table/e-table-memory.h
 include/evolution-${R}/table/e-table-model.h
 include/evolution-${R}/table/e-table-one.h
-include/evolution-${R}/table/e-table-scrolled.h
 include/evolution-${R}/table/e-table-search.h
 include/evolution-${R}/table/e-table-selection-model.h
-include/evolution-${R}/table/e-table-simple.h
 include/evolution-${R}/table/e-table-sort-info.h
 include/evolution-${R}/table/e-table-sorted-variable.h
 include/evolution-${R}/table/e-table-sorted.h
@@ -326,38 +357,44 @@ include/evolution-${R}/table/e-table-specification.h
 include/evolution-${R}/table/e-table-state.h
 include/evolution-${R}/table/e-table-subset-variable.h
 include/evolution-${R}/table/e-table-subset.h
-include/evolution-${R}/table/e-table-tooltip.h
 include/evolution-${R}/table/e-table-utils.h
 include/evolution-${R}/table/e-table-without.h
 include/evolution-${R}/table/e-table.h
 include/evolution-${R}/table/e-tree-memory-callbacks.h
 include/evolution-${R}/table/e-tree-memory.h
 include/evolution-${R}/table/e-tree-model.h
-include/evolution-${R}/table/e-tree-scrolled.h
 include/evolution-${R}/table/e-tree-selection-model.h
 include/evolution-${R}/table/e-tree-sorted.h
 include/evolution-${R}/table/e-tree-table-adapter.h
 include/evolution-${R}/table/e-tree.h
+include/evolution-${R}/table/gal-a11y-e-cell-popup.h
+include/evolution-${R}/table/gal-a11y-e-cell-registry.h
+include/evolution-${R}/table/gal-a11y-e-cell-text.h
+include/evolution-${R}/table/gal-a11y-e-cell-toggle.h
+include/evolution-${R}/table/gal-a11y-e-cell-tree.h
+include/evolution-${R}/table/gal-a11y-e-cell-vbox.h
+include/evolution-${R}/table/gal-a11y-e-cell.h
+include/evolution-${R}/table/gal-a11y-e-table-click-to-add-factory.h
+include/evolution-${R}/table/gal-a11y-e-table-click-to-add.h
+include/evolution-${R}/table/gal-a11y-e-table-column-header.h
+include/evolution-${R}/table/gal-a11y-e-table-factory.h
+include/evolution-${R}/table/gal-a11y-e-table-item-factory.h
+include/evolution-${R}/table/gal-a11y-e-table-item.h
+include/evolution-${R}/table/gal-a11y-e-table.h
+include/evolution-${R}/table/gal-a11y-e-tree-factory.h
+include/evolution-${R}/table/gal-a11y-e-tree.h
 include/evolution-${R}/text/
+include/evolution-${R}/text/e-reflow-model.h
+include/evolution-${R}/text/e-reflow.h
 include/evolution-${R}/text/e-text-model-repos.h
 include/evolution-${R}/text/e-text-model.h
 include/evolution-${R}/text/e-text.h
-lib/bonobo/
-lib/bonobo/servers/
-lib/bonobo/servers/GNOME_Evolution_Addressbook.server
-lib/bonobo/servers/GNOME_Evolution_Calendar.server
-lib/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server
-lib/bonobo/servers/GNOME_Evolution_Mail.server
-lib/bonobo/servers/GNOME_Evolution_Shell.server
+include/evolution-${R}/text/gal-a11y-e-text-factory.h
+include/evolution-${R}/text/gal-a11y-e-text.h
 lib/evolution/
 lib/evolution/${R}/
-lib/evolution/${R}/components/
-lib/evolution/${R}/components/libevolution-addressbook.a
-lib/evolution/${R}/components/libevolution-addressbook.la
-lib/evolution/${R}/components/libevolution-calendar.a
-lib/evolution/${R}/components/libevolution-calendar.la
-lib/evolution/${R}/components/libevolution-mail.a
-lib/evolution/${R}/components/libevolution-mail.la
+lib/evolution/${R}/libcomposer.a
+lib/evolution/${R}/libcomposer.la
 lib/evolution/${R}/libeabutil.a
 lib/evolution/${R}/libeabutil.la
 lib/evolution/${R}/libeconduit.a
@@ -366,8 +403,8 @@ lib/evolution/${R}/libecontacteditor.a
 lib/evolution/${R}/libecontacteditor.la
 lib/evolution/${R}/libecontactlisteditor.a
 lib/evolution/${R}/libecontactlisteditor.la
-lib/evolution/${R}/libefilterbar.a
-lib/evolution/${R}/libefilterbar.la
+lib/evolution/${R}/libemformat.a
+lib/evolution/${R}/libemformat.la
 lib/evolution/${R}/libemiscwidgets.a
 lib/evolution/${R}/libemiscwidgets.la
 lib/evolution/${R}/libeshell.a
@@ -384,31 +421,34 @@ lib/evolution/${R}/libeutil.a
 lib/evolution/${R}/libeutil.la
 lib/evolution/${R}/libevolution-a11y.a
 lib/evolution/${R}/libevolution-a11y.la
-lib/evolution/${R}/libevolution-addressbook-a11y.a
-lib/evolution/${R}/libevolution-addressbook-a11y.la
 lib/evolution/${R}/libevolution-addressbook-importers.a
 lib/evolution/${R}/libevolution-addressbook-importers.la
-lib/evolution/${R}/libevolution-cal-shared.a
-lib/evolution/${R}/libevolution-cal-shared.la
-lib/evolution/${R}/libevolution-calendar-a11y.a
-lib/evolution/${R}/libevolution-calendar-a11y.la
 lib/evolution/${R}/libevolution-calendar-importers.a
 lib/evolution/${R}/libevolution-calendar-importers.la
+lib/evolution/${R}/libevolution-calendar.a
+lib/evolution/${R}/libevolution-calendar.la
 lib/evolution/${R}/libevolution-mail-importers.a
 lib/evolution/${R}/libevolution-mail-importers.la
-lib/evolution/${R}/libevolution-mail-shared.a
-lib/evolution/${R}/libevolution-mail-shared.la
+lib/evolution/${R}/libevolution-mail-settings.a
+lib/evolution/${R}/libevolution-mail-settings.la
+lib/evolution/${R}/libevolution-mail.a
+lib/evolution/${R}/libevolution-mail.la
 lib/evolution/${R}/libevolution-smime.a
 lib/evolution/${R}/libevolution-smime.la
-lib/evolution/${R}/libevolution-widgets-a11y.a
-lib/evolution/${R}/libevolution-widgets-a11y.la
 lib/evolution/${R}/libfilter.a
 lib/evolution/${R}/libfilter.la
 lib/evolution/${R}/libmenus.a
 lib/evolution/${R}/libmenus.la
+lib/evolution/${R}/modules/
+lib/evolution/${R}/modules/libevolution-module-addressbook.a
+lib/evolution/${R}/modules/libevolution-module-addressbook.la
+lib/evolution/${R}/modules/libevolution-module-calendar.a
+lib/evolution/${R}/modules/libevolution-module-calendar.la
+lib/evolution/${R}/modules/libevolution-module-mail.a
+lib/evolution/${R}/modules/libevolution-module-mail.la
+lib/evolution/${R}/modules/libevolution-module-plugin-lib.a
+lib/evolution/${R}/modules/libevolution-module-plugin-lib.la
 lib/evolution/${R}/plugins/
-lib/evolution/${R}/plugins/libmail-account-disable.a
-lib/evolution/${R}/plugins/libmail-account-disable.la
 lib/evolution/${R}/plugins/liborg-gnome-addressbook-file.a
 lib/evolution/${R}/plugins/liborg-gnome-addressbook-file.la
 lib/evolution/${R}/plugins/liborg-gnome-bogo-junk-plugin.a
@@ -429,12 +469,10 @@ lib/evolution/${R}/plugins/liborg-gnome-evolution-startup-wizard.a
 lib/evolution/${R}/plugins/liborg-gnome-evolution-startup-wizard.la
 lib/evolution/${R}/plugins/liborg-gnome-evolution-webdav.a
 lib/evolution/${R}/plugins/liborg-gnome-evolution-webdav.la
-lib/evolution/${R}/plugins/liborg-gnome-exchange-operations.a
-lib/evolution/${R}/plugins/liborg-gnome-exchange-operations.la
 lib/evolution/${R}/plugins/liborg-gnome-groupwise-features.a
 lib/evolution/${R}/plugins/liborg-gnome-groupwise-features.la
-lib/evolution/${R}/plugins/liborg-gnome-gw-account-setup.a
-lib/evolution/${R}/plugins/liborg-gnome-gw-account-setup.la
+lib/evolution/${R}/plugins/liborg-gnome-image-inline.a
+lib/evolution/${R}/plugins/liborg-gnome-image-inline.la
 lib/evolution/${R}/plugins/liborg-gnome-imap-features.a
 lib/evolution/${R}/plugins/liborg-gnome-imap-features.la
 lib/evolution/${R}/plugins/liborg-gnome-itip-formatter.a
@@ -462,25 +500,18 @@ lib/evolution/${R}/plugins/org-gnome-evolution-caldav.eplug
 lib/evolution/${R}/plugins/org-gnome-evolution-google.eplug
 lib/evolution/${R}/plugins/org-gnome-evolution-startup-wizard.eplug
 lib/evolution/${R}/plugins/org-gnome-evolution-webdav.eplug
-lib/evolution/${R}/plugins/org-gnome-exchange-ab-subscription.xml
-lib/evolution/${R}/plugins/org-gnome-exchange-cal-subscription.xml
-lib/evolution/${R}/plugins/org-gnome-exchange-operations.eplug
-lib/evolution/${R}/plugins/org-gnome-exchange-tasks-subscription.xml
-lib/evolution/${R}/plugins/org-gnome-folder-permissions.xml
-lib/evolution/${R}/plugins/org-gnome-folder-subscription.xml
 lib/evolution/${R}/plugins/org-gnome-groupwise-features.eplug
-lib/evolution/${R}/plugins/org-gnome-gw-account-setup.eplug
+lib/evolution/${R}/plugins/org-gnome-image-inline.eplug
 lib/evolution/${R}/plugins/org-gnome-imap-features.eplug
 lib/evolution/${R}/plugins/org-gnome-itip-formatter.eplug
-lib/evolution/${R}/plugins/org-gnome-mail-account-disable.eplug
 lib/evolution/${R}/plugins/org-gnome-mark-all-read.eplug
 lib/evolution/${R}/plugins/org-gnome-plugin-manager.eplug
-lib/evolution/${R}/plugins/org-gnome-plugin-manager.xml
 lib/evolution/${R}/plugins/org-gnome-pst-import.eplug
 lib/evolution/${R}/plugins/org-gnome-publish-calendar.eplug
-lib/evolution/${R}/plugins/org-gnome-publish-calendar.xml
 lib/evolution/${R}/plugins/org-gnome-sa-junk-plugin.eplug
 lib/evolution/${R}/plugins/org-gnome-vcard-inline.eplug
+lib/pkgconfig/evolution-calendar.pc
+lib/pkgconfig/evolution-mail.pc
 lib/pkgconfig/evolution-plugin.pc
 lib/pkgconfig/evolution-shell.pc
 libexec/evolution/
@@ -488,8 +519,8 @@ libexec/evolution/${R}/
 libexec/evolution/${R}/csv2vcard
 libexec/evolution/${R}/evolution-addressbook-clean
 @bin libexec/evolution/${R}/evolution-addressbook-export
-@bin libexec/evolution/${R}/evolution-alarm-notify
 @bin libexec/evolution/${R}/killev
+share/applications/evolution-settings.desktop
 share/applications/evolution.desktop
 share/evolution/
 share/evolution/${R}/
@@ -591,7 +622,6 @@ share/evolution/${R}/errors/e-system.error
 share/evolution/${R}/errors/filter.error
 share/evolution/${R}/errors/mail-composer.error
 share/evolution/${R}/errors/mail.error
-share/evolution/${R}/errors/org-gnome-exchange-operations.error
 share/evolution/${R}/errors/org-gnome-itip-formatter.error
 share/evolution/${R}/errors/org-gnome-mail-retract.error
 share/evolution/${R}/errors/org-gnome-process-meeting.error
@@ -607,54 +637,6 @@ share/evolution/${R}/etspec/e-meeting-time-sel.etspec
 share/evolution/${R}/etspec/e-memo-table.etspec
 share/evolution/${R}/etspec/message-list.etspec
 share/evolution/${R}/filtertypes.xml
-share/evolution/${R}/glade/
-share/evolution/${R}/glade/alarm-dialog.glade
-share/evolution/${R}/glade/alarm-list-dialog.glade
-share/evolution/${R}/glade/alarm-notify.glade
-share/evolution/${R}/glade/cal-prefs-dialog.glade
-share/evolution/${R}/glade/contact-editor.glade
-share/evolution/${R}/glade/contact-list-editor.glade
-share/evolution/${R}/glade/e-active-connection-dialog.glade
-share/evolution/${R}/glade/e-delegate-dialog.glade
-share/evolution/${R}/glade/e-foreign-folder-dialog.glade
-share/evolution/${R}/glade/e-itip-control.glade
-share/evolution/${R}/glade/e-send-options.glade
-share/evolution/${R}/glade/e-table-config.glade
-share/evolution/${R}/glade/e-table-field-chooser.glade
-share/evolution/${R}/glade/e-timezone-dialog.glade
-share/evolution/${R}/glade/eab-contact-commit-duplicate-detected.glade
-share/evolution/${R}/glade/eab-contact-duplicate-detected.glade
-share/evolution/${R}/glade/event-page.glade
-share/evolution/${R}/glade/exchange-change-password.glade
-share/evolution/${R}/glade/exchange-delegates.glade
-share/evolution/${R}/glade/exchange-folder-tree.glade
-share/evolution/${R}/glade/exchange-oof.glade
-share/evolution/${R}/glade/exchange-passwd-expiry.glade
-share/evolution/${R}/glade/exchange-permissions-dialog.glade
-share/evolution/${R}/glade/exchange-send-options.glade
-share/evolution/${R}/glade/filter.glade
-share/evolution/${R}/glade/fullname.glade
-share/evolution/${R}/glade/gal-define-views.glade
-share/evolution/${R}/glade/gal-view-instance-save-as-dialog.glade
-share/evolution/${R}/glade/gal-view-new-dialog.glade
-share/evolution/${R}/glade/goto-dialog.glade
-share/evolution/${R}/glade/imap-headers.glade
-share/evolution/${R}/glade/import.glade
-share/evolution/${R}/glade/junk-settings.glade
-share/evolution/${R}/glade/ldap-config.glade
-share/evolution/${R}/glade/mail-config.glade
-share/evolution/${R}/glade/mail-dialogs.glade
-share/evolution/${R}/glade/memo-page.glade
-share/evolution/${R}/glade/properties.glade
-share/evolution/${R}/glade/proxy-add-dialog.glade
-share/evolution/${R}/glade/proxy-listing.glade
-share/evolution/${R}/glade/proxy-login-dialog.glade
-share/evolution/${R}/glade/publish-calendar.glade
-share/evolution/${R}/glade/recurrence-page.glade
-share/evolution/${R}/glade/schedule-page.glade
-share/evolution/${R}/glade/smime-ui.glade
-share/evolution/${R}/glade/task-details-page.glade
-share/evolution/${R}/glade/task-page.glade
 share/evolution/${R}/help/
 share/evolution/${R}/help/quickref/
 share/evolution/${R}/help/quickref/C/
@@ -682,6 +664,86 @@ share/evolution/${R}/help/quickref/sq/quickref.pdf
 share/evolution/${R}/help/quickref/sv/
 share/evolution/${R}/help/quickref/sv/quickref.pdf
 share/evolution/${R}/icons/
+share/evolution/${R}/icons/gnome/
+share/evolution/${R}/icons/gnome/16x16/
+share/evolution/${R}/icons/gnome/16x16/stock/
+share/evolution/${R}/icons/gnome/16x16/stock/data/
+share/evolution/${R}/icons/gnome/16x16/stock/data/stock_signature-bad.png
+share/evolution/${R}/icons/gnome/16x16/stock/data/stock_signature-ok.png
+share/evolution/${R}/icons/gnome/16x16/stock/data/stock_signature.png
+share/evolution/${R}/icons/gnome/16x16/stock/document/
+share/evolution/${R}/icons/gnome/16x16/stock/document/stock_task-assigned-to.png
+share/evolution/${R}/icons/gnome/16x16/stock/document/stock_task-assigned.png
+share/evolution/${R}/icons/gnome/16x16/stock/document/stock_task-recurring.png
+share/evolution/${R}/icons/gnome/16x16/stock/document/stock_task.png
+share/evolution/${R}/icons/gnome/16x16/stock/document/stock_todo.png
+share/evolution/${R}/icons/gnome/16x16/stock/generic/
+share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_bell.png
+share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_check-filled.png
+share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_new-meeting.png
+share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_score-high.png
+share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_score-higher.png
+share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_score-highest.png
+share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_score-low.png
+share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_score-lower.png
+share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_score-lowest.png
+share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_score-normal.png
+share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_show-all.png
+share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_timezone.png
+share/evolution/${R}/icons/gnome/16x16/stock/generic/stock_view-details.png
+share/evolution/${R}/icons/gnome/16x16/stock/net/
+share/evolution/${R}/icons/gnome/16x16/stock/net/stock_contact-list.png
+share/evolution/${R}/icons/gnome/16x16/stock/net/stock_mail-filters-apply.png
+share/evolution/${R}/icons/gnome/16x16/stock/net/stock_mail-flag-for-followup-done.png
+share/evolution/${R}/icons/gnome/16x16/stock/net/stock_mail-flag-for-followup.png
+share/evolution/${R}/icons/gnome/16x16/stock/net/stock_mail-open-multiple.png
+share/evolution/${R}/icons/gnome/16x16/stock/net/stock_mail-unread-multiple.png
+share/evolution/${R}/icons/gnome/16x16/stock/net/stock_shared-by-me.png
+share/evolution/${R}/icons/gnome/16x16/stock/net/stock_shared-to-me.png
+share/evolution/${R}/icons/gnome/16x16/stock/net/stock_video-conferencing.png
+share/evolution/${R}/icons/gnome/16x16/stock/object/
+share/evolution/${R}/icons/gnome/16x16/stock/object/stock_insert-note.png
+share/evolution/${R}/icons/gnome/24x24/
+share/evolution/${R}/icons/gnome/24x24/stock/
+share/evolution/${R}/icons/gnome/24x24/stock/data/
+share/evolution/${R}/icons/gnome/24x24/stock/data/stock_signature-bad.png
+share/evolution/${R}/icons/gnome/24x24/stock/data/stock_signature-ok.png
+share/evolution/${R}/icons/gnome/24x24/stock/data/stock_signature.png
+share/evolution/${R}/icons/gnome/24x24/stock/document/
+share/evolution/${R}/icons/gnome/24x24/stock/document/stock_task-assigned-to.png
+share/evolution/${R}/icons/gnome/24x24/stock/document/stock_task-assigned.png
+share/evolution/${R}/icons/gnome/24x24/stock/document/stock_task-recurring.png
+share/evolution/${R}/icons/gnome/24x24/stock/document/stock_task.png
+share/evolution/${R}/icons/gnome/24x24/stock/document/stock_todo.png
+share/evolution/${R}/icons/gnome/24x24/stock/generic/
+share/evolution/${R}/icons/gnome/24x24/stock/generic/stock_new-meeting.png
+share/evolution/${R}/icons/gnome/24x24/stock/generic/stock_show-all.png
+share/evolution/${R}/icons/gnome/24x24/stock/generic/stock_timezone.png
+share/evolution/${R}/icons/gnome/24x24/stock/net/
+share/evolution/${R}/icons/gnome/24x24/stock/net/stock_contact-list.png
+share/evolution/${R}/icons/gnome/24x24/stock/net/stock_mail-filters-apply.png
+share/evolution/${R}/icons/gnome/24x24/stock/net/stock_mail-open-multiple.png
+share/evolution/${R}/icons/gnome/24x24/stock/net/stock_mail-unread-multiple.png
+share/evolution/${R}/icons/gnome/24x24/stock/net/stock_shared-by-me.png
+share/evolution/${R}/icons/gnome/24x24/stock/net/stock_shared-to-me.png
+share/evolution/${R}/icons/gnome/24x24/stock/net/stock_video-conferencing.png
+share/evolution/${R}/icons/gnome/24x24/stock/object/
+share/evolution/${R}/icons/gnome/24x24/stock/object/stock_insert-note.png
+share/evolution/${R}/icons/gnome/48x48/
+share/evolution/${R}/icons/gnome/48x48/stock/
+share/evolution/${R}/icons/gnome/48x48/stock/data/
+share/evolution/${R}/icons/gnome/48x48/stock/data/stock_signature-bad.png
+share/evolution/${R}/icons/gnome/48x48/stock/data/stock_signature-ok.png
+share/evolution/${R}/icons/gnome/48x48/stock/data/stock_signature.png
+share/evolution/${R}/icons/gnome/48x48/stock/document/
+share/evolution/${R}/icons/gnome/48x48/stock/document/stock_todo.png
+share/evolution/${R}/icons/gnome/48x48/stock/generic/
+share/evolution/${R}/icons/gnome/48x48/stock/generic/stock_alarm.png
+share/evolution/${R}/icons/gnome/48x48/stock/generic/stock_new-meeting.png
+share/evolution/${R}/icons/gnome/48x48/stock/generic/stock_timezone.png
+share/evolution/${R}/icons/gnome/48x48/stock/net/
+share/evolution/${R}/icons/gnome/48x48/stock/net/stock_mail-flag-for-followup-done.png
+share/evolution/${R}/icons/gnome/48x48/stock/net/stock_mail-flag-for-followup.png
 share/evolution/${R}/icons/hicolor/
 share/evolution/${R}/icons/hicolor/16x16/
 share/evolution/${R}/icons/hicolor/16x16/actions/
@@ -772,16 +834,51 @@ share/evolution/${R}/sounds/
 share/evolution/${R}/sounds/default_alarm.wav
 share/evolution/${R}/tasktypes.xml
 share/evolution/${R}/ui/
-share/evolution/${R}/ui/evolution-addressbook.xml
-share/evolution/${R}/ui/evolution-calendar.xml
+share/evolution/${R}/ui/alarm-dialog.ui
+share/evolution/${R}/ui/alarm-list-dialog.ui
+share/evolution/${R}/ui/alarm-notify.ui
+share/evolution/${R}/ui/cal-prefs-dialog.ui
+share/evolution/${R}/ui/contact-editor.ui
+share/evolution/${R}/ui/contact-list-editor.ui
+share/evolution/${R}/ui/e-delegate-dialog.ui
+share/evolution/${R}/ui/e-itip-control.ui
+share/evolution/${R}/ui/e-send-options.ui
+share/evolution/${R}/ui/e-table-config.ui
+share/evolution/${R}/ui/e-timezone-dialog.ui
+share/evolution/${R}/ui/eab-contact-commit-duplicate-detected.ui
+share/evolution/${R}/ui/eab-contact-duplicate-detected.ui
+share/evolution/${R}/ui/event-page.ui
+share/evolution/${R}/ui/evolution-calendars.ui
 share/evolution/${R}/ui/evolution-composer.ui
-share/evolution/${R}/ui/evolution-mail-global.xml
-share/evolution/${R}/ui/evolution-mail-list.xml
-share/evolution/${R}/ui/evolution-mail-message.xml
-share/evolution/${R}/ui/evolution-mail-messagedisplay.xml
-share/evolution/${R}/ui/evolution-memos.xml
-share/evolution/${R}/ui/evolution-tasks.xml
-share/evolution/${R}/ui/evolution.xml
+share/evolution/${R}/ui/evolution-contacts.ui
+share/evolution/${R}/ui/evolution-mail-reader.ui
+share/evolution/${R}/ui/evolution-mail.ui
+share/evolution/${R}/ui/evolution-memos.ui
+share/evolution/${R}/ui/evolution-shell.ui
+share/evolution/${R}/ui/evolution-tasks.ui
+share/evolution/${R}/ui/filter.ui
+share/evolution/${R}/ui/fullname.ui
+share/evolution/${R}/ui/gal-define-views.ui
+share/evolution/${R}/ui/gal-view-instance-save-as-dialog.ui
+share/evolution/${R}/ui/gal-view-new-dialog.ui
+share/evolution/${R}/ui/goto-dialog.ui
+share/evolution/${R}/ui/imap-headers.ui
+share/evolution/${R}/ui/junk-settings.ui
+share/evolution/${R}/ui/ldap-config.ui
+share/evolution/${R}/ui/mail-config.ui
+share/evolution/${R}/ui/mail-dialogs.ui
+share/evolution/${R}/ui/memo-page.ui
+share/evolution/${R}/ui/org-gnome-email-custom-header.ui
+share/evolution/${R}/ui/properties.ui
+share/evolution/${R}/ui/proxy-add-dialog.ui
+share/evolution/${R}/ui/proxy-listing.ui
+share/evolution/${R}/ui/proxy-login-dialog.ui
+share/evolution/${R}/ui/publish-calendar.ui
+share/evolution/${R}/ui/recurrence-page.ui
+share/evolution/${R}/ui/schedule-page.ui
+share/evolution/${R}/ui/smime-ui.ui
+share/evolution/${R}/ui/task-details-page.ui
+share/evolution/${R}/ui/task-page.ui
 share/evolution/${R}/vfoldertypes.xml
 share/evolution/${R}/views/
 share/evolution/${R}/views/addressbook/
@@ -810,14 +907,6 @@ share/evolution/${R}/views/tasks/Tasks.galview
 share/evolution/${R}/views/tasks/With_DueDate.galview
 share/evolution/${R}/views/tasks/With_Status.galview
 share/evolution/${R}/views/tasks/galview.xml
-share/evolution/${R}/weather/
-share/evolution/${R}/weather/category_weather_cloudy_16.png
-share/evolution/${R}/weather/category_weather_fog_16.png
-share/evolution/${R}/weather/category_weather_partly_cloudy_16.png
-share/evolution/${R}/weather/category_weather_rain_16.png
-share/evolution/${R}/weather/category_weather_snow_16.png
-share/evolution/${R}/weather/category_weather_sun_16.png
-share/evolution/${R}/weather/category_weather_tstorm_16.png
 share/gnome/help/evolution/
 share/gnome/help/evolution/C/
 share/gnome/help/evolution/C/evolution.xml
@@ -1647,6 +1736,53 @@ share/gnome/help/evolution/sv/figures/quick_add_a.png
 share/gnome/help/evolution/sv/figures/quick_reference.png
 share/gnome/help/evolution/sv/figures/stock_search.png
 share/gnome/help/evolution/sv/figures/ver_view_a.png
+share/gtk-doc/html/eshell/
+share/gtk-doc/html/eshell/EShell.html
+share/gtk-doc/html/eshell/EShellBackend.html
+share/gtk-doc/html/eshell/EShellContent.html
+share/gtk-doc/html/eshell/EShellSearchbar.html
+share/gtk-doc/html/eshell/EShellSettings.html
+share/gtk-doc/html/eshell/EShellSidebar.html
+share/gtk-doc/html/eshell/EShellSwitcher.html
+share/gtk-doc/html/eshell/EShellTaskbar.html
+share/gtk-doc/html/eshell/EShellView.html
+share/gtk-doc/html/eshell/EShellWindow.html
+share/gtk-doc/html/eshell/ch01.html
+share/gtk-doc/html/eshell/ch02.html
+share/gtk-doc/html/eshell/ch03.html
+share/gtk-doc/html/eshell/ch04.html
+share/gtk-doc/html/eshell/eshell-Action-Groups.html
+share/gtk-doc/html/eshell/eshell-Bit-Arrays-(Legacy).html
+share/gtk-doc/html/eshell/eshell-Categories.html
+share/gtk-doc/html/eshell/eshell-Container-for-Signatures.html
+share/gtk-doc/html/eshell/eshell-Date-and-Time-Formatting.html
+share/gtk-doc/html/eshell/eshell-Dialog-Utilities-(Legacy).html
+share/gtk-doc/html/eshell/eshell-Error-Logging.html
+share/gtk-doc/html/eshell/eshell-GConf-Bridge.html
+share/gtk-doc/html/eshell/eshell-GObject-Property-Bindings.html
+share/gtk-doc/html/eshell/eshell-Generic-Module-Loader.html
+share/gtk-doc/html/eshell/eshell-Icon-Utilities-(Legacy).html
+share/gtk-doc/html/eshell/eshell-Mail-Accounts.html
+share/gtk-doc/html/eshell/eshell-Miscellaneous-Utilities.html
+share/gtk-doc/html/eshell/eshell-More-Signature-Utilities.html
+share/gtk-doc/html/eshell/eshell-Personalized-Signatures.html
+share/gtk-doc/html/eshell/eshell-Printing.html
+share/gtk-doc/html/eshell/eshell-Reading-and-Writing-XML.html
+share/gtk-doc/html/eshell/eshell-Selections.html
+share/gtk-doc/html/eshell/eshell-Shell-Actions.html
+share/gtk-doc/html/eshell/eshell-Shell-Utilities.html
+share/gtk-doc/html/eshell/eshell-Text-to-HTML-Conversion.html
+share/gtk-doc/html/eshell/eshell-User-Alert-Handling.html
+share/gtk-doc/html/eshell/eshell.devhelp
+share/gtk-doc/html/eshell/eshell.devhelp2
+share/gtk-doc/html/eshell/home.png
+share/gtk-doc/html/eshell/index.html
+share/gtk-doc/html/eshell/index.sgml
+share/gtk-doc/html/eshell/ix01.html
+share/gtk-doc/html/eshell/left.png
+share/gtk-doc/html/eshell/right.png
+share/gtk-doc/html/eshell/style.css
+share/gtk-doc/html/eshell/up.png
 share/icons/hicolor/16x16/apps/evolution-mail.png
 share/icons/hicolor/16x16/apps/evolution-memos.png
 share/icons/hicolor/16x16/apps/evolution-tasks.png
@@ -1668,34 +1804,26 @@ share/icons/hicolor/48x48/apps/evolution-memos.png
 share/icons/hicolor/48x48/apps/evolution-tasks.png
 share/icons/hicolor/48x48/apps/evolution.png
 share/icons/hicolor/scalable/apps/evolution.svg
-share/idl/
-share/idl/evolution-${R}/
-share/idl/evolution-${R}/Evolution-Component.idl
-share/idl/evolution-${R}/Evolution-ConfigControl.idl
-share/idl/evolution-${R}/Evolution-Mail.idl
-share/idl/evolution-${R}/Evolution-Shell.idl
-share/idl/evolution-${R}/Evolution.idl
-share/idl/evolution-${R}/evolution-calendar.idl
 share/locale/af/LC_MESSAGES/evolution-${R}.mo
 share/locale/am/LC_MESSAGES/evolution-${R}.mo
 share/locale/ar/LC_MESSAGES/evolution-${R}.mo
 share/locale/as/LC_MESSAGES/evolution-${R}.mo
 share/locale/ast/LC_MESSAGES/evolution-${R}.mo
 share/locale/az/LC_MESSAGES/evolution-${R}.mo
-share/locale/be/LC_MESSAGES/evolution-${R}.mo
 share/locale/be@latin/LC_MESSAGES/evolution-${R}.mo
 share/locale/bg/LC_MESSAGES/evolution-${R}.mo
 share/locale/bn/LC_MESSAGES/evolution-${R}.mo
 share/locale/bn_IN/LC_MESSAGES/evolution-${R}.mo
+share/locale/br/LC_MESSAGES/evolution-${R}.mo
 share/locale/bs/LC_MESSAGES/evolution-${R}.mo
 share/locale/ca/LC_MESSAGES/evolution-${R}.mo
-share/locale/ca@valencia/LC_MESSAGES/evolution-${R}.mo
 share/locale/cs/LC_MESSAGES/evolution-${R}.mo
 share/locale/cy/LC_MESSAGES/evolution-${R}.mo
 share/locale/da/LC_MESSAGES/evolution-${R}.mo
 share/locale/de/LC_MESSAGES/evolution-${R}.mo
 share/locale/dz/LC_MESSAGES/evolution-${R}.mo
 share/locale/el/LC_MESSAGES/evolution-${R}.mo
+share/locale/en@shaw/LC_MESSAGES/evolution-${R}.mo
 share/locale/en_AU/
 share/locale/en_AU/LC_MESSAGES/
 share/locale/en_AU/LC_MESSAGES/evolution-${R}.mo

mail/evolution/pkg/PLIST-plugins

@@ -1,12 +1,9 @@
-@comment $OpenBSD: PLIST-plugins,v 1.5 2009/10/13 22:07:04 jasper Exp $
+@comment $OpenBSD: PLIST-plugins,v 1.6 2010/04/22 16:30:02 jasper Exp $
 %%SHARED%%
-lib/evolution/${R}/plugins/attachment-reminder.glade
 lib/evolution/${R}/plugins/liborg-gnome-audio-inline.a
 lib/evolution/${R}/plugins/liborg-gnome-audio-inline.la
 lib/evolution/${R}/plugins/liborg-gnome-backup-restore.a
 lib/evolution/${R}/plugins/liborg-gnome-backup-restore.la
-lib/evolution/${R}/plugins/liborg-gnome-copy-tool.a
-lib/evolution/${R}/plugins/liborg-gnome-copy-tool.la
 lib/evolution/${R}/plugins/liborg-gnome-default-mailer.a
 lib/evolution/${R}/plugins/liborg-gnome-default-mailer.la
 lib/evolution/${R}/plugins/liborg-gnome-email-custom-header.a
@@ -25,38 +22,28 @@ lib/evolution/${R}/plugins/liborg-gnome-prefer-plain.a
 lib/evolution/${R}/plugins/liborg-gnome-prefer-plain.la
 lib/evolution/${R}/plugins/liborg-gnome-save-calendar.a
 lib/evolution/${R}/plugins/liborg-gnome-save-calendar.la
-lib/evolution/${R}/plugins/liborg-gnome-select-one-source.a
-lib/evolution/${R}/plugins/liborg-gnome-select-one-source.la
 lib/evolution/${R}/plugins/liborg-gnome-subject-thread.a
 lib/evolution/${R}/plugins/liborg-gnome-subject-thread.la
 lib/evolution/${R}/plugins/liborg-gnome-templates.a
 lib/evolution/${R}/plugins/liborg-gnome-templates.la
 lib/evolution/${R}/plugins/org-gnome-audio-inline.eplug
 lib/evolution/${R}/plugins/org-gnome-backup-restore.eplug
-lib/evolution/${R}/plugins/org-gnome-backup-restore.xml
-lib/evolution/${R}/plugins/org-gnome-copy-tool.eplug
 lib/evolution/${R}/plugins/org-gnome-default-mailer.eplug
 lib/evolution/${R}/plugins/org-gnome-email-custom-header.eplug
 lib/evolution/${R}/plugins/org-gnome-evolution-attachment-reminder.eplug
 lib/evolution/${R}/plugins/org-gnome-evolution-bbdb.eplug
 lib/evolution/${R}/plugins/org-gnome-mail-notification.eplug
 lib/evolution/${R}/plugins/org-gnome-mail-to-task.eplug
-lib/evolution/${R}/plugins/org-gnome-mail-to-task.xml
 lib/evolution/${R}/plugins/org-gnome-mailing-list-actions.eplug
-lib/evolution/${R}/plugins/org-gnome-mailing-list-actions.xml
 lib/evolution/${R}/plugins/org-gnome-prefer-plain.eplug
 lib/evolution/${R}/plugins/org-gnome-save-calendar.eplug
-lib/evolution/${R}/plugins/org-gnome-select-one-source.eplug
 lib/evolution/${R}/plugins/org-gnome-subject-thread.eplug
 lib/evolution/${R}/plugins/org-gnome-templates.eplug
-lib/evolution/${R}/plugins/templates.glade
 @bin libexec/evolution/${R}/evolution-backup
 share/evolution/${R}/errors/org-gnome-attachment-reminder.error
 share/evolution/${R}/errors/org-gnome-backup-restore.error
 share/evolution/${R}/errors/org-gnome-default-mailer.error
 share/evolution/${R}/errors/org-gnome-mailing-list-actions.error
-share/evolution/${R}/glade/email-custom-header.glade
-share/evolution/${R}/glade/org-gnome-email-custom-header.glade
 @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
 ${SCHEMAS_INSTDIR}/apps-evolution-attachment-reminder.schemas
 ${SCHEMAS_INSTDIR}/apps-evolution-mail-notification.schemas