Update to use Tcl/Tk version 8.2.

5 files changed, 89 insertions, 3 deletions

diff --git a/sysutils/cd-write/files/patch-1 b/sysutils/cd-write/files/patch-1
index d62af63944ce..7c6c45d63059 100644
--- a/sysutils/cd-write/files/patch-1
+++ b/sysutils/cd-write/files/patch-1
@@ -5,7 +5,7 @@
  # Tk-based application.  Arranges class bindings for widgets.
  #
 -# SCCS: @(#) tk.tcl 1.87 96/09/30 09:28:02
-+# RCS: @(#) $Id: tk.tcl,v 1.5 1998/11/12 06:22:05 welch Exp $
++# RCS: @(#) $Id: patch-1,v 1.1 1999/05/03 22:49:45 jmz Exp $
  #
  # Copyright (c) 1992-1994 The Regents of the University of California.
  # Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -15,8 +15,8 @@
  
 -package require -exact Tk 4.2
 -package require -exact Tcl 7.6
-+package require -exact Tk 8.0
-+package require -exact Tcl 8.0
++package require -exact Tk 8.2
++package require -exact Tcl 8.2
  
  
  # Turn off strict Motif look and feel as a default.
diff --git a/sysutils/cd-write/files/patch-2 b/sysutils/cd-write/files/patch-2
new file mode 100644
index 000000000000..528fadf42693
--- /dev/null
+++ b/sysutils/cd-write/files/patch-2
@@ -0,0 +1,11 @@
+--- copy.cc.orig	Sun Nov 28 19:29:05 1999
++++ copy.cc	Sun Nov 28 19:29:25 1999
+@@ -397,7 +397,7 @@
+     hlist.subwidget ("hlist", "delete all");
+     for (i = 0; t[i].track != 0xaa; i++) {
+ 	state = (t[i].type & T_AUDIO && !ops->read_audio_blocks) ? 
+-	    "disabled" : "normal";
++	    (char *)"disabled" : (char *)"normal";
+ 	sprintf (s, "add %d -itemtype imagetext -image %s -state %s", i, 
+ 		 t[i].type & T_AUDIO ? (t[i].type & T_PREEMP ? "note_p" : "note") : "data",
+ 		 state);
diff --git a/sysutils/cd-write/files/patch-3 b/sysutils/cd-write/files/patch-3
new file mode 100644
index 000000000000..132ab4a251cf
--- /dev/null
+++ b/sysutils/cd-write/files/patch-3
@@ -0,0 +1,12 @@
+--- c++tk/Makefile.orig	Sun Nov 28 19:31:26 1999
++++ c++tk/Makefile	Sun Nov 28 19:42:34 1999
+@@ -1,7 +1,7 @@
+-CFLAGS=-g -O -I/usr/local/include/tcl8.0
++CFLAGS=-g -O -I${PREFIX}/include/tcl8.2 -I${PREFIX}/include -I${PREFIX}/include/tk8.2 -I${X11BASE}/include
+ OBJS = c++tk.o
+ 
+-TK_LIB=	/usr/local/lib/tk8.0
++TK_LIB=	${PREFIX}/lib/tk8.2
+ TCL_SCRIPTS= bgerror button dialog entry focus listbox menu obsolete \
+ 	 	optMenu palette text scale scrlbar tearoff 
+ 
diff --git a/sysutils/cd-write/files/patch-4 b/sysutils/cd-write/files/patch-4
new file mode 100644
index 000000000000..d3b22193e90b
--- /dev/null
+++ b/sysutils/cd-write/files/patch-4
@@ -0,0 +1,40 @@
+--- c++tk/c++tk.cc.orig	Sun Nov 28 19:32:37 1999
++++ c++tk/c++tk.cc	Sun Nov 28 19:42:32 1999
+@@ -28,6 +28,9 @@
+ //  $Id: c++tk.cc,v 1.22 1997/05/19 04:06:12 jmz Exp $
+ //
+ #include <tcl.h>
++#ifdef TIX
++#include <tix.h>
++#endif
+ #include <string.h>
+ #include <stdlib.h>
+ #include <limits.h>
+@@ -38,7 +41,9 @@
+ 
+ extern "C" {
+     int Tk_Init (Tcl_Interp *);
++#if 0
+     ClientData Tk_MainWindow (Tcl_Interp *);
++#endif
+ }
+ 
+ #include "c++tk.h"
+@@ -80,7 +85,7 @@
+     add_tvar (v)
+ #define VARIABLE \
+     sprintf (xstr, "%s%x", VARNAME, v);\
+-    Tcl_SetVar (interp, xstr, *v? "1":"0", TCL_GLOBAL_ONLY);\
++    Tcl_SetVar (interp, xstr, *v? (char *)"1":(char*)"0", TCL_GLOBAL_ONLY);\
+     sprintf (xstr, "%s configure -variable %s%x", pname, VARNAME, v);\
+     TkError = Tcl_GlobalEval (interp, xstr);\
+     sprintf (xstr, "%s%x", VARNAME, v);\
+@@ -289,7 +294,7 @@
+     Tk_Init (interp);
+     Tcl_StaticPackage (interp, "Tk", Tk_Init, 0);
+ #ifdef TIX
+-    if (Tixsam_Init (interp) != TCL_OK ) {
++    if (Tix_Init (interp) != TCL_OK ) {
+         fprintf(stderr,"Can't initialize the Tix extension.\n");
+         exit(1);
+     }
diff --git a/sysutils/cd-write/files/patch-5 b/sysutils/cd-write/files/patch-5
new file mode 100644
index 000000000000..de175bb3e8b8
--- /dev/null
+++ b/sysutils/cd-write/files/patch-5
@@ -0,0 +1,23 @@
+--- Makefile.orig	Sun Nov 28 19:48:42 1999
++++ Makefile	Sun Nov 28 19:49:26 1999
+@@ -1,10 +1,10 @@
+ OBJS=	main.o iso9660.o copy.o write.o misc.o generic.o specific.o worm.o dao.o
+ 
+-CFLAGS = -g -O -Ic++tk -DTIX -DMKISOFS='"/usr/local/bin/mkisofs"'
++CFLAGS = -g -O -Ic++tk -DTIX -DMKISOFS='"${PREFIX}/bin/mkisofs"'
+ 
+ cd-write: $(OBJS) subdir
+ 	$(CC) -o  cd-write $(OBJS) c++tk/c++tk.o\
+-		-L/usr/local/lib -L/usr/X11R6/lib -ltixsam4180 -ltk80 -ltcl80 -lX11 -lm -lcam
++		-L${PREFIX}/lib -L${X11BASE}/lib -ltixsam4180 -ltk82 -ltcl82 -lX11 -lm -lcam
+ 
+ subdir:
+ 	cd c++tk && make TIX=1
+@@ -16,6 +16,6 @@
+ 	makedepend  ${CFLAGS} ${OBJS:S/.o/.cc/g}
+ 
+ install:
+-	install -c cd-write  /usr/local/bin
++	install -c cd-write  ${PREFIX}/bin
+ 
+ all: cd-write