Thu Nov 8 05:32:23 2018 UTC ()
ical: update to 3.0.3

Fixes for tcl 8.6 and gcc 6+


(markd)
diff -r1.36 -r1.37 pkgsrc/time/ical/Makefile
diff -r1.14 -r1.15 pkgsrc/time/ical/distinfo
diff -r1.1 -r0 pkgsrc/time/ical/patches/patch-bitmaps_dleft.xbm
diff -r1.1 -r0 pkgsrc/time/ical/patches/patch-bitmaps_done.xbm
diff -r1.1 -r0 pkgsrc/time/ical/patches/patch-bitmaps_dright.xbm
diff -r1.1 -r0 pkgsrc/time/ical/patches/patch-bitmaps_ical.xbm
diff -r1.1 -r0 pkgsrc/time/ical/patches/patch-bitmaps_left.xbm
diff -r1.1 -r0 pkgsrc/time/ical/patches/patch-bitmaps_right.xbm
diff -r1.1 -r0 pkgsrc/time/ical/patches/patch-bitmaps_sleft.xbm
diff -r1.1 -r0 pkgsrc/time/ical/patches/patch-bitmaps_sright.xbm
diff -r1.1 -r0 pkgsrc/time/ical/patches/patch-bitmaps_todo.xbm
diff -r1.1 -r0 pkgsrc/time/ical/patches/patch-calendar_Item.C
diff -r1.1 -r0 pkgsrc/time/ical/patches/patch-ical.C
diff -r1.1 -r1.2 pkgsrc/time/ical/patches/patch-time_Time.C
cvs diff -r1.36 -r1.37 pkgsrc/time/ical/Makefile (expand / switch to unified diff)

--- pkgsrc/time/ical/Makefile 2018/03/12 11:17:41 1.36
+++ pkgsrc/time/ical/Makefile 2018/11/08 05:32:23 1.37
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.36 2018/03/12 11:17:41 wiz Exp $ 1# $NetBSD: Makefile,v 1.37 2018/11/08 05:32:23 markd Exp $
2 2
3DISTNAME= ical-3.0.2 3DISTNAME= ical-3.0.3
4PKGREVISION= 7 
5CATEGORIES= time 4CATEGORIES= time
6MASTER_SITES= https://launchpad.net/ical-tcl/3.x/${PKGVERSION_NOREV}/+download/ 5MASTER_SITES= https://launchpad.net/ical-tcl/3.x/${PKGVERSION_NOREV}/+download/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://launchpad.net/ical-tcl/ 8HOMEPAGE= https://launchpad.net/ical-tcl/
10COMMENT= Calendar application 9COMMENT= Calendar application
11 10
12USE_LANGUAGES= c c++ 11USE_LANGUAGES= c c++
13GNU_CONFIGURE= yes 12GNU_CONFIGURE= yes
14CONFIGURE_ARGS+= --prefix=${PREFIX} \ 13CONFIGURE_ARGS+= --prefix=${PREFIX} \
15 --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib \ 14 --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib \
16 --with-tclsh=${BUILDLINK_PREFIX.tcl}/bin/tclsh \ 15 --with-tclsh=${BUILDLINK_PREFIX.tcl}/bin/tclsh \
17 --with-tkconfig=${BUILDLINK_PREFIX.tk}/lib 16 --with-tkconfig=${BUILDLINK_PREFIX.tk}/lib
cvs diff -r1.14 -r1.15 pkgsrc/time/ical/distinfo (expand / switch to unified diff)

