Make it compile with tcl/tk-8.3.2. Dumps core on startup, though.

Still marked BROKEN, committed as starting point for tcl/tk hackers.

6 files changed, 49 insertions, 15 deletions

diff --git a/math/abacus/Makefile b/math/abacus/Makefile
index 95462fcb2cf..122f0dcd747 100644
--- a/math/abacus/Makefile
+++ b/math/abacus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/09/01 17:58:04 jwise Exp $
+# $NetBSD: Makefile,v 1.7 2000/09/03 23:08:33 wiz Exp $
 # FreeBSD Id: Makefile,v 1.3 1998/09/25 10:07:44 asami Exp
 #
 
@@ -7,26 +7,31 @@ CATEGORIES=	math x11
 MASTER_SITES=	http://www-cad.eecs.berkeley.edu/HomePages/aml/abacus/ \
 		http://tahoe.inesc.pt/~aml/abacus/
 
-BROKEN=		This package has not yet been updated to work with tcl-8.3.2.
-
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www-cad.eecs.berkeley.edu/HomePages/aml/abacus/abacus.html
 
-DEPENDS+=	tcl-8.0.5:../../lang/tcl80
-DEPENDS+=	tk-8.0.5:../../x11/tk80
+DEPENDS+=	tcl-8.3.2:../../lang/tcl
+DEPENDS+=	tk-8.3.2:../../x11/tk
+
+BROKEN=		This package has been updated to compile with tcl-8.3.2, but dumps core on startup.
 
 USE_GMAKE=	yes
 USE_X11BASE=	yes
 
+MESSAGE_FILE=	${WRKDIR}/MESSAGE
+
 pre-patch:
 	@for d in `${FIND} ${WRKSRC} -name RCS -type d -print`; do	\
 		${MV} $$d $$d-dist;					\
 	done
 
 # Until we have tcl 8.0.3 in pkgsrc
-pre-build:
-	@ ${RM} -f ${WRKSRC}/canvas
-	@ ${LN} -fs ${WRKSRC}/canvas-tcl8.0.0 ${WRKSRC}/canvas
+#pre-build:
+#	@ ${RM} -f ${WRKSRC}/canvas
+#	@ ${LN} -fs ${WRKSRC}/canvas-tcl8.0.0 ${WRKSRC}/canvas
+
+pre-install:
+	${SED} -e "s_@PREFIX@_${PREFIX}_" < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
 
 do-install:
 	@ ${SED} s!@PREFIX@!${PREFIX}!g ${WRKSRC}/abacus >${WRKSRC}/abacus.sh
diff --git a/math/abacus/files/patch-sum b/math/abacus/files/patch-sum
index 9c8bfa82281..93cd11553a7 100644
--- a/math/abacus/files/patch-sum
+++ b/math/abacus/files/patch-sum
@@ -1,6 +1,8 @@
-$NetBSD: patch-sum,v 1.2 2000/05/03 17:23:28 rh Exp $
+$NetBSD: patch-sum,v 1.3 2000/09/03 23:08:33 wiz Exp $
 
 MD5 (patch-aa) = 7fda9921599a03fbf297bd62acd110a9
 MD5 (patch-ab) = a8af0611540aa7f0c7f0fa91dd210e9c
 MD5 (patch-ac) = 2b7af933016e5e77c6b0a1ebdf61e291
-MD5 (patch-ad) = 405a26336210cfbd539e462858750f61
+MD5 (patch-ad) = a0e68dfe53360fe387a2363bd1b3f157
+MD5 (patch-ae) = 825ce571e3fd29091a34213ef09eaca3
+MD5 (patch-af) = 05a0591c9683f7e09c5d35311a79ac1c
diff --git a/math/abacus/patches/patch-ad b/math/abacus/patches/patch-ad
index e56cbd9c24c..6675557ebcd 100644
--- a/math/abacus/patches/patch-ad
+++ b/math/abacus/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 1998/12/13 00:29:20 frueauf Exp $
+$NetBSD: patch-ad,v 1.2 2000/09/03 23:08:33 wiz Exp $
 
---- tcl_interf/Makefile.orig	Sat Dec 12 14:29:00 1998
-+++ tcl_interf/Makefile	Sat Dec 12 14:29:00 1998
+--- tcl_interf/Makefile.orig	Mon Oct 26 00:39:45 1998
++++ tcl_interf/Makefile
 @@ -14,7 +14,7 @@
  OTHERSOURCES = 
  SOURCES = $(CSOURCES) $(OTHERSOURCES)
  XXL_LIBS = $(LIBDIR)/libcalc.a $(LIBDIR)/libio.a $(LIBDIR)/libcanvas.a
 -LIBS =  -ltk8.0 -ltcl8.0 -lX11 -ldl -lm 
-+LIBS =  -ltk80 -ltcl80 -lX11 -lm 
++LIBS =  -ltk83 -ltcl83 -lX11 -lm 
  
  include ../Makefile.options
  
diff --git a/math/abacus/patches/patch-ae b/math/abacus/patches/patch-ae
new file mode 100644
index 00000000000..e8c3987f212
--- /dev/null
+++ b/math/abacus/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2000/09/03 23:08:34 wiz Exp $
+
+--- canvas-tcl8.0.3/tkInt.h.orig	Tue Sep 29 00:15:51 1998
++++ canvas-tcl8.0.3/tkInt.h
+@@ -38,7 +38,6 @@
+ 
+ typedef struct TkColormap TkColormap;
+ typedef struct TkGrabEvent TkGrabEvent;
+-typedef struct Tk_PostscriptInfo Tk_PostscriptInfo;
+ typedef struct TkpCursor_ *TkpCursor;
+ typedef struct TkRegion_ *TkRegion;
+ typedef struct TkStressedCmap TkStressedCmap;
diff --git a/math/abacus/patches/patch-af b/math/abacus/patches/patch-af
new file mode 100644
index 00000000000..eaa0fa475bd
--- /dev/null
+++ b/math/abacus/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2000/09/03 23:08:34 wiz Exp $
+
+--- canvas-tcl8.0.3/tkEvent.c.orig	Wed Sep 30 03:05:07 1998
++++ canvas-tcl8.0.3/tkEvent.c
+@@ -836,7 +836,7 @@
+      * Find our display structure for the event's display.
+      */
+ 
+-    for (dispPtr = tkDisplayList; ; dispPtr = dispPtr->nextPtr) {
++    for (dispPtr = TkGetDisplayList(); ; dispPtr = dispPtr->nextPtr) {
+ 	if (dispPtr == NULL) {
+ 	    return;
+ 	}
diff --git a/math/abacus/pkg/MESSAGE b/math/abacus/pkg/MESSAGE
index 1d1d225e6be..65d07e0bd42 100644
--- a/math/abacus/pkg/MESSAGE
+++ b/math/abacus/pkg/MESSAGE
@@ -1,3 +1,5 @@
+$NetBSD: MESSAGE,v 1.2 2000/09/03 23:08:34 wiz Exp $
+
 Define the following environment variables:
 
 	ABACUS_HOME - directory where you installed the Abacus share tcl files.
@@ -5,6 +7,6 @@ Define the following environment variables:
 	ABACUS_BROWSER - web browser to view WWW pages and info.
 
 e.g.:
-	setenv ABACUS_HOME /usr/X11R6/share/abacus
+	setenv ABACUS_HOME @PREFIX@/share/abacus
 	setenv ABACUS_EDITOR emacs
 	setenv ABACUS_BROWSER netscape