Presenting GNOME 2.14.1 for FreeBSD! Checkout

http://www.gnome.org/start/2.14/ for the official release notes, and a list
of all the gooides in this new release.  In particular, GNOME 2.14 focused
on performance, and they did not miss the mark.  There's some new eye candy,
but most of the big things are waiting until GNOME 2.16.  On the FreeBSD
side, we tried to clean up all the crashers we could.  In particular, we
really improved GNOME's 64-bit support.

The good news is that this release does not bring any big shared library
version bumps, so you can almost do a simple portupgrade to get to 2.14.
There are a few minor gotchas that will be documented in UPDATING shortly.

The FreeBSD GNOME Team would like th thank the following users for their
patches, feedback, and sometimes incessant complaing about crashes (you
know who you are).

Yasuda Keisuke <kysd@po.harenet.ne.jp>
Pascal Hofstee <caelian@gmail.com>
rmgls@wanadoo.fr
tmclaugh
Yuri Pankov <yuri.pankov@gmail.com>
sajd on #freebsd-gnome
ade
ankon on #FreeBSD-Gnome
mux
Pascal Hofstee <caelian@gmail.com>
QuiRK on #freebsd-gnome
Vladimir Timofeev <vovkasm@gmail.com>

11 files changed, 121 insertions, 101 deletions

diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index c85600b4535b..2352de3063a0 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.39 2005/10/04 04:32:19 marcus Exp $
+#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.59 2006/04/13 07:52:36 bland Exp $
 #
 
 PORTNAME=	evolution-exchange
-PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTVERSION=	2.6.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/2.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	kiesel@schlund.de
@@ -21,21 +20,20 @@ BUILD_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
 RUN_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_OPENLDAP=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnometarget
-USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
 		--with-static-ldap=no \
 		--disable-compile-warnings
 
-EVO_VERSION=	2.4
-PLIST_SUB=	VERSION="2.4" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" \
+EVO_VERSION=	2.6
+PLIST_SUB=	VERSION="2.6" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" \
 		OLDDOCSDIR="share/doc/ximian-connector"
 
 .include <bsd.port.pre.mk>
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index bbd27e390bb7..18f4c48f2fd3 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.4.2.tar.bz2) = 67802f9c0be1528edaa0612188588914
-SHA256 (gnome2/evolution-exchange-2.4.2.tar.bz2) = beaa8e806e5babb2cd479446720ea492ed854db65036df678d7717c682cc332c
-SIZE (gnome2/evolution-exchange-2.4.2.tar.bz2) = 1100845
+MD5 (gnome2/evolution-exchange-2.6.1.tar.bz2) = 027cc03c5d8f95f4eb26603781e49816
+SHA256 (gnome2/evolution-exchange-2.6.1.tar.bz2) = fbb9120984ea440c9b29ecf707bc7e39e1a93b4455ec79d89183233b718dfd21
+SIZE (gnome2/evolution-exchange-2.6.1.tar.bz2) = 1022518
diff --git a/mail/evolution-exchange/files/patch-configure b/mail/evolution-exchange/files/patch-configure
index 43668716a0d1..f5d9a43d8c25 100644
--- a/mail/evolution-exchange/files/patch-configure
+++ b/mail/evolution-exchange/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Fri Aug 20 15:26:49 2004
-+++ configure	Fri Aug 20 15:27:21 2004
-@@ -23754,8 +23754,8 @@
+--- configure.orig	Thu Nov 10 17:41:52 2005
++++ configure	Thu Nov 10 17:43:52 2005
+@@ -24837,8 +24837,8 @@
  				# libldap might depend on OpenSSL... We need to pull
  				# in the dependency libs explicitly here since we're
  				# not using libtool for the configure test.
@@ -11,12 +11,3 @@
  				fi
  			else
  				LDAP_LIBS="-llber $LDAP_LIBS"
-@@ -24006,7 +24006,7 @@
- 
- 
- mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
--heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
-+heimlibs="-lkrb5 -lcrypt -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
- echo "$as_me:$LINENO: checking for Kerberos 5" >&5
- echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
- if test "${ac_cv_lib_kerberos5+set}" = set; then
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 24e31d9d08e3..5c2509a6dee8 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -62,9 +62,6 @@ libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage
 %%OLDDOCSDIR%%/ximian-connector-xntlm.html
 %%OLDDOCSDIR%%/ximian-connector.devhelp
 %%OLDDOCSDIR%%/ximian-connnector-booking.html
