3 files changed, 72 insertions, 8 deletions

diff --git a/deskutils/ical/Makefile b/deskutils/ical/Makefile
index d6483365a73e..5e1ffb4bcf62 100644
--- a/deskutils/ical/Makefile
+++ b/deskutils/ical/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:    ical
-# Version required:     2.1
+# Version required:     2.2
 # Date created:         Mon Aug 28 13:35:31 CDT 1995
 # Whom:                 erich@rrnet.com
 #
@@ -7,20 +7,20 @@
 #
 
 DISTNAME=	ical-2.2
-CATEGORIES=	deskutils tk80
+CATEGORIES=	deskutils tk82
 MASTER_SITES=	http://www.research.digital.com/SRC/personal/Sanjay_Ghemawat/ical/icalbins/
 
 MAINTAINER=	erich@FreeBSD.org
 
-LIB_DEPENDS=    tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS=    tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--with-tclconfig=${PREFIX}/lib/tcl8.0 \
-		--with-tclhdir=${PREFIX}/include/tcl8.0 \
-		--with-tclsh=${PREFIX}/bin/tclsh8.0 \
-		--with-tkconfig=${PREFIX}/lib/tk8.0 \
-		--with-tkhdir=${PREFIX}/include/tk8.0
+		--with-tclconfig=${PREFIX}/lib/tcl8.2 \
+		--with-tclhdir=${PREFIX}/include/tcl8.2 \
+		--with-tclsh=${PREFIX}/bin/tclsh8.2 \
+		--with-tkconfig=${PREFIX}/lib/tk8.2 \
+		--with-tkhdir=${PREFIX}/include/tk8.2
 
 MAN1=		ical.1
 
diff --git a/deskutils/ical/files/patch-aa b/deskutils/ical/files/patch-aa
new file mode 100644
index 000000000000..3811adda6b80
--- /dev/null
+++ b/deskutils/ical/files/patch-aa
@@ -0,0 +1,29 @@
+--- cal_tcl.C.orig	Sun Nov 28 17:29:13 1999
++++ cal_tcl.C	Sun Nov 28 17:30:24 1999
+@@ -516,7 +516,7 @@
+ 	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 @@
+ 	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 @@
+ 	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[]){
diff --git a/deskutils/ical/files/patch-ab b/deskutils/ical/files/patch-ab
new file mode 100644
index 000000000000..ae2264c1c776
--- /dev/null
+++ b/deskutils/ical/files/patch-ab
@@ -0,0 +1,35 @@
+--- item_tcl.C.orig	Sun Nov 28 17:31:26 1999
++++ item_tcl.C	Sun Nov 28 17:32:25 1999
+@@ -329,7 +329,7 @@
+ 
+ static int item_owned(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+     Item_Tcl* item = (Item_Tcl*) c;
+-    TCL_Return(tcl, (item->value()->IsMine() ? "1" : "0"));
++    TCL_Return(tcl, (item->value()->IsMine() ? (char *)"1" : (char *)"0"));
+ }
+ 
+ static int item_own(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+@@ -492,12 +492,12 @@
+ 
+ static int item_empty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+     Item_Tcl* item = (Item_Tcl*) c;
+-    TCL_Return(tcl, (item->value()->empty()?"1":"0"));
++    TCL_Return(tcl, (item->value()->empty() ? (char *)"1" : (char *)"0"));
+ }
+ 
+ static int item_repeat(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+     Item_Tcl* item = (Item_Tcl*) c;
+-    TCL_Return(tcl,(item->value()->repeats()?"1":"0"));
++    TCL_Return(tcl,(item->value()->repeats() ? (char *)"1" : (char *)"0"));
+ }
+ 
+ static int item_first(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+@@ -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, char* argv[]) {