Attachment #191722 for bug #226799





PORTNAME=	ical
PORTVERSION=	2.2
PORTREVISION=	5
CATEGORIES=	deskutils tk
MASTER_SITES=	ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/

PATCH_SITES=	http://www.isi.edu/~johnh/SOFTWARE/ICAL/
PATCHFILES=	ical-2.3.1-upvar.patch

MAINTAINER=	fbsd@opal.com
COMMENT=	Calendar application

LICENSE=	GPLv2

Line 0 Link Here

(-)deskutils/ical/files/patch-bitmaps-dleft.xbm (+10 lines)
	1	--- bitmaps/dleft.xbm.orig 1994-12-17 16:41:32.000000000 -0500
	2	+++ bitmaps/dleft.xbm 2018-03-21 16:30:16.156611000 -0400
	3	@@ -1,6 +1,6 @@
	4	#define dleft_width 16
	5	#define dleft_height 16
	6	-static char dleft_bits[] = {
	7	+static unsigned char dleft_bits[] = {
	8	0x00, 0x00, 0x80, 0x61, 0xc0, 0x71, 0xe0, 0x79, 0xf0, 0x7d, 0xf8, 0x7f,
	9	0xfc, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfc, 0x7f, 0xf8, 0x7f, 0xf0, 0x7d,
	10	0xe0, 0x79, 0xc0, 0x71, 0x80, 0x61, 0x00, 0x00};

Line 0 Link Here

(-)deskutils/ical/files/patch-bitmaps-done.xbm (+10 lines)
	1	--- bitmaps/done.xbm.orig 1994-12-17 16:29:47.000000000 -0500
	2	+++ bitmaps/done.xbm 2018-03-21 16:30:37.428943000 -0400
	3	@@ -1,6 +1,6 @@
	4	#define done_width 16
	5	#define done_height 16
	6	-static char done_bits[] = {
	7	+static unsigned char done_bits[] = {
	8	0x00, 0x00, 0xff, 0x8f, 0xff, 0x67, 0x03, 0x30, 0x03, 0x18, 0x03, 0x4c,
	9	0x33, 0x6e, 0x7b, 0x67, 0xff, 0x67, 0xfb, 0x63, 0xf3, 0x63, 0xe3, 0x61,
	10	0xc3, 0x61, 0x83, 0x60, 0xff, 0x7f, 0xff, 0x7f};

Line 0 Link Here

(-)deskutils/ical/files/patch-bitmaps-dright.xbm (+10 lines)
	1	--- bitmaps/dright.xbm.orig 1994-12-17 16:41:33.000000000 -0500
	2	+++ bitmaps/dright.xbm 2018-03-21 16:30:44.179406000 -0400
	3	@@ -1,6 +1,6 @@
	4	#define dright_width 16
	5	#define dright_height 16
	6	-static char dright_bits[] = {
	7	+static unsigned char dright_bits[] = {
	8	0x00, 0x00, 0x86, 0x01, 0x8e, 0x03, 0x9e, 0x07, 0xbe, 0x0f, 0xfe, 0x1f,
	9	0xfe, 0x3f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x3f, 0xfe, 0x1f, 0xbe, 0x0f,
	10	0x9e, 0x07, 0x8e, 0x03, 0x86, 0x01, 0x00, 0x00};

Line 0 Link Here

(-)deskutils/ical/files/patch-bitmaps-ical.xbm (+10 lines)
	1	--- bitmaps/ical.xbm.orig 1996-01-23 19:43:16.000000000 -0500
	2	+++ bitmaps/ical.xbm 2018-03-21 16:31:00.051970000 -0400
	3	@@ -1,6 +1,6 @@
	4	#define ical_width 64
	5	#define ical_height 54
	6	-static char ical_bits[] = {
	7	+static unsigned char ical_bits[] = {
	8	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
	9	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
	10	0x00, 0x00, 0x30, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00,

Line 0 Link Here

(-)deskutils/ical/files/patch-bitmaps-left.xbm (+11 lines)
	1	--- bitmaps/left.xbm.orig 1994-12-17 16:29:48.000000000 -0500
	2	+++ bitmaps/left.xbm 2018-03-21 16:31:06.288351000 -0400
	3	@@ -1,7 +1,7 @@
	4	/* Copyright (c) 1993 by Sanjay Ghemawat */
	5	#define left_width 16
	6	#define left_height 16
	7	-static char left_bits[] = {
	8	+static unsigned char left_bits[] = {
	9	0x00, 0x00, 0x80, 0x01, 0x40, 0x01, 0x20, 0x01, 0x10, 0x01, 0x08, 0x7f,
	10	0x04, 0x40, 0x02, 0x40, 0x02, 0x40, 0x04, 0x40, 0x08, 0x7f, 0x10, 0x01,
	11	0x20, 0x01, 0x40, 0x01, 0x80, 0x01, 0x00, 0x00};

Line 0 Link Here

(-)deskutils/ical/files/patch-bitmaps-right.xbm (+11 lines)
	1	--- bitmaps/right.xbm.orig 1994-12-17 16:29:49.000000000 -0500
	2	+++ bitmaps/right.xbm 2018-03-21 16:31:10.705826000 -0400
	3	@@ -1,7 +1,7 @@
	4	/* Copyright (c) 1993 by Sanjay Ghemawat */
	5	#define right_width 16
	6	#define right_height 16
	7	-static char right_bits[] = {
	8	+static unsigned char right_bits[] = {
	9	0x00, 0x00, 0x80, 0x01, 0x80, 0x02, 0x80, 0x04, 0x80, 0x08, 0xfe, 0x10,
	10	0x02, 0x20, 0x02, 0x40, 0x02, 0x40, 0x02, 0x20, 0xfe, 0x10, 0x80, 0x08,
	11	0x80, 0x04, 0x80, 0x02, 0x80, 0x01, 0x00, 0x00};

Line 0 Link Here

(-)deskutils/ical/files/patch-bitmaps-sleft.xbm (+10 lines)
	1	--- bitmaps/sleft.xbm.orig 1994-12-17 16:41:34.000000000 -0500
	2	+++ bitmaps/sleft.xbm 2018-03-21 16:29:50.989271000 -0400
	3	@@ -1,6 +1,6 @@
	4	#define sleft_width 16
	5	#define sleft_height 16
	6	-static char sleft_bits[] = {
	7	+static unsigned char sleft_bits[] = {
	8	0x00, 0x00, 0x00, 0x0c, 0x00, 0x0e, 0x00, 0x0f, 0x80, 0x0f, 0xc0, 0x0f,
	9	0xe0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xe0, 0x0f, 0xc0, 0x0f, 0x80, 0x0f,
	10	0x00, 0x0f, 0x00, 0x0e, 0x00, 0x0c, 0x00, 0x00};

Line 0 Link Here

(-)deskutils/ical/files/patch-bitmaps-sright.xbm (+10 lines)
	1	--- bitmaps/sright.xbm.orig 1994-12-17 16:41:34.000000000 -0500
	2	+++ bitmaps/sright.xbm 2018-03-21 16:31:20.968994000 -0400
	3	@@ -1,6 +1,6 @@
	4	#define sright_width 16
	5	#define sright_height 16
	6	-static char sright_bits[] = {
	7	+static unsigned char sright_bits[] = {
	8	0x00, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00, 0xf0, 0x01, 0xf0, 0x03,
	9	0xf0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x07, 0xf0, 0x03, 0xf0, 0x01,
	10	0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x00, 0x00};

Line 0 Link Here

(-)deskutils/ical/files/patch-bitmaps-todo.xbm (+10 lines)
	1	--- bitmaps/todo.xbm.orig 1994-12-17 16:29:49.000000000 -0500
	2	+++ bitmaps/todo.xbm 2018-03-21 16:31:31.632338000 -0400
	3	@@ -1,6 +1,6 @@
	4	#define todo_width 16
	5	#define todo_height 16
	6	-static char todo_bits[] = {
	7	+static unsigned char todo_bits[] = {
	8	0x00, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60,
	9	0x03, 0x60, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60, 0x03, 0x60,
	10	0x03, 0x60, 0x03, 0x60, 0xff, 0x7f, 0xff, 0x7f};




--- main.C.orig	1996-02-15 20:57:42.000000000 -0500
+++ main.C	2018-03-21 16:41:01.870226000 -0400
@@ -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 @@
 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 @@
 
 #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 @@
 
     TkCreateXEventSource();
 
-    return (eval_list(tcl, tk_lib_str));
+    return (eval_list(tcl, (char **)tk_lib_str));
 }
 #endif
 
@@ -245,37 +245,37 @@
     }
 
     // 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);

 
 #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)

Return to bug 226799

Lines 3-16 Link Here

(-)deskutils/ical/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= ical	4	PORTNAME= ical
5	PORTVERSION= 2.2	5	PORTVERSION= 2.2
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= deskutils tk	7	CATEGORIES= deskutils tk
8	MASTER_SITES= ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/	8	MASTER_SITES= ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/
9		9
10	PATCH_SITES= http://www.isi.edu/~johnh/SOFTWARE/ICAL/	10	PATCH_SITES= http://www.isi.edu/~johnh/SOFTWARE/ICAL/
11	PATCHFILES= ical-2.3.1-upvar.patch	11	PATCHFILES= ical-2.3.1-upvar.patch
12		12
13	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= fbsd@opal.com
14	COMMENT= Calendar application	14	COMMENT= Calendar application
15		15
16	LICENSE= GPLv2	16	LICENSE= GPLv2

Lines 1-8 Link Here

(-)deskutils/ical/files/patch-main.C (-3 / +110 lines)
1	--- main.C.tcl84fixes 1996-02-16 02:57:42.000000000 +0100	1	--- main.C.orig 1996-02-15 20:57:42.000000000 -0500
2	+++ main.C 2003-04-28 18:14:32.000000000 +0200	2	+++ main.C 2018-03-21 16:41:01.870226000 -0400
3	@@ -255,14 +255,14 @@ int Ical_Init(Tcl_Interp* tcl) {	3	@@ -27,13 +27,13 @@
		4	/* Include various libraries converted to strings. */
		5
		6	#ifdef STANDALONE
		7	-static char* tcl_lib_str[] = {
		8	+static const char* tcl_lib_str[] = {
		9	#include "tcl_lib.gen"
		10	0
		11	};
		12
		13	// Need to disable "source" command
		14	-static char* tk_lib_str[] = {
		15	+static const char* tk_lib_str[] = {
		16	"rename source _orig_source",
		17	"proc source {args} {}",
		18	#include "tk_lib.gen"
		19	@@ -42,37 +42,37 @@
		20	0
		21	};
		22
		23	-static char* ical_lib_str[] = {
		24	+static const char* ical_lib_str[] = {
		25	#include "ical_lib.gen"
		26	0
		27	};
		28
		29	-static char* tcllib_str[] = {
		30	+static const char* tcllib_str[] = {
		31	#include "tcllib.gen"
		32	0
		33	};
		34	#endif
		35
		36	-static char* ical_startup[] = {
		37	+static const char* ical_startup[] = {
		38	#include "ical_start.gen"
		39	0
		40	};
		41
		42	-static char* psheader_str[] = {
		43	+static const char* psheader_str[] = {
		44	"set ical(psheader) {%!PS-Adobe-",
		45	#include "psheader.gen"
		46	"}",
		47	0
		48	};
		49
		50	-static char* ical_doc_str[] = {
		51	+static const char* ical_doc_str[] = {
		52	"set ical(doc) {",
		53	#include "icaldoc.gen"
		54	"}",
		55	0
		56	};
		57
		58	-static char* tcl_doc_str[] = {
		59	+static const char* tcl_doc_str[] = {
		60	"set ical(tcl_interface_doc) {",
		61	#include "tcldoc.gen"
		62	"}",
		63	@@ -173,7 +173,7 @@
		64
		65	#ifdef STANDALONE
		66	extern "C" int MyTcl_Init(Tcl_Interp* tcl) {
		67	- return (eval_list(tcl, tcl_lib_str));
68	+ return (eval_list(tcl, (char **)tcl_lib_str));
69	}
70	#else
71	#define MyTcl_Init Tcl_Init
72	@@ -194,7 +194,7 @@
73
74	TkCreateXEventSource();
75
76	- return (eval_list(tcl, tk_lib_str));
77	+ return (eval_list(tcl, (char **)tk_lib_str));
78	}
79	#endif
80
81	@@ -245,37 +245,37 @@
82	}
83
84	// Set-up postscript prolog
85	- if (eval_list(tcl, psheader_str) != TCL_OK)
86	+ if (eval_list(tcl, (char **)psheader_str) != TCL_OK)
4	return TCL_ERROR;	87	return TCL_ERROR;
5		88
		89	// Set-up documentation
		90	- if (eval_list(tcl, ical_doc_str) != TCL_OK)
		91	+ if (eval_list(tcl, (char **)ical_doc_str) != TCL_OK)
		92	return TCL_ERROR;
		93	- if (eval_list(tcl, tcl_doc_str) != TCL_OK)
		94	+ if (eval_list(tcl, (char **)tcl_doc_str) != TCL_OK)
		95	return TCL_ERROR;
		96
6	// Non-Tk ical commands	97	// Non-Tk ical commands
7	- Tcl_CreateCommand(tcl, "calendar", Cmd_CreateCalendar, NULL, NULL);	98	- Tcl_CreateCommand(tcl, "calendar", Cmd_CreateCalendar, NULL, NULL);
8	- Tcl_CreateCommand(tcl, "notice", Cmd_CreateNotice, NULL, NULL);	99	- Tcl_CreateCommand(tcl, "notice", Cmd_CreateNotice, NULL, NULL);
Lines 23-25 Link Here
23		114
24	#ifdef STANDALONE	115	#ifdef STANDALONE
25	// Load tcllib files	116	// Load tcllib files
		117	- if (eval_list(tcl, tcllib_str) != TCL_OK)
		118	+ if (eval_list(tcl, (char **)tcllib_str) != TCL_OK)
		119	return TCL_ERROR;
		120
		121	// Load ical library files
		122	- if (eval_list(tcl, ical_lib_str) != TCL_OK)
		123	+ if (eval_list(tcl, (char **)ical_lib_str) != TCL_OK)
		124	return TCL_ERROR;
		125	#endif
		126
		127	// Initialize ical stuff
		128	- if (eval_list(tcl, ical_startup) != TCL_OK)
		129	+ if (eval_list(tcl, (char **)ical_startup) != TCL_OK)
		130	return TCL_ERROR;
		131
		132	if (Tcl_Eval(tcl, "ical_init") == TCL_ERROR)