Fix build problem when new toolchain is used.

3 files changed, 149 insertions, 1 deletions

diff --git a/time/ical/distinfo b/time/ical/distinfo
index 9f29d49c25e..b1e815cd110 100644
--- a/time/ical/distinfo
+++ b/time/ical/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 14:47:13 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/10/15 17:09:44 tron Exp $
 
 SHA1 (ical-2.2.1.tar.gz) = ba6af590a4d81360f6933762f2adab0886bb4e5f
 Size (ical-2.2.1.tar.gz) = 261959 bytes
 SHA1 (patch-aa) = 52c4adac05aa32913e6587e33a3818b497f6a0e6
 SHA1 (patch-ab) = a73037d1f1adf1397029fde66f8d965e9076aba5
+SHA1 (patch-ac) = 002612db5040469d0f316893a40eb067d94e677e
+SHA1 (patch-ad) = 8d77fd27aad3d6a19cbe1596d716eec78203c5ba
diff --git a/time/ical/patches/patch-ac b/time/ical/patches/patch-ac
new file mode 100644
index 00000000000..95b395dc001
--- /dev/null
+++ b/time/ical/patches/patch-ac
@@ -0,0 +1,41 @@
+$NetBSD: patch-ac,v 1.1 2001/10/15 17:09:44 tron Exp $
+
+--- cal_tcl.C.orig	Fri Jun 30 15:23:29 2000
++++ cal_tcl.C	Mon Oct 15 19:04:22 2001
+@@ -16,6 +16,9 @@
+ #include "calfile.h"
+ #include "uid.h"
+ 
++static char One[2] = "1";
++static char Zero[2] = "0";
++
+ implementArray(FileList,CalFile*)
+ 
+ Calendar_Tcl::Calendar_Tcl(Tcl_Interp* tcl, char const* h, char const* f)
+@@ -517,7 +520,7 @@
+ 	TCL_Error(tcl, "no such calendar");
+     }
+ 
+-    TCL_Return(tcl, file->GetCalendar()->ReadOnly() ? "1" : "0");
++    TCL_Return(tcl, file->GetCalendar()->ReadOnly() ? One : Zero);
+ }
+ 
+ static int cal_dirty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+@@ -528,7 +531,7 @@
+ 	TCL_Error(tcl, "no such calendar");
+     }
+ 
+-    TCL_Return(tcl, (file->IsModified() ? "1" : "0"));
++    TCL_Return(tcl, (file->IsModified() ? One : Zero));
+ }
+ 
+ static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+@@ -539,7 +542,7 @@
+ 	TCL_Error(tcl, "no such calendar");
+     }
+ 
+-    TCL_Return(tcl, (file->FileHasChanged() ? "1" : "0"));
++    TCL_Return(tcl, (file->FileHasChanged() ? One : Zero));
+ }
+ 
+ static int cal_save(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
diff --git a/time/ical/patches/patch-ad b/time/ical/patches/patch-ad
new file mode 100644
index 00000000000..c1a29f4d673
--- /dev/null
+++ b/time/ical/patches/patch-ad
@@ -0,0 +1,105 @@
+$NetBSD: patch-ad,v 1.1 2001/10/15 17:09:44 tron Exp $
+
+--- item_tcl.C.orig	Thu Aug  1 21:25:10 1996
++++ item_tcl.C	Mon Oct 15 19:07:06 2001
+@@ -14,6 +14,9 @@
+ #include "item_tcl.h"
+ #include "dispatch.h"
+ 
++static char One[2] = "1";
++static char Zero[2] = "0";
++
+ /*
+  * Item* -> Item_Tcl* map.
+  */
+@@ -232,14 +235,14 @@
+     Item_Tcl* item = (Item_Tcl*) c;
+ 
+     if ((strcmp(argv[0], "note") == 0) && (item->value()->AsNotice() != 0)) {
+-	TCL_Return(tcl, "1");
++	TCL_Return(tcl, One);
+     }
+ 
+     if ((strcmp(argv[0], "appt") == 0) && (item->value()->AsAppointment()!=0)){
+-	TCL_Return(tcl, "1");
++	TCL_Return(tcl, One);
+     }
+ 
+-    TCL_Return(tcl, "0");
++    TCL_Return(tcl, Zero);
+ }
+ 
+ static int item_delete(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+@@ -329,7 +332,7 @@
+ 
+ static int item_owned(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+     Item_Tcl* item = (Item_Tcl*) c;
+-    TCL_Return(tcl, (item->value()->IsMine() ? "1" : "0"));
++    TCL_Return(tcl, (item->value()->IsMine() ? One : Zero));
+ }
+ 
+ static int item_own(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+@@ -360,7 +363,7 @@
+     Item_Tcl* item = (Item_Tcl*) c;
+ 
+     if (argc == 0) {
+-	TCL_Return(tcl, (char*)(item->value()->IsTodo() ? "1" : "0"));
++	TCL_Return(tcl, (char*)(item->value()->IsTodo() ? One : Zero));
+     }
+ 
+     int todo;
+@@ -376,7 +379,7 @@
+ 
+ static int item_is_done(ClientData c, Tcl_Interp* tcl,int argc,char* argv[]) {
+     Item_Tcl* item = (Item_Tcl*) c;
+-    TCL_Return(tcl, (char*)(item->value()->IsDone() ? "1" : "0"));
++    TCL_Return(tcl, (char*)(item->value()->IsDone() ? One : Zero));
+ }
+ 
+ static int item_done(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+@@ -492,12 +495,12 @@
+ 
+ static int item_empty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+     Item_Tcl* item = (Item_Tcl*) c;
+-    TCL_Return(tcl, (item->value()->empty()?"1":"0"));
++    TCL_Return(tcl, (item->value()->empty()?One:Zero));
+ }
+ 
+ static int item_repeat(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+     Item_Tcl* item = (Item_Tcl*) c;
+-    TCL_Return(tcl,(item->value()->repeats()?"1":"0"));
++    TCL_Return(tcl,(item->value()->repeats()?One:Zero));
+ }
+ 
+ static int item_first(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+@@ -576,7 +579,7 @@
+ 	TCL_Error(tcl, "invalid date");
+     }
+     Date date(dateDays);
+-    TCL_Return(tcl, (item->value()->contains(date)?"1":"0"));
++    TCL_Return(tcl, (item->value()->contains(date)?One:Zero));
+ }
+ 
+ static int item_next(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+@@ -609,10 +612,10 @@
+ 	sprintf(buffer, "%d", f.EpochDays());
+ 	if (Tcl_SetVar(tcl, argv[1], buffer, 0) == NULL)
+ 	    TCL_Error(tcl, "could not set range finish variable");
+-	TCL_Return(tcl, "1");
++	TCL_Return(tcl, One);
+     }
+     else {
+-	TCL_Return(tcl, "0");
++	TCL_Return(tcl, Zero);
+     }
+ }
+ 
+@@ -719,7 +722,7 @@
+ // effects	Parses "n", "anchor" and "interval" from the command
+ //		arguments.  Returns TCL_OK iff successful.  If "anchor"
+ //		and "interval" are not specified in the command arguments,
+-//		then "anchor" is set to today and "interval" is set to "1".
++//		then "anchor" is set to today and "interval" is set to One.
+ static int parse_month_args(Tcl_Interp* tcl, int argc, char* argv[],
+ 			    int& n, Date& anchor, int& interval)
+ {