From 8a7c8dcf9ac4bfd7b6477c9c50a1ba556720356b Mon Sep 17 00:00:00 2001
From: Jean-Marc Zucconi <jmz@FreeBSD.org>
Date: Sun, 5 Dec 1999 16:10:59 +0000
Subject: [PATCH] Correct update to use Tcl/Tk version 8.2

---
 sysutils/cd-write/Makefile      |  2 +-
 sysutils/cd-write/files/patch-4 | 24 ++++++++++++++----------
 sysutils/cd-write/files/patch-5 | 10 +++++-----
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index 1203e7168fe5..ffcd2d57bca1 100644
--- a/sysutils/cd-write/Makefile
+++ b/sysutils/cd-write/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=   http://www.FreeBSD.org/~jmz/
 
 MAINTAINER=     jmz@FreeBSD.org
 
-LIB_DEPENDS=	tixsam4180.1:${PORTSDIR}/x11-toolkits/tix
+LIB_DEPENDS=	tixsam4182.1:${PORTSDIR}/x11-toolkits/tix
 
 WRKSRC=		${WRKDIR}/cd-write
 
diff --git a/sysutils/cd-write/files/patch-4 b/sysutils/cd-write/files/patch-4
index d3b22193e90b..f5cd773e2d7b 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	Sun Nov 28 19:32:37 1999
-+++ c++tk/c++tk.cc	Sun Nov 28 19:42:32 1999
+--- 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
 @@ -28,6 +28,9 @@
  //  $Id: c++tk.cc,v 1.22 1997/05/19 04:06:12 jmz Exp $
  //
@@ -29,12 +29,16 @@
      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);
+@@ -270,7 +275,11 @@
      }
+     return 0;
+ }
+-
++#ifdef TIX
++extern "C" {
++    int Tixsam_Init (Tcl_Interp *);
++}
++#endif
+ static void
+ initialize ()
+ {
diff --git a/sysutils/cd-write/files/patch-5 b/sysutils/cd-write/files/patch-5
index de175bb3e8b8..eccab399c899 100644
--- a/sysutils/cd-write/files/patch-5
+++ b/sysutils/cd-write/files/patch-5
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Nov 28 19:48:42 1999
-+++ Makefile	Sun Nov 28 19:49:26 1999
+--- Makefile.orig	Thu Jan 21 22:31:25 1999
++++ Makefile	Sun Dec  5 16:58:55 1999
 @@ -1,10 +1,10 @@
  OBJS=	main.o iso9660.o copy.o write.o misc.o generic.o specific.o worm.o dao.o
  
@@ -9,15 +9,15 @@
  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
++		-L${PREFIX}/lib -L${X11BASE}/lib -ltixsam4182 -ltk82 -ltcl82 -lX11 -lm -lcam
  
  subdir:
  	cd c++tk && make TIX=1
-@@ -16,6 +16,6 @@
+@@ -16,5 +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
++all: cd-write