libical: update to 3.0.3

Version 3.0.3:
--------------
 * VTODO COMPLETED property can be a DATE-TIME or DATE (for backward compatibility)
 * Improved recurrence iteration

Version 3.0.2:
--------------
 * No longer attempt to detect the need for -DUSE_32BIT_TIME_T with MSVC
 * New CMake option ICAL_BUILD_DOCS which can be used to disable the docs target
 * Fix threading hang in BSD type systems (OpenBSD, MacOS,...)
 * Build with Ninja improvements

Version 3.0.1:
--------------
 * Built-in timezones updated to tzdata2017c
 * Fix a multi-threaded deadlock in icaltimezone_load_builtin_timezone()
 * Fix a CMake problem with parallel builds

Version 3.0.0:
--------------
 * Relicense from MPL 1.0 to MPL 2.0 (keep dual license for LGPL v2.1)
 * Requires CMake v3.1.0 or higher along with various CMake and buildsystem fixes
 * Added a 'make uninstall'
 * Fixed use-after-free issues and some memory leaks
 * Built-in timezones updated to tzdata2017b
 * More accurate VTIMEZONE generation when using the system time zone data (when
   USE_BUILTIN_TZDATA=False)
 * icalvalue_as_ical_string() returns "TRUE" (non-zero) or "FALSE" (zero) values only.
 * New icalvalue.h convenience macros: ICAL_BOOLEAN_TRUE and ICAL_BOOLEAN_FALSE
 * Better value type checking of property values when parsing
 * icalvalue_new/set_date and icalvalue_new/set_datetime now enforce DATE and DATE-TIME
   values respectively
 * draft-ietf-calext-extensions (RFC 7986) support added
 * Parameter values are now en/decoded per RFC 6868
 * Removed is_utc from icaltimetype struct
    * Set icaltimetype.zone to icaltimezone_get_utc_timezone() to change a time to UTC
    * Use icaltime_is_utc() to check if a time is in UTC
 * Added support for VPATCH component
 * New publicly available functions:
     + icalproperty_set_parent (icalproperty_get_parent was already public)
     + icalvalue_get_parent (icalvalue_set_parent was already public)
     + icalparameter_set_parent
     + icalparameter_get_parent
     + icalvalue_new_datetimedate (DATE or DATE-TIME)
     + icalvalue_set_datetimedate
     + icalvalue_get_datetimedate
     + icalrecur_iterator_set_start
     + icalcomponent_normalize()
     + icalproperty_normalize()
 * Removed deprecated functions:
    + icaltime_from_timet (use icaltime_from_timet_with_zone)
    + icaltime_start_day_of_week (use icaltime_start_day_week)
    + icalproperty_remove_parameter (use icalproperty_remove_parameter_by_kind)
    + icalproperty_string_to_enum (use icalproperty_kind_and_string_to_enum)
 * Signature changed for functions:
    + VObject *Parse_MIME_FromFileName(const char *fname)
    + icalgauge *icalgauge_new_from_sql(const char *sql, int expand)
    + const char *icallangbind_property_eval_string(icalproperty *prop, const char *sep)
    + const char *icallangbind_property_eval_string_r(icalproperty *prop, const char *sep)
    + void set_zone_directory(const char *path)
    + icalcalendar *icalcalendar_new(const char *dir)
    + int icalrecur_expand_recurrence(const char *rule, time_t start, int count, time_t *array)