-share/gnome/evolution-exchange/%%VERSION%%/etspec/e-storage-set-view.etspec
-share/gnome/evolution-exchange/%%VERSION%%/glade/e-folder-creation-dialog.glade
-share/gnome/evolution-exchange/%%VERSION%%/glade/e-foreign-folder-dialog.glade
 share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-autoconfig-wizard.glade
 share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-change-password.glade
 share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-delegates.glade
@@ -81,14 +78,17 @@ share/locale/ar/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/bn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/ca/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/cy/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/en_CA/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/et/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/eu/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/fa/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/fr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -100,7 +100,9 @@ share/locale/id/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/ku/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/lt/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/mk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ms/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/nb/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ne/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -112,6 +114,7 @@ share/locale/pl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/pt/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/pt_BR/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/ro/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/rw/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/sq/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -122,13 +125,18 @@ share/locale/ta/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/th/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/tr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/xh/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/zh_HK/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrm share/gnome/evolution-exchange/%%VERSION%%/ui
 @dirrm share/gnome/evolution-exchange/%%VERSION%%/images
 @dirrm share/gnome/evolution-exchange/%%VERSION%%/glade
-@dirrm share/gnome/evolution-exchange/%%VERSION%%/etspec
 @dirrm share/gnome/evolution-exchange/%%VERSION%%
 @dirrm share/gnome/evolution-exchange
 @dirrm %%OLDDOCSDIR%%
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index eb3923090bdf..1be875126283 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.76 2005/10/09 11:09:15 kwm Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.98 2006/04/13 07:52:35 bland Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.4.2.1
-PORTREVISION=	1
+PORTVERSION=	2.6.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,12 +22,14 @@ RUN_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSD
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver \
 		gtkhtml3 desktopfileutils
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/lib/evolution/%%VERSION%%
 CONFIGURE_ARGS=	--enable-nss=yes \
 		--with-nss-includes=${LOCALBASE}/include/nss/nss \
 		--with-nss-libs=${LOCALBASE}/lib \
@@ -41,13 +42,13 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 GCONF_SCHEMAS=	apps_evolution_addressbook-${EVO_VERSION}.schemas \
 		apps_evolution_calendar-${EVO_VERSION}.schemas \
-		apps-evolution-mail-prompts-checkdefault-2.4.schemas \
+		apps-evolution-mail-prompts-checkdefault-2.6.schemas \
 		apps_evolution_shell-${EVO_VERSION}.schemas \
 		evolution-mail-${EVO_VERSION}.schemas
 
-EVO_VERSION=	2.4
+EVO_VERSION=	2.6
 PLIST_SUB=	VERSION=${EVO_VERSION} \
-		PORTVERSION=2.4
+		PORTVERSION=2.6
 
 OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
 		LDAP "Enable LDAP support" on \
@@ -55,9 +56,8 @@ OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=	"Does not build on 4.X"
-.endif
+USE_LDCONFIG=	${PREFIX}/lib/evolution/${EVO_VERSION}
+.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
 
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
 WITH_GSTREAMER=	yes
@@ -93,7 +93,7 @@ RUN_DEPENDS+=	spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 .endif
 
 .if defined(WITH_GSTREAMER)
-LIB_DEPENDS+=	gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer
+LIB_DEPENDS+=	gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer80
 PLIST_SUB+=	GSTREAMER=""
 .else
 PLIST_SUB+=	GSTREAMER="@comment "
@@ -118,19 +118,9 @@ CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 .endif
 .endif
 
