Update to 2.2.2:

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

 * Addressbook
   #74404 - [Gnopernicus] Evolution crashes after deleting contacts with keyboard (Yu Mengjie)
   #73330 - Tried adding attende in meeting under gw calendar - Evolution crashed (Siva)
   #74255 - Copy to address book option doesnot check for duplicates (Siva)

 * Calendar
   #44719 - Alarm Notify window is not sticky any more (Rodrigo)
   #69272 - crash creating new appointment (JP)
   #73320 - double click attendee - removes user from meeting attendence list (Chen)
   #44579 - appointment location / description does not get printed (Harry Lu)
   #68525 - crash while evo is in background (Chen)
   #72983 - 'List' view has one entry for recurring appointment (Rodrigo)
   #68423 - Memory leak when purging (Rodrigo)
   #73969 - 'Cancel' meeting doesnt delete all instances of recurring meeting in 'attendee's calendar

 * Mail
   #73347 - default action for recover files wrong (Michael)
   #72935 - Cancel Button does not light up in second window (Michael)
   #72518 - Delete warning untrue when choose Delete vFolder (Michael)
   #70394 - "mailer" header is displayed twice when both "x-mailer" and "user-agent" set (Jeff)
   #73363 - loads every message the cursor passes through (Michael)
   #73559 - Evolution filter crash when using Source Account criteria (Michael)
   #71003 - threads still running at exit (Michael)
   #73550 - HTML mails don't show if "prefer plain-text" plugin no active (Michael)
   #36972 - Composer overrides selection  (Radek)
   #73192 - Mark as (un)read missing from context popup menu (Rodney)
   #74320 - evolution crashes on non-malformed mail message (Michael)

 * Plugins
   #73627 - No way to configure mailbox != username (Sushma)
   #73844 - Problem handling meeting requests with VTIMEZONEs (JP)

Other bugs

 * Calendar
   - Fix memory leaks in calendar (Rodrigo)

 * Mail
   - Update menu sensitivity in the non-single message case (Michael)

 * SMIME
   - Handle cases where the version of the root cert module changed (Jeff)

 * Shell
   - Handle cases where the version of the root cert module changed (Jeff)

 * Plugins
   - Emit the offline event properly in the shell (Michael)
   - Prevent crash of bbdb if the book can't be opened (Michael)

 * 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)

3 files changed, 21 insertions, 13 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 7c3da564457..43b085ee557 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.79 2005/04/13 17:16:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.80 2005/05/19 21:06:46 jmmv Exp $
 
-DISTNAME=		evolution-2.2.1.1
+DISTNAME=		evolution-2.2.2
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution/2.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -99,10 +99,10 @@ 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.evolution-data-server+=	evolution-data-server>=1.2.2
+BUILDLINK_DEPENDS.gal2+=	gal2>=2.4.2
 BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb2
-BUILDLINK_DEPENDS.gtkhtml36+=	gtkhtml36>=3.6.1
+BUILDLINK_DEPENDS.gtkhtml36+=	gtkhtml36>=3.6.2
 BUILDLINK_DEPENDS.libsoup-devel+=		libsoup-devel>=2.2.1
 
 .if !exists(/usr/include/semaphore.h)
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 5f56b6acefe..417206f3450 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.37 2005/03/26 16:21:12 jmmv Exp $
+$NetBSD: distinfo,v 1.38 2005/05/19 21:06:46 jmmv Exp $
 
-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 (evolution-2.2.2.tar.bz2) = 8072e99c1e458416465a66ac7f87c0af90fac1f2
+RMD160 (evolution-2.2.2.tar.bz2) = c2e93248436eb314c47cf99bdd050f4f56629f4d
+Size (evolution-2.2.2.tar.bz2) = 13858551 bytes
 SHA1 (patch-ab) = 871a322eefd1a42e7197da764d49cd1d24f6535d
-SHA1 (patch-ac) = 5150f3163e7307e03ed82757e1d31a54310feae3
+SHA1 (patch-ac) = eac530ef720daf3f8f812690496ae39b76691799
diff --git a/mail/evolution/patches/patch-ac b/mail/evolution/patches/patch-ac
index f9c04b18f27..03cd71f97d9 100644
--- a/mail/evolution/patches/patch-ac
+++ b/mail/evolution/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.12 2005/01/17 08:46:34 jmmv Exp $
+$NetBSD: patch-ac,v 1.13 2005/05/19 21:06:46 jmmv Exp $
 
---- configure.orig	2004-12-06 18:27:04.000000000 +0100
+--- configure.orig	2005-04-08 19:27:21.000000000 +0000
 +++ configure
-@@ -23078,6 +23078,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -23589,6 +23589,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -10,3 +10,11 @@ $NetBSD: patch-ac,v 1.12 2005/01/17 08:46:34 jmmv Exp $
  
  		#define BUFSIZE (sizeof(struct hostent)+10)
  
+@@ -24717,6 +24718,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 		#include <sys/socket.h>
+ 		#include <netinet/in.h>
+ 		#include <netdb.h>
++		#include <stdio.h> /* Needed to get NULL's definition */
+ 
+ 
+ int