9 files changed, 54 insertions, 120 deletions

diff --git a/deskutils/ical/files/patch-cal_tcl.C b/deskutils/ical/files/patch-cal_tcl.C
index 0407a6297d74..dfb62ad94262 100644
--- a/deskutils/ical/files/patch-cal_tcl.C
+++ b/deskutils/ical/files/patch-cal_tcl.C
@@ -49,15 +49,6 @@
      { 0,		0, 0, 0			}
  };
  
-@@ -281,7 +281,7 @@ static int parse_items(Tcl_Interp* tcl, Calendar_Tcl* 
- 
-     if ((argc >= 2) && (strcmp(argv[0], "-items") == 0)) {
- 	int count;
--	char** list;
-+	CONST84 char** list;
- 	if (Tcl_SplitList(tcl, argv[1], &count, &list) != TCL_OK) {
- 	    TCL_Error(tcl, "invalid item list");
- 	}
 @@ -516,7 +516,7 @@ static int cal_ronly(ClientData c, Tcl_Interp* tcl, in
  	TCL_Error(tcl, "no such calendar");
      }
diff --git a/deskutils/ical/files/patch-config.h.in b/deskutils/ical/files/patch-config.h.in
index c420c5be8366..4f495bb2519b 100644
--- a/deskutils/ical/files/patch-config.h.in
+++ b/deskutils/ical/files/patch-config.h.in
@@ -1,43 +1,23 @@
---- config.h.in.orig	1995-07-02 22:12:55 UTC
+--- config.h.in.orig	2004-03-11 11:26:55 UTC
 +++ config.h.in
-@@ -5,26 +5,26 @@
+@@ -5,14 +5,14 @@
  #undef pid_t
  
  #undef SIZEOF_LONG
 -#undef HAVE_STRING_H
 -#undef HAVE_LIMITS_H
-+#define HAVE_STRING_H 1
-+#define HAVE_LIMITS_H 1
++#define HAVE_STRING_H	1
++#define HAVE_LIMITS_H	1
  
 -#undef HAVE_FSYNC
-+#define HAVE_FSYNC 1
++#define HAVE_FSYNC	1
  
 -#undef HAVE_STRERROR
--#undef HAVE_STRERROR_PROTO
--#undef HAVE_SYS_ERRLIST_PROTO
-+#define HAVE_STRERROR 1
-+#define HAVE_STRERROR_PROTO 1
-+#define HAVE_SYS_ERRLIST_PROTO 1
- 
--#undef HAVE_GETTIMEOFDAY_PROTO
-+#define HAVE_GETTIMEOFDAY_PROTO 1
- 
--#undef HAVE_GETHOSTID
--#undef HAVE_GETHOSTID_PROTO
-+#define HAVE_GETHOSTID 1
-+#define HAVE_GETHOSTID_PROTO 1
++#define HAVE_STRERROR	1
  
 -#undef HAVE_UNAME
 -#undef HAVE_SYS_UTSNAME_H
--#undef HAVE_GETHOSTNAME_PROTO
-+#define HAVE_UNAME 1
-+#define HAVE_SYS_UTSNAME_H 1
-+#define HAVE_GETHOSTNAME_PROTO 1
- 
--#undef HAVE_GETPID_PROTO
-+#define HAVE_GETPID_PROTO 1
- 
--#undef HAVE_STRNCASECMP_PROTO
-+#define HAVE_STRNCASECMP_PROTO 1
++#define HAVE_UNAME	1
++#define HAVE_SYS_UTSNAME_H	1
  
  #endif /* _CONFIG_H_IN */
diff --git a/deskutils/ical/files/patch-configure b/deskutils/ical/files/patch-configure
index d8350a9b153b..a1c2c1493cd9 100644
--- a/deskutils/ical/files/patch-configure
+++ b/deskutils/ical/files/patch-configure
@@ -1,17 +1,17 @@
---- configure.orig	1999-08-06 23:07:54 UTC
+--- configure.orig	2004-03-11 11:26:55 UTC
 +++ configure
-@@ -1204,8 +1204,8 @@ fi
+@@ -1208,8 +1208,8 @@
  
  echo "checking Tcl/Tk installation" 1>&6
- echo "configure:1207: checking Tcl/Tk installation" >&5
--legal_tk_versions="8.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1"
--legal_tcl_versions="8.0 7.9 7.8 7.7 7.6 7.5"
-+legal_tk_versions="8.5 8.4 8.3 8.2 8.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1"
-+legal_tcl_versions="8.5 8.4 8.3 8.2 8.0 7.9 7.8 7.7 7.6 7.5"
+ echo "configure:1211: checking Tcl/Tk installation" >&5
+-legal_tk_versions="8.4 8.3 8.2 8.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1"
+-legal_tcl_versions="8.4 8.3 8.2 8.0 7.9 7.8 7.7 7.6 7.5"
++legal_tk_versions="8.6 8.5 8.4 8.3 8.2 8.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1"
++legal_tcl_versions="8.6 8.5 8.4 8.3 8.2 8.0 7.9 7.8 7.7 7.6 7.5"
  
  #### Find tclsh
  # Check whether --with-tclsh or --without-tclsh was given.
-@@ -1327,6 +1327,8 @@ echo "$ac_t""$tkconfig/tkConfig.sh" 1>&6
+@@ -1331,6 +1331,8 @@
  #### Load the Tcl/Tk configuration files 
  . $tclconfig/tclConfig.sh
  . $tkconfig/tkConfig.sh
@@ -20,7 +20,7 @@
  
  if test -z "$TCL_EXEC_PREFIX"; then TCL_EXEC_PREFIX="$TCL_PREFIX"; fi
  if test -z "$TK_EXEC_PREFIX"; then TK_EXEC_PREFIX="$TK_PREFIX"; fi
-@@ -1517,8 +1519,7 @@ cat > conftest.$ac_ext <<EOF
+@@ -1521,8 +1523,7 @@
      good_tk_version
  #endif
  EOF
diff --git a/deskutils/ical/files/patch-dateeditor.C b/deskutils/ical/files/patch-dateeditor.C
index 4b468612a8aa..8cfdbf1b1cfa 100644
--- a/deskutils/ical/files/patch-dateeditor.C
+++ b/deskutils/ical/files/patch-dateeditor.C
@@ -1,14 +1,5 @@
 --- dateeditor.C.orig	1996-02-10 03:17:35 UTC
 +++ dateeditor.C
-@@ -113,7 +113,7 @@ int Cmd_HiliteLoop(ClientData, Tcl_Interp* tcl, int ar
-     }
- 
-     int count;
--    char** strlist;
-+    CONST84 char** strlist;
-     if (Tcl_SplitList(tcl, argv[2], &count, &strlist) != TCL_OK) {
- 	return TCL_ERROR;
-     }
 @@ -146,14 +146,14 @@ int Cmd_HiliteLoop(ClientData, Tcl_Interp* tcl, int ar
  	if (!contains(hlist, hilite)) hilite = "always";
  
diff --git a/deskutils/ical/files/patch-dispatch.C b/deskutils/ical/files/patch-dispatch.C
index c17179d4a512..9f6fa7f97e37 100644
--- a/deskutils/ical/files/patch-dispatch.C
+++ b/deskutils/ical/files/patch-dispatch.C
@@ -5,7 +5,7 @@
  		TCL_Error(tcl, "too many arguments");
  	    }
 -	    return entry->handler(c, tcl, argc, argv);
-+	    return entry->handler(c, tcl, argc, (CONST84 char **)argv);
++	    return entry->handler(c, tcl, argc, (const char **)argv);
  	}
      }
  
