Presenting GNOME 2.18 for FreeBSD. GNOME 2.18 is a departure from recent GNOME

releases in that it focuses more on stability and functionality than on
new features.  Not that it doesn't have its share of new and exciting
items.  See http://www.gnome.org/start/2.18/ for all the goodies in
this release.

GNOME 2.18 for FreeBSD would not have been possible without the hard work
of the FreeBSD GNOME Team and our intrepid band of testers including
J. W. Ballantine, Pawel Worach, Yasuda Keisuke, Pascal Hofstee, miwi,
Yoshihiro Ota, Vladimir Grebenschikov, Jukka A. Ukkonen,
Phillip Neumann, Franz Klammer, and Neal Delmonico.

11 files changed, 465 insertions, 1043 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 7b60ea0c81c1..7d7ef7d5d34e 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Glenn Johnson <gljohns@bellsouth.net>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/balsa/Makefile,v 1.7 2006/07/27 17:09:22 mezz Exp $
+#   $MCom: ports/mail/balsa/Makefile,v 1.10 2007/03/14 17:45:39 marcus Exp $
 #
 
 PORTNAME=	balsa
 PORTVERSION=	2.3.14
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/
 DISTNAME=	balsa-${PORTVERSION}
@@ -76,7 +77,8 @@ post-patch:
 		${WRKSRC}/libbalsa/mailbox_imap.c
 # PREFIX safeness
 	@${REINPLACE_CMD} -E \
-		-e 's|^(HICOLOR_ICON_DIR)[^/]+/|\1=${PREFIX}/|' \
+		-e 's|^(HICOLOR_ICON_DIR)[^/]+/|\1=${PREFIX}/| ; \
+		s|libgtkhtml-3.8|libgtkhtml-3.14|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-install:
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 7309ce80d5ce..4626ccd214a0 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.70 2006/10/03 02:06:00 ahze Exp $
+#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.83 2007/03/13 16:03:50 marcus Exp $
 #
 
 PORTNAME=	evolution-exchange
-PORTVERSION=	2.8.3
+PORTVERSION=	2.10.0
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -24,17 +24,22 @@ USE_GETTEXT=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_BDB=	41
 USE_OPENLDAP=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnometarget
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-openldap=${LOCALBASE} \
 		--with-static-ldap=no \
-		--disable-compile-warnings
+		--disable-compile-warnings \
+		--with-libdb=${LOCALBASE}
 
-EVO_VERSION=	2.8
-PLIST_SUB=	VERSION="2.8" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" \
-		OLDDOCSDIR="share/doc/ximian-connector"
+EVO_VERSION=	2.10
+VERSION=	2.10
+PLIST_SUB=	VERSION=${VERSION} EVO_VERSION=${EVO_VERSION} \
+		EDS_VERSION="1.2" OLDDOCSDIR="share/doc/ximian-connector"
+
+GCONF_SCHEMAS=	apps_exchange_addressbook-${VERSION}.schemas
 
 .include <bsd.port.pre.mk>
 
@@ -58,4 +63,10 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC"
 IGNORE=	does not build with ${LOCALBASE}/include/mapi.h exists in system, run pkg_info -W ${LOCALBASE}/include/mapi.h to find the offending port and uninstall it, then install ${PORTNAME} and reinstall port
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|EVOLUTION_API_VERSION=2.8|EVOLUTION_API_VERSION=2.10| ; \
+	    	s|EDS_BASE_VERSION=1.8|EDS_BASE_VERSION=1.10| ; \
+		s|-ldb|-l${BDB_LIB_NAME}|g' \
+		${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index 5f71a13d4d3f..1b6b34321c85 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.8.3.tar.bz2) = 8a6be6640c7824285088f6a2e98f12a4
-SHA256 (gnome2/evolution-exchange-2.8.3.tar.bz2) = 987b31056ba8914f2c1b6d0ae64c45f8564dda6d1949fda1ebec11abc1de611b
-SIZE (gnome2/evolution-exchange-2.8.3.tar.bz2) = 1034763
+MD5 (gnome2/evolution-exchange-2.10.0.tar.bz2) = ffed2fdc7645b029bbf0c774e35e3fa0
+SHA256 (gnome2/evolution-exchange-2.10.0.tar.bz2) = faacd758f4d36a698506066a4958806d66c74b68d3a40b5767dfcd1ffd3d08d1
+SIZE (gnome2/evolution-exchange-2.10.0.tar.bz2) = 1043846
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 0ee2427da3a9..49e44b3e087d 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.119 2006/10/07 17:10:06 marcus Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.134 2007/03/13 05:41:38 marcus Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.8.3
-PORTREVISION=	1
+PORTVERSION=	2.10.0
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -26,16 +25,13 @@ USE_BISON=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver \
-		gtkhtml3 desktopfileutils
+		gtkhtml3 desktopfileutils gnomedocutils libgnomeprintui
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/evolution/%%VERSION%%
 CONFIGURE_ARGS=	--enable-nss=yes \
-		--with-nss-includes=${LOCALBASE}/include/nss/nss \
-		--with-nss-libs=${LOCALBASE}/lib \
-		--with-nspr-includes=${LOCALBASE}/include/nspr \
-		--with-nspr-libs=${LOCALBASE}/lib \
 		--enable-mono=no \
 		--with-sub-version=" FreeBSD GNOME Team Port"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -47,9 +43,9 @@ GCONF_SCHEMAS=	apps_evolution_addressbook-${EVO_VERSION}.schemas \
 		apps_evolution_shell-${EVO_VERSION}.schemas \
 		evolution-mail-${EVO_VERSION}.schemas
 
-EVO_VERSION=	2.8
+EVO_VERSION=	2.10
 PLIST_SUB=	VERSION=${EVO_VERSION} \
-		PORTVERSION=2.8
+		PORTVERSION=2.10
 
 OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
 		LDAP "Enable LDAP support" on \
@@ -61,7 +57,6 @@ 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
 WITH_DBUS=	yes
 .endif
 
@@ -69,10 +64,6 @@ WITH_DBUS=	yes
 WITH_DBUS=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libgstreamer-0.8.so)
-WITH_GSTREAMER=	yes
-.endif
-
 .if defined(WITH_PILOT)
 LIB_DEPENDS+=	gpilotdconduit.2:${PORTSDIR}/palm/gnome-pilot
 CONFIGURE_ARGS+=	--with-pisock=${LOCALBASE} \
@@ -93,13 +84,6 @@ CONFIGURE_ARGS+=--with-openldap=no
 RUN_DEPENDS+=	spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 .endif
 