-post-patch:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
-		s|%%EVO_VERSION%%|${EVO_VERSION}|' \
-		${FILESDIR}/evolibs.sh > ${WRKDIR}/evolibs.sh
-	@${REINPLACE_CMD} -e "s|gal-2.4|gal-2.6|g" \
-		${WRKSRC}/evolution-shell.pc.in \
-		${WRKSRC}/evolution-plugin.pc.in
-
-post-install:
+post-install: install-ldconfig-file
 	@${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \
 		${PREFIX}/bin/evolution
-	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/evolibs.sh \
-		${PREFIX}/etc/rc.d/000.evolibs.sh
 	-@update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 45e731362487..c065bd751e86 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.4.2.1.tar.bz2) = cee3e0ac6ca43e5060468c3b938bea72
-SHA256 (gnome2/evolution-2.4.2.1.tar.bz2) = eae8fed13de8eee9f60606ec0e645876e4b9a1e9bb30d21dace54e3995ca5f40
-SIZE (gnome2/evolution-2.4.2.1.tar.bz2) = 11503590
+MD5 (gnome2/evolution-2.6.1.tar.bz2) = 6ca70a86e6d8e8b3824e58f28a362065
+SHA256 (gnome2/evolution-2.6.1.tar.bz2) = 9b78e132a52a9f7192ff396a6b957f9836794e34f45b96823f971756b8261ef8
+SIZE (gnome2/evolution-2.6.1.tar.bz2) = 12291684
diff --git a/mail/evolution/files/evolibs.sh b/mail/evolution/files/evolibs.sh
deleted file mode 100644
index e191b9c41ed9..000000000000
--- a/mail/evolution/files/evolibs.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-    start)
-    	/sbin/ldconfig -m %%PREFIX%%/lib/evolution/%%EVO_VERSION%%
-	;;
-    stop)
-    	;;
-    *)
-    	echo ""
-	echo "Usage: `basename $0` { start | stop }"
-	echo ""
-	exit 64
-	;;
-esac
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 0ad426b2d938..f09892fc8150 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,8 +1,8 @@
---- configure.orig	Fri Jul 29 17:50:28 2005
-+++ configure	Fri Jul 29 17:51:42 2005
-@@ -23657,6 +23657,14 @@
-     DL_LIB=''
+--- configure.orig	Tue Nov 15 17:58:33 2005
++++ configure	Tue Nov 15 18:02:37 2005
+@@ -23732,6 +23732,15 @@
      SOFTOKN3_LIB=''
+     HAL_REQUIREMENT=''
      ;;
 +*freebsd*) os_win32=no
 +    NO_UNDEFINED=''
@@ -11,11 +11,12 @@
 +    SA_JUNK_PLUGIN=sa-junk-plugin
 +    DL_LIB=''
 +    SOFTOKN3_LIB='-lsoftokn3'
++    HAL_REQUIREMENT=''
 +    ;;
  *)  os_win32=no
      NO_UNDEFINED=''
-     SOCKET_LIBS=''
-@@ -26205,6 +26213,7 @@
+     SOEXT='.so'
+@@ -26280,6 +26289,7 @@
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -23,7 +24,7 @@
  
  
  int
-@@ -27882,7 +27891,7 @@
+@@ -27980,7 +27990,7 @@
  	LDFLAGS_save="$LDFLAGS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@@ -32,7 +33,7 @@
  	echo "$as_me:$LINENO: checking for Kerberos 5" >&5
  echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
  if test "${ac_cv_lib_kerberos5+set}" = set; then
-@@ -33151,7 +33160,7 @@
+@@ -33143,7 +33153,7 @@
  idldir="$datadir/idl/evolution-$BASE_VERSION"
  
  
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index a19421e95403..bb958c9531c7 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,6 +1,5 @@
 bin/evolution
 bin/evolution-%%VERSION%%
-etc/rc.d/000.evolibs.sh
 include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-popup.h
 include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-registry.h
 include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-text.h
@@ -27,12 +26,9 @@ include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-popup.h
 include/evolution-%%VERSION%%/calendar/gui/e-cal-config.h
 include/evolution-%%VERSION%%/e-conduit/e-pilot-map.h
 include/evolution-%%VERSION%%/e-conduit/e-pilot-util.h
-include/evolution-%%VERSION%%/e-util/e-account-list.h
-include/evolution-%%VERSION%%/e-util/e-account.h
 include/evolution-%%VERSION%%/e-util/e-bconf-map.h
 include/evolution-%%VERSION%%/e-util/e-bit-array.h
 include/evolution-%%VERSION%%/e-util/e-categories-config.h