diff --git a/deskutils/ical/files/patch-ical.h b/deskutils/ical/files/patch-ical.h
deleted file mode 100644
index 00178e6f9835..000000000000
--- a/deskutils/ical/files/patch-ical.h
+++ /dev/null
@@ -1,30 +0,0 @@
---- ical.h.orig	1996-02-10 03:17:36 UTC
-+++ ical.h
-@@ -4,6 +4,11 @@
- 
- #include <tcl.h>
- 
-+// That was introduced in tcl8.4
-+#ifndef CONST84
-+#define CONST84
-+#endif
-+
- // Proc for triggering tcl code based on changes
- // to calendars/items.
- 
-@@ -25,13 +30,13 @@ extern void trigger(Tcl_Interp*, char const* ttype, ch
- 
- #define TCL_Return(tcl,str)			\
-     do {					\
--	Tcl_SetResult(tcl, (str), TCL_STATIC);	\
-+	Tcl_SetResult(tcl, ((char *)(str)), TCL_STATIC);	\
- 	return TCL_OK;				\
-     } while (0)
- 
- #define TCL_Error(tcl,str)			\
-     do {					\
--	Tcl_SetResult(tcl, (str), TCL_STATIC);	\
-+	Tcl_SetResult(tcl, ((char *)(str)), TCL_STATIC);	\
- 	return TCL_ERROR;			\
-     } while (0)
- 
diff --git a/deskutils/ical/files/patch-item_tcl.C b/deskutils/ical/files/patch-item_tcl.C
index 27fcf11db70c..5e86f35ee813 100644
--- a/deskutils/ical/files/patch-item_tcl.C
+++ b/deskutils/ical/files/patch-item_tcl.C
@@ -1,7 +1,7 @@
---- item_tcl.C.orig	1996-08-01 19:25:10 UTC
+--- item_tcl.C.orig	2004-03-11 11:26:56 UTC
 +++ item_tcl.C
-@@ -106,52 +106,52 @@ static int item_mweekday	(ClientData, Tcl_Interp*, int
- static int item_mlweekday	(ClientData, Tcl_Interp*, int, char*[]);
+@@ -106,52 +106,52 @@
+ static int item_mlweekday	(ClientData, Tcl_Interp*, int, const char*[]);
  
  static Dispatch_Entry item_dispatch[] = {
 -    { "delete",			0, 0, item_delete	},
@@ -93,40 +93,31 @@
  
      { 0,			0, 0, 0			}
  };
-@@ -329,7 +329,7 @@ static int item_owner(ClientData c, Tcl_Interp* tcl, i
+@@ -329,7 +329,7 @@
  
- 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() ? (char *)"1" : (char *)"0"));
  }
  