-.if defined(WITH_GSTREAMER)
-LIB_DEPENDS+=	gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer80
-PLIST_SUB+=	GSTREAMER=""
-.else
-PLIST_SUB+=	GSTREAMER="@comment "
-.endif
-
 .if defined(WITH_DBUS)
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 PLIST_SUB+=	DBUS=""
@@ -119,6 +103,10 @@ CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 .endif
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \
+	    	${WRKSRC}/configure
+
 post-install: install-ldconfig-file
 	@${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \
 		${PREFIX}/bin/evolution
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 5bd728123f20..f342183c1fb4 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.8.3.tar.bz2) = 099876b347b114ec08ce6998b4a48d8c
-SHA256 (gnome2/evolution-2.8.3.tar.bz2) = 08819f459185de7f36ac43702bb5314d1b2a9fae33db9ac4c5d9dfb3aaabca90
-SIZE (gnome2/evolution-2.8.3.tar.bz2) = 12931527
+MD5 (gnome2/evolution-2.10.0.tar.bz2) = 68d32e518f235bea9d768ae55e91bffc
+SHA256 (gnome2/evolution-2.10.0.tar.bz2) = 46035f6ea64c9310d6f5c9ebe0cdd851e3a3d6748d0e7d545e088dd2682251c7
+SIZE (gnome2/evolution-2.10.0.tar.bz2) = 15525569
diff --git a/mail/evolution/files/patch-90_build_with_new_pisock b/mail/evolution/files/patch-90_build_with_new_pisock
deleted file mode 100644
index ffa26563c941..000000000000
--- a/mail/evolution/files/patch-90_build_with_new_pisock
+++ /dev/null
@@ -1,907 +0,0 @@
-diff -Nur evolution-2.8.0/addressbook/conduit/address-conduit.c evolution-2.8.0.new/addressbook/conduit/address-conduit.c
---- addressbook/conduit/address-conduit.c.orig	2005-12-06 09:43:37.000000000 +0100
-+++ addressbook/conduit/address-conduit.c	2006-09-20 18:47:49.000000000 +0200
-@@ -462,6 +462,7 @@
- {
- 	static char buff[ 4096 ];
- 	struct Address addr;
-+	pi_buffer_t piBuf;
- 
- 	if (remote == NULL) {
- 		sprintf (buff, "[NULL]");
-@@ -469,7 +470,10 @@
- 	}
- 
- 	memset (&addr, 0, sizeof (struct Address));
--	unpack_Address (&addr, remote->record, remote->length);
-+	piBuf.data = remote->record;
-+	piBuf.allocated = remote->length;
-+	piBuf.used = remote->length;
-+	unpack_Address(&addr, &piBuf, address_v1);
- 
- 	g_snprintf (buff, 4096, "['%s' '%s' '%s']",
- 		    addr.entry[entryLastname] ?
-@@ -786,12 +790,23 @@
- 	}
- }
- 
-+/* convert a local EAddrLocalRecord to a GnomePilotRecord for the PDA
-+ * 
-+ * @param local local Evolution address record
-+ * @param ctxt conduit context
-+ * @param record record to use for GnomePilotRecord. Allow the calling
-+ *               function to determine if the record should be allocated
-+ *               dynamically or statically.
-+ * @param maxRecordLen size of *record (max amount of data that can be put
-+ *                      into record)
-+ */
- static GnomePilotRecord
- local_record_to_pilot_record (EAddrLocalRecord *local,
--			      EAddrConduitContext *ctxt)
-+			      EAddrConduitContext *ctxt,
-+			      unsigned char *record,
-+			      int maxRecordLen)
- {
- 	GnomePilotRecord p;
--	static char record[0xffff];
- 	
- 	g_assert (local->addr != NULL );
- 	
-@@ -802,10 +817,25 @@
- 	p.attr = local->local.attr;
- 	p.archived = local->local.archived;
- 	p.secret = local->local.secret;
-+	
-+	memset(record, 0, maxRecordLen);
- 
- 	/* Generate pilot record structure */
--	p.record = record;
--	p.length = pack_Address (local->addr, p.record, 0xffff);
-+	{
-+		pi_buffer_t piBuf;
-+		memset (&piBuf, 0, sizeof (piBuf));
-+
-+		pack_Address(local->addr, &piBuf, address_v1);
-+		if(piBuf.used > 0) {
-+			memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
-+		}
-+		
-+		p.length = piBuf.used;
-+		p.record = record;
-+		if(piBuf.data) {
-+			free(piBuf.data);
-+		}
-+	}
- 
- 	return p;	
- }
-@@ -834,16 +864,26 @@
- 	 */
- 	if (local->local.ID != 0) {
- 		struct Address addr;
--		char record[0xffff];
-+		pi_buffer_t *piBuf;
- 		int cat = 0;
-+		int dlpReadRetval = 0;
-+
- 		
--		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
--					ctxt->dbi->db_handle,
--					local->local.ID, &record, 
--					NULL, NULL, NULL, &cat) > 0) {
-+		piBuf = pi_buffer_new(0xffff);
-+		if(piBuf == NULL) {
-+			WARN( _("local_record_from_ecard: no more memory to allocate") );
-+			return;
-+		}
-+		dlpReadRetval = dlp_ReadRecordById(ctxt->dbi->pilot_socket,
-+		                                  ctxt->dbi->db_handle,
-+		                                  local->local.ID, piBuf,
-+		                                  NULL, NULL, &cat);
-+
-+
-+		if (dlpReadRetval > 0) {
- 			local->local.category = cat;
- 			memset (&addr, 0, sizeof (struct Address));
--			unpack_Address (&addr, record, 0xffff);
-+			unpack_Address(&addr, piBuf, address_v1);
- 			for (i = 0; i < 5; i++) {
- 				if (addr.entry[entryPhone1 + i])
- 					local->addr->entry[entryPhone1 + i] = 
-@@ -858,6 +898,8 @@
- 			}
- 			free_Address (&addr);
- 		}
-+		
-+		pi_buffer_free(piBuf);
- 	}
- 
- 	local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
-@@ -1022,7 +1064,13 @@
- 
- 	g_return_val_if_fail(remote!=NULL,NULL);
- 	memset (&address, 0, sizeof (struct Address));
--	unpack_Address (&address, remote->record, remote->length);
-+	{
-+		pi_buffer_t piBuf;
-+		piBuf.data = remote->record;
-+		piBuf.allocated = remote->length;
-+		piBuf.used = remote->length;
-+		unpack_Address(&address, &piBuf, address_v1);
-+	}
- 
- 	if (in_contact == NULL)
- 		contact = e_contact_new ();
-@@ -1212,7 +1260,7 @@
- 	EBookQuery *query;
-     	GList *l;
- 	int len;
--	unsigned char *buf;
-+	pi_buffer_t *piBuf;
- 	char *filename;
- 	char *change_id;
- 	char *auth;
-@@ -1302,9 +1350,14 @@
-   	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-   	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
- 
--	buf = (unsigned char*)g_malloc (0xffff);
--	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
--			      (unsigned char *)buf, 0xffff);
-+	piBuf = pi_buffer_new(0xffff);
-+	if(piBuf == NULL) {
-+		WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		gnome_pilot_conduit_error (conduit,
-+			_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		return -1;
-+	}
-+	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
- 	
- 	if (len < 0) {
- 		WARN (_("Could not read pilot's Address application block"));
-@@ -1313,8 +1366,8 @@
- 					   _("Could not read pilot's Address application block"));
- 		return -1;
- 	}
--	unpack_AddressAppInfo (&(ctxt->ai), buf, len);
--	g_free (buf);
-+	unpack_AddressAppInfo (&(ctxt->ai), piBuf->data, len);
-+	pi_buffer_free(piBuf);
- 
-   	check_for_slow_setting (conduit, ctxt);
- 	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-@@ -1494,6 +1547,7 @@
- {
- 	GnomePilotRecord local_pilot;
- 	int retval = 0;
-+	static unsigned char record[0xffff];
- 
- 	LOG (g_message ("compare: local=%s remote=%s...\n",
- 			print_local (local), print_remote (remote)));
-@@ -1501,7 +1555,7 @@
- 	g_return_val_if_fail (local != NULL, -1);
- 	g_return_val_if_fail (remote != NULL, -1);
- 
--	local_pilot = local_record_to_pilot_record (local, ctxt);
-+	local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 
- 	if (remote->length != local_pilot.length
- 	    || memcmp (local_pilot.record, remote->record, remote->length))
-@@ -1693,9 +1747,11 @@
- 	 GnomePilotRecord *remote,
- 	 EAddrConduitContext *ctxt)
- {
-+	static unsigned char record[0xffff];
-+	
- 	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
- 	
--	*remote = local_record_to_pilot_record (local, ctxt);
-+	*remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 	
- 	return 0;
- }
-diff -Nur evolution-2.8.0/calendar/conduits/calendar/calendar-conduit.c evolution-2.8.0.new/calendar/conduits/calendar/calendar-conduit.c
---- calendar/conduits/calendar/calendar-conduit.c.orig	2005-12-23 05:39:34.000000000 +0100
-+++ calendar/conduits/calendar/calendar-conduit.c	2006-09-20 18:48:56.000000000 +0200
-@@ -413,6 +413,7 @@
- {
- 	static char buff[ 4096 ];
- 	struct Appointment appt;
-+	pi_buffer_t piBuf;
- 
- 	if (remote == NULL) {
- 		sprintf (buff, "[NULL]");
-@@ -420,7 +421,10 @@
- 	}
- 
- 	memset (&appt, 0, sizeof (struct Appointment));
--	unpack_Appointment (&appt, remote->record, remote->length);
-+	piBuf.data = remote->record;
-+	piBuf.allocated = remote->length;
-+	piBuf.used = remote->length;
-+	unpack_Appointment(&appt, &piBuf, datebook_v1);
- 
- 	g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
- 		    mktime (&appt.begin),
-@@ -813,12 +817,23 @@
- 	return TRUE;
- }
- 
-+/* convert a local ECalLocalRecord to a GnomePilotRecord for the PDA
-+ * 
-+ * @param local local Evolution Calendar record
-+ * @param ctxt conduit context
-+ * @param record record to use for GnomePilotRecord. Allow the calling
-+ *               function to determine if the record should be allocated
-+ *               dynamically or statically.
-+ * @param maxRecordLen size of *record (max amount of data that can be put
-+ *                      into record)
-+ */
- static GnomePilotRecord
- local_record_to_pilot_record (ECalLocalRecord *local,
--			      ECalConduitContext *ctxt)
-+			      ECalConduitContext *ctxt,
-+			      unsigned char *record,
-+			      int maxRecordLen)
- {
- 	GnomePilotRecord p;
--	static char record[0xffff];
- 
- 	g_assert (local->comp != NULL);
- 	g_assert (local->appt != NULL );
-@@ -829,9 +844,25 @@
- 	p.archived = local->local.archived;
- 	p.secret = local->local.secret;
- 
-+	memset(record, 0, maxRecordLen);
-+
- 	/* Generate pilot record structure */
--	p.record = record;
--	p.length = pack_Appointment (local->appt, p.record, 0xffff);
-+	{
-+
-+		pi_buffer_t piBuf;
-+		memset (&piBuf, 0, sizeof (piBuf));
-+
-+		pack_Appointment(local->appt, &piBuf, datebook_v1);
-+		if(piBuf.used > 0) {
-+			memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
-+		}
-+		
-+		p.length = piBuf.used;
-+		p.record = record;
-+		if(piBuf.data) {
-+			free(piBuf.data);
-+		}
-+	}
- 
- 	return p;	
- }
-@@ -867,22 +898,31 @@
-          * we don't overwrite them 
- 	 */
- 	if (local->local.ID != 0) {
--		struct Appointment appt;		
--		char record[0xffff];
-+		struct Appointment appt;
-+		pi_buffer_t *piBuf;
- 		int cat = 0;
-+		int dlpReadRetval = 0;
- 		
--		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
--					ctxt->dbi->db_handle,
--					local->local.ID, &record, 
--					NULL, NULL, NULL, &cat) > 0) {
-+		piBuf = pi_buffer_new(0xffff);
-+		if(piBuf == NULL) {
-+			WARN( _("local_record_from_comp: no more memory to allocate") );
-+			return;
-+		}
-+		dlpReadRetval = dlp_ReadRecordById (ctxt->dbi->pilot_socket,
-+						    ctxt->dbi->db_handle,
-+						    local->local.ID, piBuf,
-+						    NULL, NULL, &cat);
-+		
-+		if (dlpReadRetval > 0) {
- 			local->local.category = cat;
- 			memset (&appt, 0, sizeof (struct Appointment));
--			unpack_Appointment (&appt, record, 0xffff);
-+			unpack_Appointment (&appt, piBuf, datebook_v1);
- 			local->appt->alarm = appt.alarm;
- 			local->appt->advance = appt.advance;
- 			local->appt->advanceUnits = appt.advanceUnits;
- 			free_Appointment (&appt);
- 		}
-+		pi_buffer_free(piBuf);
- 	}
- 
- 	/* STOP: don't replace these with g_strdup, since free_Appointment
-@@ -1144,7 +1184,13 @@
- 	g_return_val_if_fail (remote != NULL, NULL);
- 
- 	memset (&appt, 0, sizeof (struct Appointment));
--	unpack_Appointment (&appt, remote->record, remote->length);
-+	{
-+		pi_buffer_t piBuf;
-+		piBuf.data = remote->record;
-+		piBuf.allocated = remote->length;
-+		piBuf.used = remote->length;
-+		unpack_Appointment(&appt, &piBuf, datebook_v1);
-+	}
- 
- 	if (in_comp == NULL) {
- 		comp = e_cal_component_new ();
-@@ -1409,7 +1455,7 @@
- 	GnomePilotConduitSyncAbs *abs_conduit;
- 	GList *removed = NULL, *added = NULL, *l;
- 	int len;
--	unsigned char *buf;
-+	pi_buffer_t *piBuf;
- 	char *filename, *change_id;
- 	icalcomponent *icalcomp;
- 	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-@@ -1521,9 +1567,14 @@
- 	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
- 	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
- 
--	buf = (unsigned char*)g_malloc (0xffff);
--	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
--			      (unsigned char *)buf, 0xffff);
-+	piBuf = pi_buffer_new(0xffff);
-+	if(piBuf == NULL) {
-+		WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		gnome_pilot_conduit_error (conduit,
-+			_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		return -1;
-+	}
-+	len = dlp_ReadAppBlock(dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
- 	
- 	if (len < 0) {
- 		WARN (_("Could not read pilot's Calendar application block"));
-@@ -1532,8 +1583,8 @@
- 					   _("Could not read pilot's Calendar application block"));
- 		return -1;
- 	}
--	unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
--	g_free (buf);
-+	unpack_AppointmentAppInfo (&(ctxt->ai), piBuf->data, len);
-+	pi_buffer_free(piBuf);
- 
- 	check_for_slow_setting (conduit, ctxt);
- 	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-@@ -1715,6 +1766,7 @@
- 	/* used by the quick compare */
- 	GnomePilotRecord local_pilot;
- 	int retval = 0;
-+	static unsigned char record[0xffff];
- 
- 	LOG (g_message ("compare: local=%s remote=%s...\n",
- 			print_local (local), print_remote (remote)));
-@@ -1722,7 +1774,7 @@
- 	g_return_val_if_fail (local!=NULL,-1);
- 	g_return_val_if_fail (remote!=NULL,-1);
- 
--	local_pilot = local_record_to_pilot_record (local, ctxt);
-+	local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 
- 	if (remote->length != local_pilot.length
- 	    || memcmp (local_pilot.record, remote->record, remote->length))
-@@ -1883,9 +1935,11 @@
- 	 GnomePilotRecord *remote,
- 	 ECalConduitContext *ctxt)
- {
-+	static unsigned char record[0xffff];
-+	
- 	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
- 
--	*remote = local_record_to_pilot_record (local, ctxt);
-+	*remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 
- 	return 0;
- }
-diff -Nur evolution-2.8.0/calendar/conduits/memo/memo-conduit.c evolution-2.8.0.new/calendar/conduits/memo/memo-conduit.c
---- calendar/conduits/memo/memo-conduit.c.orig	2005-10-19 13:39:35.000000000 +0200
-+++ calendar/conduits/memo/memo-conduit.c	2006-09-20 18:49:46.000000000 +0200
-@@ -331,6 +331,7 @@
- {
- 	static char buff[ 64 ];
- 	struct Memo memo;
-+	pi_buffer_t piBuf;
- 
- 	if (remote == NULL) {
- 		sprintf (buff, "[NULL]");
-@@ -338,7 +339,10 @@
- 	}
- 
- 	memset (&memo, 0, sizeof (struct Memo));
--	unpack_Memo (&memo, remote->record, remote->length);
-+	piBuf.data = remote->record;
-+	piBuf.allocated = remote->length;
-+	piBuf.used = remote->length;
-+	unpack_Memo(&memo, &piBuf, memo_v1);
- 
- 	g_snprintf (buff, 64, "['%s']",
- 		    memo.text ?
-@@ -446,12 +450,24 @@
- 	}
- }
- 
-+/**
-+ * convert a local EMemoLocalRecord to a GnomePilotRecord for the PDA
-+ * 
-+ * @param local local Evolution memo record
-+ * @param ctxt conduit context
-+ * @param record record to use for GnomePilotRecord. Allow the calling
-+ *               function to determine if the record should be allocated
-+ *               dynamically or statically.
-+ * @param maxRecordLen size of *record (max amount of data that can be put
-+ *                      into record)
-+ */
- static GnomePilotRecord
- local_record_to_pilot_record (EMemoLocalRecord *local,
--			      EMemoConduitContext *ctxt)
-+			      EMemoConduitContext *ctxt,
-+			      unsigned char *record,
-+			      int maxRecordLen)
- {
- 	GnomePilotRecord p;
--	static char record[0xffff];
- 
- 	g_assert (local->comp != NULL);
- 	g_assert (local->memo != NULL );
-@@ -464,9 +480,25 @@
- 	p.archived = local->local.archived;
- 	p.secret = local->local.secret;
- 
-+	memset(record, 0, maxRecordLen);
-+
- 	/* Generate pilot record structure */
--	p.record = record;
--	p.length = pack_Memo (local->memo, p.record, 0xffff);
-+	{
-+
-+		pi_buffer_t piBuf;
-+		memset (&piBuf, 0, sizeof (piBuf));
-+
-+		pack_Memo(local->memo, &piBuf, memo_v1);
-+		if(piBuf.used > 0) {
-+			memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
-+		}
-+		
-+		p.length = piBuf.used;
-+		p.record = record;
-+		if(piBuf.data) {
-+			free(piBuf.data);
-+		}
-+	}
- 
- 	return p;	
- }
-@@ -483,53 +515,39 @@
- {
- 	int i, j;
- 	int retval = 0; /* 0 is the Unfiled category */
--	LOG(fprintf(stderr, "add_category_if_possible: called\n"));
-+	LOG(g_message("add_category_if_possible\n"));
- 	
- 	for(i=0; i<16; i++){
- 		/* if strlen is 0, then the category is empty
- 		   the PalmOS doesn't let 0-length strings for
- 		   categories */
--		LOG(fprintf(stderr, "add_category_if_possible: calling strlen, i==%d\n", i));
- 		if(strlen(category->name[i]) == 0){
- 			int cat_to_add_len;
--			LOG(fprintf(stderr, "add_category_if_possible: strlen == 0\n"));
- 			
- 			cat_to_add_len = strlen(cat_to_add);
--			LOG(fprintf(stderr, "add_category_if_possible: cat_to_add_len: %d\n",
--					cat_to_add_len));
- 			retval = i;
- 			
- 			/* only 15 characters for category, 16th is
- 			 * '\0' can't do direct mem transfer due to
- 			 * declaration type
- 			 */
--			LOG(fprintf(stderr, "add_category_if_possible: copying first 15 of category\n"));
- 			for(j=0; j<cat_to_add_len; j++){
- 				category->name[i][j] = cat_to_add[j];
- 			}
--			LOG(fprintf(stderr,
--				"add_category_if_possible: setting from %d to i==15 to \\0\n",
--				cat_to_add_len));
- 
- 			for(j=cat_to_add_len; j<16; j++)
- 				category->name[i][j] = '\0';
- 			
--			LOG(fprintf(stderr, "add_category_if_possible: setting ID[%d] to %d\n",
--				category->ID[i], lastDesktopUniqueID));
- 			category->ID[i] = lastDesktopUniqueID;
- 			lastDesktopUniqueID++;
--			
--			LOG(fprintf(stderr, "add_category_if_possible: setting renamed[%d] to TRUE\n", i));
- 			category->renamed[i] = TRUE;
- 			
--			LOG(g_message("*** adding category '%s', ID %d ***",
--				category->name[i], category->ID[i]));
- 			break;
- 		}
- 	}
- 	
- 	if(retval == 0){
--		LOG(g_message("*** not adding category - category list already full ***"));
-+		LOG(g_warning( _("*** not adding category - category list already full ***") ));
- 	}
- 	
- 	return retval;
-@@ -554,31 +572,35 @@
- 	local->comp = comp;
- 	g_object_ref (comp);
- 
--	LOG(fprintf(stderr, "local_record_from_comp: calling e_cal_component_get_uid\n"));
- 	e_cal_component_get_uid (local->comp, &uid);
--	LOG(fprintf(stderr, "local_record_from_comp: got UID - %s, calling e_pilot_map_lookup_pid\n", uid));
- 	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid, TRUE);
--	LOG(fprintf(stderr, "local_record_from_comp: local->local.ID == %lu\n", local->local.ID));
- 
- 	compute_status (ctxt, local, uid);
--	
--	LOG(fprintf(stderr, "local_record_from_comp: local->local.attr: %d\n", local->local.attr));
- 
- 	local->memo = g_new0 (struct Memo,1);
- 
- 	/* Don't overwrite the category */
- 	if (local->local.ID != 0) {
--		char record[0xffff];
- 		int cat = 0;
-+		int dlpReadRetval = 0;
-+		pi_buffer_t *piBuf;
-+		piBuf = pi_buffer_new(0xffff);
-+		if(piBuf == NULL) {
-+			WARN( _("local_record_from_comp: no more memory to allocate") );
-+			return;
-+		}
- 		
--		LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n"));
--		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
--					ctxt->dbi->db_handle,
--					local->local.ID, &record, 
--					NULL, NULL, NULL, &cat) > 0) {
-+		dlpReadRetval = dlp_ReadRecordById(ctxt->dbi->pilot_socket,
-+						   ctxt->dbi->db_handle,
-+						   local->local.ID, piBuf,
-+						   NULL, NULL, &cat);
-+
-+		
-+		if (dlpReadRetval > 0) {
- 			local->local.category = cat;
- 		}
--		LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n"));
-+		
-+		pi_buffer_free(piBuf);
- 	}
- 	
- 	/*
-@@ -589,34 +611,23 @@
- 		int cat = -1;
- 		int i;
- 		
--		LOG(fprintf(stderr, "local_record_from_comp: trying to set category"));
--		LOG(fprintf(stderr, "local_record_from_comp: calling e_cal_component_get_categories_list\n"));
--		
- 		e_cal_component_get_categories_list(comp, &categ_list_head);
--		LOG(fprintf(stderr, "local_record_from_comp: got list, setting categ_list_cur to head\n"));
- 		
- 		categ_list_cur = categ_list_head;
- 		while (categ_list_cur && cat == -1)
- 		{	
--			LOG(fprintf(stderr, "local_record_from_comp: iterating, data == %s",
--				(char *)categ_list_cur->data));
- 			for(i=0; i<16; i++){
--				LOG(fprintf(stderr, "local_record_from_comp: i == %d\n", i));
- 				if(strcmp((char *)categ_list_cur->data,
- 					  ctxt->ai.category.name[i]) == 0){
- 					cat = i;
--					LOG(fprintf(stderr, "local_record_from_comp: found category, name: %s\n",
--							ctxt->ai.category.name[i]));
- 					break;
- 				}
- 			}
- 			
--			LOG(fprintf(stderr, "local_record_from_comp: calling g_slist_next\n"));
- 			categ_list_cur = g_slist_next(categ_list_cur);
- 		}
- 		
- 		if(cat != -1){
--			LOG(fprintf(stderr, "local_record_from_comp: setting category\n"));
- 			local->local.category = cat;
- 		}
- 		else if(categ_list_head != NULL){
-@@ -708,7 +719,13 @@
- 	g_return_val_if_fail (remote != NULL, NULL);
- 
- 	memset (&memo, 0, sizeof (struct Memo));
--	unpack_Memo (&memo, remote->record, remote->length);
-+	{
-+		pi_buffer_t piBuf;
-+		piBuf.data = remote->record;
-+		piBuf.allocated = remote->length;
-+		piBuf.used = remote->length;
-+		unpack_Memo(&memo, &piBuf, memo_v1);
-+	}
- 
- 	utc_zone = icaltimezone_get_utc_timezone ();
- 	now = icaltime_from_timet_with_zone (time (NULL), FALSE, 
-@@ -836,7 +853,7 @@
- 	GnomePilotConduitSyncAbs *abs_conduit;
- 	GList *l;
- 	int len;
--	unsigned char *buf;
-+	pi_buffer_t *piBuf;
- 	char *filename, *change_id;
- 	icalcomponent *icalcomp;
- 	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-@@ -929,9 +946,14 @@
- 	g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
- 		num_records, add_records, mod_records, del_records);
- 
--	buf = (unsigned char*)g_malloc (0xffff);
--	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
--			      (unsigned char *)buf, 0xffff);
-+	piBuf = pi_buffer_new(0xffff);
-+	if(piBuf == NULL) {
-+		WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		gnome_pilot_conduit_error (conduit,
-+			_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		return -1;
-+	}
-+	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
- 	
- 	if (len < 0) {
- 		WARN (_("Could not read pilot's Memo application block"));
-@@ -940,8 +962,9 @@
- 					   _("Could not read pilot's Memo application block"));
- 		return -1;
- 	}
--	unpack_MemoAppInfo (&(ctxt->ai), buf, len);
--	g_free (buf);
-+	
-+	unpack_MemoAppInfo (&(ctxt->ai), piBuf->data, len);
-+	pi_buffer_free(piBuf);
- 	
- 	lastDesktopUniqueID = 128;
- 
-@@ -963,6 +986,9 @@
- 	unsigned char *buf;
- 	int dlpRetVal, len;
- 
-+	/* Write AppBlock to PDA - updates categories */
-+	/* NOTE: not changed for pilot-link 0.12 because the two
-+	 * functions below didn't change */
- 	buf = (unsigned char*)g_malloc (0xffff);
- 	
- 	len = pack_MemoAppInfo (&(ctxt->ai), buf, 0xffff);
-@@ -1156,6 +1182,7 @@
- 	/* used by the quick compare */
- 	GnomePilotRecord local_pilot;
- 	int retval = 0;
-+	static unsigned char record[0xffff];
- 
- 	LOG (g_message ("compare: local=%s remote=%s...\n",
- 			print_local (local), print_remote (remote)));
-@@ -1163,7 +1190,7 @@
- 	g_return_val_if_fail (local!=NULL,-1);
- 	g_return_val_if_fail (remote!=NULL,-1);
- 
--	local_pilot = local_record_to_pilot_record (local, ctxt);
-+	local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 
- 	if (remote->length != local_pilot.length
- 	    || memcmp (local_pilot.record, remote->record, remote->length))
-@@ -1319,9 +1346,10 @@
- 	 GnomePilotRecord *remote,
- 	 EMemoConduitContext *ctxt)
- {
-+	static unsigned char record[0xffff];
- 	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
- 
--	*remote = local_record_to_pilot_record (local, ctxt);
-+	*remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 
- 	return 0;
- }
-diff -Nur evolution-2.8.0/calendar/conduits/todo/todo-conduit.c evolution-2.8.0.new/calendar/conduits/todo/todo-conduit.c
---- calendar/conduits/todo/todo-conduit.c.orig	2006-05-13 09:56:49.000000000 +0200
-+++ calendar/conduits/todo/todo-conduit.c	2006-09-20 18:50:31.000000000 +0200
-@@ -409,7 +409,13 @@
- 	}
- 
- 	memset (&todo, 0, sizeof (struct ToDo));
--	unpack_ToDo (&todo, remote->record, remote->length);
-+	{
-+		pi_buffer_t piBuf;
-+		piBuf.data = remote->record;
-+		piBuf.allocated = remote->length;
-+		piBuf.used = remote->length;
-+		unpack_ToDo(&todo, &piBuf, todo_v1);
-+	}
- 
- 	g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s' %d]",
- 		    todo.indefinite,
-@@ -589,12 +595,24 @@
- 	}
- }
- 
-+/**
-+ * convert a local EMemoLocalRecord to a GnomePilotRecord for the PDA
-+ * 
-+ * @param local local Evolution memo record
-+ * @param ctxt conduit context
-+ * @param record record to use for GnomePilotRecord. Allow the calling
-+ *               function to determine if the record should be allocated
-+ *               dynamically or statically.
-+ * @param maxRecordLen size of *record (max amount of data that can be put
-+ *                      into record)
-+ */
- static GnomePilotRecord
- local_record_to_pilot_record (EToDoLocalRecord *local,
--			      EToDoConduitContext *ctxt)
-+			      EToDoConduitContext *ctxt,
-+			      unsigned char *record,
-+			      int maxRecordLen)
- {
- 	GnomePilotRecord p;
--	static char record[0xffff];
- 
- 	g_assert (local->comp != NULL);
- 	g_assert (local->todo != NULL );
-@@ -607,9 +625,24 @@
- 	p.archived = local->local.archived;
- 	p.secret = local->local.secret;
- 
-+	memset(record, 0, maxRecordLen);
-+
- 	/* Generate pilot record structure */
--	p.record = record;
--	p.length = pack_ToDo (local->todo, p.record, 0xffff);
-+	{
-+		pi_buffer_t piBuf;
-+		memset (&piBuf, 0, sizeof (piBuf));
-+
-+		pack_ToDo(local->todo, &piBuf, todo_v1);
-+		if(piBuf.used > 0) {
-+			memcpy(record, piBuf.data, MIN(piBuf.used, maxRecordLen) );
-+		}
-+		
-+		p.length = piBuf.used;
-+		p.record = record;
-+		if(piBuf.data) {
-+			free(piBuf.data);
-+		}
-+	}
- 
- 	return p;	
- }
-@@ -696,15 +729,23 @@
- 
- 	/* Don't overwrite the category */
- 	if (local->local.ID != 0) {
--		char record[0xffff];
- 		int cat = 0;
--		
--		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
--					ctxt->dbi->db_handle,
--					local->local.ID, &record, 
--					NULL, NULL, NULL, &cat) > 0) {
-+		int dlpReadRetval = 0;
-+		pi_buffer_t *piBuf = pi_buffer_new(0xffff);
-+		if(piBuf == NULL) {
-+			WARN( _("local_record_from_comp: no more memory to allocate") );
-+			return;
-+		}
-+		dlpReadRetval = dlp_ReadRecordById(ctxt->dbi->pilot_socket,
-+						   ctxt->dbi->db_handle,
-+						   local->local.ID, piBuf,
-+						   NULL, NULL, &cat);
-+
-+		if (dlpReadRetval > 0) {
- 			local->local.category = cat;
- 		}
-+		
-+		pi_buffer_free(piBuf);
- 	}
- 	
- 	/*
-@@ -864,7 +905,13 @@
- 	g_return_val_if_fail (remote != NULL, NULL);
- 
- 	memset (&todo, 0, sizeof (struct ToDo));
--	unpack_ToDo (&todo, remote->record, remote->length);
-+	{
-+		pi_buffer_t piBuf;
-+		piBuf.data = remote->record;
-+		piBuf.allocated = remote->length;
-+		piBuf.used = remote->length;
-+		unpack_ToDo(&todo, &piBuf, todo_v1);
-+	}
- 
- 	utc_zone = icaltimezone_get_utc_timezone ();
- 	now = icaltime_from_timet_with_zone (time (NULL), FALSE, 
-@@ -1014,7 +1061,7 @@
- 	GnomePilotConduitSyncAbs *abs_conduit;
- 	GList *l;
- 	int len;
--	unsigned char *buf;
-+	pi_buffer_t *piBuf;
- 	char *filename, *change_id;
- 	icalcomponent *icalcomp;
- 	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-@@ -1104,9 +1151,14 @@
- 	g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
- 			num_records, add_records, mod_records, del_records);
- 
--	buf = (unsigned char*)g_malloc (0xffff);
--	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
--			      (unsigned char *)buf, 0xffff);
-+	piBuf = pi_buffer_new(0xffff);
-+	if(piBuf == NULL) {
-+		WARN (_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		gnome_pilot_conduit_error (conduit,
-+			_("pre_sync(): Error allocating pi_buffer_t memory"));
-+		return -1;
-+	}
-+	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -1, piBuf);
- 	
- 	if (len < 0) {
- 		WARN (_("Could not read pilot's ToDo application block"));
-@@ -1115,8 +1167,9 @@
- 					   _("Could not read pilot's ToDo application block"));
- 		return -1;
- 	}
--	unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
--	g_free (buf);
-+
-+	unpack_ToDoAppInfo (&(ctxt->ai), piBuf->data, len);
-+	pi_buffer_free(piBuf);
- 	
- 	lastDesktopUniqueID = 128;
- 
-@@ -1138,6 +1191,9 @@
- 	unsigned char *buf;
- 	int dlpRetVal, len;
- 
-+	/* Write AppBlock to PDA - updates categories */
-+	/* NOTE: not changed for pilot-link 0.12 because the two
-+	 * functions below didn't change */
- 	buf = (unsigned char*)g_malloc (0xffff);
- 	
- 	len = pack_ToDoAppInfo (&(ctxt->ai), buf, 0xffff);
-@@ -1320,6 +1376,7 @@
- 	/* used by the quick compare */
- 	GnomePilotRecord local_pilot;
- 	int retval = 0;
-+	static unsigned char record[0xffff];
- 
- 	LOG (g_message ("compare: local=%s remote=%s...\n",
- 			print_local (local), print_remote (remote)));
-@@ -1327,7 +1384,7 @@
- 	g_return_val_if_fail (local!=NULL,-1);
- 	g_return_val_if_fail (remote!=NULL,-1);
- 
--	local_pilot = local_record_to_pilot_record (local, ctxt);
-+	local_pilot = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 
- 	if (remote->length != local_pilot.length
- 	    || memcmp (local_pilot.record, remote->record, remote->length))
-@@ -1484,9 +1541,11 @@
- 	 GnomePilotRecord *remote,
- 	 EToDoConduitContext *ctxt)
- {
-+	static unsigned char record[0xffff];
-+
- 	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
- 
--	*remote = local_record_to_pilot_record (local, ctxt);
-+	*remote = local_record_to_pilot_record (local, ctxt, record, sizeof(record));
- 
- 	return 0;
- }
diff --git a/mail/evolution/files/patch-data_Makefile.in b/mail/evolution/files/patch-data_Makefile.in
deleted file mode 100644
index b6b89ee4bb78..000000000000
--- a/mail/evolution/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- data/Makefile.in.orig	Mon Jan 29 21:52:23 2007
-+++ data/Makefile.in	Mon Jan 29 21:59:20 2007
-@@ -753,16 +753,16 @@
- install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file)
- 	$(mkinstalldirs) $(DESTDIR)$(desktopdir);							\
- 	$(INSTALL_DATA) $(desktop_file)									\
--			$(DESTDIR)$(desktopdir)/$(desktop_file) ;	\
-+			$(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ;	\
- 	$(mkinstalldirs) $(DESTDIR)$(keysdir);								\
--	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file) ;	\
-+	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
- 	$(mkinstalldirs) $(DESTDIR)$(mimedir);								\
--	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file) ;
-+	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
- 
- uninstall-local: uninstall-kde-applnk
--	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file) ; 	\
--	rm -rf $(DESTDIR)$(keysdir)/$(keys_file) ;	\
--	rm -rf $(DESTDIR)$(mimedir)/$(mime_file) ;
-+	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; 	\
-+	rm -rf $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
-+	rm -rf $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
- 
- # CDE Stuff
- 
diff --git a/mail/evolution/files/patch-mail_em-utils.h b/mail/evolution/files/patch-mail_em-utils.h
new file mode 100644
index 000000000000..b3e7b9ffbe25
--- /dev/null
+++ b/mail/evolution/files/patch-mail_em-utils.h
@@ -0,0 +1,10 @@
+--- mail/em-utils.h.orig	Tue Aug  3 16:59:46 2004
++++ mail/em-utils.h	Tue Aug  3 17:00:04 2004
+@@ -23,6 +23,7 @@
+ #ifndef __EM_UTILS_H__
+ #define __EM_UTILS_H__
+ 
++#include <sys/types.h>
+ #include <glib.h>
+ 
+ #ifdef __cplusplus
diff --git a/mail/evolution/files/patch-plugins_groupwise-features_junk-settings.c b/mail/evolution/files/patch-plugins_groupwise-features_junk-settings.c
deleted file mode 100644
index 6c9b6f401450..000000000000
--- a/mail/evolution/files/patch-plugins_groupwise-features_junk-settings.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/groupwise-features/junk-settings.c.orig	Mon Feb 12 01:44:51 2007
-+++ plugins/groupwise-features/junk-settings.c	Mon Feb 12 01:45:01 2007
-@@ -25,6 +25,7 @@
- #include <glade/glade.h>
- #include "junk-settings.h"
- #include <glib/gmain.h>
-+#include <glib/gi18n-lib.h>
- #include <gtk/gtktreemodel.h>
- #include <gtk/gtkliststore.h>
- #include <gtk/gtktreeselection.h>
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 4ea665ccf840..0e1443472042 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -296,8 +296,6 @@ 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
-%%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
@@ -326,6 +324,8 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.la
@@ -355,7 +355,6 @@ 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
-%%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
@@ -376,6 +375,7 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-folder-permissions.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-folder-subscription.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-groupwise-features.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-gw-account-setup.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-imap-features.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
@@ -409,11 +409,12 @@ 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/es/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
@@ -474,6 +475,7 @@ share/gnome/evolution/%%VERSION%%/glade/exchange-folder-tree.glade
 share/gnome/evolution/%%VERSION%%/glade/exchange-oof.glade
 share/gnome/evolution/%%VERSION%%/glade/exchange-passwd-expiry.glade
 share/gnome/evolution/%%VERSION%%/glade/exchange-permissions-dialog.glade
