diff options
| author | drochner <drochner> | 2009-03-19 11:57:48 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2009-03-19 11:57:48 +0000 |
| commit | 9733a8b3e53918df4df1a3bd3a4676fe323b407e (patch) | |
| tree | afa5a1e009d080c5ef805936d230ab639acc3759 /time | |
| parent | 9995a3e3c1c1b04d3ac5dae79c61621336112f65 (diff) | |
| download | pkgsrc-9733a8b3e53918df4df1a3bd3a4676fe323b407e.tar.gz | |
update to 0.43
changes: fixes from evolution
pkgsrc change: pull in a portability patch from evolution-data-server,
depend on zone.tab
Diffstat (limited to 'time')
| -rw-r--r-- | time/libical/Makefile | 10 | ||||
| -rw-r--r-- | time/libical/distinfo | 9 | ||||
| -rw-r--r-- | time/libical/patches/patch-as | 40 |
3 files changed, 53 insertions, 6 deletions
diff --git a/time/libical/Makefile b/time/libical/Makefile index 80711b66854..67b05122135 100644 --- a/time/libical/Makefile +++ b/time/libical/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/12/19 21:48:05 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/03/19 11:57:48 drochner Exp $ # -DISTNAME= libical-0.42 +DISTNAME= libical-0.43 CATEGORIES= time MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freeassociation/} @@ -17,4 +17,10 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= libical.pc.in +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "NetBSD" +# zone.tab file in /usr/share/zoneinfo +DEPENDS+= zonetab-[0-9]*:../../time/zonetab +.endif + .include "../../mk/bsd.pkg.mk" diff --git a/time/libical/distinfo b/time/libical/distinfo index ad88c8e8cb6..bbd12b5c3e1 100644 --- a/time/libical/distinfo +++ b/time/libical/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/12/19 21:48:05 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/03/19 11:57:48 drochner Exp $ -SHA1 (libical-0.42.tar.gz) = 8b6654c714b0193e4496a55427803c969c9cb5e1 -RMD160 (libical-0.42.tar.gz) = 71544a562a4244bec7f62669bdbf280591c0b253 -Size (libical-0.42.tar.gz) = 1145477 bytes +SHA1 (libical-0.43.tar.gz) = a972fa876b3b9834a6e8102b7e2a670f73091cdf +RMD160 (libical-0.43.tar.gz) = a0a79aec38970c5d694a3e9065a4cb7746b31fea +Size (libical-0.43.tar.gz) = 1145724 bytes +SHA1 (patch-as) = 86fc413de3e1e5c858c04099ea530484a6e46a6d diff --git a/time/libical/patches/patch-as b/time/libical/patches/patch-as new file mode 100644 index 00000000000..e6124f9d413 --- /dev/null +++ b/time/libical/patches/patch-as @@ -0,0 +1,40 @@ +$NetBSD: patch-as,v 1.1 2009/03/19 11:57:48 drochner Exp $ + +--- src/libical/icaltz-util.c.orig 2009-01-08 17:50:21.000000000 +0100 ++++ src/libical/icaltz-util.c +@@ -25,6 +25,7 @@ + #endif + #include <string.h> + ++#if 0 /* XXX see below */ + #if defined(sun) && defined(__SVR4) + #include <sys/byteorder.h> + #else +@@ -43,6 +44,7 @@ + # include <endian.h> + # endif + #endif ++#endif + + #ifdef WIN32 + #if !defined(HAVE_BYTESWAP_H) && !defined(HAVE_SYS_ENDIAN_H) && !defined(HAVE_ENDIAN_H) +@@ -128,6 +130,7 @@ extern const char *ical_tzid_prefix; + static int + decode (const void *ptr) + { ++#if 0 /* XXX nonportable, possibly alignment problems */ + #if defined(sun) && defined(__SVR4) + if (sizeof (int) == 4) + #ifdef _BIG_ENDIAN +@@ -142,9 +145,10 @@ decode (const void *ptr) + return bswap_32 (*(const int *) ptr); + #endif + else ++#endif + { + const unsigned char *p = ptr; +- int result = *p & (1 << (CHAR_BIT - 1)) ? ~0 : 0; ++ unsigned int result = *p & (1 << (CHAR_BIT - 1)) ? ~0 : 0; + + result = (result << 8) | *p++; + result = (result << 8) | *p++; |