ical: update to 3.0.3

Fixes for tcl 8.6 and gcc 6+

14 files changed, 9 insertions, 186 deletions

diff --git a/time/ical/Makefile b/time/ical/Makefile
index c843a55c5c4..caae4b502f2 100644
--- a/time/ical/Makefile
+++ b/time/ical/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2018/03/12 11:17:41 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2018/11/08 05:32:23 markd Exp $
 
-DISTNAME=	ical-3.0.2
-PKGREVISION=	7
+DISTNAME=	ical-3.0.3
 CATEGORIES=	time
 MASTER_SITES=	https://launchpad.net/ical-tcl/3.x/${PKGVERSION_NOREV}/+download/
 
diff --git a/time/ical/distinfo b/time/ical/distinfo
index 24277307cd7..664610c367d 100644
--- a/time/ical/distinfo
+++ b/time/ical/distinfo
@@ -1,18 +1,7 @@
-$NetBSD: distinfo,v 1.14 2018/02/18 23:50:36 he Exp $
+$NetBSD: distinfo,v 1.15 2018/11/08 05:32:23 markd Exp $
 
-SHA1 (ical-3.0.2.tar.gz) = 8a0c2f132979320cb2c24b187cb7238698161e5d
-RMD160 (ical-3.0.2.tar.gz) = e66326edf0cc562e601770959df3a415126ae8c5
-SHA512 (ical-3.0.2.tar.gz) = 6ce7f2d49133c246c6f792203a7a494bcec6d55eb59fac43b6610bc97d0fdbf44cbfa230014241ede581ceb10047d10320fd1a119587d7ba6693ab69b0c7c938
-Size (ical-3.0.2.tar.gz) = 308788 bytes
-SHA1 (patch-bitmaps_dleft.xbm) = 06259c3088efd7f99788b8c1fce15c6e429de59e
-SHA1 (patch-bitmaps_done.xbm) = 5c47063e18725d7c5d2af5f63e626b28db099640
-SHA1 (patch-bitmaps_dright.xbm) = 15b1cc3c92e31643d0853f0068be4c9018c76437
-SHA1 (patch-bitmaps_ical.xbm) = fcd8ffc2494334b8c61a6577f5fab533453b5385
-SHA1 (patch-bitmaps_left.xbm) = da199839502d9dfbf23c0c5d788d47214d8539a2
-SHA1 (patch-bitmaps_right.xbm) = f034a1f923b7dbc6930df1cd64c7073a1eeeb71a
-SHA1 (patch-bitmaps_sleft.xbm) = 5fbfe6c881d55dbad5c044942932e2c1c5f29122
-SHA1 (patch-bitmaps_sright.xbm) = 329bfd258ffadc44f28eab37fff005ffcae0f90b
-SHA1 (patch-bitmaps_todo.xbm) = 2f81f93fcbcbc2394037f75f1441afaa3fa393cf
-SHA1 (patch-calendar_Item.C) = 66fbf2c57829188ca9ae0456ef13c1bc8bba8702
-SHA1 (patch-ical.C) = 83811014ee3f1582dd4b469d5b1aa7df47c1df58
-SHA1 (patch-time_Time.C) = 8e2452a91f81884d6fd99487f81c35108e7d9023
+SHA1 (ical-3.0.3.tar.gz) = d9c9fbd264b17b6ab7182070766af71cc2d99088
+RMD160 (ical-3.0.3.tar.gz) = ff458cd12050c73295743a92ae52c1fd0235d27a
+SHA512 (ical-3.0.3.tar.gz) = 4217bcd02bdb5e255deef297723a0e252198c02248df1374064b04370621b0529d12d1443a36fceb5286da5a758003fa4a9ea2d05280df37b119df91bb85c2d9
+Size (ical-3.0.3.tar.gz) = 331158 bytes
+SHA1 (patch-time_Time.C) = bda17ecae23f8c0e5cf67bf72929418cbd518dbb
diff --git a/time/ical/patches/patch-bitmaps_dleft.xbm b/time/ical/patches/patch-bitmaps_dleft.xbm
deleted file mode 100644
index ddfc71b307d..00000000000
--- a/time/ical/patches/patch-bitmaps_dleft.xbm
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bitmaps_dleft.xbm,v 1.1 2018/02/18 23:50:36 he Exp $
-
---- bitmaps/dleft.xbm.orig	2009-01-18 13:18:18.000000000 +0000
-+++ bitmaps/dleft.xbm
-@@ -1,6 +1,6 @@
- #define dleft_width 16
- #define dleft_height 16
--static char dleft_bits[] = {
-+static unsigned char dleft_bits[] = {
-    0x00, 0x00, 0x80, 0x61, 0xc0, 0x71, 0xe0, 0x79, 0xf0, 0x7d, 0xf8, 0x7f,
-    0xfc, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfc, 0x7f, 0xf8, 0x7f, 0xf0, 0x7d,
-    0xe0, 0x79, 0xc0, 0x71, 0x80, 0x61, 0x00, 0x00};
diff --git a/time/ical/patches/patch-bitmaps_done.xbm b/time/ical/patches/patch-bitmaps_done.xbm
deleted file mode 100644
index 7afb850e09c..00000000000
--- a/time/ical/patches/patch-bitmaps_done.xbm
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bitmaps_done.xbm,v 1.1 2018/02/18 23:50:36 he Exp $
-
---- bitmaps/done.xbm.orig	2009-01-18 13:18:19.000000000 +0000
-+++ bitmaps/done.xbm
-@@ -1,6 +1,6 @@
- #define done_width 16
- #define done_height 16
--static char done_bits[] = {
-+static unsigned char done_bits[] = {
-    0x00, 0x00, 0xff, 0x8f, 0xff, 0x67, 0x03, 0x30, 0x03, 0x18, 0x03, 0x4c,
-    0x33, 0x6e, 0x7b, 0x67, 0xff, 0x67, 0xfb, 0x63, 0xf3, 0x63, 0xe3, 0x61,
-    0xc3, 0x61, 0x83, 0x60, 0xff, 0x7f, 0xff, 0x7f};
diff --git a/time/ical/patches/patch-bitmaps_dright.xbm b/time/ical/patches/patch-bitmaps_dright.xbm
deleted file mode 100644
index 78b307b8553..00000000000
--- a/time/ical/patches/patch-bitmaps_dright.xbm
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bitmaps_dright.xbm,v 1.1 2018/02/18 23:50:36 he Exp $
-
---- bitmaps/dright.xbm.orig	2009-01-18 13:18:19.000000000 +0000
-+++ bitmaps/dright.xbm
-@@ -1,6 +1,6 @@
- #define dright_width 16
- #define dright_height 16
--static char dright_bits[] = {
-+static unsigned char dright_bits[] = {
-    0x00, 0x00, 0x86, 0x01, 0x8e, 0x03, 0x9e, 0x07, 0xbe, 0x0f, 0xfe, 0x1f,
-    0xfe, 0x3f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x3f, 0xfe, 0x1f, 0xbe, 0x0f,
-    0x9e, 0x07, 0x8e, 0x03, 0x86, 0x01, 0x00, 0x00};
diff --git a/time/ical/patches/patch-bitmaps_ical.xbm b/time/ical/patches/patch-bitmaps_ical.xbm
deleted file mode 100644
index 72fda9dde05..00000000000
--- a/time/ical/patches/patch-bitmaps_ical.xbm
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bitmaps_ical.xbm,v 1.1 2018/02/18 23:50:36 he Exp $
-
---- bitmaps/ical.xbm.orig	2009-01-18 13:18:18.000000000 +0000
-+++ bitmaps/ical.xbm
-@@ -1,6 +1,6 @@
- #define ical_width 64
- #define ical_height 54
--static char ical_bits[] = {
-+static unsigned char ical_bits[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x30, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00,
diff --git a/time/ical/patches/patch-bitmaps_left.xbm b/time/ical/patches/patch-bitmaps_left.xbm
deleted file mode 100644
index dc9ae25f7f8..00000000000
--- a/time/ical/patches/patch-bitmaps_left.xbm
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bitmaps_left.xbm,v 1.1 2018/02/18 23:50:36 he Exp $
-
---- bitmaps/left.xbm.orig	2009-01-18 13:18:19.000000000 +0000
-+++ bitmaps/left.xbm
-@@ -1,7 +1,7 @@
- /* Copyright (c) 1993 by Sanjay Ghemawat */
- #define left_width 16
- #define left_height 16
--static char left_bits[] = {
-+static unsigned char left_bits[] = {
-    0x00, 0x00, 0x80, 0x01, 0x40, 0x01, 0x20, 0x01, 0x10, 0x01, 0x08, 0x7f,
-    0x04, 0x40, 0x02, 0x40, 0x02, 0x40, 0x04, 0x40, 0x08, 0x7f, 0x10, 0x01,
-    0x20, 0x01, 0x40, 0x01, 0x80, 0x01, 0x00, 0x00};
diff --git a/time/ical/patches/patch-bitmaps_right.xbm b/time/ical/patches/patch-bitmaps_right.xbm
deleted file mode 100644
index 36fdb257f86..00000000000
--- a/time/ical/patches/patch-bitmaps_right.xbm
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bitmaps_right.xbm,v 1.1 2018/02/18 23:50:36 he Exp $
-
---- bitmaps/right.xbm.orig	2009-01-18 13:18:19.000000000 +0000
-+++ bitmaps/right.xbm
-@@ -1,7 +1,7 @@
- /* Copyright (c) 1993 by Sanjay Ghemawat */
- #define right_width 16
- #define right_height 16
--static char right_bits[] = {
-+static unsigned char right_bits[] = {
-    0x00, 0x00, 0x80, 0x01, 0x80, 0x02, 0x80, 0x04, 0x80, 0x08, 0xfe, 0x10,
-    0x02, 0x20, 0x02, 0x40, 0x02, 0x40, 0x02, 0x20, 0xfe, 0x10, 0x80, 0x08,
-    0x80, 0x04, 0x80, 0x02, 0x80, 0x01, 0x00, 0x00};
diff --git a/time/ical/patches/patch-bitmaps_sleft.xbm b/time/ical/patches/patch-bitmaps_sleft.xbm
deleted file mode 100644
index 93adb82819d..00000000000
--- a/time/ical/patches/patch-bitmaps_sleft.xbm
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bitmaps_sleft.xbm,v 1.1 2018/02/18 23:50:36 he Exp $
-
---- bitmaps/sleft.xbm.orig	2009-01-18 13:18:18.000000000 +0000
-+++ bitmaps/sleft.xbm
-@@ -1,6 +1,6 @@
- #define sleft_width 16
- #define sleft_height 16
--static char sleft_bits[] = {
-+static unsigned char sleft_bits[] = {
-    0x00, 0x00, 0x00, 0x0c, 0x00, 0x0e, 0x00, 0x0f, 0x80, 0x0f, 0xc0, 0x0f,
-    0xe0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xe0, 0x0f, 0xc0, 0x0f, 0x80, 0x0f,
-    0x00, 0x0f, 0x00, 0x0e, 0x00, 0x0c, 0x00, 0x00};
diff --git a/time/ical/patches/patch-bitmaps_sright.xbm b/time/ical/patches/patch-bitmaps_sright.xbm
deleted file mode 100644
index eae0e3228e5..00000000000
--- a/time/ical/patches/patch-bitmaps_sright.xbm
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bitmaps_sright.xbm,v 1.1 2018/02/18 23:50:36 he Exp $
-
---- bitmaps/sright.xbm.orig	2009-01-18 13:18:18.000000000 +0000
-+++ bitmaps/sright.xbm
-@@ -1,6 +1,6 @@
- #define sright_width 16
- #define sright_height 16
--static char sright_bits[] = {
-+static unsigned char sright_bits[] = {
-    0x00, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00, 0xf0, 0x01, 0xf0, 0x03,
-    0xf0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x07, 0xf0, 0x03, 0xf0, 0x01,
-    0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x00, 0x00};
diff --git a/time/ical/patches/patch-bitmaps_todo.xbm b/time/ical/patches/patch-bitmaps_todo.xbm
deleted file mode 100644
index cc76c5f9611..00000000000
--- a/time/ical/patches/patch-bitmaps_todo.xbm
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bitmaps_todo.xbm,v 1.1 2018/02/18 23:50:36 he Exp $
-
---- bitmaps/todo.xbm.orig	2009-01-18 13:18:18.000000000 +0000
-+++ bitmaps/todo.xbm
-@@ -1,6 +1,6 @@
- #define todo_width 16
- #define todo_height 16
--static char todo_bits[] = {
-+static unsigned char todo_bits[] = {
-    0x00, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60,
-    0x03, 0x60, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60,
-    0x03, 0x60, 0x03, 0x60, 0xff, 0x7f, 0xff, 0x7f};
diff --git a/time/ical/patches/patch-calendar_Item.C b/time/ical/patches/patch-calendar_Item.C
deleted file mode 100644
index c2a4cdad480..00000000000
--- a/time/ical/patches/patch-calendar_Item.C
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-calendar_Item.C,v 1.1 2013/01/09 17:22:14 is Exp $
-
---- calendar/item.C.orig	2009-07-28 19:09:43.000000000 +0000
-+++ calendar/item.C
-@@ -388,8 +388,8 @@ void Appointment::convert_tz(Date &d, in
-     cache.from_d=d;
-     cache.to_tz=to_tz;
- 
--    const char* old=getenv("TZ");
--    if (old) old=strdupa(old);
-+    char* old=getenv("TZ");
-+    if (old) old=strdup(old);
- 
-     struct tm t;
-     WeekDay wd;
-@@ -427,6 +427,8 @@ void Appointment::convert_tz(Date &d, in
-     min=t1->tm_min+t1->tm_hour*60;
-     cache.to_d=d;
-     cache.to_min=min;
-+
-+    if (old) free(old);
- }
- 
- int Appointment::contains(Date d) const {
diff --git a/time/ical/patches/patch-ical.C b/time/ical/patches/patch-ical.C
deleted file mode 100644
index 62bb13a40d9..00000000000
--- a/time/ical/patches/patch-ical.C
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ical.C,v 1.1 2018/02/18 20:03:31 he Exp $
-
-Use newer API to get interpreter string result.
-
---- ical.C.orig	2009-04-18 11:49:55.000000000 +0000
-+++ ical.C
-@@ -141,7 +141,7 @@ void trigger(Tcl_Interp* tcl, char const
-     buffer.append('\0');
- 
-     if (Tcl_Eval(tcl, buffer.as_pointer()) == TCL_ERROR)
--        fprintf(stderr, "ical: trigger error: %s\n", tcl->result);
-+        fprintf(stderr, "ical: trigger error: %s\n", Tcl_GetStringResult(tcl));
- 
-     buffer.clear();
- }
diff --git a/time/ical/patches/patch-time_Time.C b/time/ical/patches/patch-time_Time.C
index c0fdfc2500c..003ea45f9e8 100644
--- a/time/ical/patches/patch-time_Time.C
+++ b/time/ical/patches/patch-time_Time.C
@@ -1,4 +1,4 @@
-$NetBSD: patch-time_Time.C,v 1.1 2013/01/09 17:22:14 is Exp $
+$NetBSD: patch-time_Time.C,v 1.2 2018/11/08 05:32:23 markd Exp $
 
 --- time/Time.C.orig	2009-01-18 13:18:20.000000000 +0000
 +++ time/Time.C
@@ -10,22 +10,6 @@ $NetBSD: patch-time_Time.C,v 1.1 2013/01/09 17:22:14 is Exp $
  #include <stdlib.h>
  
  #include "config.h"
-@@ -54,13 +53,13 @@ void Time::BreakDown(int& mday, WeekDay&
-                      int& hour, int& min, int& sec, int& milli,
-                      const char *tz) const
- {
--    const char *old;
-+    char *old;
-     if (! initialized) Initialize();
- 
-     time_t clock = (time_t) round(rep + offset);
- 
-     if (tz) {
--        if ((old=getenv("TZ"))) old=strdupa(old);
-+        if ((old=getenv("TZ"))) old=strdup(old);
-         setenv("TZ", tz, 1);
-         tzset();
-     }
 @@ -80,6 +79,8 @@ void Time::BreakDown(int& mday, WeekDay&
      min   = t->tm_min;
      sec   = t->tm_sec;