+share/gnome/evolution/%%VERSION%%/glade/exchange-send-options.glade
 share/gnome/evolution/%%VERSION%%/glade/filter.glade
 share/gnome/evolution/%%VERSION%%/glade/fulladdr.glade
 share/gnome/evolution/%%VERSION%%/glade/fullname.glade
@@ -483,13 +485,14 @@ share/gnome/evolution/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/gal-view-new-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/goto-dialog.glade
 share/gnome/evolution/%%VERSION%%/glade/im.glade
+share/gnome/evolution/%%VERSION%%/glade/imap-headers.glade
 share/gnome/evolution/%%VERSION%%/glade/import.glade
 share/gnome/evolution/%%VERSION%%/glade/junk-settings.glade
 share/gnome/evolution/%%VERSION%%/glade/ldap-config.glade
 share/gnome/evolution/%%VERSION%%/glade/mail-config.glade
 share/gnome/evolution/%%VERSION%%/glade/mail-dialogs.glade
-share/gnome/evolution/%%VERSION%%/glade/meeting-page.glade
 share/gnome/evolution/%%VERSION%%/glade/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
 share/gnome/evolution/%%VERSION%%/glade/proxy-listing.glade
@@ -501,11 +504,10 @@ share/gnome/evolution/%%VERSION%%/glade/task-details-page.glade
 share/gnome/evolution/%%VERSION%%/glade/task-page.glade
 share/gnome/evolution/%%VERSION%%/help/quickref/C/quickref.pdf
 share/gnome/evolution/%%VERSION%%/help/quickref/de/quickref.pdf
