26 files changed, 18 insertions, 781 deletions

diff --git a/deskutils/ical/files/patch-Makefile.in b/deskutils/ical/files/patch-Makefile.in
index 01da1de6a41a..7d2da8e758c5 100644
--- a/deskutils/ical/files/patch-Makefile.in
+++ b/deskutils/ical/files/patch-Makefile.in
@@ -1,34 +1,11 @@
---- Makefile.in.orig	1997-06-04 16:09:59 UTC
+--- Makefile.in.orig	2019-04-16 08:17:38 UTC
 +++ Makefile.in
-@@ -14,10 +14,10 @@
-  CONFIGURE_IN = @MFILES_IN@
-  CONFFILES    = $(srcdir)/configure.in
+@@ -404,7 +404,7 @@ app_DATA = ical.desktop
+ ical_SOURCES = cal_tcl.C dateeditor.C dispatch.C ical.C ical_tcl.C \
+ 	       item_tcl.C object.C time_tcl.C main.C
  
--       BINDIR = $(exec_prefix)/bin
--       LIBDIR = $(prefix)/lib
-+       BINDIR = $(STAGEDIR)$(exec_prefix)/bin
-+       LIBDIR = $(STAGEDIR)$(prefix)/lib
-       ILIBDIR = $(LIBDIR)/ical/v@ICAL_VERSION@
--       MANDIR = $(prefix)/man
-+       MANDIR = $(STAGEDIR)$(prefix)/man
+-ical_CPPFLAGS = -DICALLIBDIR='"$(icallibdir)"' -I$(srcdir)/calendar -I$(srcdir)/types -I$(srcdir)/time @TK_XINCLUDES@
++ical_CPPFLAGS = -DICALLIBDIR='"$(icallibdir)"' -I$(srcdir)/calendar -I$(srcdir)/types -I$(srcdir)/time @TCL_INCLUDE_SPEC@ @TK_INCLUDE_SPEC@ @TK_XINCLUDES@
+ ical_LDADD = libcalendar.a libtime.a libtypes.a \
+ 	     @TK_LIB_SPEC@ @TCL_LIB_SPEC@ @TK_LIBS@
  
