Wed Jan 9 17:22:14 2013 UTC ()
Upgrade from the no-longer-maintained 2.x to 3.0.2. This fixes pkg/47421


(is)
diff -r1.24 -r1.25 pkgsrc/time/ical/Makefile
diff -r1.3 -r1.4 pkgsrc/time/ical/PLIST
diff -r1.10 -r1.11 pkgsrc/time/ical/distinfo
diff -r1.3 -r0 pkgsrc/time/ical/patches/patch-aa
diff -r1.4 -r0 pkgsrc/time/ical/patches/patch-ab
diff -r1.4 -r0 pkgsrc/time/ical/patches/patch-ac
diff -r0 -r1.1 pkgsrc/time/ical/patches/patch-calendar_Item.C
diff -r0 -r1.1 pkgsrc/time/ical/patches/patch-time_Time.C
cvs diff -r1.24 -r1.25 pkgsrc/time/ical/Makefile (expand / switch to unified diff)

--- pkgsrc/time/ical/Makefile 2013/01/08 15:26:09 1.24
+++ pkgsrc/time/ical/Makefile 2013/01/09 17:22:14 1.25
@@ -1,30 +1,36 @@ @@ -1,30 +1,36 @@
1# $NetBSD: Makefile,v 1.24 2013/01/08 15:26:09 wiz Exp $ 1# $NetBSD: Makefile,v 1.25 2013/01/09 17:22:14 is Exp $
2 2
3DISTNAME= ical-2.3.1 3VER= 3.0.2
4PKGREVISION= 4 4DISTNAME= ical-${VER}
 5EXTRACT_SUFFIX= .tar.gz
 6#PKGREVISION= 1
5CATEGORIES= time 7CATEGORIES= time
6MASTER_SITES= # http://www.annexia.org/_file/ 8MASTER_SITES= https://launchpad.net/ical-tcl/3.x/${VER}/+download/
 9FETCH_USING= curl
7 10
8MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
9#HOMEPAGE= http://www.annexia.org/freeware/ical 12HOMEPAGE= https://launchpad.net/ical-tcl/
10COMMENT= Calendar application 13COMMENT= Calendar application
11 14
12PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
13 16
14USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
15GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --prefix=${PREFIX:Q} \ 19CONFIGURE_ARGS+= --prefix=${PREFIX:Q} \
17 --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib \ 20 --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib \
18 --with-tclsh=${BUILDLINK_PREFIX.tcl}/bin/tclsh \ 21 --with-tclsh=${BUILDLINK_PREFIX.tcl}/bin/tclsh \
19 --with-tkconfig=${BUILDLINK_PREFIX.tk}/lib 22 --with-tkconfig=${BUILDLINK_PREFIX.tk}/lib
20 23
 24USE_TOOLS+= gmake gsed
 25
 26PLIST_SUBS+= "PKGVERSION=${VER}"
 27
21post-configure: 28post-configure:
22 ${TOUCH} ${WRKDIR}/${DISTNAME}/Makefile \ 29 ${TOUCH} ${WRKDIR}/${DISTNAME}/Makefile \
23 ${WRKDIR}/${DISTNAME}/calendar/Makefile \ 30 ${WRKDIR}/${DISTNAME}/calendar/Makefile \
24 ${WRKDIR}/${DISTNAME}/startup.tcl \ 
25 ${WRKDIR}/${DISTNAME}/time/Makefile 31 ${WRKDIR}/${DISTNAME}/time/Makefile
26 32
27.include "../../lang/tcl/buildlink3.mk" 33.include "../../lang/tcl/buildlink3.mk"
28.include "../../x11/tk/buildlink3.mk" 34.include "../../x11/tk/buildlink3.mk"
29.include "../../mk/pthread.buildlink3.mk" 35.include "../../mk/pthread.buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/time/ical/PLIST (expand / switch to unified diff)

