[pkgsrc/trunk]: pkgsrc/mail/evolution Use get_local_offset() instead of timez...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/84ecc1ce2ca3
branches:  trunk
changeset: 519762:84ecc1ce2ca3
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Oct 09 11:34:09 2006 +0000

description:
Use get_local_offset() instead of timezone as external symbol.
The latter conflicts with timezone(3) at leat on DragonFly and
FreeBSD. Bump revision.

diffstat:

 mail/evolution/Makefile         |   4 ++--
 mail/evolution/distinfo         |   3 ++-
 mail/evolution/patches/patch-aa |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r 7292469e15a6 -r 84ecc1ce2ca3 mail/evolution/Makefile
--- a/mail/evolution/Makefile   Mon Oct 09 10:54:12 2006 +0000
+++ b/mail/evolution/Makefile   Mon Oct 09 11:34:09 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.114 2006/09/16 12:20:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.115 2006/10/09 11:34:09 joerg Exp $
 
 DISTNAME=              evolution-2.8.0
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            mail time gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/evolution/2.8/}
 EXTRACT_SUFX=          .tar.bz2
diff -r 7292469e15a6 -r 84ecc1ce2ca3 mail/evolution/distinfo
--- a/mail/evolution/distinfo   Mon Oct 09 10:54:12 2006 +0000
+++ b/mail/evolution/distinfo   Mon Oct 09 11:34:09 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.46 2006/09/15 15:24:57 jmmv Exp $
+$NetBSD: distinfo,v 1.47 2006/10/09 11:34:09 joerg Exp $
 
 SHA1 (evolution-2.8.0.tar.bz2) = 0da65a3de84e60d0e41265607c7c7fcec18fe072
 RMD160 (evolution-2.8.0.tar.bz2) = ba73d9529a02f2ea6db8c8f2c7da3041276e1d5c
 Size (evolution-2.8.0.tar.bz2) = 12821926 bytes
+SHA1 (patch-aa) = 7f6478813462095996fa22ffd347893773e5cf35
 SHA1 (patch-ab) = 871a322eefd1a42e7197da764d49cd1d24f6535d
diff -r 7292469e15a6 -r 84ecc1ce2ca3 mail/evolution/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/evolution/patches/patch-aa   Mon Oct 09 11:34:09 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.22 2006/10/09 11:34:09 joerg Exp $
+
+--- widgets/e-timezone-dialog/e-timezone-dialog.c.orig 2006-09-21 19:22:45.000000000 +0000
++++ widgets/e-timezone-dialog/e-timezone-dialog.c
+@@ -80,8 +80,6 @@ struct _ETimezoneDialogPrivate {
+ 
+ #ifndef G_OS_WIN32 /* Declared properly in time.h already */
+ extern char *tzname[2];
+-extern long timezone;
+-extern int daylight;
+ #endif
+ 
+ static void e_timezone_dialog_class_init      (ETimezoneDialogClass *class);
+@@ -324,7 +322,7 @@ get_local_timezone()
+       icaltimezone *zone;
+       
+       tzset();
+-      zone =  icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]);
++      zone =  icaltimezone_get_builtin_timezone_from_offset (-get_local_offset(), tzname[0]);
+ 
+       return zone;
+ }