- static int item_own(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-@@ -431,7 +431,7 @@ static int item_alarms(ClientData c, Tcl_Interp* tcl, 
-     }
- 
-     int count;
--    char** list;
-+    CONST84 char** list;
-     if (Tcl_SplitList(tcl, argv[0], &count, &list) != TCL_OK) {
- 	TCL_Error(tcl, "invalid alarm list");
-     }
-@@ -492,12 +492,12 @@ static int item_doption(ClientData c, Tcl_Interp* tcl,
+ static int item_own(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
+@@ -492,12 +492,12 @@
  
- 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() ? (char *)"1" : (char *)"0"));
++    TCL_Return(tcl, (item->value()->empty() ? (char *) "1" : (char *) "0"));
  }
  
- 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() ? (char *)"1" : (char *)"0"));
++    TCL_Return(tcl,(item->value()->repeats() ? (char *) "1" : (char *) "0"));
  }
  
- static int item_first(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-@@ -508,7 +508,7 @@ static int item_first(ClientData c, Tcl_Interp* tcl, i
+ static int item_first(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
+@@ -508,7 +508,7 @@
      }
  
      char buffer[100];
@@ -135,7 +126,7 @@
      Tcl_SetResult(tcl, buffer, TCL_VOLATILE);
      return TCL_OK;
  }
-@@ -518,43 +518,43 @@ static int item_type(ClientData c, Tcl_Interp* tcl, in
+@@ -518,43 +518,43 @@
      char* result;
      switch (item->value()->repeat_type()) {
        case DateSet::None:
@@ -192,7 +183,7 @@
  	break;
      }
      TCL_Return(tcl, result);
-@@ -576,7 +576,7 @@ static int item_cont(ClientData c, Tcl_Interp* tcl, in
+@@ -576,7 +576,7 @@
  	TCL_Error(tcl, "invalid date");
      }
      Date date(dateDays);
@@ -200,8 +191,8 @@
 +    TCL_Return(tcl, (item->value()->contains(date) ? (char *)"1" : (char *)"0"));
  }
  
- static int item_next(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
-@@ -592,7 +592,7 @@ static int item_next(ClientData c, Tcl_Interp* tcl, in
+ static int item_next(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
+@@ -592,7 +592,7 @@
      }
  
      char buffer[100];
@@ -210,7 +201,7 @@
      Tcl_SetResult(tcl, buffer, TCL_VOLATILE);
      return TCL_OK;
  }
-@@ -603,10 +603,10 @@ static int item_range(ClientData c, Tcl_Interp* tcl, i
+@@ -603,10 +603,10 @@
      Date s, f;
      if (item->value()->range(s, f)) {
  	char buffer[100];
@@ -223,7 +214,7 @@
  	if (Tcl_SetVar(tcl, argv[1], buffer, 0) == NULL)
  	    TCL_Error(tcl, "could not set range finish variable");
  	TCL_Return(tcl, "1");
-@@ -886,7 +886,7 @@ static int check_permission(Tcl_Interp* tcl, Item_Tcl*
+@@ -886,7 +886,7 @@
      if (file == 0) return 1;
  
      if (file->GetCalendar()->ReadOnly()) {
diff --git a/deskutils/ical/files/patch-pref.tcl b/deskutils/ical/files/patch-pref.tcl
index 401744d734a3..207decfd57d6 100644
--- a/deskutils/ical/files/patch-pref.tcl
+++ b/deskutils/ical/files/patch-pref.tcl
@@ -1,16 +1,23 @@
---- pref.tcl.orig	1997-06-12 22:50:36 UTC
+--- pref.tcl.orig	2004-03-11 11:26:56 UTC
 +++ pref.tcl
-@@ -118,7 +118,12 @@ proc pref_init {} {
+@@ -116,10 +116,16 @@
+     }
+ 
      # XXX People do not seem to like the motif-style popup behavior
-     global tk_strictMotif
-     if {!$tk_strictMotif} {
--	bind Menubutton <Any-ButtonRelease-1> {tkMenuUnpost {}}
+-#    global tk_strictMotif
+-#    if {!$tk_strictMotif} {
+-#	bind Menubutton <Any-ButtonRelease-1> {tkMenuUnpost {}}
+-#    }
++    global tk_strictMotif
++    if {!$tk_strictMotif} {
++	bind Menubutton <Any-ButtonRelease-1> {tkMenuUnpost {}}
 +	set tv [info tclversion]
 +	if {[package vcompare $tv 8.4] >= 0} {
 +	    bind Menubutton <Any-ButtonRelease-1> {::tk::MenuUnpost {}}
 +	} else {
 +	    bind Menubutton <Any-ButtonRelease-1> {tkMenuUnpost {}}
 +	}
-     }
++    }
  
      # Handle command line preferences
+     global ical
diff --git a/deskutils/ical/files/pkg-message.in b/deskutils/ical/files/pkg-message.in
new file mode 100644
index 000000000000..beed912d8bd6
--- /dev/null
+++ b/deskutils/ical/files/pkg-message.in
@@ -0,0 +1,4 @@
+Ical has been updated to version %%VERSION%%.
+
+Any users who source Ical code in their ~/.tk/ical/user.tcl file
+should update the file paths to "%%PREFIX%%/lib/ical/v%%VERSION%%/".