Update to 2.0.4:

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

 * Addressbook

   #36137 - Leading %s in addressbook message totally non-obvious (Siva)
   #70339 - vcard preview doesn't appear to work (Siva)
   #70622 - Crash changing gtkhtml settings (JP)
   #70922 - Email address types should show "Other" when importing vcards (Siva)
   #70540 - Adding contact from email doesn't let you change "file as" (Hans)

 * Calendar

   #41624 - only the last exception is deleted on palm device (JP)
   #46901 - Only one line gets printed when printing Tasks and Appointments
     (Yong Sun)

 * Mail

   #33933 - Sorting by subject does not result in expected order (Jeff)
   #70795 - Next/Previous Message Should Only Display Listed Emails (Michael)
   #65329 - regression in default folder name localisation (Michael)
   #71312 - Double-clicking vFolder of Draft folder doesn't allow editing
     (Michael)
   #71310 - Always loses my signature script settings (Michael)
   #71310 - Always loses my signature script settings (Michael)
   #69850 - Crash: attempting to create a Vfolder based on a message without a
     Sender (Michael)
   #65178 - newly created folder on local maildir doesn't show until evolution
     restart (Michael)
   #70858 - selecting newly created folder flakey (Michael)
   #60664 - message view does not follow theme change (Michael)
   #70768 - 'Mark All as Read' marks all the mails which are not in current
     query as read (Michael)
   #70563 - crash when 'load images' on MyEclipse newsletter email (Michael)
   #66943 - Crash when saving draft (Michael)
   #71105 - When trying to rename a folder containing a slash "/" and spaces,
     evil stuff happens (Michael)
   #72020 - Error parsing filter: Unknown identifier: adjust-score (Michael)
   #38791 - gpg can make evo hang if keyserver unreachable (Michael)
   #36142 - Don't use acronyms as verbs in messages (Michael)
   #70303 - pgp signature invalid with very short emails (Michael)
   #69757 - Memory leak in imap_parse_list_response (Michael)
   #22496 - Evolution does not appear to support ALERT messages (Michael)
   #71427 - Evolution does not prompt for new password (Michael)
   #71625 - Don't display content of e-mail when first selected (Michael)
   #56110 - Messages in digest displayed as source (Michael)
   #69024 - Doesn't update NNTP folder in a Virtual folder (Michael)
   #47824 - nested, identical multipart boundaries dont parse properly (Michael)
   #70919 - Crash during fetching mail (mail has gpg signature) (Michael)
   #70556 - Unable load messages info from MS Exchange by IMAP (Michael)

Other bugs

 * Mail

    -64 bit fixes (Michael)

 * Addressbook

    - work around 67411 (Hans)
    - 64 bit fixes (Michael)
    - Turkish locale fixes (S.Çaglar Onur)

 * Calendar

    - fix potential resize crash (Michael)

 * S/MIME

    - don't remove the cert from the tree if it wasn't actually deleted
      (Michael)

Updated translations:

  - nl (Vincent van Adrighem)
  - pt (Duarte Loreto)
  - hu (Laszlo Dvornik)
  - ca (Jordi Mallach)
  - fr (Jeremie Knuesel, Sebastien Bacher, Christophe Merlet)
  - sv (Christian Rose)
  - de (Hendrik Brandt)
  - id (Mohammad DAMT)
  - es (Francisco Javier F. Serrador)
  - da (Martin Willemoes Hansen)
  - ko (Changwoo Ryu)
  - zh_CN (Funda Wang)
  - ms (Hasbullah Bin Pit)
  - hu (Laszlo Dvornik)
  - cs (Miloslav Trmac)
  - ru (Leonid Kanter)
  - bg (Vladimir Petkov)
  - sq (Laurent Dhima)
  - en_GB (David Lodge)
  - pl (Artur Flinta)
  - sr (Danilo Segan)
  - sr@Latn (Danilo Segan)
  - en_CA (Adam Weinberger)
  - pt_BR (Raphael Higino)
  - nn (Åsmund Skjæveland)

3 files changed, 6 insertions, 24 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 46488e9c313..dae5bb8b88f 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2005/01/25 15:23:46 drochner Exp $
+# $NetBSD: Makefile,v 1.74 2005/02/22 18:25:31 jmmv Exp $
 
-DISTNAME=		evolution-2.0.3
-PKGREVISION=		1
+DISTNAME=		evolution-2.0.4
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution/2.0/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,7 +12,7 @@ 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.4
+BUILDLINK_DEPENDS.gal2+=	gal2>=2.2.5
 BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb2
 BUILDLINK_DEPENDS.gtkhtml3+=	gtkhtml3>=3.2.4
 BUILDLINK_DEPENDS.evolution-data-server+=	evolution-data-server>=1.0.3
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 3b9cb73d6e5..9ca581e0416 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.33 2005/01/25 15:23:46 drochner Exp $
+$NetBSD: distinfo,v 1.34 2005/02/22 18:25:31 jmmv Exp $
 
-SHA1 (evolution-2.0.3.tar.bz2) = 059253acd24648b841c6fc24e376c475b2598b6d
-Size (evolution-2.0.3.tar.bz2) = 15381448 bytes
+SHA1 (evolution-2.0.4.tar.bz2) = 2f6ad658e5426999dfe83f7bb2f2e8a87a9a7213
+Size (evolution-2.0.4.tar.bz2) = 15395184 bytes
 SHA1 (patch-aa) = a89da54c40813c07af76dd98f876dd2e979c2554
 SHA1 (patch-ab) = 871a322eefd1a42e7197da764d49cd1d24f6535d
 SHA1 (patch-ac) = 5150f3163e7307e03ed82757e1d31a54310feae3
-SHA1 (patch-ad) = 32b3b688033518602cd91888e5239b78558f1558
diff --git a/mail/evolution/patches/patch-ad b/mail/evolution/patches/patch-ad
deleted file mode 100644
index e58c27566cf..00000000000
--- a/mail/evolution/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2005/01/25 15:23:46 drochner Exp $
-
---- camel/camel-lock-helper.c.orig	2005-01-25 15:34:38.000000000 +0100
-+++ camel/camel-lock-helper.c
-@@ -360,8 +360,9 @@ int main(int argc, char **argv)
- 			switch(msg.id) {
- 			case CAMEL_LOCK_HELPER_LOCK:
- 				res = CAMEL_LOCK_HELPER_STATUS_NOMEM;
--				path = malloc(msg.data+1);
--				if (path != NULL) {
-+				if (msg.data > 0xffff) {
-+					res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;
-+				} else if ((path = malloc(msg.data+1)) != NULL) {
- 					res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;
- 					len = read_n(STDIN_FILENO, path, msg.data);
- 					if (len == msg.data) {