-include/evolution-%%VERSION%%/e-util/e-component-listener.h
 include/evolution-%%VERSION%%/e-util/e-config-listener.h
 include/evolution-%%VERSION%%/e-util/e-config.h
 include/evolution-%%VERSION%%/e-util/e-corba-utils.h
@@ -47,11 +43,7 @@ include/evolution-%%VERSION%%/e-util/e-gtk-utils.h
 include/evolution-%%VERSION%%/e-util/e-gui-utils.h
 include/evolution-%%VERSION%%/e-util/e-html-utils.h
 include/evolution-%%VERSION%%/e-util/e-icon-factory.h
-include/evolution-%%VERSION%%/e-util/e-iconv.h
 include/evolution-%%VERSION%%/e-util/e-import.h
-include/evolution-%%VERSION%%/e-util/e-iterator.h
-include/evolution-%%VERSION%%/e-util/e-list-iterator.h
-include/evolution-%%VERSION%%/e-util/e-list.h
 include/evolution-%%VERSION%%/e-util/e-menu.h
 include/evolution-%%VERSION%%/e-util/e-mktemp.h
 include/evolution-%%VERSION%%/e-util/e-plugin.h
@@ -66,12 +58,9 @@ include/evolution-%%VERSION%%/e-util/e-sorter.h
 include/evolution-%%VERSION%%/e-util/e-text-event-processor-emacs-like.h
 include/evolution-%%VERSION%%/e-util/e-text-event-processor-types.h
 include/evolution-%%VERSION%%/e-util/e-text-event-processor.h
-include/evolution-%%VERSION%%/e-util/e-time-utils.h
-include/evolution-%%VERSION%%/e-util/e-uid.h
 include/evolution-%%VERSION%%/e-util/e-util-marshal.h
 include/evolution-%%VERSION%%/e-util/e-util.h
 include/evolution-%%VERSION%%/e-util/e-xml-utils.h
-include/evolution-%%VERSION%%/e-util/md5-utils.h
 include/evolution-%%VERSION%%/mail/Evolution-Mail.h
 include/evolution-%%VERSION%%/mail/em-composer-utils.h
 include/evolution-%%VERSION%%/mail/em-config.h
@@ -162,6 +151,7 @@ include/evolution-%%VERSION%%/misc/e-url-entry.h
 include/evolution-%%VERSION%%/misc/gal-combo-box.h
 include/evolution-%%VERSION%%/misc/gal-combo-text.h
 include/evolution-%%VERSION%%/shell/Evolution.h
+include/evolution-%%VERSION%%/shell/e-component-view.h
 include/evolution-%%VERSION%%/shell/e-shell-utils.h
 include/evolution-%%VERSION%%/shell/e-user-creatable-items-handler.h
 include/evolution-%%VERSION%%/shell/es-event.h
@@ -324,8 +314,8 @@ lib/evolution/%%VERSION%%/plugins/libmail-account-disable.la
 lib/evolution/%%VERSION%%/plugins/libmail-account-disable.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so
+%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.la
+%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.la
@@ -340,6 +330,12 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-hula-account-setup.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-hula-account-setup.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.la
@@ -364,6 +360,8 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.la
@@ -373,7 +371,7 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug
+%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug
@@ -382,6 +380,9 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-copy-tool.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-default-mailer.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-bbdb.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-caldav.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-hula-account-setup.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-mail-attachments-import-ics.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-startup-wizard.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-ab-subscription.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-cal-subscription.xml
@@ -394,6 +395,7 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-gw-account-setup.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-itip-formatter.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mail-account-disable.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-mark-all-read.eplug
@@ -403,10 +405,13 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.xml
+lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-sa-junk-plugin.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-select-one-source.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-subject-thread.eplug
+lib/evolution/%%VERSION%%/plugins/publish-calendar.glade
 libdata/bonobo/servers/GNOME_Evolution_Addressbook_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Calendar_%%VERSION%%.server
 libdata/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%%VERSION%%.server