--- pkgsrc/time/ical/distinfo 2018/02/18 23:50:36 1.14
+++ pkgsrc/time/ical/distinfo 2018/11/08 05:32:23 1.15
@@ -1,18 +1,7 @@ @@ -1,18 +1,7 @@
1$NetBSD: distinfo,v 1.14 2018/02/18 23:50:36 he Exp $ 1$NetBSD: distinfo,v 1.15 2018/11/08 05:32:23 markd Exp $
2 2
3SHA1 (ical-3.0.2.tar.gz) = 8a0c2f132979320cb2c24b187cb7238698161e5d 3SHA1 (ical-3.0.3.tar.gz) = d9c9fbd264b17b6ab7182070766af71cc2d99088
4RMD160 (ical-3.0.2.tar.gz) = e66326edf0cc562e601770959df3a415126ae8c5 4RMD160 (ical-3.0.3.tar.gz) = ff458cd12050c73295743a92ae52c1fd0235d27a
5SHA512 (ical-3.0.2.tar.gz) = 6ce7f2d49133c246c6f792203a7a494bcec6d55eb59fac43b6610bc97d0fdbf44cbfa230014241ede581ceb10047d10320fd1a119587d7ba6693ab69b0c7c938 5SHA512 (ical-3.0.3.tar.gz) = 4217bcd02bdb5e255deef297723a0e252198c02248df1374064b04370621b0529d12d1443a36fceb5286da5a758003fa4a9ea2d05280df37b119df91bb85c2d9
6Size (ical-3.0.2.tar.gz) = 308788 bytes 6Size (ical-3.0.3.tar.gz) = 331158 bytes
7SHA1 (patch-bitmaps_dleft.xbm) = 06259c3088efd7f99788b8c1fce15c6e429de59e 7SHA1 (patch-time_Time.C) = bda17ecae23f8c0e5cf67bf72929418cbd518dbb
8SHA1 (patch-bitmaps_done.xbm) = 5c47063e18725d7c5d2af5f63e626b28db099640 
9SHA1 (patch-bitmaps_dright.xbm) = 15b1cc3c92e31643d0853f0068be4c9018c76437 
10SHA1 (patch-bitmaps_ical.xbm) = fcd8ffc2494334b8c61a6577f5fab533453b5385 
11SHA1 (patch-bitmaps_left.xbm) = da199839502d9dfbf23c0c5d788d47214d8539a2 
12SHA1 (patch-bitmaps_right.xbm) = f034a1f923b7dbc6930df1cd64c7073a1eeeb71a 
13SHA1 (patch-bitmaps_sleft.xbm) = 5fbfe6c881d55dbad5c044942932e2c1c5f29122 
14SHA1 (patch-bitmaps_sright.xbm) = 329bfd258ffadc44f28eab37fff005ffcae0f90b 
15SHA1 (patch-bitmaps_todo.xbm) = 2f81f93fcbcbc2394037f75f1441afaa3fa393cf 
16SHA1 (patch-calendar_Item.C) = 66fbf2c57829188ca9ae0456ef13c1bc8bba8702 
17SHA1 (patch-ical.C) = 83811014ee3f1582dd4b469d5b1aa7df47c1df58 
18SHA1 (patch-time_Time.C) = 8e2452a91f81884d6fd99487f81c35108e7d9023 
File Deleted: pkgsrc/time/ical/patches/Attic/patch-bitmaps_dleft.xbm
File Deleted: pkgsrc/time/ical/patches/Attic/patch-bitmaps_done.xbm
File Deleted: pkgsrc/time/ical/patches/Attic/patch-bitmaps_dright.xbm
File Deleted: pkgsrc/time/ical/patches/Attic/patch-bitmaps_ical.xbm
File Deleted: pkgsrc/time/ical/patches/Attic/patch-bitmaps_left.xbm
File Deleted: pkgsrc/time/ical/patches/Attic/patch-bitmaps_right.xbm
File Deleted: pkgsrc/time/ical/patches/Attic/patch-bitmaps_sleft.xbm
File Deleted: pkgsrc/time/ical/patches/Attic/patch-bitmaps_sright.xbm
File Deleted: pkgsrc/time/ical/patches/Attic/patch-bitmaps_todo.xbm
File Deleted: pkgsrc/time/ical/patches/Attic/patch-calendar_Item.C
File Deleted: pkgsrc/time/ical/patches/Attic/patch-ical.C
cvs diff -r1.1 -r1.2 pkgsrc/time/ical/patches/patch-time_Time.C (expand / switch to unified diff)

--- pkgsrc/time/ical/patches/patch-time_Time.C 2013/01/09 17:22:14 1.1
+++ pkgsrc/time/ical/patches/patch-time_Time.C 2018/11/08 05:32:23 1.2
@@ -1,41 +1,25 @@ @@ -1,41 +1,25 @@
1$NetBSD: patch-time_Time.C,v 1.1 2013/01/09 17:22:14 is Exp $ 1$NetBSD: patch-time_Time.C,v 1.2 2018/11/08 05:32:23 markd Exp $
2 2
3--- time/Time.C.orig 2009-01-18 13:18:20.000000000 +0000 3--- time/Time.C.orig 2009-01-18 13:18:20.000000000 +0000
4+++ time/Time.C 4+++ time/Time.C
5@@ -4,7 +4,6 @@ 5@@ -4,7 +4,6 @@
6 #include <sys/types.h> 6 #include <sys/types.h>
7 #include <math.h> 7 #include <math.h>
8 #include <string.h> 8 #include <string.h>
9-#include <alloca.h> 9-#include <alloca.h>
10 #include <stdlib.h> 10 #include <stdlib.h>
11  11
12 #include "config.h" 12 #include "config.h"
13@@ -54,13 +53,13 @@ void Time::BreakDown(int& mday, WeekDay& 
14 int& hour, int& min, int& sec, int& milli, 
15 const char *tz) const 
16 { 
17- const char *old; 
18+ char *old; 
19 if (! initialized) Initialize(); 
20  
21 time_t clock = (time_t) round(rep + offset); 
22  
23 if (tz) { 
24- if ((old=getenv("TZ"))) old=strdupa(old); 
25+ if ((old=getenv("TZ"))) old=strdup(old); 
26 setenv("TZ", tz, 1); 
27 tzset(); 
28 } 
29@@ -80,6 +79,8 @@ void Time::BreakDown(int& mday, WeekDay& 13@@ -80,6 +79,8 @@ void Time::BreakDown(int& mday, WeekDay&
30 min = t->tm_min; 14 min = t->tm_min;
31 sec = t->tm_sec; 15 sec = t->tm_sec;
32 milli = (int)round((rep - floor(rep)) * 1000); 16 milli = (int)round((rep - floor(rep)) * 1000);
33+ 17+
34+ if(tz) free(old); 18+ if(tz) free(old);
35 } 19 }
36  20
37 Time::Time(const struct timeval& tv) { 21 Time::Time(const struct timeval& tv) {
38@@ -96,8 +97,8 @@ void Time::Convert(struct timeval& tv) c 22@@ -96,8 +97,8 @@ void Time::Convert(struct timeval& tv) c
39  23
40 #if 0 24 #if 0
41 time_t timezone_to_local(time_t clock, const char *tz) { 25 time_t timezone_to_local(time_t clock, const char *tz) {