-            CC = @CC@
-           CXX = @CXX@
-@@ -59,14 +59,12 @@
- # Tiny bundled executable uses shared versions of tcl/tk libraries
-  TINY_BLIBS = $(LIBS)
- 
--       OPTF = -O
--
--   CXXFLAGS = $(OPTF)
-     CXXINCS = -I. -I$(srcdir) -I$(srcdir)/calendar \
-               -I$(srcdir)/types -I$(srcdir)/time \
--              $(X_CFLAGS) -I@TCL_INCDIR@ -I@TK_INCDIR@
-+	      -I$(prefix)/include \
-+              $(X_CFLAGS) -I@TCL_INCDIR@ -I@TK_INCDIR@ \
- 
--     CFLAGS = $(OPTF) -I. -I$(srcdir) $(X_CFLAGS)
-+     CFLAGS += -I. -I$(srcdir) $(X_CFLAGS)
- 
- OBJS = cal_tcl.o dateeditor.o dispatch.o ical.o ical_tcl.o \
-        item_tcl.o object.o time_tcl.o @LIBOBJS@
diff --git a/deskutils/ical/files/patch-bitmaps-dleft.xbm b/deskutils/ical/files/patch-bitmaps-dleft.xbm
deleted file mode 100644
index e0d34bf3c0ad..000000000000
--- a/deskutils/ical/files/patch-bitmaps-dleft.xbm
+++ /dev/null
@@ -1,10 +0,0 @@
---- bitmaps/dleft.xbm.orig	1994-12-17 21:41:32 UTC
-+++ bitmaps/dleft.xbm
-@@ -1,6 +1,6 @@
- #define dleft_width 16
- #define dleft_height 16
--static char dleft_bits[] = {
-+static unsigned char dleft_bits[] = {
-    0x00, 0x00, 0x80, 0x61, 0xc0, 0x71, 0xe0, 0x79, 0xf0, 0x7d, 0xf8, 0x7f,
-    0xfc, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfc, 0x7f, 0xf8, 0x7f, 0xf0, 0x7d,
-    0xe0, 0x79, 0xc0, 0x71, 0x80, 0x61, 0x00, 0x00};
diff --git a/deskutils/ical/files/patch-bitmaps-done.xbm b/deskutils/ical/files/patch-bitmaps-done.xbm
deleted file mode 100644
index 23df6c8f7aaa..000000000000
--- a/deskutils/ical/files/patch-bitmaps-done.xbm
+++ /dev/null
@@ -1,10 +0,0 @@
---- bitmaps/done.xbm.orig	1994-12-17 21:29:47 UTC
-+++ bitmaps/done.xbm
-@@ -1,6 +1,6 @@
- #define done_width 16
- #define done_height 16
--static char done_bits[] = {
-+static unsigned char done_bits[] = {
-    0x00, 0x00, 0xff, 0x8f, 0xff, 0x67, 0x03, 0x30, 0x03, 0x18, 0x03, 0x4c,
-    0x33, 0x6e, 0x7b, 0x67, 0xff, 0x67, 0xfb, 0x63, 0xf3, 0x63, 0xe3, 0x61,
-    0xc3, 0x61, 0x83, 0x60, 0xff, 0x7f, 0xff, 0x7f};
diff --git a/deskutils/ical/files/patch-bitmaps-dright.xbm b/deskutils/ical/files/patch-bitmaps-dright.xbm
deleted file mode 100644
index ebc7f2292646..000000000000
--- a/deskutils/ical/files/patch-bitmaps-dright.xbm
+++ /dev/null
@@ -1,10 +0,0 @@
---- bitmaps/dright.xbm.orig	1994-12-17 21:41:33 UTC
-+++ bitmaps/dright.xbm
-@@ -1,6 +1,6 @@
- #define dright_width 16
- #define dright_height 16
--static char dright_bits[] = {
-+static unsigned char dright_bits[] = {
-    0x00, 0x00, 0x86, 0x01, 0x8e, 0x03, 0x9e, 0x07, 0xbe, 0x0f, 0xfe, 0x1f,
-    0xfe, 0x3f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x3f, 0xfe, 0x1f, 0xbe, 0x0f,
-    0x9e, 0x07, 0x8e, 0x03, 0x86, 0x01, 0x00, 0x00};
diff --git a/deskutils/ical/files/patch-bitmaps-ical.xbm b/deskutils/ical/files/patch-bitmaps-ical.xbm
deleted file mode 100644
index 83840e75becf..000000000000
--- a/deskutils/ical/files/patch-bitmaps-ical.xbm
+++ /dev/null
@@ -1,10 +0,0 @@
---- bitmaps/ical.xbm.orig	1996-01-24 00:43:16 UTC
-+++ bitmaps/ical.xbm
-@@ -1,6 +1,6 @@
- #define ical_width 64
- #define ical_height 54
--static char ical_bits[] = {
-+static unsigned char ical_bits[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x30, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00,
diff --git a/deskutils/ical/files/patch-bitmaps-left.xbm b/deskutils/ical/files/patch-bitmaps-left.xbm
deleted file mode 100644
index 3c9a72d6f3b6..000000000000
--- a/deskutils/ical/files/patch-bitmaps-left.xbm
+++ /dev/null
@@ -1,11 +0,0 @@
---- bitmaps/left.xbm.orig	1994-12-17 21:29:48 UTC
-+++ bitmaps/left.xbm
-@@ -1,7 +1,7 @@
- /* Copyright (c) 1993 by Sanjay Ghemawat */
- #define left_width 16
- #define left_height 16
--static char left_bits[] = {
-+static unsigned char left_bits[] = {
-    0x00, 0x00, 0x80, 0x01, 0x40, 0x01, 0x20, 0x01, 0x10, 0x01, 0x08, 0x7f,
-    0x04, 0x40, 0x02, 0x40, 0x02, 0x40, 0x04, 0x40, 0x08, 0x7f, 0x10, 0x01,
-    0x20, 0x01, 0x40, 0x01, 0x80, 0x01, 0x00, 0x00};
diff --git a/deskutils/ical/files/patch-bitmaps-right.xbm b/deskutils/ical/files/patch-bitmaps-right.xbm
deleted file mode 100644
index 0a49b5ce9b00..000000000000
--- a/deskutils/ical/files/patch-bitmaps-right.xbm
+++ /dev/null
@@ -1,11 +0,0 @@
---- bitmaps/right.xbm.orig	1994-12-17 21:29:49 UTC
-+++ bitmaps/right.xbm
-@@ -1,7 +1,7 @@
- /* Copyright (c) 1993 by Sanjay Ghemawat */
- #define right_width 16
- #define right_height 16
--static char right_bits[] = {
-+static unsigned char right_bits[] = {
-    0x00, 0x00, 0x80, 0x01, 0x80, 0x02, 0x80, 0x04, 0x80, 0x08, 0xfe, 0x10,
-    0x02, 0x20, 0x02, 0x40, 0x02, 0x40, 0x02, 0x20, 0xfe, 0x10, 0x80, 0x08,
-    0x80, 0x04, 0x80, 0x02, 0x80, 0x01, 0x00, 0x00};
diff --git a/deskutils/ical/files/patch-bitmaps-sleft.xbm b/deskutils/ical/files/patch-bitmaps-sleft.xbm
deleted file mode 100644
index 9f92367fb40f..000000000000
--- a/deskutils/ical/files/patch-bitmaps-sleft.xbm
+++ /dev/null
@@ -1,10 +0,0 @@
---- bitmaps/sleft.xbm.orig	1994-12-17 21:41:34 UTC
-+++ bitmaps/sleft.xbm
-@@ -1,6 +1,6 @@
- #define sleft_width 16
- #define sleft_height 16
--static char sleft_bits[] = {
-+static unsigned char sleft_bits[] = {
-    0x00, 0x00, 0x00, 0x0c, 0x00, 0x0e, 0x00, 0x0f, 0x80, 0x0f, 0xc0, 0x0f,
-    0xe0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xe0, 0x0f, 0xc0, 0x0f, 0x80, 0x0f,
-    0x00, 0x0f, 0x00, 0x0e, 0x00, 0x0c, 0x00, 0x00};
diff --git a/deskutils/ical/files/patch-bitmaps-sright.xbm b/deskutils/ical/files/patch-bitmaps-sright.xbm
deleted file mode 100644
index 3ffeda7077ec..000000000000
--- a/deskutils/ical/files/patch-bitmaps-sright.xbm
+++ /dev/null
@@ -1,10 +0,0 @@
---- bitmaps/sright.xbm.orig	1994-12-17 21:41:34 UTC
-+++ bitmaps/sright.xbm
-@@ -1,6 +1,6 @@
- #define sright_width 16
- #define sright_height 16
--static char sright_bits[] = {
-+static unsigned char sright_bits[] = {
-    0x00, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00, 0xf0, 0x01, 0xf0, 0x03,
-    0xf0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x07, 0xf0, 0x03, 0xf0, 0x01,
-    0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x00, 0x00};
diff --git a/deskutils/ical/files/patch-bitmaps-todo.xbm b/deskutils/ical/files/patch-bitmaps-todo.xbm
deleted file mode 100644
index 6e2484a8ddd4..000000000000
--- a/deskutils/ical/files/patch-bitmaps-todo.xbm
+++ /dev/null
@@ -1,10 +0,0 @@
---- bitmaps/todo.xbm.orig	1994-12-17 21:29:49 UTC
-+++ bitmaps/todo.xbm
-@@ -1,6 +1,6 @@
- #define todo_width 16
- #define todo_height 16
--static char todo_bits[] = {
-+static unsigned char todo_bits[] = {
-    0x00, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60,
-    0x03, 0x60, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60,
-    0x03, 0x60, 0x03, 0x60, 0xff, 0x7f, 0xff, 0x7f};
diff --git a/deskutils/ical/files/patch-cal_tcl.C b/deskutils/ical/files/patch-cal_tcl.C
deleted file mode 100644
index dfb62ad94262..000000000000
--- a/deskutils/ical/files/patch-cal_tcl.C
+++ /dev/null
@@ -1,87 +0,0 @@
---- cal_tcl.C.orig	1995-07-06 15:48:16 UTC
-+++ cal_tcl.C
-@@ -214,27 +214,27 @@ static int cal_loopf	(ClientData, Tcl_Interp*, int, ch
- static int cal_loopb	(ClientData, Tcl_Interp*, int, char*[]);
- 
- static Dispatch_Entry calendar_dispatch[] = {
--    { "delete",		0, 0, cal_delete	},
--    { "main",		0, 0, cal_main		},
--    { "include",	1, 1, cal_include	},
--    { "exclude",	1, 1, cal_exclude	},
--    { "forincludes",	2, 2, cal_forincs	},
--    { "add",		1, 2, cal_add		},
--    { "remove",		1, 1, cal_remove	},
--    { "hide",		1, 1, cal_hide		},
--    { "readonly",	0, 1, cal_ronly		},
--    { "dirty",		0, 1, cal_dirty		},
--    { "stale",		0, 1, cal_stale		},
--    { "save",		0, 1, cal_save		},
--    { "reread",		0, 1, cal_reread	},
--    { "query",		5, 7, cal_query		},
--    { "listing",	5, 7, cal_listing	},
--    { "loop",		2, 4, cal_loop		},
--    { "incalendar",	3, 3, cal_incal		},
--    { "option",		1, 4, cal_option	},
--    { "delete_option",	1, 3, cal_doption	},
--    { "loop_forward",	5, 7, cal_loopf		},
--    { "loop_backward",	5, 7, cal_loopb		},
-+    { "delete",		0, 0, (Tcl_CmdProc *)cal_delete		},
-+    { "main",		0, 0, (Tcl_CmdProc *)cal_main		},
-+    { "include",	1, 1, (Tcl_CmdProc *)cal_include	},
-+    { "exclude",	1, 1, (Tcl_CmdProc *)cal_exclude	},
-+    { "forincludes",	2, 2, (Tcl_CmdProc *)cal_forincs	},
-+    { "add",		1, 2, (Tcl_CmdProc *)cal_add		},
-+    { "remove",		1, 1, (Tcl_CmdProc *)cal_remove		},
-+    { "hide",		1, 1, (Tcl_CmdProc *)cal_hide		},
-+    { "readonly",	0, 1, (Tcl_CmdProc *)cal_ronly		},
-+    { "dirty",		0, 1, (Tcl_CmdProc *)cal_dirty		},
-+    { "stale",		0, 1, (Tcl_CmdProc *)cal_stale		},
-+    { "save",		0, 1, (Tcl_CmdProc *)cal_save		},
-+    { "reread",		0, 1, (Tcl_CmdProc *)cal_reread		},
-+    { "query",		5, 7, (Tcl_CmdProc *)cal_query		},
-+    { "listing",	5, 7, (Tcl_CmdProc *)cal_listing	},
-+    { "loop",		2, 4, (Tcl_CmdProc *)cal_loop		},
-+    { "incalendar",	3, 3, (Tcl_CmdProc *)cal_incal		},
-+    { "option",		1, 4, (Tcl_CmdProc *)cal_option		},
-+    { "delete_option",	1, 3, (Tcl_CmdProc *)cal_doption	},
-+    { "loop_forward",	5, 7, (Tcl_CmdProc *)cal_loopf		},
-+    { "loop_backward",	5, 7, (Tcl_CmdProc *)cal_loopb		},
-     { 0,		0, 0, 0			}
- };
- 
-@@ -516,7 +516,7 @@ static int cal_ronly(ClientData c, Tcl_Interp* tcl, in
- 	TCL_Error(tcl, "no such calendar");
-     }
- 
--    TCL_Return(tcl, file->GetCalendar()->ReadOnly() ? "1" : "0");
-+    TCL_Return(tcl, file->GetCalendar()->ReadOnly() ? (char *)"1" : (char *)"0");
- }
- 
- static int cal_dirty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-@@ -527,7 +527,7 @@ static int cal_dirty(ClientData c, Tcl_Interp* tcl, in
- 	TCL_Error(tcl, "no such calendar");
-     }
- 
--    TCL_Return(tcl, (file->IsModified() ? "1" : "0"));
-+    TCL_Return(tcl, (file->IsModified() ? (char *)"1" : (char *)"0"));
- }
- 
- static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-@@ -538,7 +538,7 @@ static int cal_stale(ClientData c, Tcl_Interp* tcl, in
- 	TCL_Error(tcl, "no such calendar");
-     }
- 
--    TCL_Return(tcl, (file->FileHasChanged() ? "1" : "0"));
-+    TCL_Return(tcl, (file->FileHasChanged() ? (char *)"1" : (char *)"0"));
- }
- 
- static int cal_save(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
-@@ -609,7 +609,7 @@ static int item_loop(Tcl_Interp* tcl, Occurrences cons
- 
- 	if (dvar != 0) {
- 	    char buffer[20];
--	    sprintf(buffer, "%d", list[i].date.EpochDays());
-+	    sprintf(buffer, "%ld", list[i].date.EpochDays());
- 	    if (Tcl_SetVar(tcl, dvar, buffer, 0) == NULL) {
- 		TCL_Error(tcl, "could not set loop variable");
- 	    }
diff --git a/deskutils/ical/files/patch-calendar_Makefile.in b/deskutils/ical/files/patch-calendar_Makefile.in
deleted file mode 100644
index e4d17d0523e5..000000000000
--- a/deskutils/ical/files/patch-calendar_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- calendar/Makefile.in.orig	1997-10-21 23:52:59 UTC
-+++ calendar/Makefile.in
-@@ -12,7 +12,6 @@
-            AR = ar
-          ECHO = echo
- 
--   CXXFLAGS = -O
-     CXXINCS = -I.. -I$(srcdir) -I$(srcdir)/../types -I$(srcdir)/../time
- 
-     CXXOBJS = arrays.o calendar.o calfile.o dateset.o item.o\
diff --git a/deskutils/ical/files/patch-calendar_calendar.C b/deskutils/ical/files/patch-calendar_calendar.C
deleted file mode 100644
index 851bca2bfc78..000000000000
--- a/deskutils/ical/files/patch-calendar_calendar.C
+++ /dev/null
@@ -1,18 +0,0 @@
---- calendar/calendar.C.orig	1997-05-21 20:32:59 UTC
-+++ calendar/calendar.C
-@@ -224,13 +224,13 @@ int Calendar::Read(Lexer* lex) {
- 	    char* name = new char[len + 1];
- 	    if (! lex->GetText(name, len) ||
- 		! lex->Skip(closer)) {
--		delete name;
-+		delete [] name;
- 		lex->SetError("error reading included file name");
- 		return 0;
- 	    }
- 	    name[len] = '\0';
- 	    Include(name);
--	    delete name;
-+	    delete [] name;
- 	}
- 	else if (strcmp(keyword, "Hide") == 0) {
- 	    char const* x;
diff --git a/deskutils/ical/files/patch-calendar_calfile.C b/deskutils/ical/files/patch-calendar_calfile.C
deleted file mode 100644
index 77fa38b37a61..000000000000
--- a/deskutils/ical/files/patch-calendar_calfile.C
+++ /dev/null
@@ -1,11 +0,0 @@
---- calendar/calfile.C.orig	1997-05-24 00:23:52 UTC
-+++ calendar/calfile.C
-@@ -60,7 +60,7 @@ CalFile::CalFile(int ro, const char* name) {
-     backupName = tmp;
- 
-     // Get directory name for access checks
--    char* lastSlash = strrchr(name, '/');
-+    const char* lastSlash = strrchr(name, '/');
-     if (lastSlash == 0) {
- 	/* Calendar is in current directory */
- 	tmp = new char[3];
diff --git a/deskutils/ical/files/patch-config.h.in b/deskutils/ical/files/patch-config.h.in
deleted file mode 100644
index 4f495bb2519b..000000000000
--- a/deskutils/ical/files/patch-config.h.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- config.h.in.orig	2004-03-11 11:26:55 UTC
-+++ config.h.in
-@@ -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
- 
--#undef HAVE_FSYNC
-+#define HAVE_FSYNC	1
- 
--#undef HAVE_STRERROR
-+#define HAVE_STRERROR	1
- 
--#undef HAVE_UNAME
--#undef HAVE_SYS_UTSNAME_H
-+#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
deleted file mode 100644
index a1c2c1493cd9..000000000000
--- a/deskutils/ical/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.orig	2004-03-11 11:26:55 UTC
-+++ configure
-@@ -1208,8 +1208,8 @@
- 
- echo "checking Tcl/Tk installation" 1>&6
- 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.
-@@ -1331,6 +1331,8 @@
- #### Load the Tcl/Tk configuration files 
- . $tclconfig/tclConfig.sh
- . $tkconfig/tkConfig.sh
-+TCL_LIB_FILE=`eval "echo ${TCL_LIB_FILE}"`
-+TK_LIB_FILE=`eval "echo ${TK_LIB_FILE}"`
- 
- 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
-@@ -1521,8 +1523,7 @@
-     good_tk_version
- #endif
- EOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "good_tk_version" >/dev/null 2>&1; then
-+if true; then
-   rm -rf conftest*
-   is_good_tk_version=yes
- else
diff --git a/deskutils/ical/files/patch-dateeditor.C b/deskutils/ical/files/patch-dateeditor.C
deleted file mode 100644
index 8cfdbf1b1cfa..000000000000
--- a/deskutils/ical/files/patch-dateeditor.C
+++ /dev/null
@@ -1,34 +0,0 @@
---- dateeditor.C.orig	1996-02-10 03:17:35 UTC
-+++ dateeditor.C
-@@ -146,14 +146,14 @@ int Cmd_HiliteLoop(ClientData, Tcl_Interp* tcl, int ar
- 	if (!contains(hlist, hilite)) hilite = "always";
- 
- 	char buffer[20];
--	sprintf(buffer, "%d", list[i].date.EpochDays());
-+	sprintf(buffer, "%ld", list[i].date.EpochDays());
- 	if (Tcl_SetVar(tcl, dvar, buffer, 0) == NULL) {
--	    free((char*) strlist);
-+	    Tcl_Free((char*) strlist);
- 	    TCL_Error(tcl, "could not set loop variable");
- 	}
- 
- 	if (Tcl_SetVar(tcl, hvar, (char*)hilite, 0) == NULL) {
--	    free((char*) strlist);
-+	    Tcl_Free((char*) strlist);
- 	    TCL_Error(tcl, "could not set loop variable");
- 	}
- 
-@@ -165,11 +165,11 @@ int Cmd_HiliteLoop(ClientData, Tcl_Interp* tcl, int ar
- 	if (result == TCL_BREAK) break;
- 
- 	// Error of some sort
--	free((char*) strlist);
-+	Tcl_Free((char*) strlist);
- 	return result;
-     }
- 
--    free((char*) strlist);
-+    Tcl_Free((char*) strlist);
-     TCL_Return(tcl, "");
- }
- 
diff --git a/deskutils/ical/files/patch-dispatch.C b/deskutils/ical/files/patch-dispatch.C
deleted file mode 100644
index 9f6fa7f97e37..000000000000
--- a/deskutils/ical/files/patch-dispatch.C
+++ /dev/null
@@ -1,11 +0,0 @@
---- dispatch.C.orig	1994-05-20 03:21:54 UTC
-+++ dispatch.C
-@@ -24,7 +24,7 @@ int Dispatch(Dispatch_Entry* table, ClientData c, Tcl_
- 	    if ((entry->max_arg_count >= 0) && (argc > entry->max_arg_count)) {
- 		TCL_Error(tcl, "too many arguments");
- 	    }
--	    return entry->handler(c, tcl, argc, argv);
-+	    return entry->handler(c, tcl, argc, (const char **)argv);
- 	}
-     }
- 
diff --git a/deskutils/ical/files/patch-item_tcl.C b/deskutils/ical/files/patch-item_tcl.C
deleted file mode 100644
index 5e86f35ee813..000000000000
--- a/deskutils/ical/files/patch-item_tcl.C
+++ /dev/null
@@ -1,225 +0,0 @@
---- item_tcl.C.orig	2004-03-11 11:26:56 UTC
-+++ item_tcl.C
-@@ -106,52 +106,52 @@
- static int item_mlweekday	(ClientData, Tcl_Interp*, int, const char*[]);
- 
- static Dispatch_Entry item_dispatch[] = {
--    { "delete",			0, 0, item_delete	},
--    { "clone",			0, 0, item_clone	},
-+    { "delete",			0, 0, (Tcl_CmdProc *)item_delete	},
-+    { "clone",			0, 0, (Tcl_CmdProc *)item_clone		},
- 
--    { "length",			0, 1, item_length	},
--    { "starttime",		0, 1, item_startt	},
--    { "alarms",			0, 1, item_alarms	},
--    { "option",			1, 2, item_option	},
--    { "delete_option",		1, 1, item_doption	},
-+    { "length",			0, 1, (Tcl_CmdProc *)item_length	},
-+    { "starttime",		0, 1, (Tcl_CmdProc *)item_startt	},
-+    { "alarms",			0, 1, (Tcl_CmdProc *)item_alarms	},
-+    { "option",			1, 2, (Tcl_CmdProc *)item_option	},
-+    { "delete_option",		1, 1, (Tcl_CmdProc *)item_doption	},
- 
--    { "is",			1, 1, item_is		},
--    { "calendar",		0, 0, item_cal		},
--    { "text",			0, 1, item_text		},
--    { "uid",			0, 0, item_uid		},
--    { "earlywarning",		0, 1, item_early	},
--    { "owner",			0, 1, item_owner	},
--    { "owned",			0, 0, item_owned	},
--    { "own",			0, 0, item_own		},
--    { "hilite",			0, 1, item_hilite	},
--    { "todo",			0, 1, item_todo		},
--    { "is_done",		0, 0, item_is_done	},
--    { "done",			1, 1, item_done		},
-+    { "is",			1, 1, (Tcl_CmdProc *)item_is		},
-+    { "calendar",		0, 0, (Tcl_CmdProc *)item_cal		},
-+    { "text",			0, 1, (Tcl_CmdProc *)item_text		},
-+    { "uid",			0, 0, (Tcl_CmdProc *)item_uid		},
-+    { "earlywarning",		0, 1, (Tcl_CmdProc *)item_early		},
-+    { "owner",			0, 1, (Tcl_CmdProc *)item_owner		},
-+    { "owned",			0, 0, (Tcl_CmdProc *)item_owned		},
-+    { "own",			0, 0, (Tcl_CmdProc *)item_own		},
-+    { "hilite",			0, 1, (Tcl_CmdProc *)item_hilite	},
-+    { "todo",			0, 1, (Tcl_CmdProc *)item_todo		},
-+    { "is_done",		0, 0, (Tcl_CmdProc *)item_is_done	},
-+    { "done",			1, 1, (Tcl_CmdProc *)item_done		},
- 
--    { "contains",		1, 1, item_cont		},
--    { "empty",			0, 0, item_empty	},
--    { "repeats",		0, 0, item_repeat	},
--    { "first",			0, 0, item_first	},
--    { "next",			1, 1, item_next		},
--    { "range",			2, 2, item_range	},
--    { "type",			0, 0, item_type		},
--    { "describe_repeat",	0, 0, item_desc		},
-+    { "contains",		1, 1, (Tcl_CmdProc *)item_cont		},
-+    { "empty",			0, 0, (Tcl_CmdProc *)item_empty		},
-+    { "repeats",		0, 0, (Tcl_CmdProc *)item_repeat	},
-+    { "first",			0, 0, (Tcl_CmdProc *)item_first		},
-+    { "next",			1, 1, (Tcl_CmdProc *)item_next		},
-+    { "range",			2, 2, (Tcl_CmdProc *)item_range		},
-+    { "type",			0, 0, (Tcl_CmdProc *)item_type		},
-+    { "describe_repeat",	0, 0, (Tcl_CmdProc *)item_desc		},
- 
--    { "date",			1, 1, item_date		},
--    { "dayrepeat",		2, 2, item_dayr		},
-+    { "date",			1, 1, (Tcl_CmdProc *)item_date		},
-+    { "dayrepeat",		2, 2, (Tcl_CmdProc *)item_dayr		},
- 
--    { "monthrepeat",		2, 2, item_monthr	},
--    { "month_day",		1, 3, item_mday		},
--    { "month_last_day",		1, 3, item_mlday	},
--    { "month_work_day",		1, 3, item_mworkday	},
--    { "month_last_work_day",	1, 3, item_mlworkday	},
--    { "month_week_day",		2, 4, item_mweekday	},
--    { "month_last_week_day",	2, 4, item_mlweekday	},
-+    { "monthrepeat",		2, 2, (Tcl_CmdProc *)item_monthr	},
-+    { "month_day",		1, 3, (Tcl_CmdProc *)item_mday		},
-+    { "month_last_day",		1, 3, (Tcl_CmdProc *)item_mlday		},
-+    { "month_work_day",		1, 3, (Tcl_CmdProc *)item_mworkday	},
-+    { "month_last_work_day",	1, 3, (Tcl_CmdProc *)item_mlworkday	},
-+    { "month_week_day",		2, 4, (Tcl_CmdProc *)item_mweekday	},
-+    { "month_last_week_day",	2, 4, (Tcl_CmdProc *)item_mlweekday	},
- 
--    { "weekdays",		0, -1, item_wdays	},
--    { "start",			1, 1, item_start	},
--    { "finish",			1, 1, item_finish	},
--    { "deleteon",		1, 1, item_ondel	},
-+    { "weekdays",		0, -1, (Tcl_CmdProc *)item_wdays	},
-+    { "start",			1, 1, (Tcl_CmdProc *)item_start		},
-+    { "finish",			1, 1, (Tcl_CmdProc *)item_finish	},
-+    { "deleteon",		1, 1, (Tcl_CmdProc *)item_ondel		},
- 
-     { 0,			0, 0, 0			}
- };
-@@ -329,7 +329,7 @@
- 
- 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, const char* argv[]) {
-@@ -492,12 +492,12 @@
- 
- 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"));
- }
- 
- 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"));
- }
- 
- static int item_first(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-@@ -508,7 +508,7 @@
-     }
- 
-     char buffer[100];
--    sprintf(buffer, "%d", d.EpochDays());
-+    sprintf(buffer, "%ld", d.EpochDays());
-     Tcl_SetResult(tcl, buffer, TCL_VOLATILE);
-     return TCL_OK;
- }
-@@ -518,43 +518,43 @@
-     char* result;
-     switch (item->value()->repeat_type()) {
-       case DateSet::None:
--	result = "";
-+	result = (char *)"";
- 	break;
-       case DateSet::Daily:
--	result = "Daily";
-+	result = (char *)"Daily";
- 	break;
-       case DateSet::Weekly:
--	result = "Weekly";
-+	result = (char *)"Weekly";
- 	break;
-       case DateSet::BiWeekly:
--	result = "Every Two Weeks";
-+	result = (char *)"Every Two Weeks";
- 	break;
-       case DateSet::ThreeWeekly:
--	result = "Every Three Weeks";
-+	result = (char *)"Every Three Weeks";
- 	break;
-       case DateSet::FourWeekly:
--	result = "Every Four Weeks";
-+	result = (char *)"Every Four Weeks";
- 	break;
-       case DateSet::Monthly:
--	result = "Monthly";
-+	result = (char *)"Monthly";
- 	break;
-       case DateSet::TwoMonthly:
--	result = "Every Two Months";
-+	result = (char *)"Every Two Months";
- 	break;
-       case DateSet::ThreeMonthly:
--	result = "Every Three Months";
-+	result = (char *)"Every Three Months";
- 	break;
-       case DateSet::FourMonthly:
--	result = "Every Four Months";
-+	result = (char *)"Every Four Months";
- 	break;
-       case DateSet::SixMonthly:
--	result = "Every Six Months";
-+	result = (char *)"Every Six Months";
- 	break;
-       case DateSet::Annual:
--	result = "Annual";
-+	result = (char *)"Annual";
- 	break;
-       default:
--	result = "Complex";
-+	result = (char *)"Complex";
- 	break;
-     }
-     TCL_Return(tcl, result);
-@@ -576,7 +576,7 @@
- 	TCL_Error(tcl, "invalid date");
-     }
-     Date date(dateDays);
--    TCL_Return(tcl, (item->value()->contains(date)?"1":"0"));
-+    TCL_Return(tcl, (item->value()->contains(date) ? (char *)"1" : (char *)"0"));
- }
- 
- static int item_next(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
-@@ -592,7 +592,7 @@
-     }
- 
-     char buffer[100];
--    sprintf(buffer, "%d", next.EpochDays());
-+    sprintf(buffer, "%ld", next.EpochDays());
-     Tcl_SetResult(tcl, buffer, TCL_VOLATILE);
-     return TCL_OK;
- }
-@@ -603,10 +603,10 @@
-     Date s, f;
-     if (item->value()->range(s, f)) {
- 	char buffer[100];
--	sprintf(buffer, "%d", s.EpochDays());
-+	sprintf(buffer, "%ld", s.EpochDays());
- 	if (Tcl_SetVar(tcl, argv[0], buffer, 0) == NULL)
- 	    TCL_Error(tcl, "could not set range start variable");
--	sprintf(buffer, "%d", f.EpochDays());
-+	sprintf(buffer, "%ld", f.EpochDays());
- 	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 @@
-     if (file == 0) return 1;
- 
-     if (file->GetCalendar()->ReadOnly()) {
--	Tcl_SetResult(tcl, "item is in readonly calendar", TCL_STATIC);
-+	Tcl_SetResult(tcl, (char *)"item is in readonly calendar", TCL_STATIC);
- 	return 0;
-     }
- 
diff --git a/deskutils/ical/files/patch-main.C b/deskutils/ical/files/patch-main.C
deleted file mode 100644
index 6b3b3fce3367..000000000000
--- a/deskutils/ical/files/patch-main.C
+++ /dev/null
@@ -1,132 +0,0 @@
---- main.C.orig	1996-02-16 01:57:42 UTC
-+++ main.C
-@@ -27,13 +27,13 @@
- /* Include various libraries converted to strings. */
- 
- #ifdef STANDALONE
--static char* tcl_lib_str[] = {
-+static const char* tcl_lib_str[] = {
- #include "tcl_lib.gen"
- 0
- };
- 
- // Need to disable "source" command
--static char* tk_lib_str[] = {
-+static const char* tk_lib_str[] = {
- "rename source _orig_source",
- "proc source {args} {}",
- #include "tk_lib.gen"
-@@ -42,37 +42,37 @@ static char* tk_lib_str[] = {
- 0
- };
- 
--static char* ical_lib_str[] = {
-+static const char* ical_lib_str[] = {
- #include "ical_lib.gen"
- 0
- };
- 
--static char* tcllib_str[] = {
-+static const char* tcllib_str[] = {
- #include "tcllib.gen"
- 0
- };
- #endif
- 
--static char* ical_startup[] = {
-+static const char* ical_startup[] = {
- #include "ical_start.gen"
- 0
- };
- 
--static char* psheader_str[] = {
-+static const char* psheader_str[] = {
- "set ical(psheader) {%!PS-Adobe-",
- #include "psheader.gen"
- "}",
- 0
- };
- 
--static char* ical_doc_str[] = {
-+static const char* ical_doc_str[] = {
- "set ical(doc) {",
- #include "icaldoc.gen"
- "}",
- 0
- };
- 
--static char* tcl_doc_str[] = {
-+static const char* tcl_doc_str[] = {
- "set ical(tcl_interface_doc) {",
- #include "tcldoc.gen"
- "}",
-@@ -173,7 +173,7 @@ main(int argc, char* argv[]) {
- 
- #ifdef STANDALONE
- extern "C" int MyTcl_Init(Tcl_Interp* tcl) {
--    return (eval_list(tcl, tcl_lib_str));
-+    return (eval_list(tcl, (char **)tcl_lib_str));
- }
- #else
- #define MyTcl_Init Tcl_Init
-@@ -194,7 +194,7 @@ extern "C" int TkPlatformInit(Tcl_Interp* tcl) {
- 
-     TkCreateXEventSource();
- 
--    return (eval_list(tcl, tk_lib_str));
-+    return (eval_list(tcl, (char **)tk_lib_str));
- }
- #endif
- 
-@@ -245,37 +245,37 @@ int Ical_Init(Tcl_Interp* tcl) {
-     }
- 
-     // Set-up postscript prolog
--    if (eval_list(tcl, psheader_str) != TCL_OK)
-+    if (eval_list(tcl, (char **)psheader_str) != TCL_OK)
- 	return TCL_ERROR;
- 
-     // Set-up documentation
--    if (eval_list(tcl, ical_doc_str) != TCL_OK)
-+    if (eval_list(tcl, (char **)ical_doc_str) != TCL_OK)
- 	return TCL_ERROR;
--    if (eval_list(tcl, tcl_doc_str) != TCL_OK)
-+    if (eval_list(tcl, (char **)tcl_doc_str) != TCL_OK)
- 	return TCL_ERROR;
- 
-     // Non-Tk ical commands
--    Tcl_CreateCommand(tcl, "calendar",     Cmd_CreateCalendar,	NULL, NULL);
--    Tcl_CreateCommand(tcl, "notice",       Cmd_CreateNotice,	NULL, NULL);
--    Tcl_CreateCommand(tcl, "appointment",  Cmd_CreateAppt,	NULL, NULL);
--    Tcl_CreateCommand(tcl, "date",         Cmd_Date,		NULL, NULL);
--    Tcl_CreateCommand(tcl, "ical_time",    Cmd_Time,		NULL, NULL);
--    Tcl_CreateCommand(tcl, "de_monthdays", Cmd_MonthDays,	NULL, NULL);
--    Tcl_CreateCommand(tcl, "hilite_loop",  Cmd_HiliteLoop,	NULL, NULL);
--    Tcl_CreateCommand(tcl, "ical_expand_file_name", Cmd_ExpandFileName, 0, 0);
-+    Tcl_CreateCommand(tcl, "calendar",     (Tcl_CmdProc *)Cmd_CreateCalendar,	NULL, NULL);
-+    Tcl_CreateCommand(tcl, "notice",       (Tcl_CmdProc *)Cmd_CreateNotice,	NULL, NULL);
-+    Tcl_CreateCommand(tcl, "appointment",  (Tcl_CmdProc *)Cmd_CreateAppt,	NULL, NULL);
-+    Tcl_CreateCommand(tcl, "date",         (Tcl_CmdProc *)Cmd_Date,		NULL, NULL);
-+    Tcl_CreateCommand(tcl, "ical_time",    (Tcl_CmdProc *)Cmd_Time,		NULL, NULL);
-+    Tcl_CreateCommand(tcl, "de_monthdays", (Tcl_CmdProc *)Cmd_MonthDays,	NULL, NULL);
-+    Tcl_CreateCommand(tcl, "hilite_loop",  (Tcl_CmdProc *)Cmd_HiliteLoop,	NULL, NULL);
-+    Tcl_CreateCommand(tcl, "ical_expand_file_name", (Tcl_CmdProc *)Cmd_ExpandFileName, 0, 0);
- 
- #ifdef STANDALONE
-     // Load tcllib files
--    if (eval_list(tcl, tcllib_str) != TCL_OK)
-+    if (eval_list(tcl, (char **)tcllib_str) != TCL_OK)
- 	return TCL_ERROR;
- 
-     // Load ical library files
--    if (eval_list(tcl, ical_lib_str) != TCL_OK)
-+    if (eval_list(tcl, (char **)ical_lib_str) != TCL_OK)
- 	return TCL_ERROR;
- #endif
- 
-     // Initialize ical stuff
--    if (eval_list(tcl, ical_startup) != TCL_OK)
-+    if (eval_list(tcl, (char **)ical_startup) != TCL_OK)
- 	return TCL_ERROR;
- 
-     if (Tcl_Eval(tcl, "ical_init") == TCL_ERROR)
diff --git a/deskutils/ical/files/patch-object.C b/deskutils/ical/files/patch-object.C
deleted file mode 100644
index f5920b2629ba..000000000000
--- a/deskutils/ical/files/patch-object.C
+++ /dev/null
@@ -1,20 +0,0 @@
---- object.C.orig	1994-05-20 03:22:04 UTC
-+++ object.C
-@@ -33,7 +33,7 @@ void Object::init(Tcl_Interp* t, char const* ty, char 
-     interp = t;
- 
-     /* Create TCL Command */
--    Tcl_CreateCommand(interp, name, obj_handle, (ClientData) this, NULL);
-+    Tcl_CreateCommand(interp, name, (Tcl_CmdProc *)obj_handle, (ClientData) this, NULL);
- }
- 
- Object::~Object() {
-@@ -46,7 +46,7 @@ Object::~Object() {
- Object* Object::find(Tcl_Interp* tcl, char const* h) {
-     Tcl_CmdInfo i;
- 
--    if (Tcl_GetCommandInfo(tcl, (char*)h, &i) && (i.proc == obj_handle))
-+    if (Tcl_GetCommandInfo(tcl, (char*)h, &i) && (i.proc == (Tcl_CmdProc *)obj_handle))
- 	return ((Object*) i.clientData);
- 
-     return 0;
diff --git a/deskutils/ical/files/patch-pref.tcl b/deskutils/ical/files/patch-pref.tcl
deleted file mode 100644
index 207decfd57d6..000000000000
--- a/deskutils/ical/files/patch-pref.tcl
+++ /dev/null
@@ -1,23 +0,0 @@
---- pref.tcl.orig	2004-03-11 11:26:56 UTC
-+++ pref.tcl
-@@ -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 {}}
-+	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/patch-time_Makefile.in b/deskutils/ical/files/patch-time_Makefile.in
deleted file mode 100644
index 6f7d1b815ea2..000000000000
--- a/deskutils/ical/files/patch-time_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- time/Makefile.in.orig	1996-02-10 03:17:47 UTC
-+++ time/Makefile.in
-@@ -11,7 +11,6 @@
-          ECHO = echo
-        RANLIB = @RANLIB@
- 
--     CXXFLAGS = -O
-       CXXINCS = -I.. -I$(srcdir)
-          OBJS = Date.o Month.o Time.o WeekDay.o Year.o parse.o
-         TESTS = testparse
diff --git a/deskutils/ical/files/patch-time_Time.C b/deskutils/ical/files/patch-time_Time.C
new file mode 100644
index 000000000000..e7316c01a275
--- /dev/null
+++ b/deskutils/ical/files/patch-time_Time.C
@@ -0,0 +1,10 @@
+--- time/Time.C.orig	2012-06-02 18:44:03 UTC
++++ time/Time.C
+@@ -4,7 +4,6 @@
+ #include <sys/types.h>
+ #include <math.h>
+ #include <string.h>
+-#include <alloca.h>
+ #include <stdlib.h>
+ 
+ #include "config.h"
diff --git a/deskutils/ical/files/patch-time_tcl.C b/deskutils/ical/files/patch-time_tcl.C
deleted file mode 100644
index 37671bd800b6..000000000000
--- a/deskutils/ical/files/patch-time_tcl.C
+++ /dev/null
@@ -1,11 +0,0 @@
---- time_tcl.C.orig	1994-05-20 03:22:05 UTC
-+++ time_tcl.C
-@@ -135,7 +135,7 @@ int Cmd_Date(ClientData, Tcl_Interp* tcl, int argc, ch
- 		TCL_Return(tcl, "0");
- 
- 	    // Set variables
--	    sprintf(buffer, "%d", result.EpochDays());
-+	    sprintf(buffer, "%ld", result.EpochDays());
- 	    if (Tcl_SetVar(tcl, argv[3], buffer, 0) == NULL)
- 		TCL_Error(tcl, "could not set <date> result");
- 
diff --git a/deskutils/ical/files/patch-types_Makefile.in b/deskutils/ical/files/patch-types_Makefile.in
deleted file mode 100644
index 6ed700f474c2..000000000000
--- a/deskutils/ical/files/patch-types_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- types/Makefile.in.orig	1997-10-21 23:53:02 UTC
-+++ types/Makefile.in
-@@ -12,7 +12,7 @@
-          ECHO = echo
-        RANLIB = @RANLIB@
- 
--     CXXFLAGS = -O $(DEFS)
-+     CXXFLAGS = $(DEFS)
-       CXXINCS = -I$(srcdir)
-          OBJS = bitvec.o hashfuncs.o intset.o
-         TESTS = testarray testbv testomap testoset timemap testhash testmap\