--- pkgsrc/time/ical/PLIST 2009/06/14 18:17:58 1.3
+++ pkgsrc/time/ical/PLIST 2013/01/09 17:22:14 1.4
@@ -1,65 +1,84 @@ @@ -1,65 +1,84 @@
1@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:17:58 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.4 2013/01/09 17:22:14 is Exp $
2bin/ical 2bin/ical
3bin/ical-2.3 3lib/ical/v${PKGVERSION}/actions.tcl
4lib/ical/v2.3/actions.tcl 4lib/ical/v${PKGVERSION}/alarm.tcl
5lib/ical/v2.3/alarm.tcl 5lib/ical/v${PKGVERSION}/apptlist.tcl
6lib/ical/v2.3/apptlist.tcl 6lib/ical/v${PKGVERSION}/canvsup.tcl
7lib/ical/v2.3/canvsup.tcl 7lib/ical/v${PKGVERSION}/contrib/README
8lib/ical/v2.3/contrib/README 8lib/ical/v${PKGVERSION}/contrib/calicon.tcl
9lib/ical/v2.3/contrib/ical.spec 9lib/ical/v${PKGVERSION}/contrib/ical-2.2-duplicates.patch
10lib/ical/v2.3/contrib/ical.xbm 10lib/ical/v${PKGVERSION}/contrib/ical-2.2-no-locincpth.patch
11lib/ical/v2.3/contrib/ical.xpm 11lib/ical/v${PKGVERSION}/contrib/ical-2.3.1-filesel_slash_fix.patch
12lib/ical/v2.3/contrib/ical2calendar 12lib/ical/v${PKGVERSION}/contrib/ical-2.3.1-item_mouseover_expansion-1.patch
13lib/ical/v2.3/contrib/ical2html 13lib/ical/v${PKGVERSION}/contrib/ical-2.3.1-item_mouseover_expansion-2.patch
14lib/ical/v2.3/contrib/ical2zsh 14lib/ical/v${PKGVERSION}/contrib/ical-2.3.2-earlywarning_notice.patch
15lib/ical/v2.3/contrib/icaladd 15lib/ical/v${PKGVERSION}/contrib/ical-2.3.3-tcl8.6.patch
16lib/ical/v2.3/contrib/icaladdlines 16lib/ical/v${PKGVERSION}/contrib/ical-fedora1.patch
17lib/ical/v2.3/contrib/icalexpire 17lib/ical/v${PKGVERSION}/contrib/ical-script
18lib/ical/v2.3/contrib/icalweekly 18lib/ical/v${PKGVERSION}/contrib/ical.spec
19lib/ical/v2.3/contrib/iconwindow.tcl 19lib/ical/v${PKGVERSION}/contrib/ical.xbm
20lib/ical/v2.3/contrib/timeofday.tcl 20lib/ical/v${PKGVERSION}/contrib/ical.xpm
21lib/ical/v2.3/contrib/weeknumber.tcl 21lib/ical/v${PKGVERSION}/contrib/ical2calendar
22lib/ical/v2.3/dateeditor.tcl 22lib/ical/v${PKGVERSION}/contrib/ical2html
23lib/ical/v2.3/dayview.tcl 23lib/ical/v${PKGVERSION}/contrib/ical2ics
24lib/ical/v2.3/dg_alarms.tcl 24lib/ical/v${PKGVERSION}/contrib/ical2zsh
25lib/ical/v2.3/dg_item.tcl 25lib/ical/v${PKGVERSION}/contrib/icaladd
26lib/ical/v2.3/dg_key.tcl 26lib/ical/v${PKGVERSION}/contrib/icaladdlines
27lib/ical/v2.3/dg_monthr.tcl 27lib/ical/v${PKGVERSION}/contrib/icalexpire
28lib/ical/v2.3/dg_print.tcl 28lib/ical/v${PKGVERSION}/contrib/icalweekly
29lib/ical/v2.3/dg_range.tcl 29lib/ical/v${PKGVERSION}/contrib/icon.png
30lib/ical/v2.3/dg_wdays.tcl 30lib/ical/v${PKGVERSION}/contrib/iconwindow.tcl
31lib/ical/v2.3/help.tcl 31lib/ical/v${PKGVERSION}/contrib/oster_termine
32lib/ical/v2.3/ical_text.tcl 32lib/ical/v${PKGVERSION}/contrib/public_item.tcl
33lib/ical/v2.3/ical_x.tcl 33lib/ical/v${PKGVERSION}/contrib/publical
34lib/ical/v2.3/io.tcl 34lib/ical/v${PKGVERSION}/contrib/timeofday.tcl
35lib/ical/v2.3/itemlist.tcl 35lib/ical/v${PKGVERSION}/contrib/weeknumber.tcl
36lib/ical/v2.3/itemwindow.tcl 36lib/ical/v${PKGVERSION}/dateeditor.tcl
37lib/ical/v2.3/link.tcl 37lib/ical/v${PKGVERSION}/dayview.tcl
38lib/ical/v2.3/listing.tcl 38lib/ical/v${PKGVERSION}/dg_alarms.tcl
39lib/ical/v2.3/notelist.tcl 39lib/ical/v${PKGVERSION}/dg_colors.tcl
40lib/ical/v2.3/parse.tcl 40lib/ical/v${PKGVERSION}/dg_item.tcl
41lib/ical/v2.3/pref.tcl 41lib/ical/v${PKGVERSION}/dg_key.tcl
42lib/ical/v2.3/print.tcl 42lib/ical/v${PKGVERSION}/dg_monthr.tcl
43lib/ical/v2.3/support.tcl 43lib/ical/v${PKGVERSION}/dg_print.tcl
44lib/ical/v2.3/tclIndex 44lib/ical/v${PKGVERSION}/dg_range.tcl
45lib/ical/v2.3/tcllib/canvas.tcl 45lib/ical/v${PKGVERSION}/dg_wdays.tcl
46lib/ical/v2.3/tcllib/class.tcl 46lib/ical/v${PKGVERSION}/help.tcl
47lib/ical/v2.3/tcllib/dg_bug.tcl 47lib/ical/v${PKGVERSION}/ical_doc.tcl
48lib/ical/v2.3/tcllib/dg_error.tcl 48lib/ical/v${PKGVERSION}/ical_text.tcl
49lib/ical/v2.3/tcllib/dg_file.tcl 49lib/ical/v${PKGVERSION}/ical_x.tcl
50lib/ical/v2.3/tcllib/dg_num.tcl 50lib/ical/v${PKGVERSION}/interface_doc.tcl
51lib/ical/v2.3/tcllib/dg_string.tcl 51lib/ical/v${PKGVERSION}/io.tcl
52lib/ical/v2.3/tcllib/dg_yn.tcl 52lib/ical/v${PKGVERSION}/itemlist.tcl
53lib/ical/v2.3/tcllib/dg_ync.tcl 53lib/ical/v${PKGVERSION}/itemwindow.tcl
54lib/ical/v2.3/tcllib/filesel.tcl 54lib/ical/v${PKGVERSION}/link.tcl
55lib/ical/v2.3/tcllib/hooks.tcl 55lib/ical/v${PKGVERSION}/listing.tcl
56lib/ical/v2.3/tcllib/key.tcl 56lib/ical/v${PKGVERSION}/notelist.tcl
57lib/ical/v2.3/tcllib/label.tcl 57lib/ical/v${PKGVERSION}/parse.tcl
58lib/ical/v2.3/tcllib/menus.tcl 58lib/ical/v${PKGVERSION}/pref.tcl
59lib/ical/v2.3/tcllib/ruler.tcl 59lib/ical/v${PKGVERSION}/print.tcl
60lib/ical/v2.3/tcllib/support.tcl 60lib/ical/v${PKGVERSION}/ps_header.tcl
61lib/ical/v2.3/tcllib/tclIndex 61lib/ical/v${PKGVERSION}/startup.tcl
62lib/ical/v2.3/tcllib/textwin.tcl 62lib/ical/v${PKGVERSION}/support.tcl
63lib/ical/v2.3/timerange.tcl 63lib/ical/v${PKGVERSION}/tclIndex
64lib/ical/v2.3/trigger.tcl 64lib/ical/v${PKGVERSION}/tcllib/canvas.tcl
 65lib/ical/v${PKGVERSION}/tcllib/class.tcl
 66lib/ical/v${PKGVERSION}/tcllib/dg_bug.tcl
 67lib/ical/v${PKGVERSION}/tcllib/dg_error.tcl
 68lib/ical/v${PKGVERSION}/tcllib/dg_file.tcl
 69lib/ical/v${PKGVERSION}/tcllib/dg_num.tcl
 70lib/ical/v${PKGVERSION}/tcllib/dg_string.tcl
 71lib/ical/v${PKGVERSION}/tcllib/dg_yn.tcl
 72lib/ical/v${PKGVERSION}/tcllib/dg_ync.tcl
 73lib/ical/v${PKGVERSION}/tcllib/filesel.tcl
 74lib/ical/v${PKGVERSION}/tcllib/hooks.tcl
 75lib/ical/v${PKGVERSION}/tcllib/key.tcl
 76lib/ical/v${PKGVERSION}/tcllib/label.tcl
 77lib/ical/v${PKGVERSION}/tcllib/menus.tcl
 78lib/ical/v${PKGVERSION}/tcllib/ruler.tcl
 79lib/ical/v${PKGVERSION}/tcllib/support.tcl
 80lib/ical/v${PKGVERSION}/tcllib/tclIndex
 81lib/ical/v${PKGVERSION}/tcllib/textwin.tcl
 82lib/ical/v${PKGVERSION}/timerange.tcl
 83lib/ical/v${PKGVERSION}/trigger.tcl
