Update libical to 1.0.

bugfixes.

6 files changed, 34 insertions, 64 deletions

diff --git a/time/libical/Makefile b/time/libical/Makefile
index cd105684ff5..3f4b40b97dc 100644
--- a/time/libical/Makefile
+++ b/time/libical/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2013/05/31 12:42:24 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/02/01 01:44:52 markd Exp $
 #
 
-DISTNAME=	libical-0.44
-PKGREVISION=	2
+DISTNAME=	libical-1.0
 CATEGORIES=	time
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freeassociation/}
 
@@ -11,9 +10,8 @@ HOMEPAGE=	http://freeassociation.sourceforge.net/
 COMMENT=	Reference implementation of the iCalendar data type and format
 
 USE_TOOLS+=	perl
-USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --without-builtintz
+USE_CMAKE=	yes
+CMAKE_ARGS+= -DUSE_BUILTIN_TZDATA=false
 
 PKGCONFIG_OVERRIDE+=	libical.pc.in
 
@@ -24,7 +22,7 @@ DEPENDS+= zonetab-[0-9]*:../../time/zonetab
 .endif
 
 # C++ is only needed for test
-#USE_LANGUAGES=	c c++
+USE_LANGUAGES=	c c++
 #TEST_TARGET=	check
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/libical/PLIST b/time/libical/PLIST
index b9b4f075407..e3fa3f691e2 100644
--- a/time/libical/PLIST
+++ b/time/libical/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:17:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/02/01 01:44:52 markd Exp $
 include/ical.h
 include/libical/ical.h
 include/libical/icalarray.h
@@ -45,7 +45,16 @@ include/libical/sspm.h
 include/libical/vcaltmp.h
 include/libical/vcc.h
 include/libical/vobject.h
-lib/libical.la
-lib/libicalss.la
-lib/libicalvcal.la
+lib/libical.a
+lib/libical.so
+lib/libical.so.1
+lib/libical.so.1.0.0
+lib/libicalss.a
+lib/libicalss.so
+lib/libicalss.so.1
+lib/libicalss.so.1.0.0
+lib/libicalvcal.a
+lib/libicalvcal.so
+lib/libicalvcal.so.1
+lib/libicalvcal.so.1.0.0
 lib/pkgconfig/libical.pc
diff --git a/time/libical/distinfo b/time/libical/distinfo
index 29aac53a1d2..615bc1d8ba4 100644
--- a/time/libical/distinfo
+++ b/time/libical/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/11/25 21:35:58 joerg Exp $
+$NetBSD: distinfo,v 1.5 2014/02/01 01:44:52 markd Exp $
 