@@ -419,12 +424,16 @@ libexec/evolution/%%VERSION%%/evolution-addressbook-clean
 libexec/evolution/%%VERSION%%/evolution-addressbook-export
 libexec/evolution/%%VERSION%%/evolution-alarm-notify
 libexec/evolution/%%VERSION%%/killev
-share/gnome/applications/evolution-%%VERSION%%.desktop
+share/gnome/applications/evolution.desktop
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/evolution/%%VERSION%%/addresstypes.xml
 share/gnome/evolution/%%VERSION%%/default/C/mail/local/Inbox
 share/gnome/evolution/%%VERSION%%/default/de/mail/local/Inbox
+share/gnome/evolution/%%VERSION%%/default/fi/mail/local/Inbox
+share/gnome/evolution/%%VERSION%%/default/fr/mail/local/Inbox
 share/gnome/evolution/%%VERSION%%/default/ja/mail/local/Inbox
+share/gnome/evolution/%%VERSION%%/default/lt/mail/local/Inbox
+share/gnome/evolution/%%VERSION%%/default/mk/mail/local/Inbox
 share/gnome/evolution/%%VERSION%%/default/nl/mail/local/Inbox
 share/gnome/evolution/%%VERSION%%/default/pt/mail/local/Inbox
 share/gnome/evolution/%%VERSION%%/default/zh_CN/mail/local/Inbox
@@ -450,6 +459,7 @@ share/gnome/evolution/%%VERSION%%/etspec/e-cal-list-view.etspec
 share/gnome/evolution/%%VERSION%%/etspec/e-calendar-table.etspec
 share/gnome/evolution/%%VERSION%%/etspec/e-contact-list-editor.etspec
 share/gnome/evolution/%%VERSION%%/etspec/e-meeting-time-sel.etspec
+share/gnome/evolution/%%VERSION%%/etspec/e-memo-table.etspec
 share/gnome/evolution/%%VERSION%%/etspec/message-list.etspec
 share/gnome/evolution/%%VERSION%%/filtertypes.xml
 share/gnome/evolution/%%VERSION%%/glade/alarm-dialog.glade
@@ -475,6 +485,7 @@ share/gnome/evolution/%%VERSION%%/glade/event-page.glade
 share/gnome/evolution/%%VERSION%%/glade/exchange-change-password.glade
 share/gnome/evolution/%%VERSION%%/glade/exchange-delegates.glade
 share/gnome/evolution/%%VERSION%%/glade/exchange-folder-tree.glade
+share/gnome/evolution/%%VERSION%%/glade/exchange-passwd-expiry.glade
 share/gnome/evolution/%%VERSION%%/glade/exchange-permissions-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/filter.glade
 share/gnome/evolution/%%VERSION%%/glade/fulladdr.glade
@@ -490,6 +501,7 @@ share/gnome/evolution/%%VERSION%%/glade/junk-settings.glade
 share/gnome/evolution/%%VERSION%%/glade/ldap-config.glade
 share/gnome/evolution/%%VERSION%%/glade/mail-config.glade
 share/gnome/evolution/%%VERSION%%/glade/mail-dialogs.glade
+share/gnome/evolution/%%VERSION%%/glade/memo-page.glade
 share/gnome/evolution/%%VERSION%%/glade/meeting-page.glade
 share/gnome/evolution/%%VERSION%%/glade/properties.glade
 share/gnome/evolution/%%VERSION%%/glade/proxy-add-dialog.glade
@@ -500,7 +512,6 @@ share/gnome/evolution/%%VERSION%%/glade/schedule-page.glade
 share/gnome/evolution/%%VERSION%%/glade/smime-ui.glade
 share/gnome/evolution/%%VERSION%%/glade/task-details-page.glade
 share/gnome/evolution/%%VERSION%%/glade/task-page.glade
-share/gnome/evolution/%%VERSION%%/glade/url-editor-dialog.glade
 share/gnome/evolution/%%VERSION%%/help/quickref/C/quickref.pdf
 share/gnome/evolution/%%VERSION%%/images/about-box.png
 share/gnome/evolution/%%VERSION%%/images/bcg.png
@@ -508,19 +519,24 @@ share/gnome/evolution/%%VERSION%%/images/evolution-contacts-mini.png
 share/gnome/evolution/%%VERSION%%/images/monkey-16.png
 share/gnome/evolution/%%VERSION%%/images/offline.png
 share/gnome/evolution/%%VERSION%%/images/online.png