65man/man1/ical.1 84man/man1/ical.1
cvs diff -r1.10 -r1.11 pkgsrc/time/ical/distinfo (expand / switch to unified diff)

--- pkgsrc/time/ical/distinfo 2011/01/29 22:53:29 1.10
+++ pkgsrc/time/ical/distinfo 2013/01/09 17:22:14 1.11
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.10 2011/01/29 22:53:29 markd Exp $ 1$NetBSD: distinfo,v 1.11 2013/01/09 17:22:14 is Exp $
2 2
3SHA1 (ical-2.3.1.tar.gz) = 98649b7e1fbad9c13356eb5dded693d81b2252f2 3SHA1 (ical-3.0.2.tar.gz) = 8a0c2f132979320cb2c24b187cb7238698161e5d
4RMD160 (ical-2.3.1.tar.gz) = 98642da1ef330ca3a5cf099508fb09dcdeb208be 4RMD160 (ical-3.0.2.tar.gz) = e66326edf0cc562e601770959df3a415126ae8c5
5Size (ical-2.3.1.tar.gz) = 264576 bytes 5Size (ical-3.0.2.tar.gz) = 308788 bytes
6SHA1 (patch-aa) = 29d06f928f67165f5579aa87487b88f1aa2e0031 6SHA1 (patch-calendar_Item.C) = 66fbf2c57829188ca9ae0456ef13c1bc8bba8702
7SHA1 (patch-ab) = ccfdc593988195128c837bac36d706150b5a7df6 7SHA1 (patch-time_Time.C) = 8e2452a91f81884d6fd99487f81c35108e7d9023
8SHA1 (patch-ac) = 31e9d5dbb205065b146276ebde7a1a4207418477 
File Deleted: pkgsrc/time/ical/patches/Attic/patch-aa
File Deleted: pkgsrc/time/ical/patches/Attic/patch-ab
File Deleted: pkgsrc/time/ical/patches/Attic/patch-ac
File Added: pkgsrc/time/ical/patches/Attic/patch-calendar_Item.C
$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 {
File Added: pkgsrc/time/ical/patches/patch-time_Time.C
$NetBSD: patch-time_Time.C,v 1.1 2013/01/09 17:22:14 is Exp $

--- time/Time.C.orig	2009-01-18 13:18:20.000000000 +0000
+++ time/Time.C
@@ -4,7 +4,6 @@
 #include <sys/types.h>
 #include <math.h>
 #include <string.h>
-#include <alloca.h>
 #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;
     milli = (int)round((rep - floor(rep)) * 1000);
+
+    if(tz) free(old);
 }
 
 Time::Time(const struct timeval& tv) {
@@ -96,8 +97,8 @@ void Time::Convert(struct timeval& tv) c
 
 #if 0
 time_t timezone_to_local(time_t clock, const char *tz) {
-    const char *old=getenv("TZ");
-    if (old) old=strdupa(old);
+    char *old=getenv("TZ");
+    if (old) old=strdup(old);
     
     struct tm* t = localtime(&clock);
     setenv("TZ", tz, 1);
@@ -107,12 +108,13 @@ time_t timezone_to_local(time_t clock, c
     if (old) setenv("TZ", old, 1); else unsetenv("TZ");
     tzset();
 
+    if(old) free(old);
     return clock;
 }
 
 time_t local_to_timezone(time_t clock, const char *tz) {
-    const char *old=getenv("TZ");
-    if (old) old=strdupa(old);
+    char *old=getenv("TZ");
+    if (old) old=strdup(old);
     
     setenv("TZ", tz, 1);
     tzset();
@@ -122,6 +124,7 @@ time_t local_to_timezone(time_t clock, c
     tzset();
     clock = mktime(t);
 
+    if (old) free(old);
     return clock;
 }
 #endif