Fixed problem reported in RP 26866 and updated ical to 2.3.1

16 files changed, 73 insertions, 1215 deletions

diff --git a/time/ical/Makefile b/time/ical/Makefile
index a85dbece8e6..4e26cd8dcab 100644
--- a/time/ical/Makefile
+++ b/time/ical/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2004/04/01 00:52:39 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2004/09/08 15:40:07 wulf Exp $
 
-DISTNAME=	ical-2.2.1
-PKGREVISION=	1
+DISTNAME=	ical-2.3.1
 CATEGORIES=	time
-MASTER_SITES=	http://members.nbci.com/majahj/ical/
+MASTER_SITES=	http://www.annexia.org/_file/
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://members.nbci.com/majahj/ical/
+HOMEPAGE=	http://www.annexia.org/freeware/ical
 COMMENT=	Calendar application
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/time/ical/PLIST b/time/ical/PLIST
index f2608e095a2..44b0bad01f9 100644
--- a/time/ical/PLIST
+++ b/time/ical/PLIST
@@ -1,68 +1,69 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:19:07 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/08 15:40:07 wulf Exp $
 bin/ical
-bin/ical-2.2
-lib/ical/v2.2/actions.tcl
-lib/ical/v2.2/alarm.tcl
-lib/ical/v2.2/apptlist.tcl
-lib/ical/v2.2/canvsup.tcl
-lib/ical/v2.2/contrib/README
-lib/ical/v2.2/contrib/ical.xbm
-lib/ical/v2.2/contrib/ical.xpm
-lib/ical/v2.2/contrib/ical2calendar
-lib/ical/v2.2/contrib/ical2html
-lib/ical/v2.2/contrib/ical2zsh
-lib/ical/v2.2/contrib/icaladd
-lib/ical/v2.2/contrib/icaladdlines
-lib/ical/v2.2/contrib/icalexpire
-lib/ical/v2.2/contrib/icalweekly
-lib/ical/v2.2/contrib/iconwindow.tcl
-lib/ical/v2.2/contrib/timeofday.tcl
-lib/ical/v2.2/contrib/weeknumber.tcl
-lib/ical/v2.2/dateeditor.tcl
-lib/ical/v2.2/dayview.tcl
-lib/ical/v2.2/dg_alarms.tcl
-lib/ical/v2.2/dg_item.tcl
-lib/ical/v2.2/dg_key.tcl
-lib/ical/v2.2/dg_monthr.tcl
-lib/ical/v2.2/dg_print.tcl
-lib/ical/v2.2/dg_range.tcl
-lib/ical/v2.2/dg_wdays.tcl
-lib/ical/v2.2/help.tcl
-lib/ical/v2.2/ical_text.tcl
-lib/ical/v2.2/ical_x.tcl
-lib/ical/v2.2/io.tcl
-lib/ical/v2.2/itemlist.tcl
-lib/ical/v2.2/itemwindow.tcl
-lib/ical/v2.2/link.tcl
-lib/ical/v2.2/listing.tcl
-lib/ical/v2.2/notelist.tcl
-lib/ical/v2.2/parse.tcl
-lib/ical/v2.2/pref.tcl
-lib/ical/v2.2/print.tcl
-lib/ical/v2.2/support.tcl
-lib/ical/v2.2/tclIndex
-lib/ical/v2.2/tcllib/canvas.tcl
-lib/ical/v2.2/tcllib/class.tcl
-lib/ical/v2.2/tcllib/dg_bug.tcl
-lib/ical/v2.2/tcllib/dg_error.tcl
-lib/ical/v2.2/tcllib/dg_file.tcl
-lib/ical/v2.2/tcllib/dg_num.tcl
-lib/ical/v2.2/tcllib/dg_string.tcl
-lib/ical/v2.2/tcllib/dg_yn.tcl
-lib/ical/v2.2/tcllib/dg_ync.tcl
-lib/ical/v2.2/tcllib/filesel.tcl
-lib/ical/v2.2/tcllib/hooks.tcl
-lib/ical/v2.2/tcllib/key.tcl
-lib/ical/v2.2/tcllib/label.tcl
-lib/ical/v2.2/tcllib/menus.tcl
-lib/ical/v2.2/tcllib/ruler.tcl
-lib/ical/v2.2/tcllib/support.tcl
-lib/ical/v2.2/tcllib/tclIndex
-lib/ical/v2.2/tcllib/textwin.tcl
-lib/ical/v2.2/timerange.tcl
-lib/ical/v2.2/trigger.tcl
+bin/ical-2.3
+lib/ical/v2.3/actions.tcl
+lib/ical/v2.3/alarm.tcl
+lib/ical/v2.3/apptlist.tcl
+lib/ical/v2.3/canvsup.tcl
+lib/ical/v2.3/contrib/README
+lib/ical/v2.3/contrib/ical.spec
+lib/ical/v2.3/contrib/ical.xbm
+lib/ical/v2.3/contrib/ical.xpm
+lib/ical/v2.3/contrib/ical2calendar
+lib/ical/v2.3/contrib/ical2html
+lib/ical/v2.3/contrib/ical2zsh
+lib/ical/v2.3/contrib/icaladd
+lib/ical/v2.3/contrib/icaladdlines
+lib/ical/v2.3/contrib/icalexpire
+lib/ical/v2.3/contrib/icalweekly
+lib/ical/v2.3/contrib/iconwindow.tcl
+lib/ical/v2.3/contrib/timeofday.tcl
+lib/ical/v2.3/contrib/weeknumber.tcl
+lib/ical/v2.3/dateeditor.tcl
+lib/ical/v2.3/dayview.tcl
+lib/ical/v2.3/dg_alarms.tcl
+lib/ical/v2.3/dg_item.tcl
+lib/ical/v2.3/dg_key.tcl
+lib/ical/v2.3/dg_monthr.tcl
+lib/ical/v2.3/dg_print.tcl
+lib/ical/v2.3/dg_range.tcl
+lib/ical/v2.3/dg_wdays.tcl
+lib/ical/v2.3/help.tcl
+lib/ical/v2.3/ical_text.tcl
+lib/ical/v2.3/ical_x.tcl
+lib/ical/v2.3/io.tcl
+lib/ical/v2.3/itemlist.tcl
+lib/ical/v2.3/itemwindow.tcl
+lib/ical/v2.3/link.tcl
+lib/ical/v2.3/listing.tcl
+lib/ical/v2.3/notelist.tcl
+lib/ical/v2.3/parse.tcl
+lib/ical/v2.3/pref.tcl
+lib/ical/v2.3/print.tcl
+lib/ical/v2.3/support.tcl
+lib/ical/v2.3/tclIndex
+lib/ical/v2.3/tcllib/canvas.tcl
+lib/ical/v2.3/tcllib/class.tcl
+lib/ical/v2.3/tcllib/dg_bug.tcl
+lib/ical/v2.3/tcllib/dg_error.tcl
+lib/ical/v2.3/tcllib/dg_file.tcl
+lib/ical/v2.3/tcllib/dg_num.tcl
+lib/ical/v2.3/tcllib/dg_string.tcl
+lib/ical/v2.3/tcllib/dg_yn.tcl
+lib/ical/v2.3/tcllib/dg_ync.tcl
+lib/ical/v2.3/tcllib/filesel.tcl
+lib/ical/v2.3/tcllib/hooks.tcl
+lib/ical/v2.3/tcllib/key.tcl
+lib/ical/v2.3/tcllib/label.tcl
+lib/ical/v2.3/tcllib/menus.tcl
+lib/ical/v2.3/tcllib/ruler.tcl
+lib/ical/v2.3/tcllib/support.tcl
+lib/ical/v2.3/tcllib/tclIndex
+lib/ical/v2.3/tcllib/textwin.tcl
+lib/ical/v2.3/timerange.tcl
+lib/ical/v2.3/trigger.tcl
 man/man1/ical.1