+share/gnome/evolution/%%VERSION%%/images/query-free-busy.png
 share/gnome/evolution/%%VERSION%%/images/world_map-960.png
 share/gnome/evolution/%%VERSION%%/searchtypes.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-addressbook.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-calendar.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-composer-entries.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-executive-summary.xml
+share/gnome/evolution/%%VERSION%%/ui/evolution-editor.xml
+share/gnome/evolution/%%VERSION%%/ui/evolution-event-editor.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-mail-global.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-mail-list.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-mail-message.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-mail-messagedisplay.xml
+share/gnome/evolution/%%VERSION%%/ui/evolution-memo-editor.xml
+share/gnome/evolution/%%VERSION%%/ui/evolution-memos.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-message-composer.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-signature-editor.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-subscribe.xml
+share/gnome/evolution/%%VERSION%%/ui/evolution-task-editor.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution-tasks.xml
 share/gnome/evolution/%%VERSION%%/ui/evolution.xml
 share/gnome/evolution/%%VERSION%%/vfoldertypes.xml
@@ -537,6 +553,8 @@ share/gnome/evolution/%%VERSION%%/views/mail/By_Status.galview
 share/gnome/evolution/%%VERSION%%/views/mail/By_Subject.galview
 share/gnome/evolution/%%VERSION%%/views/mail/Messages.galview
 share/gnome/evolution/%%VERSION%%/views/mail/galview.xml
+share/gnome/evolution/%%VERSION%%/views/memos/Memos.galview
+share/gnome/evolution/%%VERSION%%/views/memos/galview.xml
 share/gnome/evolution/%%VERSION%%/views/tasks/Tasks.galview
 share/gnome/evolution/%%VERSION%%/views/tasks/With_DueDate.galview
 share/gnome/evolution/%%VERSION%%/views/tasks/With_Status.galview
@@ -552,6 +570,7 @@ share/gnome/evolution/%%VERSION%%/weather/category_weather_tstorm_16.png
 %%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar-%%VERSION%%.conduit
 %%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo-%%VERSION%%.conduit
 share/gnome/help/evolution-%%VERSION%%/C/evolution-%%VERSION%%.xml
+share/gnome/help/evolution-%%VERSION%%/C/figures/Screenshot-Free-Busy.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/calendar.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/config-cal.png
 share/gnome/help/evolution-%%VERSION%%/C/figures/config-mail.png
@@ -606,8 +625,8 @@ share/gnome/idl/evolution-%%VERSION%%/Evolution-Mail.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Shell.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution.idl
 share/gnome/idl/evolution-%%VERSION%%/evolution-calendar.idl
-share/gnome/mime-info/evolution-%%VERSION%%.keys
-share/gnome/mime-info/evolution-%%VERSION%%.mime
+share/gnome/mime-info/evolution.keys
+share/gnome/mime-info/evolution.mime
 share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf
 share/gnome/pixmaps/evolution-%%VERSION%%.png
 share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -616,12 +635,14 @@ share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/br/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/cy/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/en_AU/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/en_CA/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -636,15 +657,19 @@ share/locale/ga/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/gl/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/gu/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/he/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/hi/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/hr/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/hu/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/id/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/is/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/ka/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/ku/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/lt/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/lv/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/mk/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ms/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/nb/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -665,6 +690,7 @@ share/locale/sq/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sr/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sr@Latn/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/te/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/th/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/tr/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -673,7 +699,14 @@ share/locale/vi/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/wa/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/xh/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/zh_HK/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrm share/gnome/omf/evolution
 @dirrm share/gnome/idl/evolution-%%VERSION%%
 @dirrm share/gnome/help/evolution-%%VERSION%%/C/figures
@@ -681,6 +714,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/help/evolution-%%VERSION%%
 @dirrm share/gnome/evolution/%%VERSION%%/weather
 @dirrm share/gnome/evolution/%%VERSION%%/views/tasks
