Unbreak.

3 files changed, 27 insertions, 15 deletions

diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index 851bb87..3457279 100644
--- a/sysutils/cd-write/Makefile
+++ b/sysutils/cd-write/Makefile
@@ -22,11 +22,9 @@ WRKSRC=		${WRKDIR}/cd-write
 BROKEN=		CAM
 .endif
 
-BROKEN=		"Missing TK header - see http://bento.freebsd.org/errorlogs/3-full/cd-write-1.4.1.log"
-
 pre-build:
 	@cd ${WRKSRC}; ${MV} Makefile Makefile~; \
-		${SED} -e s:/usr/local:${PREFIX}:g <Makefile~ >Makefile;\
+		${SED} -e s:/usr/local:${PREFIX}:g -e s/CFL/CXXFL/ <Makefile~ >Makefile;\
 		${ECHO} all: cd-write >> Makefile
 	@cd ${WRKSRC}/c++tk; ${MV} Makefile Makefile~; \
 		${SED} -e s:/usr/local:${PREFIX}:g <Makefile~ >Makefile
diff --git a/sysutils/cd-write/files/patch-3 b/sysutils/cd-write/files/patch-3
index 132ab4a..00935fd 100644
--- a/sysutils/cd-write/files/patch-3
+++ b/sysutils/cd-write/files/patch-3
@@ -1,8 +1,8 @@
---- c++tk/Makefile.orig	Sun Nov 28 19:31:26 1999
-+++ c++tk/Makefile	Sun Nov 28 19:42:34 1999
+--- c++tk/Makefile.orig	Tue Nov 17 23:34:37 1998
++++ c++tk/Makefile	Sat Apr 29 23:38:40 2000
 @@ -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
++CXXFLAGS=-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
@@ -10,3 +10,12 @@
  TCL_SCRIPTS= bgerror button dialog entry focus listbox menu obsolete \
  	 	optMenu palette text scale scrlbar tearoff 
  
+@@ -9,7 +9,7 @@
+ 
+ .if defined(TIX)
+ DEPS+= tix_scripts.h
+-CFLAGS+= -DTIX
++CXXFLAGS+= -DTIX
+ .endif
+ 
+ c++tk.o: ${DEPS}
diff --git a/sysutils/cd-write/files/patch-4 b/sysutils/cd-write/files/patch-4
index f5cd773..400f538 100644
--- a/sysutils/cd-write/files/patch-4
+++ b/sysutils/cd-write/files/patch-4
@@ -1,5 +1,5 @@
 --- c++tk/c++tk.cc.orig	Thu Sep 25 03:43:24 1997
-+++ c++tk/c++tk.cc	Sun Dec  5 17:06:02 1999
++++ c++tk/c++tk.cc	Sat Apr 29 23:40:59 2000
 @@ -28,6 +28,9 @@
  //  $Id: c++tk.cc,v 1.22 1997/05/19 04:06:12 jmz Exp $
  //
@@ -14,8 +14,9 @@
  
  extern "C" {
      int Tk_Init (Tcl_Interp *);
-+#if 0
-     ClientData Tk_MainWindow (Tcl_Interp *);
+-    ClientData Tk_MainWindow (Tcl_Interp *);
++#ifdef TIX
++    int Tixsam_Init (Tcl_Interp *);
 +#endif
  }
  
@@ -29,16 +30,20 @@
      sprintf (xstr, "%s configure -variable %s%x", pname, VARNAME, v);\
      TkError = Tcl_GlobalEval (interp, xstr);\
      sprintf (xstr, "%s%x", VARNAME, v);\
-@@ -270,7 +275,11 @@
+@@ -270,7 +275,6 @@
      }
      return 0;
  }
 -
-+#ifdef TIX
-+extern "C" {
-+    int Tixsam_Init (Tcl_Interp *);
-+}
-+#endif
  static void
  initialize ()
  {
+@@ -302,7 +306,7 @@
+ #endif
+     Tcl_CreateCommand (interp, JMPNAME, 
+ 		   (Tcl_CmdProc *) Proc_Handler, 
+-		   Tk_MainWindow (interp), 0);
++		   (void *)Tk_MainWindow (interp), 0);
+     i_vars = new int * [VAR_SIZE];
+     I_vars = new int [VAR_SIZE];
+     t_vars = new char * [VAR_SIZE];