Version 2.0.0:
--------------
 * WARNING: Version 2 IS NOT Binary Compatible with Older Versions
 * Version 2 is Source Compatible with Older Versions
 * Lots of source code scrubbing
 * [New] RSCALE support (requires libicu from http://www.icu-project.org)
 * [New] CalDAV attachment support (draft-ietf-calext-caldav-attachments)
 * [New] Resurrect the Berkeley DB storage support
 * [Bug] issue83: Incorrect recurrence generation for weekly pattern
 * Handle RRULEs better
 * Handle threading better

6 files changed, 107 insertions, 64 deletions

diff --git a/time/libical/Makefile b/time/libical/Makefile
index 20350a22fdc..2dbca20f9e3 100644
--- a/time/libical/Makefile
+++ b/time/libical/Makefile
@@ -1,22 +1,23 @@
-# $NetBSD: Makefile,v 1.14 2016/07/09 06:39:08 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2018/04/25 05:51:20 markd Exp $
 #
 
-DISTNAME=	libical-1.0
-PKGREVISION=	3
+DISTNAME=	libical-3.0.3
 CATEGORIES=	time
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freeassociation/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=libical/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://freeassociation.sourceforge.net/
+HOMEPAGE=	https://github.com/libical/libical/
 COMMENT=	Reference implementation of the iCalendar data type and format
-LICENSE=	gnu-lgpl-v2.1 OR mpl-1.0
+LICENSE=	gnu-lgpl-v2.1 OR mpl-2.0
 
-USE_TOOLS+=	perl
+USE_TOOLS+=	perl pkg-config
 USE_CMAKE=	yes
 CMAKE_ARGS+= -DUSE_BUILTIN_TZDATA=false
+CMAKE_ARGS+= -DICAL_BUILD_DOCS=false
 MAKE_JOBS_SAFE=	no
 
-PKGCONFIG_OVERRIDE+=	libical.pc.in
+PKGCONFIG_OVERRIDE+=	libical.pc.in src/libical-glib/libical-glib.pc.in
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD"
@@ -28,5 +29,8 @@ DEPENDS+= zonetab-[0-9]*:../../time/zonetab
 USE_LANGUAGES=	c c++
 #TEST_TARGET=	check
 
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/libical/PLIST b/time/libical/PLIST
index e3fa3f691e2..c2ce2df0f2f 100644
--- a/time/libical/PLIST
+++ b/time/libical/PLIST
@@ -1,5 +1,40 @@
-@comment $NetBSD: PLIST,v 1.4 2014/02/01 01:44:52 markd Exp $
-include/ical.h
+@comment $NetBSD: PLIST,v 1.5 2018/04/25 05:51:20 markd Exp $
+include/libical-glib/i-cal-array.h
+include/libical-glib/i-cal-attach.h
+include/libical-glib/i-cal-comp-iter.h
+include/libical-glib/i-cal-component.h
+include/libical-glib/i-cal-datetimeperiod-type.h
+include/libical-glib/i-cal-derived-parameter.h
+include/libical-glib/i-cal-derived-property.h
+include/libical-glib/i-cal-derived-value.h
+include/libical-glib/i-cal-duration-type.h
+include/libical-glib/i-cal-enums.h
+include/libical-glib/i-cal-error.h
+include/libical-glib/i-cal-forward-declarations.h
+include/libical-glib/i-cal-geo-type.h
+include/libical-glib/i-cal-langbind.h
+include/libical-glib/i-cal-memory.h
+include/libical-glib/i-cal-mime.h
+include/libical-glib/i-cal-object.h
+include/libical-glib/i-cal-parameter.h
+include/libical-glib/i-cal-parser.h
+include/libical-glib/i-cal-period-type.h
+include/libical-glib/i-cal-property.h
+include/libical-glib/i-cal-recur-iterator.h
+include/libical-glib/i-cal-recur.h
+include/libical-glib/i-cal-recurrence-type.h
+include/libical-glib/i-cal-reqstat-type.h
+include/libical-glib/i-cal-restriction.h
+include/libical-glib/i-cal-time-span.h
+include/libical-glib/i-cal-time.h
+include/libical-glib/i-cal-timetype.h
+include/libical-glib/i-cal-timezone-phase.h
+include/libical-glib/i-cal-timezone.h
+include/libical-glib/i-cal-timezonetype.h
+include/libical-glib/i-cal-trigger-type.h
+include/libical-glib/i-cal-unknowntokenhandling.h
+include/libical-glib/i-cal-value.h
+include/libical-glib/libical-glib.h
 include/libical/ical.h
 include/libical/icalarray.h
 include/libical/icalattach.h
@@ -24,13 +59,16 @@ include/libical/icalmemory.h
 include/libical/icalmessage.h
 include/libical/icalmime.h
 include/libical/icalparameter.h
+include/libical/icalparameter_cxx.h
 include/libical/icalparser.h
 include/libical/icalperiod.h
 include/libical/icalproperty.h
+include/libical/icalproperty_cxx.h
 include/libical/icalrecur.h
 include/libical/icalrestriction.h
 include/libical/icalset.h
 include/libical/icalspanlist.h
+include/libical/icalspanlist_cxx.h
 include/libical/icalss.h
 include/libical/icalssyacc.h
 include/libical/icaltime.h
@@ -38,23 +76,45 @@ include/libical/icaltimezone.h
 include/libical/icaltypes.h
 include/libical/icaltz-util.h
 include/libical/icalvalue.h
+include/libical/icalvalue_cxx.h
 include/libical/icalvcal.h
-include/libical/port.h
+include/libical/icptrholder_cxx.h
+include/libical/libical_ical_export.h
+include/libical/libical_icalss_export.h
+include/libical/libical_vcal_export.h
 include/libical/pvl.h
 include/libical/sspm.h
 include/libical/vcaltmp.h
 include/libical/vcc.h
+include/libical/vcomponent_cxx.h
 include/libical/vobject.h
+lib/cmake/LibIcal/LibIcalConfig.cmake
+lib/cmake/LibIcal/LibIcalConfigVersion.cmake
+lib/cmake/LibIcal/LibIcalTargets-noconfig.cmake
+lib/cmake/LibIcal/LibIcalTargets.cmake
+lib/libical-glib.a
+lib/libical-glib.so
+lib/libical-glib.so.3
+lib/libical-glib.so.${PKGVERSION}
 lib/libical.a
 lib/libical.so
-lib/libical.so.1
-lib/libical.so.1.0.0
+lib/libical.so.3
+lib/libical.so.${PKGVERSION}
+lib/libical_cxx.a
+lib/libical_cxx.so
+lib/libical_cxx.so.3
+lib/libical_cxx.so.${PKGVERSION}
 lib/libicalss.a
 lib/libicalss.so
-lib/libicalss.so.1
-lib/libicalss.so.1.0.0
+lib/libicalss.so.3
+lib/libicalss.so.${PKGVERSION}
+lib/libicalss_cxx.a
+lib/libicalss_cxx.so
+lib/libicalss_cxx.so.3
+lib/libicalss_cxx.so.${PKGVERSION}
 lib/libicalvcal.a
 lib/libicalvcal.so
-lib/libicalvcal.so.1
-lib/libicalvcal.so.1.0.0
+lib/libicalvcal.so.3
+lib/libicalvcal.so.${PKGVERSION}
+lib/pkgconfig/libical-glib.pc
 lib/pkgconfig/libical.pc
diff --git a/time/libical/buildlink3.mk b/time/libical/buildlink3.mk
index 11457565f1d..30c5149a5da 100644
--- a/time/libical/buildlink3.mk
+++ b/time/libical/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/04/25 05:51:20 markd Exp $
 
 BUILDLINK_TREE+=	libical
 
@@ -6,7 +6,10 @@ BUILDLINK_TREE+=	libical
 LIBICAL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libical+=	libical>=0.42
+BUILDLINK_ABI_DEPENDS.libical+=	libical>=3.0.3
 BUILDLINK_PKGSRCDIR.libical?=	../../time/libical
+
+.include "../../textproc/icu/buildlink3.mk"
 .endif # LIBICAL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libical
diff --git a/time/libical/distinfo b/time/libical/distinfo
index 490715c59b9..82f83b3bf93 100644
--- a/time/libical/distinfo
+++ b/time/libical/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/02 23:31:37 agc Exp $
+$NetBSD: distinfo,v 1.7 2018/04/25 05:51:20 markd Exp $
 
-SHA1 (libical-1.0.tar.gz) = 25c75f6f947edb6347404a958b1444cceeb9f117
-RMD160 (libical-1.0.tar.gz) = 1c78b07c37c80e8fe068fb3164bbf8614f02e67f
-SHA512 (libical-1.0.tar.gz) = 4764b08c9a57e867884aae4eb9b9dce53df7abebbbde7190caf4d62bdb223eed57945ac8233029b1d253afc173437363264ce8f75ccbfb2af0bb64dafdd3cec4
-Size (libical-1.0.tar.gz) = 1199483 bytes
-SHA1 (patch-as) = 94243c14ea3f554cd78c92a16b27e6b3b66b9e2d
+SHA1 (libical-3.0.3.tar.gz) = 3ca0c859de22cf05e87f8139499ab1e3d8dd1d00
+RMD160 (libical-3.0.3.tar.gz) = 83960fbd48def56f9e5d4c472d637e210066303a
+SHA512 (libical-3.0.3.tar.gz) = 319a9e02b34835eb222728cb691b18e4f490b21f7faa55d266f298c07dafb5e15a492fb2105e2c3ab6d60d2affcf430b5b248cc38abc1e3bc29143662676fe70
+Size (libical-3.0.3.tar.gz) = 866624 bytes
+SHA1 (patch-src_libical_icaltz-util.c) = 4e3dcf8298586b3477a3961409be81cd7a743788
diff --git a/time/libical/patches/patch-as b/time/libical/patches/patch-as
deleted file mode 100644
index 4b7d4935bd5..00000000000
--- a/time/libical/patches/patch-as
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-as,v 1.2 2014/02/01 01:44:53 markd Exp $
-
---- src/libical/icaltz-util.c.orig	2013-04-14 17:24:42.000000000 +0000
-+++ src/libical/icaltz-util.c
-@@ -29,6 +29,7 @@
- #include <stdint.h>
- #endif
- 
-+#if 0 /* XXX see below */
- #if defined(sun) && defined(__SVR4)
- #include <sys/types.h>
- #include <sys/byteorder.h>
-@@ -49,6 +50,7 @@
- # endif
- # endif
- #endif
-+#endif
- 
- #ifdef _MSC_VER
- #if !defined(HAVE_BYTESWAP_H) && !defined(HAVE_SYS_ENDIAN_H) && !defined(HAVE_ENDIAN_H)
-@@ -140,6 +142,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
-@@ -154,9 +157,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++;
diff --git a/time/libical/patches/patch-src_libical_icaltz-util.c b/time/libical/patches/patch-src_libical_icaltz-util.c
new file mode 100644
index 00000000000..1999b6b648e
--- /dev/null
+++ b/time/libical/patches/patch-src_libical_icaltz-util.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_libical_icaltz-util.c,v 1.1 2018/04/25 05:51:20 markd Exp $
+
+Define bswap_32 on NetBSD
+
+--- src/libical/icaltz-util.c.orig	2018-02-27 15:34:25.000000000 +0000
++++ src/libical/icaltz-util.c
+@@ -48,6 +48,9 @@
+ #endif
+ #endif
+ 
++#if defined(__NetBSD__) && !defined(bswap_32)
++#define bswap_32 bswap32
++#endif
+ #if defined(__OpenBSD__) && !defined(bswap_32)
+ #define bswap_32 swap32
+ #endif