Fix build against tcl 8.6.

Note though that this seems to have been merged into the main tcl
package and it won't be installable -- not being a tcl person I don't
know what the proper approach is

5 files changed, 131 insertions, 1 deletions

diff --git a/devel/tcl-tclOO/distinfo b/devel/tcl-tclOO/distinfo
index b3a9054361d..99b4c326ac6 100644
--- a/devel/tcl-tclOO/distinfo
+++ b/devel/tcl-tclOO/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.2 2013/11/16 21:04:37 asau Exp $
+$NetBSD: distinfo,v 1.3 2014/06/28 22:02:50 dholland Exp $
 
 SHA1 (TclOO1.0.1.tar.gz) = b28be85ba9c29acb650164c1cabddec7f1dae83f
 RMD160 (TclOO1.0.1.tar.gz) = 8d80a3628ca33fb26e0aa4080c0c917f5799f450
 Size (TclOO1.0.1.tar.gz) = 228647 bytes
+SHA1 (patch-generic_tclOOBasic.c) = de4638ebd578ee91a0df899133389779d1ccb3c9
+SHA1 (patch-generic_tclOODefineCmds.c) = e12819d3f76b8957d99c2e158c71c6eed905dd13
+SHA1 (patch-generic_tclOOInt.h) = ea16fb14b29c73340b5092174b80824b7a1db093
+SHA1 (patch-generic_tclOOMethod.c) = c92e4da4279e5bdf222fc2510e88b4abb15008b1
diff --git a/devel/tcl-tclOO/patches/patch-generic_tclOOBasic.c b/devel/tcl-tclOO/patches/patch-generic_tclOOBasic.c
new file mode 100644
index 00000000000..fd8bdbbc705
--- /dev/null
+++ b/devel/tcl-tclOO/patches/patch-generic_tclOOBasic.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-generic_tclOOBasic.c,v 1.1 2014/06/28 22:02:50 dholland Exp $
+
+Fix build with tcl 8.6.
+
+--- generic/tclOOBasic.c~	2013-09-18 09:34:49.000000000 +0000
++++ generic/tclOOBasic.c
+@@ -384,7 +384,7 @@ TclOO_Object_Eval(
+     if (result == TCL_ERROR) {
+ 	Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
+ 		"\n    (in \"%s eval\" script line %d)",
+-		TclGetString(objnameObj), interp->errorLine));
++		TclGetString(objnameObj), Tcl_GetErrorLine(interp)));
+     }
+ 
+     /*
diff --git a/devel/tcl-tclOO/patches/patch-generic_tclOODefineCmds.c b/devel/tcl-tclOO/patches/patch-generic_tclOODefineCmds.c
new file mode 100644
index 00000000000..c5f3aef0ee7
--- /dev/null
+++ b/devel/tcl-tclOO/patches/patch-generic_tclOODefineCmds.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-generic_tclOODefineCmds.c,v 1.1 2014/06/28 22:02:50 dholland Exp $
+
+Fix build with tcl 8.6.
+
+--- generic/tclOODefineCmds.c~	2013-09-18 09:35:24.000000000 +0000
++++ generic/tclOODefineCmds.c
+@@ -775,7 +775,7 @@ GenerateErrorInfo(
+     Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
+ 	    "\n    (in definition script for %s \"%.*s%s\" line %d)",
+ 	    typeOfSubject, (overflow ? limit : length), objName,
+-	    (overflow ? "..." : ""), interp->errorLine));
++	    (overflow ? "..." : ""), Tcl_GetErrorLine(interp)));
+ }
+ 
+ /*
diff --git a/devel/tcl-tclOO/patches/patch-generic_tclOOInt.h b/devel/tcl-tclOO/patches/patch-generic_tclOOInt.h
new file mode 100644
index 00000000000..b88f211cfc9
--- /dev/null
+++ b/devel/tcl-tclOO/patches/patch-generic_tclOOInt.h
@@ -0,0 +1,23 @@
+$NetBSD: patch-generic_tclOOInt.h,v 1.1 2014/06/28 22:02:50 dholland Exp $
+
+Fix build with tcl 8.6.
+
+--- generic/tclOOInt.h.orig	2013-08-03 11:47:14.000000000 +0000
++++ generic/tclOOInt.h
+@@ -87,14 +87,14 @@ typedef struct ProcedureMethod {
+     ClientData clientData;
+     TclOO_PmCDDeleteProc *deleteClientdataProc;
+     TclOO_PmCDCloneProc *cloneClientdataProc;
+-    ProcErrorProc errProc;	/* Replacement error handler. */
++    ProcErrorProc *errProc;	/* Replacement error handler. */
+     TclOO_PreCallProc *preCallProc;
+ 				/* Callback to allow for additional setup
+ 				 * before the method executes. */
+     TclOO_PostCallProc *postCallProc;
+ 				/* Callback to allow for additional cleanup
+ 				 * after the method executes. */
+-    GetFrameInfoValueProc gfivProc;
++    GetFrameInfoValueProc *gfivProc;
+ 				/* Callback to allow for fine tuning of how
+ 				 * the method reports itself. */
+ } ProcedureMethod;
diff --git a/devel/tcl-tclOO/patches/patch-generic_tclOOMethod.c b/devel/tcl-tclOO/patches/patch-generic_tclOOMethod.c
new file mode 100644
index 00000000000..f88ca66ef8a
--- /dev/null
+++ b/devel/tcl-tclOO/patches/patch-generic_tclOOMethod.c
@@ -0,0 +1,73 @@
+$NetBSD: patch-generic_tclOOMethod.c,v 1.1 2014/06/28 22:02:50 dholland Exp $
+
+Fix build with tcl 8.6.
+
+--- generic/tclOOMethod.c~	2013-08-03 11:31:43.000000000 +0000
++++ generic/tclOOMethod.c
+@@ -34,7 +34,7 @@ struct PNI {
+ typedef struct {
+     CallFrame *framePtr;	/* Reference to the call frame itself (it's
+ 				 * actually allocated on the Tcl stack). */
+-    ProcErrorProc errProc;	/* The error handler for the body. */
++    ProcErrorProc *errProc;	/* The error handler for the body. */
+     Tcl_Obj *nameObj;		/* The "name" of the command. */
+     Command cmd;		/* The command structure. Mostly bogus. */
+     ExtraFrameInfo efi;		/* Extra information used for [info frame]. */
+@@ -508,8 +508,8 @@ TclOOMakeProcInstanceMethod(
+ 		cfPtr->data.eval.path = context.data.eval.path;
+ 		Tcl_IncrRefCount(cfPtr->data.eval.path);
+ 
+-		cfPtr->cmd.str.cmd = NULL;
+-		cfPtr->cmd.str.len = 0;
++		cfPtr->cmd = NULL;
++		cfPtr->len = 0;
+ 
+ 		hPtr = Tcl_CreateHashEntry(iPtr->linePBodyPtr,
+ 			(char *) procPtr, &isNew);
+@@ -621,8 +621,8 @@ TclOOMakeProcMethod(
+ 		cfPtr->data.eval.path = context.data.eval.path;
+ 		Tcl_IncrRefCount(cfPtr->data.eval.path);
+ 
+-		cfPtr->cmd.str.cmd = NULL;
+-		cfPtr->cmd.str.len = 0;
++		cfPtr->cmd = NULL;
++		cfPtr->len = 0;
+ 
+ 		hPtr = Tcl_CreateHashEntry(iPtr->linePBodyPtr,
+ 			(char *) procPtr, &isNew);
+@@ -756,7 +756,7 @@ PushMethodCallFrame(
+     register int result;
+     const char *namePtr;
+     CallFrame **framePtrPtr = &fdPtr->framePtr;
+-    static Tcl_ObjType *byteCodeTypePtr = NULL;	/* HACK! */
++    static const Tcl_ObjType *byteCodeTypePtr = NULL;	/* HACK! */
+ 
+     /*
+      * Compute basic information on the basis of the type of method it is.
+@@ -1168,7 +1168,7 @@ MethodErrorHandler(
+     Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
+ 	    "\n    (%s \"%.*s%s\" method \"%.*s%s\" line %d)",
+ 	    kindName, ELLIPSIFY(objectName, objectNameLen),
+-	    ELLIPSIFY(methodName, nameLen), interp->errorLine));
++	    ELLIPSIFY(methodName, nameLen), Tcl_GetErrorLine(interp)));
+ }
+ 
+ static void
+@@ -1197,7 +1197,7 @@ ConstructorErrorHandler(
+ 	    &objectNameLen);
+     Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
+ 	    "\n    (%s \"%.*s%s\" constructor line %d)", kindName,
+-	    ELLIPSIFY(objectName, objectNameLen), interp->errorLine));
++	    ELLIPSIFY(objectName, objectNameLen), Tcl_GetErrorLine(interp)));
+ }
+ 
+ static void
+@@ -1226,7 +1226,7 @@ DestructorErrorHandler(
+ 	    &objectNameLen);
+     Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
+ 	    "\n    (%s \"%.*s%s\" destructor line %d)", kindName,
+-	    ELLIPSIFY(objectName, objectNameLen), interp->errorLine));
++	    ELLIPSIFY(objectName, objectNameLen), Tcl_GetErrorLine(interp)));
+ }
+ 
+ /*