-@dirrm lib/ical/v2.2/contrib
-@dirrm lib/ical/v2.2/tcllib
-@dirrm lib/ical/v2.2
+@dirrm lib/ical/v2.3/contrib
+@dirrm lib/ical/v2.3/tcllib
+@dirrm lib/ical/v2.3
 @dirrm lib/ical
diff --git a/time/ical/distinfo b/time/ical/distinfo
index e466a0272ee..cd7aeb76a63 100644
--- a/time/ical/distinfo
+++ b/time/ical/distinfo
@@ -1,18 +1,5 @@
-$NetBSD: distinfo,v 1.5 2004/04/01 00:52:39 minskim Exp $
+$NetBSD: distinfo,v 1.6 2004/09/08 15:40:07 wulf Exp $
 
-SHA1 (ical-2.2.1.tar.gz) = ba6af590a4d81360f6933762f2adab0886bb4e5f
-Size (ical-2.2.1.tar.gz) = 261959 bytes
+SHA1 (ical-2.3.1.tar.gz) = 98649b7e1fbad9c13356eb5dded693d81b2252f2
+Size (ical-2.3.1.tar.gz) = 264576 bytes
 SHA1 (patch-aa) = 238d2d4ce21cc60ec0eaae854aa722ca0486701d
-SHA1 (patch-ab) = 17ad50ae2815a56590ab9e8745f790782e3b18d4
-SHA1 (patch-ac) = 8fc75ec309325eb46c0a024d99a3b6dfb3f26cae
-SHA1 (patch-ad) = 251c01e9922f6f6fb353b18a9c4c58c7ebde76ca
-SHA1 (patch-ae) = be5885bb63149db74dbddc95dd346fdbccc13087
-SHA1 (patch-af) = 48d148d37bba928e470e02037325bedb9b460406
-SHA1 (patch-ag) = c1fb1fdbca761f19b66ac8405d3e78d4a1e9076e
-SHA1 (patch-ah) = f80d4792d0f980c8b7606bdc9c78378bb18b3b21
-SHA1 (patch-ai) = 2379fc3829e6ec844f9ade5163e9243dc71c13ce
-SHA1 (patch-aj) = f41d1049e258ece3f0928f9be399111aac4391fc
-SHA1 (patch-ak) = bd9fd4cef88050a09c6765b9f483904808e470dd
-SHA1 (patch-al) = 39096e3102a81191c980c70efb5a44f1032d6f9e
-SHA1 (patch-am) = bdba66e18987c46482b13effa678952908beb536
-SHA1 (patch-an) = df67d141a4e08a8a525940777a37177a6849b356
diff --git a/time/ical/patches/patch-ab b/time/ical/patches/patch-ab
deleted file mode 100644
index 96dd64d8cba..00000000000
--- a/time/ical/patches/patch-ab
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/10/02 20:14:23 tron Exp $
-
---- configure.orig	1997-10-22 01:52:57.000000000 +0200
-+++ configure	2003-10-02 22:12:00.000000000 +0200
-@@ -1089,8 +1089,8 @@
- 
- #### Check that the library files exist
- echo $ac_n "checking for installed Tcl/Tk library files""... $ac_c" 1>&6
--lib1="${TCL_EXEC_PREFIX}/lib/${TCL_LIB_FILE}"
--lib2="${TK_EXEC_PREFIX}/lib/${TK_LIB_FILE}"
-+eval lib1="${TCL_EXEC_PREFIX}/lib/${TCL_LIB_FILE}"
-+eval lib2="${TK_EXEC_PREFIX}/lib/${TK_LIB_FILE}"
- for f in "$lib1" "$lib2"; do
-     if test ! -f "$f"; then
- 	echo "$ac_t""$f not found" 1>&6
-@@ -1661,7 +1661,7 @@
- #endif
- 
- #include <string.h>
--static void* ptr = &strerror;
-+static void* ptr = (void *) &strerror;
- int main() {return 0;}
- 
- EOF
-@@ -1699,7 +1699,7 @@
- #endif
- 
- #include <errno.h>
--static void* ptr = &sys_errlist;
-+static void* ptr = (void *) &sys_errlist;
- int main() {return 0;}
- 
- EOF
-@@ -1737,7 +1737,7 @@
- #endif
- 
- #include <sys/time.h>
--static void* ptr = &gettimeofday;
-+static void* ptr = (void *) &gettimeofday;
- int main() {return 0;}
- 
- EOF
-@@ -1775,7 +1775,7 @@
- #endif
- 
- #include <unistd.h>
--static void* ptr = &gethostname;
-+static void* ptr = (void *) &gethostname;
- int main() {return 0;}
- 
- EOF
-@@ -1813,7 +1813,7 @@
- #endif
- 
- #include <unistd.h>
--static void* ptr = &getpid;
-+static void* ptr = (void *) &getpid;
- int main() {return 0;}
- 
- EOF
-@@ -1851,7 +1851,7 @@
- #endif
- 
- #include <string.h>
--static void* ptr = &strncasecmp;
-+static void* ptr = (void *) &strncasecmp;
- int main() {return 0;}
- 
- EOF
-@@ -1889,7 +1889,7 @@
- #endif
- 
- #include <unistd.h>
--static void* ptr = &gethostid;
-+static void* ptr = (void *) &gethostid;
- int main() {return 0;}
- 
- EOF
diff --git a/time/ical/patches/patch-ac b/time/ical/patches/patch-ac
deleted file mode 100644
index 9bb8f8080a6..00000000000
--- a/time/ical/patches/patch-ac
+++ /dev/null
@@ -1,298 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/04/01 00:52:39 minskim Exp $
-
---- cal_tcl.C.orig	2000-06-30 08:23:29.000000000 -0500
-+++ cal_tcl.C
-@@ -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)
-@@ -192,27 +195,27 @@ void Calendar_Tcl::add_error(char const*
- /*
-  * Forward declaration of handler procedures.
-  */
--static int cal_delete	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_main	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_include	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_exclude	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_forincs	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_add	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_remove	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_hide	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_ronly	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_dirty	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_stale	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_save	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_reread	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_query	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_listing	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_loop	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_incal	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_option	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_doption	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_loopf	(ClientData, Tcl_Interp*, int, char*[]);
--static int cal_loopb	(ClientData, Tcl_Interp*, int, char*[]);
-+static int cal_delete	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_main	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_include	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_exclude	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_forincs	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_add	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_remove	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_hide	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_ronly	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_dirty	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_stale	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_save	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_reread	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_query	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_listing	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_loop	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_incal	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_option	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_doption	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_loopf	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int cal_loopb	(ClientData, Tcl_Interp*, int, const char*[]);
- 
- static Dispatch_Entry calendar_dispatch[] = {
-     { "delete",		0, 0, cal_delete	},
-@@ -243,7 +246,7 @@ static Dispatch_Entry calendar_dispatch[
- // query operations.
- 
- static int parse_items(Tcl_Interp* tcl, Calendar_Tcl* cal, ItemList& items,
--		       int& argc, char**& argv)
-+		       int& argc, const char**& argv)
- {
-     // modifies	items, argc, argv
-     // effects	If "argc/argv" starts with "-all", then strips off
-@@ -282,7 +285,7 @@ static int parse_items(Tcl_Interp* tcl, 
- 
-     if ((argc >= 2) && (strcmp(argv[0], "-items") == 0)) {
- 	int count;
--	char** list;
-+	const char** list;
- 	if (Tcl_SplitList(tcl, argv[1], &count, &list) != TCL_OK) {
- 	    TCL_Error(tcl, "invalid item list");
- 	}
-@@ -309,23 +312,23 @@ static int parse_items(Tcl_Interp* tcl, 
-     return TCL_OK;
- }
- 
--int Calendar_Tcl::method(int argc, char* argv[]) {
-+int Calendar_Tcl::method(int argc, const char* argv[]) {
-     return Dispatch(calendar_dispatch, (ClientData)this, tcl(), argc, argv);
- }
- 
--static int cal_delete(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_delete(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
-     delete cal;
- 
-     TCL_Return(tcl, "");
- }
- 
--static int cal_main(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_main(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
-     TCL_Return(tcl, (char*) cal->main->GetName());
- }
- 
--static int cal_include(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_include(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     if (cal->main->GetCalendar()->ReadOnly()) {
-@@ -348,7 +351,7 @@ static int cal_include(ClientData c, Tcl
-     TCL_Return(tcl, "");
- }
- 
--static int cal_exclude(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_exclude(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     if (cal->main->GetCalendar()->ReadOnly()) {
-@@ -381,11 +384,11 @@ static int cal_exclude(ClientData c, Tcl
-     TCL_Error(tcl, "no such calendar");
- }
- 
--static int cal_forincs(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_forincs(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
--    char* var = argv[0];
--    char* body = argv[1];
-+    const char* var = argv[0];
-+    const char* body = argv[1];
-     for (int i = 0; i < cal->includes->size(); i++) {
- 	if (Tcl_SetVar(tcl, var, (char*) (cal->includes->slot(i)->GetName()),
- 		       0) == NULL) {
-@@ -401,7 +404,7 @@ static int cal_forincs(ClientData c, Tcl
-     TCL_Return(tcl, "");
- }
- 
--static int cal_add(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_add(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     // Find item
-@@ -444,7 +447,7 @@ static int cal_add(ClientData c, Tcl_Int
-     TCL_Return(tcl, "");
- }
- 
--static int cal_remove(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_remove(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     // Find item
-@@ -471,7 +474,7 @@ static int cal_remove(ClientData c, Tcl_
-     TCL_Return(tcl, "");
- }
- 
--static int cal_hide(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_hide(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     // Find item
-@@ -509,7 +512,7 @@ static int cal_hide(ClientData c, Tcl_In
-     TCL_Return(tcl, "");
- }
- 
--static int cal_ronly(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_ronly(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     CalFile* file = cal->name2file(argv[0]);
-@@ -517,10 +520,10 @@ static int cal_ronly(ClientData c, Tcl_I
- 	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[]){
-+static int cal_dirty(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     CalFile* file = cal->name2file(argv[0]);
-@@ -528,10 +531,10 @@ static int cal_dirty(ClientData c, Tcl_I
- 	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[]){
-+static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     CalFile* file = cal->name2file(argv[0]);
-@@ -539,10 +542,10 @@ static int cal_stale(ClientData c, Tcl_I
- 	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[]){
-+static int cal_save(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     CalFile* file = cal->name2file(argv[0]);
-@@ -561,7 +564,7 @@ static int cal_save(ClientData c, Tcl_In
-     TCL_Return(tcl, "");
- }
- 
--static int cal_reread(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_reread(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     CalFile* file = cal->name2file(argv[0]);
-@@ -602,7 +605,7 @@ static int cal_reread(ClientData c, Tcl_
- //		If "body" says "continue", move to the next iteration
- 
- static int item_loop(Tcl_Interp* tcl, Occurrences const& list,
--		     char* ivar, char* dvar, char* body) {
-+		     const char* ivar, const char* dvar, const char* body) {
-     for (int i = 0; i < list.size(); i++) {
- 	if (Tcl_SetVar(tcl, ivar, (char*) list[i].item->handle(), 0) == NULL) {
- 	    TCL_Error(tcl, "could not set loop variable");
-@@ -624,7 +627,7 @@ static int item_loop(Tcl_Interp* tcl, Oc
-     TCL_Return(tcl, "");
- }
- 
--static int cal_query(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_query(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     ItemList items;
-@@ -651,7 +654,7 @@ static int cal_query(ClientData c, Tcl_I
-     return (item_loop(tcl, list, argv[2], argv[3], argv[4]));
- }
- 
--static int cal_loopf(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_loopf(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     ItemList items;
-@@ -718,7 +721,7 @@ static int cal_loopf(ClientData c, Tcl_I
-     TCL_Return(tcl, "");
- }
- 
--static int cal_loopb(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_loopb(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     ItemList items;
-@@ -785,7 +788,7 @@ static int cal_loopb(ClientData c, Tcl_I
-     TCL_Return(tcl, "");
- }
- 
--static int cal_listing(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_listing(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     ItemList items;
-@@ -812,7 +815,7 @@ static int cal_listing(ClientData c, Tcl
-     return (item_loop(tcl, list, argv[2], argv[3], argv[4]));
- }
- 
--static int cal_loop(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_loop(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     ItemList items;
-@@ -838,7 +841,7 @@ static int cal_loop(ClientData c, Tcl_In
-     return (item_loop(tcl, list, argv[0], 0, argv[1]));
- }
- 
--static int cal_incal(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-+static int cal_incal(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
- 
-     CalFile* file = cal->name2file(argv[0]);
-@@ -868,7 +871,7 @@ static int cal_incal(ClientData c, Tcl_I
-     return (item_loop(tcl, list, argv[1], 0, argv[2]));
- }
- 
--static int cal_option(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int cal_option(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
-     CalFile* file = cal->main;
- 
-@@ -899,7 +902,7 @@ static int cal_option(ClientData c, Tcl_
-     TCL_Return(tcl, "");
- }
- 
--static int cal_doption(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int cal_doption(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Calendar_Tcl* cal = (Calendar_Tcl*) c;
-     CalFile* file = cal->main;
- 
diff --git a/time/ical/patches/patch-ad b/time/ical/patches/patch-ad
deleted file mode 100644
index 737d54a549c..00000000000
--- a/time/ical/patches/patch-ad
+++ /dev/null
@@ -1,505 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/04/01 00:52:39 minskim Exp $
-
---- item_tcl.C.orig	1996-08-01 14:25:10.000000000 -0500
-+++ item_tcl.C
-@@ -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.
-  */
-@@ -63,47 +66,47 @@ Item_Tcl* Item_Tcl::find(Item* item) {
- /*
-  * Forward declaration of handler procedures.
-  */
--static int item_length	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_startt	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_clone	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_is	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_delete	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_cal	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_text	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_uid	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_early	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_owner	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_owned	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_own	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_hilite	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_todo	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_is_done	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_done	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_alarms	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_option	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_doption	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_empty	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_repeat	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_first	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_type	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_desc	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_cont	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_next	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_range	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_date	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_start	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_finish	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_ondel	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_dayr	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_wdays	(ClientData, Tcl_Interp*, int, char*[]);
--
--static int item_monthr		(ClientData, Tcl_Interp*, int, char*[]);
--static int item_mday		(ClientData, Tcl_Interp*, int, char*[]);
--static int item_mlday		(ClientData, Tcl_Interp*, int, char*[]);
--static int item_mworkday	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_mlworkday	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_mweekday	(ClientData, Tcl_Interp*, int, char*[]);
--static int item_mlweekday	(ClientData, Tcl_Interp*, int, char*[]);
-+static int item_length	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_startt	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_clone	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_is	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_delete	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_cal	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_text	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_uid	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_early	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_owner	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_owned	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_own	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_hilite	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_todo	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_is_done	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_done	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_alarms	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_option	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_doption	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_empty	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_repeat	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_first	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_type	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_desc	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_cont	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_next	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_range	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_date	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_start	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_finish	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_ondel	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_dayr	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_wdays	(ClientData, Tcl_Interp*, int, const char*[]);
-+
-+static int item_monthr		(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_mday		(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_mlday		(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_mworkday	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_mlworkday	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_mweekday	(ClientData, Tcl_Interp*, int, const char*[]);
-+static int item_mlweekday	(ClientData, Tcl_Interp*, int, const char*[]);
- 
- static Dispatch_Entry item_dispatch[] = {
-     { "delete",			0, 0, item_delete	},
-@@ -156,7 +159,7 @@ static Dispatch_Entry item_dispatch[] = 
-     { 0,			0, 0, 0			}
- };
- 
--int Item_Tcl::method(int argc, char* argv[]) {
-+int Item_Tcl::method(int argc, const char* argv[]) {
-     return Dispatch(item_dispatch, (ClientData)this, tcl(), argc, argv);
- }
- 
-@@ -164,7 +167,7 @@ int Item_Tcl::method(int argc, char* arg
-  * Handler procedures.
-  */
- 
--static int item_length(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_length(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     Appointment* appt = item->value()->AsAppointment();
-@@ -193,7 +196,7 @@ static int item_length(ClientData c, Tcl
-     TCL_Error(tcl, "unknown command");
- }
- 
--static int item_startt(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_startt(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     Appointment* appt = item->value()->AsAppointment();
-@@ -222,27 +225,27 @@ static int item_startt(ClientData c, Tcl
-     TCL_Return(tcl, "");
- }
- 
--static int item_clone(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_clone(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
-     Item_Tcl* clone = new Item_Tcl(tcl, item->value()->Clone(), 0);
-     TCL_Return(tcl, (char*) clone->handle());
- }
- 
--static int item_is(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_is(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     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[]) {
-+static int item_delete(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = ((Item_Tcl*) c);
-     if (! check_permission(tcl, item)) return TCL_ERROR;
- 
-@@ -262,7 +265,7 @@ static int item_delete(ClientData c, Tcl
-     TCL_Return(tcl, "");
- }
- 
--static int item_cal(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_cal(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     CalFile* cal = item->calendar();
-@@ -272,7 +275,7 @@ static int item_cal(ClientData c, Tcl_In
-     TCL_Return(tcl, (char*)(cal->GetName()));
- }
- 
--static int item_text(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_text(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     if (argc == 0) {
-@@ -286,12 +289,12 @@ static int item_text(ClientData c, Tcl_I
-     TCL_Return(tcl, "");
- }
- 
--static int item_uid(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_uid(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
-     TCL_Return(tcl, (char*) item->value()->GetUid());
- }
- 
--static int item_early(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_early(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     if (argc == 0) {
-@@ -313,7 +316,7 @@ static int item_early(ClientData c, Tcl_
-     TCL_Return(tcl, "");
- }
- 
--static int item_owner(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_owner(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     if (argc == 0) {
-@@ -327,12 +330,12 @@ static int item_owner(ClientData c, Tcl_
-     TCL_Return(tcl, "");
- }
- 
--static int item_owned(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_owned(ClientData c, Tcl_Interp* tcl, int argc, const 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[]) {
-+static int item_own(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
-     if (! check_permission(tcl, item)) return TCL_ERROR;
-     item->value()->MakeOwner();
-@@ -341,7 +344,7 @@ static int item_own(ClientData c, Tcl_In
-     TCL_Return(tcl, "");
- }
- 
--static int item_hilite(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_hilite(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     if (argc == 0) {
-@@ -356,11 +359,11 @@ static int item_hilite(ClientData c, Tcl
-     TCL_Return(tcl, "");
- }
- 
--static int item_todo(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_todo(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     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;
-@@ -374,12 +377,12 @@ static int item_todo(ClientData c, Tcl_I
-     TCL_Return(tcl, "");
- }
- 
--static int item_is_done(ClientData c, Tcl_Interp* tcl,int argc,char* argv[]) {
-+static int item_is_done(ClientData c, Tcl_Interp* tcl,int argc, const 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[]) {
-+static int item_done(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
-     if (! check_permission(tcl, item)) return TCL_ERROR;
- 
-@@ -394,7 +397,7 @@ static int item_done(ClientData c, Tcl_I
-     TCL_Return(tcl, "");
- }
- 
--static int item_alarms(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_alarms(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     Appointment* appt = item->value()->AsAppointment();
-@@ -431,7 +434,7 @@ static int item_alarms(ClientData c, Tcl
-     }
- 
-     int count;
--    char** list;
-+    const char** list;
-     if (Tcl_SplitList(tcl, argv[0], &count, &list) != TCL_OK) {
- 	TCL_Error(tcl, "invalid alarm list");
-     }
-@@ -460,7 +463,7 @@ static int item_alarms(ClientData c, Tcl
-     TCL_Return(tcl, "");
- }
- 
--static int item_option(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_option(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     if (argc == 1) {
-@@ -476,7 +479,7 @@ static int item_option(ClientData c, Tcl
-     TCL_Return(tcl, "");
- }
- 
--static int item_doption(ClientData c, Tcl_Interp* tcl, int argc,char* argv[]) {
-+static int item_doption(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     if (! check_permission(tcl, item)) return TCL_ERROR;
-@@ -490,17 +493,17 @@ static int item_doption(ClientData c, Tc
-     TCL_Return(tcl, "");
- }
- 
--static int item_empty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_empty(ClientData c, Tcl_Interp* tcl, int argc, const 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[]) {
-+static int item_repeat(ClientData c, Tcl_Interp* tcl, int argc, const 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[]) {
-+static int item_first(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
-     Date d;
-     if (! item->value()->first(d)) {
-@@ -513,7 +516,7 @@ static int item_first(ClientData c, Tcl_
-     return TCL_OK;
- }
- 
--static int item_type(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_type(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
-     char* result;
-     switch (item->value()->repeat_type()) {
-@@ -560,7 +563,7 @@ static int item_type(ClientData c, Tcl_I
-     TCL_Return(tcl, result);
- }
- 
--static int item_desc(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_desc(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
-     charArray buffer;
-     item->value()->describe(&buffer);
-@@ -569,17 +572,17 @@ static int item_desc(ClientData c, Tcl_I
-     return TCL_OK;
- }
- 
--static int item_cont(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_cont(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
-     int dateDays;
-     if (Tcl_GetInt(tcl, argv[0], &dateDays) != TCL_OK) {
- 	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[]) {
-+static int item_next(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
-     int dateDays;
-     if (Tcl_GetInt(tcl, argv[0], &dateDays) != TCL_OK) {
-@@ -597,7 +600,7 @@ static int item_next(ClientData c, Tcl_I
-     return TCL_OK;
- }
- 
--static int item_range(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_range(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     Date s, f;
-@@ -609,14 +612,14 @@ static int item_range(ClientData c, Tcl_
- 	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);
-     }
- }
- 
--static int item_date(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_date(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
-     int dateDays;
-     if (Tcl_GetInt(tcl, argv[0], &dateDays) != TCL_OK) {
-@@ -630,7 +633,7 @@ static int item_date(ClientData c, Tcl_I
-     TCL_Return(tcl, "");
- }
- 
--static int item_start(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_start(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
-     int dateDays;
-     if (Tcl_GetInt(tcl, argv[0], &dateDays) != TCL_OK) {
-@@ -644,7 +647,7 @@ static int item_start(ClientData c, Tcl_
-     TCL_Return(tcl, "");
- }
- 
--static int item_finish(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_finish(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
-     int dateDays;
-     if (Tcl_GetInt(tcl, argv[0], &dateDays) != TCL_OK) {
-@@ -658,7 +661,7 @@ static int item_finish(ClientData c, Tcl
-     TCL_Return(tcl, "");
- }
- 
--static int item_ondel(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_ondel(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
-     int dateDays;
-     if (Tcl_GetInt(tcl, argv[0], &dateDays) != TCL_OK) {
-@@ -672,7 +675,7 @@ static int item_ondel(ClientData c, Tcl_
-     TCL_Return(tcl, "");
- }
- 
--static int item_dayr(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_dayr(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     int interval;
-@@ -693,7 +696,7 @@ static int item_dayr(ClientData c, Tcl_I
-     TCL_Return(tcl, "");
- }
- 
--static int item_monthr(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_monthr(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     int interval;
-@@ -719,8 +722,8 @@ static int item_monthr(ClientData c, Tcl
- // 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".
--static int parse_month_args(Tcl_Interp* tcl, int argc, char* argv[],
-+//		then "anchor" is set to today and "interval" is set to One.
-+static int parse_month_args(Tcl_Interp* tcl, int argc, const char* argv[],
- 			    int& n, Date& anchor, int& interval)
- {
-     if ((argc != 1) && (argc != 3)) TCL_Error(tcl,"wrong number of arguments");
-@@ -745,7 +748,7 @@ static int parse_month_args(Tcl_Interp* 
-     return TCL_OK;
- }
- 
--static int item_mday(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_mday(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     int n, interval;
-@@ -760,7 +763,7 @@ static int item_mday(ClientData c, Tcl_I
-     TCL_Return(tcl, "");
- }
- 
--static int item_mlday(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_mlday(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     int n, interval;
-@@ -776,7 +779,7 @@ static int item_mlday(ClientData c, Tcl_
- }
- 
- static int item_mworkday(ClientData c, Tcl_Interp* tcl,
--			 int argc, char* argv[]) {
-+			 int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     int n, interval;
-@@ -792,7 +795,7 @@ static int item_mworkday(ClientData c, T
- }
- 
- static int item_mlworkday(ClientData c, Tcl_Interp* tcl,
--			  int argc, char* argv[]) {
-+			  int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     int n, interval;
-@@ -808,7 +811,7 @@ static int item_mlworkday(ClientData c, 
- }
- 
- static int item_mweekday(ClientData c, Tcl_Interp* tcl,
--			 int argc, char* argv[]) {
-+			 int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     int wday;
-@@ -829,7 +832,7 @@ static int item_mweekday(ClientData c, T
- }
- 
- static int item_mlweekday(ClientData c, Tcl_Interp* tcl,
--			  int argc, char* argv[]) {
-+			  int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     int wday;
-@@ -849,7 +852,7 @@ static int item_mlweekday(ClientData c, 
-     TCL_Return(tcl, "");
- }
- 
--static int item_wdays(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+static int item_wdays(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Item_Tcl* item = (Item_Tcl*) c;
- 
-     /* Collect weekdays */
diff --git a/time/ical/patches/patch-ae b/time/ical/patches/patch-ae
deleted file mode 100644
index 4d089450b9e..00000000000
--- a/time/ical/patches/patch-ae
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/04/01 00:52:39 minskim Exp $
-
---- dateeditor.C.orig	1996-02-09 21:17:35.000000000 -0600
-+++ dateeditor.C
-@@ -47,7 +47,7 @@ static Calendar_Tcl* find_cal(Tcl_Interp
-  *		item (under the assumption that the month  named by <date>
-  *		is being displayed).
-  */
--int Cmd_MonthDays(ClientData, Tcl_Interp* tcl, int argc, char* argv[]) {
-+int Cmd_MonthDays(ClientData, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     if (argc != 4) {
- 	TCL_Error(tcl, "illegal number of arguments");
-     }
-@@ -68,7 +68,7 @@ int Cmd_MonthDays(ClientData, Tcl_Interp
-     }
-     int finish = start + first.GetMonth().Size(first.GetYear()) - 1;
- 
--    char* canvas = argv[2];
-+    const char* canvas = argv[2];
-     if (Tcl_VarEval(tcl, canvas, " itemconfig Day -text {}", NULL) != TCL_OK) {
- 	return TCL_ERROR;
-     }
-@@ -93,7 +93,7 @@ int Cmd_MonthDays(ClientData, Tcl_Interp
-  *		"<hlist>", the string "always" is used instead of actual
-  *		hilite style.
-  */
--int Cmd_HiliteLoop(ClientData, Tcl_Interp* tcl, int argc, char* argv[]) {
-+int Cmd_HiliteLoop(ClientData, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     int i;
- 
-     if (argc != 8) {
-@@ -113,7 +113,7 @@ int Cmd_HiliteLoop(ClientData, Tcl_Inter
-     }
- 
-     int count;
--    char** strlist;
-+    const char** strlist;
-     if (Tcl_SplitList(tcl, argv[2], &count, &strlist) != TCL_OK) {
- 	return TCL_ERROR;
-     }
-@@ -124,9 +124,9 @@ int Cmd_HiliteLoop(ClientData, Tcl_Inter
-     Date today = Date::Today();
-     Date start(startDays);
-     Date finish(finishDays);
--    char* dvar = argv[5];
--    char* hvar = argv[6];
--    char* body = argv[7];
-+    const char* dvar = argv[5];
-+    const char* hvar = argv[6];
-+    const char* body = argv[7];
- 
-     // Get all items
-     ItemList items;
diff --git a/time/ical/patches/patch-af b/time/ical/patches/patch-af
deleted file mode 100644
index 57ef49ba194..00000000000
--- a/time/ical/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/04/01 00:52:39 minskim Exp $
-
---- dispatch.C.orig	1994-05-19 22:21:54.000000000 -0500
-+++ dispatch.C
-@@ -4,13 +4,13 @@
- #include "ical.h"
- 
- int Dispatch(Dispatch_Entry* table, ClientData c, Tcl_Interp* tcl,
--	     int argc, char* argv[]) {
-+	     int argc, const char* argv[]) {
- 
-     if (argc < 2) {
- 	TCL_Error(tcl, "invalid command");
-     }
- 
--    char* command = argv[1];
-+    const char* command = argv[1];
-     argc -= 2;
-     argv += 2;
- 
diff --git a/time/ical/patches/patch-ag b/time/ical/patches/patch-ag
deleted file mode 100644
index 75d7f10889f..00000000000
--- a/time/ical/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/04/01 00:52:39 minskim Exp $
-
---- dispatch.h.orig	1993-06-01 12:18:39.000000000 -0500
-+++ dispatch.h
-@@ -40,6 +40,6 @@ struct Dispatch_Entry {
-  * The array is delimited by a NULL command field in the last entry.
-  */
- 
--extern int Dispatch(Dispatch_Entry*, ClientData, Tcl_Interp*, int, char*[]);
-+extern int Dispatch(Dispatch_Entry*, ClientData, Tcl_Interp*, int, const char*[]);
- 
- #endif /* _DISPATCH_H */
diff --git a/time/ical/patches/patch-ah b/time/ical/patches/patch-ah
deleted file mode 100644
index eba962bb8e7..00000000000
--- a/time/ical/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/04/01 00:52:39 minskim Exp $
-
---- cal_tcl.h.orig	1994-10-22 12:36:34.000000000 -0500
-+++ cal_tcl.h
-@@ -24,7 +24,7 @@ class Calendar_Tcl : public Object {
-     int error();		/* Used to detect initialization error */
-     char const* error_msg();	/* Error description */
- 
--    virtual int method(int, char*[]);
-+    virtual int method(int, const char*[]);
- 
-     CalFile*  main;		/* Main calendar */
-     FileList* includes;		/* Included calendars */
diff --git a/time/ical/patches/patch-ai b/time/ical/patches/patch-ai
deleted file mode 100644
index 2a82c722233..00000000000
--- a/time/ical/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/04/01 00:52:39 minskim Exp $
-
---- item_tcl.h.orig	1994-02-24 16:59:27.000000000 -0600
-+++ item_tcl.h
-@@ -31,7 +31,7 @@ class Item_Tcl : public Object {
-     static Item_Tcl* find(Item*);
- 
-     // effects	Handle TCL commands
--    virtual int method(int, char*[]);
-+    virtual int method(int, const char*[]);
-   private:
-     Item* item;		// Associated item
-     CalFile* cal;	// Associated calendar
diff --git a/time/ical/patches/patch-aj b/time/ical/patches/patch-aj
deleted file mode 100644
index 8429744b9fd..00000000000
--- a/time/ical/patches/patch-aj
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2004/04/01 00:52:39 minskim Exp $
-
---- object.C.orig	1994-05-19 22:22:04.000000000 -0500
-+++ object.C
-@@ -8,7 +8,7 @@
- #include "ical.h"
- #include "object.h"
- 
--static int obj_handle(ClientData, Tcl_Interp*, int, char*[]);
-+static int obj_handle(ClientData, Tcl_Interp*, int, const char*[]);
- 
- Object::Object(Tcl_Interp* t, char const* type) {
-     /* Generate handle */
-@@ -52,11 +52,11 @@ Object* Object::find(Tcl_Interp* tcl, ch
-     return 0;
- }
- 
--int Object::method(int, char*[]) {
-+int Object::method(int, const char*[]) {
-     TCL_Error(interp, "Object has no methods");
- }
- 
--int obj_handle(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-+int obj_handle(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     Object* object = (Object*) c;
- 
-     assert(object->tcl() == tcl);
diff --git a/time/ical/patches/patch-ak b/time/ical/patches/patch-ak
deleted file mode 100644
index 8f87c8e6438..00000000000
--- a/time/ical/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/04/01 00:52:39 minskim Exp $
-
---- object.h.orig	1994-04-01 18:11:55.000000000 -0600
-+++ object.h
-@@ -45,7 +45,7 @@ class Object {
-     static Object* find(Tcl_Interp*, char const* handle);
- 
-     /* TCL Callback */
--    virtual int method(int argc, char* argv[]);
-+    virtual int method(int argc, const char* argv[]);
-   private:
-     void init(Tcl_Interp*, char const* otype, char const* ohandle);
- 
diff --git a/time/ical/patches/patch-al b/time/ical/patches/patch-al
deleted file mode 100644
index 47779d4d676..00000000000
--- a/time/ical/patches/patch-al
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-al,v 1.1 2004/04/01 00:52:39 minskim Exp $
-
---- ical_tcl.C.orig	1996-02-09 21:17:37.000000000 -0600
-+++ ical_tcl.C
-@@ -10,7 +10,7 @@
-  *	notice <name>
-  */
- 
--int Cmd_CreateNotice(ClientData, Tcl_Interp* tcl, int argc, char* argv[]) {
-+int Cmd_CreateNotice(ClientData, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     if (argc != 1) {
- 	TCL_Error(tcl, "invalid arguments to notice");
-     }
-@@ -25,7 +25,7 @@ int Cmd_CreateNotice(ClientData, Tcl_Int
-  *	appointment <name>	-- Returns <name>
-  */
- 
--int Cmd_CreateAppt(ClientData, Tcl_Interp* tcl, int argc, char* argv[]) {
-+int Cmd_CreateAppt(ClientData, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     if (argc != 1) {
- 	TCL_Error(tcl, "invalid arguments to appointment");
-     }
-@@ -40,7 +40,7 @@ int Cmd_CreateAppt(ClientData, Tcl_Inter
-  *	calendar <name> <filename>	-- Returns <name>
-  */
- 
--int Cmd_CreateCalendar(ClientData, Tcl_Interp* tcl, int argc, char* argv[]) {
-+int Cmd_CreateCalendar(ClientData, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     if (argc != 3) {
- 	TCL_Error(tcl, "invalid arguments to calendar");
-     }
-@@ -62,7 +62,7 @@ int Cmd_CreateCalendar(ClientData, Tcl_I
-  *		of the translation fails, this routine returns an
-  *		error.  Otherwise it returns the translated file name.
-  */
--int Cmd_ExpandFileName(ClientData, Tcl_Interp* tcl, int argc, char* argv[]) {
-+int Cmd_ExpandFileName(ClientData, Tcl_Interp* tcl, int argc, const char* argv[]) {
-     if (argc != 2) {
- 	TCL_Error(tcl, "invalid arguments to expand_file_name");
-     }
diff --git a/time/ical/patches/patch-am b/time/ical/patches/patch-am
deleted file mode 100644
index 4f1805cc857..00000000000
--- a/time/ical/patches/patch-am
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/04/01 00:52:39 minskim Exp $
-
---- ical.h.orig	1996-02-09 21:17:36.000000000 -0600
-+++ ical.h
-@@ -38,18 +38,18 @@ extern void trigger(Tcl_Interp*, char co
- 
- // Prototype for Tcl commands.
- 
--extern int Cmd_CreateCalendar	(ClientData, Tcl_Interp*, int, char*[]);
--extern int Cmd_CreateNotice	(ClientData, Tcl_Interp*, int, char*[]);
--extern int Cmd_CreateAppt	(ClientData, Tcl_Interp*, int, char*[]);
-+extern int Cmd_CreateCalendar	(ClientData, Tcl_Interp*, int, const char*[]);
-+extern int Cmd_CreateNotice	(ClientData, Tcl_Interp*, int, const char*[]);
-+extern int Cmd_CreateAppt	(ClientData, Tcl_Interp*, int, const char*[]);
- 
--extern int Cmd_Date		(ClientData, Tcl_Interp*, int, char*[]);
--extern int Cmd_Time		(ClientData, Tcl_Interp*, int, char*[]);
-+extern int Cmd_Date		(ClientData, Tcl_Interp*, int, const char*[]);
-+extern int Cmd_Time		(ClientData, Tcl_Interp*, int, const char*[]);
- 
- /* Speedup routines. */
--extern int Cmd_MonthDays	(ClientData, Tcl_Interp*, int, char*[]);
--extern int Cmd_HiliteLoop	(ClientData, Tcl_Interp*, int, char*[]);
-+extern int Cmd_MonthDays	(ClientData, Tcl_Interp*, int, const char*[]);
-+extern int Cmd_HiliteLoop	(ClientData, Tcl_Interp*, int, const char*[]);
- 
- /* Convenience routines */
--extern int Cmd_ExpandFileName	(ClientData, Tcl_Interp*, int, char*[]);
-+extern int Cmd_ExpandFileName	(ClientData, Tcl_Interp*, int, const char*[]);
- 
- #endif /* _ICAL_H */
diff --git a/time/ical/patches/patch-an b/time/ical/patches/patch-an
deleted file mode 100644
index 80470eb854e..00000000000
--- a/time/ical/patches/patch-an
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/04/01 00:52:39 minskim Exp $
-
---- time_tcl.C.orig	1994-05-19 22:22:05.000000000 -0500
-+++ time_tcl.C
-@@ -32,8 +32,8 @@ extern "C" {
-  */
- 
- /* Date command */
--int Cmd_Date(ClientData, Tcl_Interp* tcl, int argc, char* argv[]) {
--    char* cmd = argv[1];
-+int Cmd_Date(ClientData, Tcl_Interp* tcl, int argc, const char* argv[]) {
-+    const char* cmd = argv[1];
-     char buffer[100];
-     int days;
-     Date d;
-@@ -162,8 +162,8 @@ int Cmd_Date(ClientData, Tcl_Interp* tcl
- }
- 
- /* Time command */
--int Cmd_Time(ClientData, Tcl_Interp* tcl, int argc, char* argv[]) {
--    char* cmd = argv[1];
-+int Cmd_Time(ClientData, Tcl_Interp* tcl, int argc, const char* argv[]) {
-+    const char* cmd = argv[1];
-     char buffer[100];
-     double secs;
-     Time t;