Update to 1.0.3:

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

  * Calendar

    #59904 - Speed up calendar queries (Rodrigo)
    #69624 - make changes in evo corresponding to soap schema changes  (Siva)

Other bugs

  * Address Book
    - prevent e_book_commit_contact from crashing on multiple calls
      (Diego Gonzalez)
    - prevent file backend from crashing if uid of vcard is NULL
      (Diego Gonzalez)

  * Calendar
    - fix libical build for automake 1.9 (Rodney)
    - fix putenv usage for portability (Julio M. Merino Vidal)

Updated Translations:
	- sv (Christian Rose)

8 files changed, 61 insertions, 158 deletions

diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 3ee829990ec..458bdbc5a46 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/10/22 16:03:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/28 21:48:12 jmmv Exp $
 #
 
-DISTNAME=	evolution-data-server-1.0.2
-PKGREVISION=	2
+DISTNAME=	evolution-data-server-1.0.3
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/1.0/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/evolution-data-server/PLIST b/mail/evolution-data-server/PLIST
index dc8c7e54996..6386f7d0087 100644
--- a/mail/evolution-data-server/PLIST
+++ b/mail/evolution-data-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/10/04 09:46:50 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/12/28 21:48:12 jmmv Exp $
 include/evolution-data-server-1.0/groupwise/e-gw-connection.h
 include/evolution-data-server-1.0/groupwise/e-gw-container.h
 include/evolution-data-server-1.0/groupwise/e-gw-filter.h
@@ -544,61 +544,61 @@ share/evolution-data-server-1.0/zoneinfo/zones.tab
 share/idl/evolution-data-server-1.0/Evolution-DataServer-Addressbook.idl
 share/idl/evolution-data-server-1.0/Evolution-DataServer-Calendar.idl
 share/idl/evolution-data-server-1.0/Evolution-DataServer.idl
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/en_AU/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/id/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/evolution-data-server-1.5.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/evolution-data-server-1.5.mo
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/en_AU/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/evolution-data-server-1.0.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/evolution-data-server-1.0.mo
 @dirrm share/idl/evolution-data-server-1.0
 @comment in ORBit2: @dirrm share/idl
 @dirrm share/evolution-data-server-1.0/zoneinfo/Pacific
diff --git a/mail/evolution-data-server/distinfo b/mail/evolution-data-server/distinfo
index a98562a1586..d4082558230 100644
--- a/mail/evolution-data-server/distinfo
+++ b/mail/evolution-data-server/distinfo
@@ -1,15 +1,10 @@
-$NetBSD: distinfo,v 1.11 2004/12/11 15:12:29 kristerw Exp $
+$NetBSD: distinfo,v 1.12 2004/12/28 21:48:12 jmmv Exp $
 
-SHA1 (evolution-data-server-1.0.2.tar.bz2) = 9b030961f5c55d9cb9a7fd62cf8913cbeabc09cc
-Size (evolution-data-server-1.0.2.tar.bz2) = 4939846 bytes
+SHA1 (evolution-data-server-1.0.3.tar.bz2) = 3d5c886786e2662016fd4cc4d9b0250a1861bdc8
+Size (evolution-data-server-1.0.3.tar.bz2) = 4869529 bytes
 SHA1 (patch-aa) = 29dbd7446e9f319628f1217cd9dd96a2cb28d2c1
-SHA1 (patch-ab) = b64824194ff4bd6b97745d40afd0f08fae1e4cf7
-SHA1 (patch-ac) = 15bd17cc1a26e00a4d8e3507f387270934c78110
-SHA1 (patch-ad) = 5c41eb12e630461c6ec076a48d4ff06d32d9b110
-SHA1 (patch-ae) = cc12c4a526cb4652d14449929d2779d33396ba45
 SHA1 (patch-af) = 81c1800ab79ff872b83b5a79fad980e119738751
 SHA1 (patch-ag) = 3b98f839509014856240966a0a5f4d56aaeced5c
 SHA1 (patch-ah) = fe05e242d12148f2a29356ada254131482774f35
 SHA1 (patch-ai) = 4031c5d07e8b133e435520359140748a763671a0
 SHA1 (patch-aj) = 3644733e7bf95ce61a1c4c0e7af4a781826a89fb
