Switch to Tcl/Tk 8.4, bl3ify, and enable pkgviews installation.

Bump PKGREVISION due to Tcl/Tk dependency changes.

14 files changed, 958 insertions, 39 deletions

diff --git a/time/ical/Makefile b/time/ical/Makefile
index 7fc61c49562..a85dbece8e6 100644
--- a/time/ical/Makefile
+++ b/time/ical/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/03/19 08:34:01 bouyer Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/01 00:52:39 minskim Exp $
 
 DISTNAME=	ical-2.2.1
+PKGREVISION=	1
 CATEGORIES=	time
 MASTER_SITES=	http://members.nbci.com/majahj/ical/
 
@@ -8,14 +9,16 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://members.nbci.com/majahj/ical/
 COMMENT=	Calendar application
 
-USE_BUILDLINK2=	yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	yes
 USE_LANGUAGES=	c c++
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--with-tclconfig=${PREFIX}/lib \
-		--with-tclsh=${PREFIX}/bin/tclsh \
-		--with-tkconfig=${PREFIX}/lib
+		--with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib \
+		--with-tclsh=${BUILDLINK_PREFIX.tcl}/bin/tclsh \
+		--with-tkconfig=${BUILDLINK_PREFIX.tk}/lib
 
 post-configure:
 	${TOUCH} ${WRKDIR}/${DISTNAME}/Makefile \
@@ -23,5 +26,6 @@ post-configure:
 	         ${WRKDIR}/${DISTNAME}/startup.tcl \
 	         ${WRKDIR}/${DISTNAME}/time/Makefile
 
-.include "../../x11/tk83/buildlink2.mk"
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/ical/distinfo b/time/ical/distinfo
index cc85b5d0e50..e466a0272ee 100644
--- a/time/ical/distinfo
+++ b/time/ical/distinfo
@@ -1,8 +1,18 @@
-$NetBSD: distinfo,v 1.4 2003/10/02 20:14:23 tron Exp $
+$NetBSD: distinfo,v 1.5 2004/04/01 00:52:39 minskim Exp $
 
 SHA1 (ical-2.2.1.tar.gz) = ba6af590a4d81360f6933762f2adab0886bb4e5f
 Size (ical-2.2.1.tar.gz) = 261959 bytes
 SHA1 (patch-aa) = 238d2d4ce21cc60ec0eaae854aa722ca0486701d
 SHA1 (patch-ab) = 17ad50ae2815a56590ab9e8745f790782e3b18d4
-SHA1 (patch-ac) = 002612db5040469d0f316893a40eb067d94e677e
-SHA1 (patch-ad) = 8d77fd27aad3d6a19cbe1596d716eec78203c5ba
+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-ac b/time/ical/patches/patch-ac
index 95b395dc001..9bb8f8080a6 100644
--- a/time/ical/patches/patch-ac
+++ b/time/ical/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2001/10/15 17:09:44 tron Exp $
+$NetBSD: patch-ac,v 1.2 2004/04/01 00:52:39 minskim Exp $
 
---- cal_tcl.C.orig	Fri Jun 30 15:23:29 2000
-+++ cal_tcl.C	Mon Oct 15 19:04:22 2001
+--- 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"
@@ -12,7 +12,162 @@ $NetBSD: patch-ac,v 1.1 2001/10/15 17:09:44 tron Exp $
  implementArray(FileList,CalFile*)
  
  Calendar_Tcl::Calendar_Tcl(Tcl_Interp* tcl, char const* h, char const* f)
-@@ -517,7 +520,7 @@
+@@ -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");
      }
  
@@ -20,8 +175,12 @@ $NetBSD: patch-ac,v 1.1 2001/10/15 17:09:44 tron Exp $
 +    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 @@
+-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");
      }
  
@@ -29,8 +188,12 @@ $NetBSD: patch-ac,v 1.1 2001/10/15 17:09:44 tron Exp $
 +    TCL_Return(tcl, (file->IsModified() ? One : Zero));
  }
  
- static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-@@ -539,7 +542,7 @@
+-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");
      }
  
@@ -38,4 +201,98 @@ $NetBSD: patch-ac,v 1.1 2001/10/15 17:09:44 tron Exp $
 +    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, 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
index c1a29f4d673..737d54a549c 100644
--- a/time/ical/patches/patch-ad
+++ b/time/ical/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2001/10/15 17:09:44 tron Exp $
+$NetBSD: patch-ad,v 1.2 2004/04/01 00:52:39 minskim Exp $
 
---- item_tcl.C.orig	Thu Aug  1 21:25:10 1996
-+++ item_tcl.C	Mon Oct 15 19:07:06 2001
+--- 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"
@@ -12,7 +12,135 @@ $NetBSD: patch-ad,v 1.1 2001/10/15 17:09:44 tron Exp $
  /*
   * Item* -> Item_Tcl* map.
   */
-@@ -232,14 +235,14 @@
+@@ -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)) {
@@ -29,17 +157,84 @@ $NetBSD: patch-ad,v 1.1 2001/10/15 17:09:44 tron Exp $
 +    TCL_Return(tcl, Zero);
  }
  
- static int item_delete(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-@@ -329,7 +332,7 @@
+-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;
  
- static int item_owned(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+     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[]) {
-@@ -360,7 +363,7 @@
+-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) {
@@ -48,31 +243,108 @@ $NetBSD: patch-ad,v 1.1 2001/10/15 17:09:44 tron Exp $
      }
  
      int todo;
-@@ -376,7 +379,7 @@
+@@ -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,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[]) {
-@@ -492,12 +495,12 @@
+-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, 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, 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[]) {
-@@ -576,7 +579,7 @@
+-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);
@@ -80,8 +352,21 @@ $NetBSD: patch-ad,v 1.1 2001/10/15 17:09:44 tron Exp $
 +    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 @@
+-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");
@@ -94,12 +379,127 @@ $NetBSD: patch-ad,v 1.1 2001/10/15 17:09:44 tron Exp $
      }
  }
  
-@@ -719,7 +722,7 @@
+-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, char* argv[],
++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
new file mode 100644
index 00000000000..4d089450b9e
--- /dev/null
+++ b/time/ical/patches/patch-ae
@@ -0,0 +1,53 @@
+$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
new file mode 100644
index 00000000000..57ef49ba194
--- /dev/null
+++ b/time/ical/patches/patch-af
@@ -0,0 +1,20 @@
+$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
new file mode 100644
index 00000000000..75d7f10889f
--- /dev/null
+++ b/time/ical/patches/patch-ag
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 00000000000..eba962bb8e7
--- /dev/null
+++ b/time/ical/patches/patch-ah
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..2a82c722233
--- /dev/null
+++ b/time/ical/patches/patch-ai
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..8429744b9fd
--- /dev/null
+++ b/time/ical/patches/patch-aj
@@ -0,0 +1,27 @@
+$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
new file mode 100644
index 00000000000..8f87c8e6438
--- /dev/null
+++ b/time/ical/patches/patch-ak
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..47779d4d676
--- /dev/null
+++ b/time/ical/patches/patch-al
@@ -0,0 +1,40 @@
+$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
new file mode 100644
index 00000000000..4f1805cc857
--- /dev/null
+++ b/time/ical/patches/patch-am
@@ -0,0 +1,31 @@
+$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
new file mode 100644
index 00000000000..80470eb854e
--- /dev/null
+++ b/time/ical/patches/patch-an
@@ -0,0 +1,26 @@
+$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;