Use unsetenv(3) instead of putenv(3) to clear the 'TZ' variable from the

environment (affects the libical library).  The later does not really remove
it under NetBSD (only leaves it blank), thus making programs get the wrong
timezone (always UTC).

This problem exposes, for example, in the GNOME Clock applet.  The time is
fine until you open the calendar (clicking on the applet).  After that, the
clock is converted to UTC and there is no way to reverse it, other than
killing the running process (i.e., starting over with a clean environment).

Bump PKGREVISION to 2.

5 files changed, 49 insertions, 3 deletions

diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index a558d9173bf..3ee829990ec 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/10/19 20:13:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/10/22 16:03:14 jmmv Exp $
 #
 
 DISTNAME=	evolution-data-server-1.0.2
-PKGREVISION=	1
+PKGREVISION=	2
 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/distinfo b/mail/evolution-data-server/distinfo
index 28339ac67e8..a78926f1407 100644
--- a/mail/evolution-data-server/distinfo
+++ b/mail/evolution-data-server/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.8 2004/10/19 20:13:44 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2004/10/22 16:03:14 jmmv Exp $
 
 SHA1 (evolution-data-server-1.0.2.tar.bz2) = 9b030961f5c55d9cb9a7fd62cf8913cbeabc09cc
 Size (evolution-data-server-1.0.2.tar.bz2) = 4939846 bytes
 SHA1 (patch-aa) = 29dbd7446e9f319628f1217cd9dd96a2cb28d2c1
 SHA1 (patch-ab) = b64824194ff4bd6b97745d40afd0f08fae1e4cf7
+SHA1 (patch-ac) = 15bd17cc1a26e00a4d8e3507f387270934c78110
+SHA1 (patch-ad) = 5c41eb12e630461c6ec076a48d4ff06d32d9b110
+SHA1 (patch-ae) = cc12c4a526cb4652d14449929d2779d33396ba45
diff --git a/mail/evolution-data-server/patches/patch-ac b/mail/evolution-data-server/patches/patch-ac
new file mode 100644
index 00000000000..dbcafb0c5d1
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-ac
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..36cf15ae59d
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-ad
@@ -0,0 +1,14 @@
+$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
new file mode 100644
index 00000000000..fb71c6b36f6
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-ae
@@ -0,0 +1,16 @@
+$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. */