-share/gnome/evolution/%%VERSION%%/images/about-box.png
-share/gnome/evolution/%%VERSION%%/images/bcg.png
+share/gnome/evolution/%%VERSION%%/help/quickref/es/quickref.pdf
+share/gnome/evolution/%%VERSION%%/help/quickref/sv/quickref.pdf
 share/gnome/evolution/%%VERSION%%/images/evolution-contacts-mini.png
 share/gnome/evolution/%%VERSION%%/images/minus.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/plus.png
@@ -561,54 +563,386 @@ share/gnome/evolution/%%VERSION%%/weather/category_weather_tstorm_16.png
 %%PILOT:%%share/gnome/gnome-pilot/conduits/e-address-%%VERSION%%.conduit
 %%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar-%%VERSION%%.conduit
 %%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo-%%VERSION%%.conduit
-share/gnome/help/evolution-%%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
-share/gnome/help/evolution-%%VERSION%%/C/figures/contact-editor.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/contact.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/contacts_mainwindow_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_account_info_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_contacteditor_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_email_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_gwreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_identity_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_imapreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mail_callout_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_maildirreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mboxreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mereceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_mhreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_newmess_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_popreceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_receive_setup2_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_receive_setup_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_rule_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_send_setup_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_timezone_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/evo_usereceive_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-delegation.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-identity.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive-options.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/exchange-receive.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/filter-new-fig.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-1.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-2.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-3.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-4.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-5.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-6.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/full-7.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-druid-pic.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-inbox.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail-threaded.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mail_mainwindow_a.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/mainwindow-pic.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/newmsg.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/replymsg.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/schedule.png
-share/gnome/help/evolution-%%VERSION%%/C/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/C/evolution.xml
+share/gnome/help/evolution/C/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/C/figures/account_editor_a.png
+share/gnome/help/evolution/C/figures/calendar.png
+share/gnome/help/evolution/C/figures/categories_a.png
+share/gnome/help/evolution/C/figures/collap_head_a.png
+share/gnome/help/evolution/C/figures/config-cal.png
+share/gnome/help/evolution/C/figures/config-mail.png
+share/gnome/help/evolution/C/figures/contact-editor.png
+share/gnome/help/evolution/C/figures/contact.png
+share/gnome/help/evolution/C/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/C/figures/delgt-add.png
+share/gnome/help/evolution/C/figures/evo_account_editor_a.png
+share/gnome/help/evolution/C/figures/evo_account_info_a.png
+share/gnome/help/evolution/C/figures/evo_add_rule_a.png
+share/gnome/help/evolution/C/figures/evo_adv_search_a.png
+share/gnome/help/evolution/C/figures/evo_allday_a.png
+share/gnome/help/evolution/C/figures/evo_cal_a.png
+share/gnome/help/evolution/C/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/C/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/C/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/C/figures/evo_edit_rule_a.png
+share/gnome/help/evolution/C/figures/evo_edit_search.png
+share/gnome/help/evolution/C/figures/evo_email_a.png
+share/gnome/help/evolution/C/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/C/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/C/figures/evo_gwreceiveedit_a.png
+share/gnome/help/evolution/C/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/C/figures/evo_identity_a.png
+share/gnome/help/evolution/C/figures/evo_identityedit_a.png
+share/gnome/help/evolution/C/figures/evo_imapheader_a.png
+share/gnome/help/evolution/C/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/C/figures/evo_import_asst_a.png
+share/gnome/help/evolution/C/figures/evo_mail_a.png
+share/gnome/help/evolution/C/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/C/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/C/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/C/figures/evo_memo_a.png
+share/gnome/help/evolution/C/figures/evo_mereceive_a.png
+share/gnome/help/evolution/C/figures/evo_message_filters_a.png
+share/gnome/help/evolution/C/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/C/figures/evo_newmess_a.png
+share/gnome/help/evolution/C/figures/evo_popreceive_a.png
+share/gnome/help/evolution/C/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/C/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/C/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/C/figures/evo_rmdrnotes_a.png
+share/gnome/help/evolution/C/figures/evo_rule_a.png
+share/gnome/help/evolution/C/figures/evo_select_add_folder.png
+share/gnome/help/evolution/C/figures/evo_select_folder.png
+share/gnome/help/evolution/C/figures/evo_send_option_a.png
+share/gnome/help/evolution/C/figures/evo_send_setup_a.png
+share/gnome/help/evolution/C/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/C/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/C/figures/evo_timezone_a.png
+share/gnome/help/evolution/C/figures/evo_usereceive_a.png
+share/gnome/help/evolution/C/figures/exchange-delegation.png
+share/gnome/help/evolution/C/figures/exchange-identity.png
+share/gnome/help/evolution/C/figures/exchange-receive-options.png
+share/gnome/help/evolution/C/figures/exchange-receive.png
+share/gnome/help/evolution/C/figures/exchg-identity.png
+share/gnome/help/evolution/C/figures/exchng-identity.png
+share/gnome/help/evolution/C/figures/exchng-rec-mail.png
+share/gnome/help/evolution/C/figures/exchng-rec-mails.png
+share/gnome/help/evolution/C/figures/exchng-rec-option.png
+share/gnome/help/evolution/C/figures/exchng-rec-options.png
+share/gnome/help/evolution/C/figures/exchng-settings.png
+share/gnome/help/evolution/C/figures/filter-new-fig.png
+share/gnome/help/evolution/C/figures/free_busy.png
+share/gnome/help/evolution/C/figures/full-1.png
+share/gnome/help/evolution/C/figures/full-2.png
+share/gnome/help/evolution/C/figures/full-3.png
+share/gnome/help/evolution/C/figures/full-4.png
+share/gnome/help/evolution/C/figures/full-5.png
+share/gnome/help/evolution/C/figures/full-6.png
+share/gnome/help/evolution/C/figures/full-7.png
+share/gnome/help/evolution/C/figures/mail-druid-pic.png
+share/gnome/help/evolution/C/figures/mail-inbox.png
+share/gnome/help/evolution/C/figures/mail-threaded.png
+share/gnome/help/evolution/C/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/C/figures/mailer_preferences.png
+share/gnome/help/evolution/C/figures/mainwindow-pic.png
+share/gnome/help/evolution/C/figures/minus.png
+share/gnome/help/evolution/C/figures/newmsg.png
+share/gnome/help/evolution/C/figures/plus.png
+share/gnome/help/evolution/C/figures/proxy-cal.png
+share/gnome/help/evolution/C/figures/proxy-login.png
+share/gnome/help/evolution/C/figures/quick_add_a.png
+share/gnome/help/evolution/C/figures/replymsg.png
+share/gnome/help/evolution/C/figures/schedule.png
+share/gnome/help/evolution/C/figures/stock_search.png
+share/gnome/help/evolution/C/figures/sub-others-folder.png
+share/gnome/help/evolution/C/figures/sub-pub-fold.png
+share/gnome/help/evolution/C/figures/ver_view_a.png
+share/gnome/help/evolution/C/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/en_GB/evolution.xml
+share/gnome/help/evolution/en_GB/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/en_GB/figures/account_editor_a.png
+share/gnome/help/evolution/en_GB/figures/calendar.png
+share/gnome/help/evolution/en_GB/figures/categories_a.png
+share/gnome/help/evolution/en_GB/figures/collap_head_a.png
+share/gnome/help/evolution/en_GB/figures/config-cal.png
+share/gnome/help/evolution/en_GB/figures/config-mail.png
+share/gnome/help/evolution/en_GB/figures/contact-editor.png
+share/gnome/help/evolution/en_GB/figures/contact.png
+share/gnome/help/evolution/en_GB/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/en_GB/figures/delgt-add.png
+share/gnome/help/evolution/en_GB/figures/evo_account_editor_a.png
+share/gnome/help/evolution/en_GB/figures/evo_account_info_a.png
+share/gnome/help/evolution/en_GB/figures/evo_add_rule_a.png
+share/gnome/help/evolution/en_GB/figures/evo_adv_search_a.png
+share/gnome/help/evolution/en_GB/figures/evo_allday_a.png
+share/gnome/help/evolution/en_GB/figures/evo_cal_a.png
+share/gnome/help/evolution/en_GB/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/en_GB/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/en_GB/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/en_GB/figures/evo_edit_rule_a.png
+share/gnome/help/evolution/en_GB/figures/evo_edit_search.png
+share/gnome/help/evolution/en_GB/figures/evo_email_a.png
+share/gnome/help/evolution/en_GB/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/en_GB/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_gwreceiveedit_a.png
+share/gnome/help/evolution/en_GB/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/en_GB/figures/evo_identity_a.png
+share/gnome/help/evolution/en_GB/figures/evo_identityedit_a.png
+share/gnome/help/evolution/en_GB/figures/evo_imapheader_a.png
+share/gnome/help/evolution/en_GB/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_import_asst_a.png
+share/gnome/help/evolution/en_GB/figures/evo_mail_a.png
+share/gnome/help/evolution/en_GB/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/en_GB/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_memo_a.png
+share/gnome/help/evolution/en_GB/figures/evo_mereceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_message_filters_a.png
+share/gnome/help/evolution/en_GB/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_newmess_a.png
+share/gnome/help/evolution/en_GB/figures/evo_popreceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/en_GB/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/en_GB/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/en_GB/figures/evo_rmdrnotes_a.png
+share/gnome/help/evolution/en_GB/figures/evo_rule_a.png
+share/gnome/help/evolution/en_GB/figures/evo_select_add_folder.png
+share/gnome/help/evolution/en_GB/figures/evo_select_folder.png
+share/gnome/help/evolution/en_GB/figures/evo_send_option_a.png
+share/gnome/help/evolution/en_GB/figures/evo_send_setup_a.png
+share/gnome/help/evolution/en_GB/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/en_GB/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/en_GB/figures/evo_timezone_a.png
+share/gnome/help/evolution/en_GB/figures/evo_usereceive_a.png
+share/gnome/help/evolution/en_GB/figures/exchange-delegation.png
+share/gnome/help/evolution/en_GB/figures/exchange-identity.png
+share/gnome/help/evolution/en_GB/figures/exchange-receive-options.png
+share/gnome/help/evolution/en_GB/figures/exchange-receive.png
+share/gnome/help/evolution/en_GB/figures/exchg-identity.png
+share/gnome/help/evolution/en_GB/figures/exchng-identity.png
+share/gnome/help/evolution/en_GB/figures/exchng-rec-mail.png
+share/gnome/help/evolution/en_GB/figures/exchng-rec-mails.png
+share/gnome/help/evolution/en_GB/figures/exchng-rec-option.png
+share/gnome/help/evolution/en_GB/figures/exchng-rec-options.png
+share/gnome/help/evolution/en_GB/figures/exchng-settings.png
+share/gnome/help/evolution/en_GB/figures/filter-new-fig.png
+share/gnome/help/evolution/en_GB/figures/free_busy.png
+share/gnome/help/evolution/en_GB/figures/full-1.png
+share/gnome/help/evolution/en_GB/figures/full-2.png
+share/gnome/help/evolution/en_GB/figures/full-3.png
+share/gnome/help/evolution/en_GB/figures/full-4.png
+share/gnome/help/evolution/en_GB/figures/full-5.png
+share/gnome/help/evolution/en_GB/figures/full-6.png
+share/gnome/help/evolution/en_GB/figures/full-7.png
+share/gnome/help/evolution/en_GB/figures/mail-druid-pic.png
+share/gnome/help/evolution/en_GB/figures/mail-inbox.png
+share/gnome/help/evolution/en_GB/figures/mail-threaded.png
+share/gnome/help/evolution/en_GB/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/en_GB/figures/mailer_preferences.png
+share/gnome/help/evolution/en_GB/figures/mainwindow-pic.png
+share/gnome/help/evolution/en_GB/figures/minus.png
+share/gnome/help/evolution/en_GB/figures/newmsg.png
+share/gnome/help/evolution/en_GB/figures/plus.png
+share/gnome/help/evolution/en_GB/figures/proxy-cal.png
+share/gnome/help/evolution/en_GB/figures/proxy-login.png
+share/gnome/help/evolution/en_GB/figures/quick_add_a.png
+share/gnome/help/evolution/en_GB/figures/replymsg.png
+share/gnome/help/evolution/en_GB/figures/schedule.png
+share/gnome/help/evolution/en_GB/figures/stock_search.png
+share/gnome/help/evolution/en_GB/figures/sub-others-folder.png
+share/gnome/help/evolution/en_GB/figures/sub-pub-fold.png
+share/gnome/help/evolution/en_GB/figures/ver_view_a.png
+share/gnome/help/evolution/en_GB/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/es/evolution.xml
+share/gnome/help/evolution/es/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/es/figures/account_editor_a.png
+share/gnome/help/evolution/es/figures/calendar.png
+share/gnome/help/evolution/es/figures/categories_a.png
+share/gnome/help/evolution/es/figures/collap_head_a.png
+share/gnome/help/evolution/es/figures/config-cal.png
+share/gnome/help/evolution/es/figures/config-mail.png
+share/gnome/help/evolution/es/figures/contact-editor.png
+share/gnome/help/evolution/es/figures/contact.png
+share/gnome/help/evolution/es/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/es/figures/delgt-add.png
+share/gnome/help/evolution/es/figures/evo_account_editor_a.png
+share/gnome/help/evolution/es/figures/evo_account_info_a.png
+share/gnome/help/evolution/es/figures/evo_add_rule_a.png
+share/gnome/help/evolution/es/figures/evo_adv_search_a.png
+share/gnome/help/evolution/es/figures/evo_allday_a.png
+share/gnome/help/evolution/es/figures/evo_cal_a.png
+share/gnome/help/evolution/es/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/es/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/es/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/es/figures/evo_edit_rule_a.png
+share/gnome/help/evolution/es/figures/evo_edit_search.png
+share/gnome/help/evolution/es/figures/evo_email_a.png
+share/gnome/help/evolution/es/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/es/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/es/figures/evo_gwreceiveedit_a.png
+share/gnome/help/evolution/es/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/es/figures/evo_identity_a.png
+share/gnome/help/evolution/es/figures/evo_identityedit_a.png
+share/gnome/help/evolution/es/figures/evo_imapheader_a.png
+share/gnome/help/evolution/es/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/es/figures/evo_import_asst_a.png
+share/gnome/help/evolution/es/figures/evo_mail_a.png
+share/gnome/help/evolution/es/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/es/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/es/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/es/figures/evo_memo_a.png
+share/gnome/help/evolution/es/figures/evo_mereceive_a.png
+share/gnome/help/evolution/es/figures/evo_message_filters_a.png
+share/gnome/help/evolution/es/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/es/figures/evo_newmess_a.png
+share/gnome/help/evolution/es/figures/evo_popreceive_a.png
+share/gnome/help/evolution/es/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/es/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/es/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/es/figures/evo_rmdrnotes_a.png
+share/gnome/help/evolution/es/figures/evo_rule_a.png
+share/gnome/help/evolution/es/figures/evo_select_add_folder.png
+share/gnome/help/evolution/es/figures/evo_select_folder.png
+share/gnome/help/evolution/es/figures/evo_send_option_a.png
+share/gnome/help/evolution/es/figures/evo_send_setup_a.png
+share/gnome/help/evolution/es/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/es/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/es/figures/evo_timezone_a.png
+share/gnome/help/evolution/es/figures/evo_usereceive_a.png
+share/gnome/help/evolution/es/figures/exchange-delegation.png
+share/gnome/help/evolution/es/figures/exchange-identity.png
+share/gnome/help/evolution/es/figures/exchange-receive-options.png
+share/gnome/help/evolution/es/figures/exchange-receive.png
+share/gnome/help/evolution/es/figures/exchg-identity.png
+share/gnome/help/evolution/es/figures/exchng-identity.png
+share/gnome/help/evolution/es/figures/exchng-rec-mail.png
+share/gnome/help/evolution/es/figures/exchng-rec-mails.png
+share/gnome/help/evolution/es/figures/exchng-rec-option.png
+share/gnome/help/evolution/es/figures/exchng-rec-options.png
+share/gnome/help/evolution/es/figures/exchng-settings.png
+share/gnome/help/evolution/es/figures/filter-new-fig.png
+share/gnome/help/evolution/es/figures/free_busy.png
+share/gnome/help/evolution/es/figures/full-1.png
+share/gnome/help/evolution/es/figures/full-2.png
+share/gnome/help/evolution/es/figures/full-3.png
+share/gnome/help/evolution/es/figures/full-4.png
+share/gnome/help/evolution/es/figures/full-5.png
+share/gnome/help/evolution/es/figures/full-6.png
+share/gnome/help/evolution/es/figures/full-7.png
+share/gnome/help/evolution/es/figures/mail-druid-pic.png
+share/gnome/help/evolution/es/figures/mail-inbox.png
+share/gnome/help/evolution/es/figures/mail-threaded.png
+share/gnome/help/evolution/es/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/es/figures/mailer_preferences.png
+share/gnome/help/evolution/es/figures/mainwindow-pic.png
+share/gnome/help/evolution/es/figures/minus.png
+share/gnome/help/evolution/es/figures/newmsg.png
+share/gnome/help/evolution/es/figures/plus.png
+share/gnome/help/evolution/es/figures/proxy-cal.png
+share/gnome/help/evolution/es/figures/proxy-login.png
+share/gnome/help/evolution/es/figures/quick_add_a.png
+share/gnome/help/evolution/es/figures/replymsg.png
+share/gnome/help/evolution/es/figures/schedule.png
+share/gnome/help/evolution/es/figures/stock_search.png
+share/gnome/help/evolution/es/figures/sub-others-folder.png
+share/gnome/help/evolution/es/figures/sub-pub-fold.png
+share/gnome/help/evolution/es/figures/ver_view_a.png
+share/gnome/help/evolution/es/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/sv/evolution.xml
+share/gnome/help/evolution/sv/figures/Screenshot-Free-Busy.png
+share/gnome/help/evolution/sv/figures/account_editor_a.png
+share/gnome/help/evolution/sv/figures/calendar.png
+share/gnome/help/evolution/sv/figures/categories_a.png
+share/gnome/help/evolution/sv/figures/collap_head_a.png
+share/gnome/help/evolution/sv/figures/config-cal.png
+share/gnome/help/evolution/sv/figures/config-mail.png
+share/gnome/help/evolution/sv/figures/contact-editor.png
+share/gnome/help/evolution/sv/figures/contact.png
+share/gnome/help/evolution/sv/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/sv/figures/delgt-add.png
+share/gnome/help/evolution/sv/figures/evo_account_editor_a.png
+share/gnome/help/evolution/sv/figures/evo_account_info_a.png
+share/gnome/help/evolution/sv/figures/evo_add_rule_a.png
+share/gnome/help/evolution/sv/figures/evo_adv_search_a.png
+share/gnome/help/evolution/sv/figures/evo_allday_a.png
+share/gnome/help/evolution/sv/figures/evo_cal_a.png
+share/gnome/help/evolution/sv/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/sv/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/sv/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/sv/figures/evo_edit_rule_a.png
+share/gnome/help/evolution/sv/figures/evo_edit_search.png
+share/gnome/help/evolution/sv/figures/evo_email_a.png
+share/gnome/help/evolution/sv/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/sv/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/sv/figures/evo_gwreceiveedit_a.png
+share/gnome/help/evolution/sv/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/sv/figures/evo_identity_a.png
+share/gnome/help/evolution/sv/figures/evo_identityedit_a.png
+share/gnome/help/evolution/sv/figures/evo_imapheader_a.png
+share/gnome/help/evolution/sv/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/sv/figures/evo_import_asst_a.png
+share/gnome/help/evolution/sv/figures/evo_mail_a.png
+share/gnome/help/evolution/sv/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/sv/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/sv/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/sv/figures/evo_memo_a.png
+share/gnome/help/evolution/sv/figures/evo_mereceive_a.png
+share/gnome/help/evolution/sv/figures/evo_message_filters_a.png
+share/gnome/help/evolution/sv/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/sv/figures/evo_newmess_a.png
+share/gnome/help/evolution/sv/figures/evo_popreceive_a.png
+share/gnome/help/evolution/sv/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/sv/figures/evo_receive_setup2_a.png
+share/gnome/help/evolution/sv/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/sv/figures/evo_rmdrnotes_a.png
+share/gnome/help/evolution/sv/figures/evo_rule_a.png
+share/gnome/help/evolution/sv/figures/evo_select_add_folder.png
+share/gnome/help/evolution/sv/figures/evo_select_folder.png
+share/gnome/help/evolution/sv/figures/evo_send_option_a.png
+share/gnome/help/evolution/sv/figures/evo_send_setup_a.png
+share/gnome/help/evolution/sv/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/sv/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/sv/figures/evo_timezone_a.png
+share/gnome/help/evolution/sv/figures/evo_usereceive_a.png
+share/gnome/help/evolution/sv/figures/exchange-delegation.png
+share/gnome/help/evolution/sv/figures/exchange-identity.png
+share/gnome/help/evolution/sv/figures/exchange-receive-options.png
+share/gnome/help/evolution/sv/figures/exchange-receive.png
+share/gnome/help/evolution/sv/figures/exchg-identity.png
+share/gnome/help/evolution/sv/figures/exchng-identity.png
+share/gnome/help/evolution/sv/figures/exchng-rec-mail.png
+share/gnome/help/evolution/sv/figures/exchng-rec-mails.png
+share/gnome/help/evolution/sv/figures/exchng-rec-option.png
+share/gnome/help/evolution/sv/figures/exchng-rec-options.png
+share/gnome/help/evolution/sv/figures/exchng-settings.png
+share/gnome/help/evolution/sv/figures/filter-new-fig.png
+share/gnome/help/evolution/sv/figures/free_busy.png
+share/gnome/help/evolution/sv/figures/full-1.png
+share/gnome/help/evolution/sv/figures/full-2.png
+share/gnome/help/evolution/sv/figures/full-3.png
+share/gnome/help/evolution/sv/figures/full-4.png
+share/gnome/help/evolution/sv/figures/full-5.png
+share/gnome/help/evolution/sv/figures/full-6.png
+share/gnome/help/evolution/sv/figures/full-7.png
+share/gnome/help/evolution/sv/figures/mail-druid-pic.png
+share/gnome/help/evolution/sv/figures/mail-inbox.png
+share/gnome/help/evolution/sv/figures/mail-threaded.png
+share/gnome/help/evolution/sv/figures/mail_mainwindow_a.png
+share/gnome/help/evolution/sv/figures/mailer_preferences.png
+share/gnome/help/evolution/sv/figures/mainwindow-pic.png
+share/gnome/help/evolution/sv/figures/minus.png
+share/gnome/help/evolution/sv/figures/newmsg.png
+share/gnome/help/evolution/sv/figures/plus.png
+share/gnome/help/evolution/sv/figures/proxy-cal.png
+share/gnome/help/evolution/sv/figures/proxy-login.png
+share/gnome/help/evolution/sv/figures/quick_add_a.png
+share/gnome/help/evolution/sv/figures/replymsg.png
+share/gnome/help/evolution/sv/figures/schedule.png
+share/gnome/help/evolution/sv/figures/stock_search.png
+share/gnome/help/evolution/sv/figures/sub-others-folder.png
+share/gnome/help/evolution/sv/figures/sub-pub-fold.png
+share/gnome/help/evolution/sv/figures/ver_view_a.png
+share/gnome/help/evolution/sv/figures/vfolder-createrule-fig.png
 share/gnome/idl/evolution-%%VERSION%%/Composer.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Component.idl
 share/gnome/idl/evolution-%%VERSION%%/Evolution-Composer.idl