-SHA1 (libical-0.44.tar.gz) = f781150e2d98806e91b7e0bee02abdc6baf9ac7d
-RMD160 (libical-0.44.tar.gz) = 5640ffd3ff01807e49d9090000510c4959218c39
-Size (libical-0.44.tar.gz) = 1149067 bytes
-SHA1 (patch-aa) = 88c6b75e74438785bafed8ae4521b3a8eb613c3d
-SHA1 (patch-ab) = 49e41ed5200ab73b37ac0824cd8b9650053186a3
-SHA1 (patch-as) = 86fc413de3e1e5c858c04099ea530484a6e46a6d
+SHA1 (libical-1.0.tar.gz) = 25c75f6f947edb6347404a958b1444cceeb9f117
+RMD160 (libical-1.0.tar.gz) = 1c78b07c37c80e8fe068fb3164bbf8614f02e67f
+Size (libical-1.0.tar.gz) = 1199483 bytes
+SHA1 (patch-as) = 94243c14ea3f554cd78c92a16b27e6b3b66b9e2d
diff --git a/time/libical/patches/patch-aa b/time/libical/patches/patch-aa
deleted file mode 100644
index 276b5b772d1..00000000000
--- a/time/libical/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/11/25 21:35:59 joerg Exp $
-
---- src/libicalvcal/Makefile.in.orig	2009-11-25 22:31:36.000000000 +0100
-+++ src/libicalvcal/Makefile.in
-@@ -58,7 +58,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
- 	"$(DESTDIR)$(libicalvcalincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libicalvcal_la_DEPENDENCIES = ../libical/.libs/libical.la
-+libicalvcal_la_DEPENDENCIES = ../libical/libical.la
- am__libicalvcal_la_SOURCES_DIST = icalvcal.h icalvcal.c port.h vcc.h \
- 	vobject.h vobject.c vcaltmp.h vcaltmp.c vcc.c vcc.y
- @DEV_FALSE@am__objects_1 = vcc.lo
-@@ -239,7 +239,7 @@ INCLUDES = \
- 	-I$(top_srcdir)/src/libicalss
- 
- libicalvcal_la_LDFLAGS = -version-info 44:0:44
--libicalvcal_la_LIBADD = ../libical/.libs/libical.la
-+libicalvcal_la_LIBADD = ../libical/libical.la
- @DEV_FALSE@libicalvcal_la_DEVSOURCES = vcc.c
- @DEV_TRUE@libicalvcal_la_DEVSOURCES = vcc.y
- libicalvcal_la_SOURCES = \
diff --git a/time/libical/patches/patch-ab b/time/libical/patches/patch-ab
deleted file mode 100644
index d0f5ff35bfd..00000000000
--- a/time/libical/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/11/25 21:35:59 joerg Exp $
-
---- src/libicalvcal/Makefile.am.orig	2009-11-25 22:31:34.000000000 +0100
-+++ src/libicalvcal/Makefile.am
-@@ -12,7 +12,7 @@ INCLUDES =				\
- 	-I$(top_srcdir)/src/libicalss
- 
- libicalvcal_la_LDFLAGS = -version-info 44:0:44
--libicalvcal_la_LIBADD = ../libical/.libs/libical.la
-+libicalvcal_la_LIBADD = ../libical/libical.la
- 
- if DEV
- libicalvcal_la_DEVSOURCES = vcc.y
diff --git a/time/libical/patches/patch-as b/time/libical/patches/patch-as
index e6124f9d413..4b7d4935bd5 100644
--- a/time/libical/patches/patch-as
+++ b/time/libical/patches/patch-as
@@ -1,24 +1,24 @@
-$NetBSD: patch-as,v 1.1 2009/03/19 11:57:48 drochner Exp $
+$NetBSD: patch-as,v 1.2 2014/02/01 01:44:53 markd Exp $
 
---- src/libical/icaltz-util.c.orig	2009-01-08 17:50:21.000000000 +0100
+--- src/libical/icaltz-util.c.orig	2013-04-14 17:24:42.000000000 +0000
 +++ src/libical/icaltz-util.c
-@@ -25,6 +25,7 @@
+@@ -29,6 +29,7 @@
+ #include <stdint.h>
  #endif
- #include <string.h>
  
 +#if 0 /* XXX see below */
  #if defined(sun) && defined(__SVR4)
+ #include <sys/types.h>
  #include <sys/byteorder.h>
- #else
-@@ -43,6 +44,7 @@
- #  include <endian.h>
- # endif 
+@@ -49,6 +50,7 @@
+ # endif
+ # endif
  #endif
 +#endif
  
- #ifdef WIN32
+ #ifdef _MSC_VER
  #if !defined(HAVE_BYTESWAP_H) && !defined(HAVE_SYS_ENDIAN_H) && !defined(HAVE_ENDIAN_H)
-@@ -128,6 +130,7 @@ extern const char *ical_tzid_prefix;
+@@ -140,6 +142,7 @@ extern const char *ical_tzid_prefix;
  static int
  decode (const void *ptr)
  {
@@ -26,7 +26,7 @@ $NetBSD: patch-as,v 1.1 2009/03/19 11:57:48 drochner Exp $
  #if defined(sun) && defined(__SVR4)
      if (sizeof (int) == 4)
  #ifdef _BIG_ENDIAN
-@@ -142,9 +145,10 @@ decode (const void *ptr)
+@@ -154,9 +157,10 @@ decode (const void *ptr)
          return bswap_32 (*(const int *) ptr);
  #endif
  	else