Update to 2.2.1.1:

Evolution 2.2.1.1, 2005-03-17
-----------------------------

Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):

 * Calendar
   #72983 - 'List' view has one entry for recurring appointment (Rodrigo)

 * Mail
   #73559 - Evolution filter crash when using Source Account criteria (Michael)
   #71003 - threads still running at exit redux (Michael)
   #73550 - HTML mails don't show if "prefer plain-text" plugin not active
   (Michael)

Other bugs

 * Plugins
   - Set auth mechanism for transport and source when configuring exchange
   (Sushma)

Evolution 2.2.1, 2005-03-15
---------------------------

Bugzilla bugs fixed (see http://bugzilla.ximian.com/show_bug.cgi):

 * Addressbook
   #73206 - Evolution crashed when clicked on 'Cancel' of LDAP authentication
   (Siva)

 * Calendar
   #73563 - evolution-alarm-notify crashes after pressing snooze button (JP)
   #72979 - Meeting is displayed as appointment in 'List view' (Chen)
   #73501 - In 'Send Options' popup 'General Options' tab should be removed
   for exchange (Sush)

 * Mail
   #73293 - unread messages becoming read do not update menu items (Michael)
   #73139 - Not able to see the icons of Shared Folders (Vivek)
   #73100 - Unify Evolution license text check box messages in Evolution
   mailer (Michael)
   #71733 - signature editor should set focus on title field (Harry Lu)
   #73501 - In 'Send Options' popup 'General Options' tab should be removed
   (Sushma)

 * Plugins
   #72807 - Switching from gw account crashes Evolution (Siva)
   #73201 -Sharing tab is not present in the properties of a folder which has
   a space in its name (Vivek)

Other bugs

 * Calendar
   - Fix memory leak in calendar views (Michael)
   - Fix forward as icalendar (JP)
   - Fix default color and selection on first run (JP)

 * Mail
   - Improved Post-To handling (Michael)
   - Fix To/CC/BCC cut and paste (Hans)

 * Plugins
   - Don't return an invisible item in gw account setup (Michael)
   - Handle assigned tasks in itip formatter (JP)

 * All
   - Clean up debug spew (Michael)
   - Fix memory leak for gal view menus (Michael)

Updated translations:
	-pl (GNOME PL Team)
	-ja (Takeshi AIHANA)
	-da (Martin Willemoes Hansen)
	-fr (Christophe Merlet)
	-ko (Changwoo Ryu)
	-en_GB (David Lodge)
	-tr (Baris Cicek)
	-cs (Miloslav Trmac)
	-de (Frank Arnold)
	-sr (Danilo Segan)
	-sr@Latn (Danilo Segan)
	-es (Francisco Javier F. Serrador)
	-pt_BR (Raphael Higino)
	-sq (Laurent Dhima)
	-fi (Hile Tuohela)
	-gu (Ankit Patel)
	-sv (Christian Rose)
	-pt (Duarte Loreto)
	-en_CA (Adam Weinberger)

4 files changed, 20 insertions, 13 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index b55f39cca30..26dcf15ee1d 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.76 2005/03/22 16:39:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.77 2005/03/26 16:21:12 jmmv Exp $
 
-DISTNAME=		evolution-2.2.0
+DISTNAME=		evolution-2.2.1.1
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution/2.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,11 +12,6 @@ COMMENT=		GNOME mailer, calendar, contact manager, and communications tool
 DEPENDS+=		psmisc-[0-9]*:../../sysutils/psmisc
 BUILD_USES_MSGFMT=	YES
 
-BUILDLINK_DEPENDS.gal2+=	gal2>=2.2.5
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb2
-BUILDLINK_DEPENDS.gtkhtml3+=	gtkhtml3>=3.2.5
-BUILDLINK_DEPENDS.libsoup-devel+=		libsoup-devel>=2.2.1
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evolution
 PKG_SUPPORTED_OPTIONS=	ipv6 krb4 krb5 ssl
 
@@ -102,6 +97,12 @@ GCONF2_SCHEMAS+=	evolution-mail-2.2.schemas
 BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
+BUILDLINK_DEPENDS.evolution-data-server+=	evolution-data-server>=1.2.1
+BUILDLINK_DEPENDS.gal2+=	gal2>=2.4.1
+BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb2
+BUILDLINK_DEPENDS.gtkhtml36+=	gtkhtml36>=3.6.1
+BUILDLINK_DEPENDS.libsoup-devel+=		libsoup-devel>=2.2.1
+
 .if !exists(/usr/include/semaphore.h)
 LDFLAGS+=	-lsemaphore
 .include "../../devel/pthread-sem/buildlink3.mk"
diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST
index fbe503017c8..0037c69cd55 100644
--- a/mail/evolution/PLIST
+++ b/mail/evolution/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2005/03/22 16:39:39 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.22 2005/03/26 16:21:12 jmmv Exp $
 bin/evolution-2.2
 include/evolution-2.2/calendar/gui/e-cal-config.h
 include/evolution-2.2/e-conduit/e-pilot-map.h
@@ -123,6 +123,7 @@ lib/evolution/2.2/plugins/liborg-gnome-mail-folder-unsubscribe.la
 lib/evolution/2.2/plugins/liborg-gnome-mail-to-task.la
 lib/evolution/2.2/plugins/liborg-gnome-mailing-list-actions.la
 lib/evolution/2.2/plugins/liborg-gnome-mark-calendar-offline.la
+lib/evolution/2.2/plugins/liborg-gnome-new-mail-notify.la
 lib/evolution/2.2/plugins/liborg-gnome-plugin-manager.la
 lib/evolution/2.2/plugins/liborg-gnome-prefer-plain.la
 lib/evolution/2.2/plugins/liborg-gnome-save-attachments.la
@@ -152,6 +153,7 @@ lib/evolution/2.2/plugins/org-gnome-mail-to-task.eplug
 lib/evolution/2.2/plugins/org-gnome-mailing-list-actions.eplug
 lib/evolution/2.2/plugins/org-gnome-mailing-list-actions.xml
 lib/evolution/2.2/plugins/org-gnome-mark-calendar-offline.eplug
+lib/evolution/2.2/plugins/org-gnome-new-mail-notify.eplug
 lib/evolution/2.2/plugins/org-gnome-plugin-manager.eplug
 lib/evolution/2.2/plugins/org-gnome-plugin-manager.xml
 lib/evolution/2.2/plugins/org-gnome-prefer-plain.eplug
diff --git a/mail/evolution/buildlink3.mk b/mail/evolution/buildlink3.mk
index 4a1db921bc1..027851f2a56 100644
--- a/mail/evolution/buildlink3.mk
+++ b/mail/evolution/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/03/22 16:39:39 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/03/26 16:21:12 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 EVOLUTION_BUILDLINK3_MK:=	${EVOLUTION_BUILDLINK3_MK}+
@@ -15,6 +15,10 @@ BUILDLINK_DEPENDS.evolution+=	evolution>=2.2.0
 BUILDLINK_PKGSRCDIR.evolution?=	../../mail/evolution
 .endif	# EVOLUTION_BUILDLINK3_MK
 
+PRINT_PLIST_AWK+=	/^@dirrm lib\/evolution\/2.2$$/ \
+				{ print "@comment in evolution: " $$0; next }
+PRINT_PLIST_AWK+=	/^@dirrm lib\/evolution$$/ \
+				{ print "@comment in evolution: " $$0; next }
 PRINT_PLIST_AWK+=	/^@dirrm libexec\/evolution\/2.2$$/ \
 				{ print "@comment in evolution: " $$0; next }
 PRINT_PLIST_AWK+=	/^@dirrm libexec\/evolution$$/ \
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index f9cd9c44ada..5f56b6acefe 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.36 2005/03/22 16:39:39 jmmv Exp $
+$NetBSD: distinfo,v 1.37 2005/03/26 16:21:12 jmmv Exp $
 
-SHA1 (evolution-2.2.0.tar.bz2) = a1999958663180be9ec5153118cc616bbe751cdd
-RMD160 (evolution-2.2.0.tar.bz2) = bb69485643c46451fa18688150b19ecddbe10023
-Size (evolution-2.2.0.tar.bz2) = 13344133 bytes
+SHA1 (evolution-2.2.1.1.tar.bz2) = 3c55da5ae3b6d4240fb1830cc205e19f43111ee8
+RMD160 (evolution-2.2.1.1.tar.bz2) = 9e7cfe74eecb2ce68457456e295370b8af35fbcc
+Size (evolution-2.2.1.1.tar.bz2) = 13400909 bytes
 SHA1 (patch-ab) = 871a322eefd1a42e7197da764d49cd1d24f6535d
 SHA1 (patch-ac) = 5150f3163e7307e03ed82757e1d31a54310feae3