-SHA1 (patch-ak) = 70c3c7fb857c9b4e972a3ae43f873d07fdc904cb
diff --git a/mail/evolution-data-server/patches/patch-ab b/mail/evolution-data-server/patches/patch-ab
deleted file mode 100644
index d77298b2cf8..00000000000
--- a/mail/evolution-data-server/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/10/19 20:13:44 jmmv Exp $
-
---- src/server.c.orig	2004-10-19 21:26:40.000000000 +0200
-+++ src/server.c
-@@ -32,6 +32,7 @@
- #include <sys/signal.h>
- #include <unistd.h>
- #include <pthread.h>
-+#include <signal.h>
- 
- #include <glib.h>
- #include <libgnome/gnome-init.h>
diff --git a/mail/evolution-data-server/patches/patch-ac b/mail/evolution-data-server/patches/patch-ac
deleted file mode 100644
index dbcafb0c5d1..00000000000
--- a/mail/evolution-data-server/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/10/22 16:03:14 jmmv Exp $
-
---- calendar/libical/configure.orig	2004-10-11 21:08:22.000000000 +0200
-+++ calendar/libical/configure
-@@ -20764,7 +20764,7 @@ fi
- 
- 
- 
--for ac_func in gmtime_r isspace iswspace strdup snprintf
-+for ac_func in gmtime_r isspace iswspace strdup snprintf unsetenv
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/mail/evolution-data-server/patches/patch-ad b/mail/evolution-data-server/patches/patch-ad
deleted file mode 100644
index 36cf15ae59d..00000000000
--- a/mail/evolution-data-server/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/10/22 16:03:14 jmmv Exp $
-
---- calendar/libical/config.h.in.orig	2004-10-11 21:08:23.000000000 +0200
-+++ calendar/libical/config.h.in
-@@ -60,6 +60,9 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
- 
-+/* Define to 1 if you have the `unsetenv' function. */
-+#undef HAVE_UNSETENV
-+
- /* Define to 1 if you have the <wctype.h> header file. */
- #undef HAVE_WCTYPE_H
- 
diff --git a/mail/evolution-data-server/patches/patch-ae b/mail/evolution-data-server/patches/patch-ae
deleted file mode 100644
index fb71c6b36f6..00000000000
--- a/mail/evolution-data-server/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/10/22 16:03:14 jmmv Exp $
-
---- calendar/libical/src/libical/icaltime.c.orig	2004-05-25 11:34:01.000000000 +0200
-+++ calendar/libical/src/libical/icaltime.c
-@@ -334,7 +334,11 @@ void unset_tz(char *tzstr)
-     if(tzstr!=0){
- 	putenv(tzstr);
-     } else {
-+#ifdef HAVE_UNSETENV
-+	unsetenv("TZ"); /* Delete from environment */
-+#else
- 	putenv("TZ"); /* Delete from environment */
-+#endif
-     } 
- 
-     /* Free any previous TZ environment string we have used. */
diff --git a/mail/evolution-data-server/patches/patch-ak b/mail/evolution-data-server/patches/patch-ak
deleted file mode 100644
index 846a75f03e2..00000000000
--- a/mail/evolution-data-server/patches/patch-ak
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/12/11 15:12:29 kristerw Exp $
-
---- libdb/dbinc/mutex.h.orig	2004-12-11 15:29:58.000000000 +0100
-+++ libdb/dbinc/mutex.h	2004-12-11 15:30:37.000000000 +0100
-@@ -729,31 +729,6 @@
- #endif
- 
- /*********************************************************************
-- * amd64/gcc assembly.
-- *********************************************************************/
--#ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
--typedef unsigned char tsl_t;
--
--#ifdef LOAD_ACTUAL_MUTEX_CODE
--/*
-- * For gcc/amd64, 0 is clear, 1 is set.
-- */
--#define  MUTEX_SET(tsl) ({           \
--	register tsl_t *__l = (tsl);          \
--	int __r;              \
--	asm volatile("mov $1,%%rax; lock; xchgb %1,%%al; xor $1,%%rax"\
--		: "=&a" (__r), "=m" (*__l)          \
--		: "1" (*__l)            \
--		);                \
--	__r & 1;              \
--})
--
--#define  MUTEX_UNSET(tsl)  (*(tsl) = 0)
--#define  MUTEX_INIT(tsl)   MUTEX_UNSET(tsl)
--#endif
--#endif
--
--/*********************************************************************
-  * x86_64/gcc assembly.
-  *********************************************************************/
- #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY