libical: Update to 3.0.9

Version 3.0.9 is a patch release.
This release is binary and source compatible with version 3.0.0.
Note that the libical-glib library is considered unstable; therefore not binary compatible with previous releases

Release Notes:

- Add support for empty parameters, e.g. CN=""
- Accept VTIMEZONE with more than one X- property
- Several fixes for recurrences containing BYWEEKNO
- icalrecurrencetype_from_string() will reject any RRULE that contains a rule-part that occurs more than once
- Improve thread safety
- Fix compiled-in path for the built-in timezone data
- Fix reading TZif files with empty v1 data (use v2+ whenever possible)
- Add backwards compatibility for previous TZIDs
- Built-in timezones updated to tzdata2020d
- Fix build with newer libicu
- Fix cross-compile support in libical-glib

7 files changed, 28 insertions, 90 deletions

diff --git a/time/libical/Makefile b/time/libical/Makefile
index 2eb40a92ff9..78dc11a0e7e 100644
--- a/time/libical/Makefile
+++ b/time/libical/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.32 2020/11/07 09:06:32 mef Exp $
+# $NetBSD: Makefile,v 1.33 2021/03/19 10:45:31 nia Exp $
 
-DISTNAME=	libical-3.0.8
-PKGREVISION=	3
+DISTNAME=	libical-3.0.9
 CATEGORIES=	time
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libical/}
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/libical/libical/
+HOMEPAGE=	https://github.com/libical/libical
 COMMENT=	Reference implementation of the iCalendar data type and format
 LICENSE=	gnu-lgpl-v2.1 OR mpl-2.0
 
diff --git a/time/libical/PLIST b/time/libical/PLIST
index a9cd59215e3..4082eb92395 100644
--- a/time/libical/PLIST
+++ b/time/libical/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2019/11/02 20:55:46 nia Exp $
+@comment $NetBSD: PLIST,v 1.7 2021/03/19 10:45:31 nia Exp $
 include/libical-glib/i-cal-array.h
 include/libical-glib/i-cal-attach.h
 include/libical-glib/i-cal-comp-iter.h
@@ -84,6 +84,8 @@ include/libical/vcaltmp.h
 include/libical/vcc.h
 include/libical/vcomponent_cxx.h
 include/libical/vobject.h
+lib/cmake/LibIcal/IcalGlibSrcGenerator-noconfig.cmake
+lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake
 lib/cmake/LibIcal/LibIcalConfig.cmake
 lib/cmake/LibIcal/LibIcalConfigVersion.cmake
 lib/cmake/LibIcal/LibIcalTargets-noconfig.cmake
@@ -114,3 +116,4 @@ lib/libicalvcal.so.3
 lib/libicalvcal.so.${PKGVERSION}
 lib/pkgconfig/libical-glib.pc
 lib/pkgconfig/libical.pc
+libexec/libical/ical-glib-src-generator
diff --git a/time/libical/distinfo b/time/libical/distinfo
index df6938844cd..61f6a4fd726 100644
--- a/time/libical/distinfo
+++ b/time/libical/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.15 2020/11/07 10:30:20 nia Exp $
+$NetBSD: distinfo,v 1.16 2021/03/19 10:45:31 nia Exp $
 
-SHA1 (libical-3.0.8.tar.gz) = d2a9cecb9b8d825d5b6989e44b424235a27173a7
-RMD160 (libical-3.0.8.tar.gz) = 1b5fa93675e74e6721107214202ab922fd5a164c
-SHA512 (libical-3.0.8.tar.gz) = ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
-Size (libical-3.0.8.tar.gz) = 881462 bytes
-SHA1 (patch-ConfigureChecks.cmake) = fe6d75c6217a303aefb6aaaef1d6f1eca883bc75
-SHA1 (patch-config.h.cmake) = ae5ae3dd64a0fddf4929d925627412b04852975e
-SHA1 (patch-src_libical_icalrecur.c) = bca2a5ce3868522aacbe7f59a43283063b0c91b0
-SHA1 (patch-src_libical_icaltz-util.c) = eb3b6d1d63faf138897968d4e2c4ee8da4ada15a
+SHA1 (libical-3.0.9.tar.gz) = 2b0eb28c1ad215bfb6c4f7c25249f6f2864976a7
+RMD160 (libical-3.0.9.tar.gz) = 5db92874e3d23a5ee99b40d809c44fcb105c9282
+SHA512 (libical-3.0.9.tar.gz) = 4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268
+Size (libical-3.0.9.tar.gz) = 886500 bytes
+SHA1 (patch-src_libical_icaltz-util.c) = 3dd41fa9d3ea99d4821219e425a65b5249c1b060
diff --git a/time/libical/patches/patch-ConfigureChecks.cmake b/time/libical/patches/patch-ConfigureChecks.cmake
deleted file mode 100644
index 19f9b49d085..00000000000
--- a/time/libical/patches/patch-ConfigureChecks.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ConfigureChecks.cmake,v 1.1 2020/11/07 10:30:20 nia Exp $
-
-[PATCH] Fix build with icu-68.1
-
-https://github.com/libical/libical/commit/a3308a23912bba2db654a8c456165c31888cc897.patch
-
---- ConfigureChecks.cmake.orig	2020-03-07 14:42:42.000000000 +0000
-+++ ConfigureChecks.cmake
-@@ -10,6 +10,7 @@ check_include_files(sys/utsname.h HAVE_S
- check_include_files(fcntl.h HAVE_FCNTL_H)
- check_include_files(unistd.h HAVE_UNISTD_H)
- check_include_files(wctype.h HAVE_WCTYPE_H)
-+check_include_files(stdbool.h HAVE_STDBOOL_H)
- 
- include(CheckFunctionExists)
- if(WIN32 AND MSVC)
diff --git a/time/libical/patches/patch-config.h.cmake b/time/libical/patches/patch-config.h.cmake
deleted file mode 100644
index 09333abed61..00000000000
--- a/time/libical/patches/patch-config.h.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-config.h.cmake,v 1.1 2020/11/07 10:30:20 nia Exp $
-
-[PATCH] Fix build with icu-68.1
-
-https://github.com/libical/libical/commit/a3308a23912bba2db654a8c456165c31888cc897.patch
-
---- config.h.cmake.orig	2020-03-07 14:42:42.000000000 +0000
-+++ config.h.cmake
-@@ -39,6 +39,9 @@
- /* Define to 1 if you have the <dirent.h> header file. */
- #cmakedefine HAVE_DIRENT_H 1
- 
-+/* Define to 1 if you have the <stdbool.h> header file. */
-+#cmakedefine HAVE_STDBOOL_H 1
-+
- /* Define if we have pthread. */
- #cmakedefine HAVE_PTHREAD_ATTR_GET_NP 1
- #cmakedefine HAVE_PTHREAD_GETATTR_NP 1
diff --git a/time/libical/patches/patch-src_libical_icalrecur.c b/time/libical/patches/patch-src_libical_icalrecur.c
deleted file mode 100644
index 1650512081e..00000000000
--- a/time/libical/patches/patch-src_libical_icalrecur.c
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-src_libical_icalrecur.c,v 1.2 2020/11/07 10:30:20 nia Exp $
-
-[PATCH] Fix build with icu-68.1
-
-https://github.com/libical/libical/commit/a3308a23912bba2db654a8c456165c31888cc897.patch
-
---- src/libical/icalrecur.c.orig	2020-03-07 14:42:42.000000000 +0000
-+++ src/libical/icalrecur.c
-@@ -145,6 +145,12 @@
- #if defined(HAVE_LIBICU)
- #include <unicode/ucal.h>
- #include <unicode/ustring.h>
-+#if defined(HAVE_STDBOOL_H)
-+#include <stdbool.h>
-+#else
-+#define false 0
-+#define true 1
-+#endif
- #define RSCALE_IS_SUPPORTED 1
- #else
- #define RSCALE_IS_SUPPORTED 0
-@@ -1018,7 +1024,7 @@ icalarray *icalrecurrencetype_rscale_sup
- 
-     calendars = icalarray_new(sizeof(const char **), 20);
- 
--    en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
-+    en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
-     while ((cal = uenum_next(en, NULL, &status))) {
-         cal = icalmemory_tmp_copy(cal);
-         icalarray_append(calendars, &cal);
-@@ -1411,7 +1417,7 @@ static int initialize_rscale(icalrecur_i
-         }
- 
-         /* Check if specified calendar is supported */
--        en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
-+        en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
-         while ((cal = uenum_next(en, NULL, &status))) {
-             if (!strcmp(cal, rule.rscale)) {
-                 is_hebrew = !strcmp(rule.rscale, "hebrew");
diff --git a/time/libical/patches/patch-src_libical_icaltz-util.c b/time/libical/patches/patch-src_libical_icaltz-util.c
index ef80aa1a65c..2152a4b7f8e 100644
--- a/time/libical/patches/patch-src_libical_icaltz-util.c
+++ b/time/libical/patches/patch-src_libical_icaltz-util.c
@@ -1,17 +1,29 @@
-$NetBSD: patch-src_libical_icaltz-util.c,v 1.4 2020/05/19 15:33:10 nia Exp $
+$NetBSD: patch-src_libical_icaltz-util.c,v 1.5 2021/03/19 10:45:31 nia Exp $
 
 Define bswap_32 on NetBSD
 
---- src/libical/icaltz-util.c.orig	2020-03-07 14:42:42.000000000 +0000
+--- src/libical/icaltz-util.c.orig	2021-01-16 14:19:41.000000000 +0000
 +++ src/libical/icaltz-util.c
-@@ -49,6 +49,10 @@
+@@ -42,6 +42,7 @@
+ #include <sys/endian.h>
+ #if defined(bswap32)
+ #define bswap_32 bswap32
++#define bswap_64 bswap64
+ #else
+ #define bswap_32 swap32
+ #endif
+@@ -49,8 +50,14 @@
  #endif
  #endif
  
 +#if defined(__NetBSD__) && !defined(bswap_32)
 +#define bswap_32 bswap32
++#define bswap_64 bswap64
 +#endif
 +
  #if defined(__OpenBSD__) && !defined(bswap_32)
  #define bswap_32 swap32
++#define bswap_64 swap64
  #endif
+ 
+ #if defined(_MSC_VER)