@@ -617,10 +951,17 @@ 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/omf/evolution/evolution-%%VERSION%%-C.omf
-share/gnome/pixmaps/evolution-%%VERSION%%.png
+share/gnome/mime-info/evolution.keys
+share/gnome/mime-info/evolution.mime
+share/gnome/omf/evolution/evolution-C.omf
+share/gnome/omf/evolution/evolution-en_GB.omf
+share/gnome/omf/evolution/evolution-es.omf
+share/gnome/omf/evolution/evolution-sv.omf
+share/icons/hicolor/16x16/apps/evolution.png
+share/icons/hicolor/22x22/apps/evolution.png
+share/icons/hicolor/24x24/apps/evolution.png
+share/icons/hicolor/32x32/apps/evolution.png
+share/icons/hicolor/scalable/apps/evolution.svg
 share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -697,9 +1038,15 @@ share/locale/zh_HK/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/omf/evolution
 @dirrm share/gnome/idl/evolution-%%VERSION%%
-@dirrm share/gnome/help/evolution-%%VERSION%%/C/figures
-@dirrm share/gnome/help/evolution-%%VERSION%%/C
-@dirrm share/gnome/help/evolution-%%VERSION%%
+@dirrm share/gnome/help/evolution/sv/figures
+@dirrm share/gnome/help/evolution/sv
+@dirrm share/gnome/help/evolution/en_GB/figures
+@dirrm share/gnome/help/evolution/en_GB
+@dirrm share/gnome/help/evolution/es/figures
+@dirrm share/gnome/help/evolution/es
+@dirrm share/gnome/help/evolution/C/figures
+@dirrm share/gnome/help/evolution/C
+@dirrm share/gnome/help/evolution
 @dirrm share/gnome/evolution/%%VERSION%%/weather
 @dirrm share/gnome/evolution/%%VERSION%%/views/tasks
 @dirrm share/gnome/evolution/%%VERSION%%/views/memos
@@ -709,6 +1056,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @dirrm share/gnome/evolution/%%VERSION%%/views
 @dirrm share/gnome/evolution/%%VERSION%%/ui
 @dirrm share/gnome/evolution/%%VERSION%%/images
+@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/sv
+@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/es
 @dirrm share/gnome/evolution/%%VERSION%%/help/quickref/de
 @dirrm share/gnome/evolution/%%VERSION%%/help/quickref/C
 @dirrm share/gnome/evolution/%%VERSION%%/help/quickref
@@ -741,6 +1090,9 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
 @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/es/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/es/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/es
 @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 cb88d55cb781..ccc3f2a71b76 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mail-notification
 DISTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	mailnotify
@@ -71,7 +72,7 @@ PLIST_SUB+=	GMAIL=""
 CONFIGURE_ARGS+=--disable-evolution
 PLIST_SUB+=	EVOLUTION="@comment "
 .else
-EVO_VERSION=	2.8
+EVO_VERSION=	2.10
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin-${EVO_VERSION}.pc:${PORTSDIR}/mail/evolution
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin-${EVO_VERSION}.pc:${PORTSDIR}/mail/evolution
 PLIST_SUB+=	EVOLUTION="" EVO_VERSION=${EVO_VERSION}