+@dirrm share/gnome/evolution/%%VERSION%%/views/memos
 @dirrm share/gnome/evolution/%%VERSION%%/views/mail
 @dirrm share/gnome/evolution/%%VERSION%%/views/calendar
 @dirrm share/gnome/evolution/%%VERSION%%/views/addressbook
@@ -703,9 +737,21 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/evolution/%%VERSION%%/default/nl/mail/local
 @dirrm share/gnome/evolution/%%VERSION%%/default/nl/mail
 @dirrm share/gnome/evolution/%%VERSION%%/default/nl
+@dirrm share/gnome/evolution/%%VERSION%%/default/mk/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/mk/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/mk
+@dirrm share/gnome/evolution/%%VERSION%%/default/lt/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/lt/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/lt
 @dirrm share/gnome/evolution/%%VERSION%%/default/ja/mail/local
 @dirrm share/gnome/evolution/%%VERSION%%/default/ja/mail
 @dirrm share/gnome/evolution/%%VERSION%%/default/ja
+@dirrm share/gnome/evolution/%%VERSION%%/default/fr/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/fr/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/fr
+@dirrm share/gnome/evolution/%%VERSION%%/default/fi/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/fi/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/fi
 @dirrm share/gnome/evolution/%%VERSION%%/default/de/mail/local
 @dirrm share/gnome/evolution/%%VERSION%%/default/de/mail
 @dirrm share/gnome/evolution/%%VERSION%%/default/de
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 23da8c17d9f2..3f479b73d1e4 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -70,10 +70,11 @@ CONFIGURE_ARGS+=	--disable-evolution
 PLIST_SUB+=		EVOLUTION="@comment "
 .else
 BUILD_DEPENDS+=		${NONEXISTENT}:${PORTSDIR}/mail/evolution:patch \
-			${X11BASE}/libdata/pkgconfig/evolution-plugin-2.4.pc:${PORTSDIR}/mail/evolution
-RUN_DEPENDS+=		${X11BASE}/libdata/pkgconfig/evolution-plugin-2.4.pc:${PORTSDIR}/mail/evolution
+			${X11BASE}/libdata/pkgconfig/evolution-plugin-2.6.pc:${PORTSDIR}/mail/evolution
+RUN_DEPENDS+=		${X11BASE}/libdata/pkgconfig/evolution-plugin-2.6.pc:${PORTSDIR}/mail/evolution
 EVOLUTION_WRKSRC!=	cd ${PORTSDIR}/mail/evolution && ${MAKE} -V WRKSRC
 CONFIGURE_ARGS+=	--with-evolution-source-dir="${EVOLUTION_WRKSRC}"
+LDFLAGS+=		-Wl,-export-dynamic
 PLIST_SUB+=		EVOLUTION="" LITERAL_PREFIX="${PREFIX}"
 .endif
 .if defined(WITHOUT_SYLPHEED)
@@ -100,7 +101,7 @@ LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|evolution-plugin-2.2|evolution-plugin-2.4|' \
+	@${REINPLACE_CMD} -e 's|evolution-plugin-2.2|evolution-plugin-2.6|' \
 		${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/mail/mail-notification/pkg-plist b/mail/mail-notification/pkg-plist
index aead5dac4852..deb9150dbf08 100644
--- a/mail/mail-notification/pkg-plist
+++ b/mail/mail-notification/pkg-plist
@@ -32,8 +32,8 @@ share/locale/ru/LC_MESSAGES/mail-notification.mo
 share/locale/sr/LC_MESSAGES/mail-notification.mo
 share/locale/sr@Latn/LC_MESSAGES/mail-notification.mo
 %%EVOLUTION%%@cwd %%X11BASE%%
-%%EVOLUTION%%lib/evolution/2.4/plugins/liborg-gnome-mail-notification.so
-%%EVOLUTION%%lib/evolution/2.4/plugins/org-gnome-mail-notification.eplug
+%%EVOLUTION%%lib/evolution/2.6/plugins/liborg-gnome-mail-notification.so
+%%EVOLUTION%%lib/evolution/2.6/plugins/org-gnome-mail-notification.eplug
 %%EVOLUTION%%@cwd %%LITERAL_PREFIX%%
 @dirrm share/gnome/omf/mail-notification
 @dirrm share/gnome/mail-notification/ui