mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-22 20:41:26 +00:00
Correct update to use Tcl/Tk version 8.2
This commit is contained in:
parent
fd22b39c83
commit
8a7c8dcf9a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=23603
@ -12,7 +12,7 @@ MASTER_SITES= http://www.FreeBSD.org/~jmz/
|
|||||||
|
|
||||||
MAINTAINER= jmz@FreeBSD.org
|
MAINTAINER= jmz@FreeBSD.org
|
||||||
|
|
||||||
LIB_DEPENDS= tixsam4180.1:${PORTSDIR}/x11-toolkits/tix
|
LIB_DEPENDS= tixsam4182.1:${PORTSDIR}/x11-toolkits/tix
|
||||||
|
|
||||||
WRKSRC= ${WRKDIR}/cd-write
|
WRKSRC= ${WRKDIR}/cd-write
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--- c++tk/c++tk.cc.orig Sun Nov 28 19:32:37 1999
|
--- c++tk/c++tk.cc.orig Thu Sep 25 03:43:24 1997
|
||||||
+++ c++tk/c++tk.cc Sun Nov 28 19:42:32 1999
|
+++ c++tk/c++tk.cc Sun Dec 5 17:06:02 1999
|
||||||
@@ -28,6 +28,9 @@
|
@@ -28,6 +28,9 @@
|
||||||
// $Id: c++tk.cc,v 1.22 1997/05/19 04:06:12 jmz Exp $
|
// $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);\
|
sprintf (xstr, "%s configure -variable %s%x", pname, VARNAME, v);\
|
||||||
TkError = Tcl_GlobalEval (interp, xstr);\
|
TkError = Tcl_GlobalEval (interp, xstr);\
|
||||||
sprintf (xstr, "%s%x", VARNAME, v);\
|
sprintf (xstr, "%s%x", VARNAME, v);\
|
||||||
@@ -289,7 +294,7 @@
|
@@ -270,7 +275,11 @@
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+#ifdef TIX
|
||||||
|
+extern "C" {
|
||||||
|
+ int Tixsam_Init (Tcl_Interp *);
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
static void
|
||||||
|
initialize ()
|
||||||
|
{
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--- Makefile.orig Sun Nov 28 19:48:42 1999
|
--- Makefile.orig Thu Jan 21 22:31:25 1999
|
||||||
+++ Makefile Sun Nov 28 19:49:26 1999
|
+++ Makefile Sun Dec 5 16:58:55 1999
|
||||||
@@ -1,10 +1,10 @@
|
@@ -1,10 +1,10 @@
|
||||||
OBJS= main.o iso9660.o copy.o write.o misc.o generic.o specific.o worm.o dao.o
|
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
|
cd-write: $(OBJS) subdir
|
||||||
$(CC) -o cd-write $(OBJS) c++tk/c++tk.o\
|
$(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/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:
|
subdir:
|
||||||
cd c++tk && make TIX=1
|
cd c++tk && make TIX=1
|
||||||
@@ -16,6 +16,6 @@
|
@@ -16,5 +16,6 @@
|
||||||
makedepend ${CFLAGS} ${OBJS:S/.o/.cc/g}
|
makedepend ${CFLAGS} ${OBJS:S/.o/.cc/g}
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- install -c cd-write /usr/local/bin
|
- install -c cd-write /usr/local/bin
|
||||||
+ install -c cd-write ${PREFIX}/bin
|
+ install -c cd-write ${PREFIX}/bin
|
||||||
|
|
||||||
all: cd-write
|
+all: cd-write
|
||||||
|
Loading…
Reference in New Issue
Block a user