Date: Wed, 22 May 2013 08:03:52 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318746 - in head/editors/e93: . files Message-ID: <201305220803.r4M83qRb090779@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Wed May 22 08:03:52 2013 New Revision: 318746 URL: http://svnweb.freebsd.org/changeset/ports/318746 Log: - Fix build with Tcl 8.6 Reported by: miwi (Tcl/Tk 86 exp-run latecomers) Approved by: portmgr Added: head/editors/e93/files/ head/editors/e93/files/patch-includes.h (contents, props changed) head/editors/e93/files/patch-shell.c (contents, props changed) head/editors/e93/files/patch-shellcmd.c (contents, props changed) Modified: head/editors/e93/Makefile (contents, props changed) Modified: head/editors/e93/Makefile ============================================================================== --- head/editors/e93/Makefile Wed May 22 07:05:34 2013 (r318745) +++ head/editors/e93/Makefile Wed May 22 08:03:52 2013 (r318746) @@ -20,7 +20,6 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME} USE_XORG= x11 xinerama -USE_TCL_BUILD= yes USE_TCL= yes USE_GMAKE= yes MAKE_ARGS= PREFIX="${PREFIX}" \ Added: head/editors/e93/files/patch-includes.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/e93/files/patch-includes.h Wed May 22 08:03:52 2013 (r318746) @@ -0,0 +1,12 @@ +--- includes.h.orig 2013-05-22 09:36:16.000000000 +0200 ++++ includes.h 2013-05-22 09:42:02.000000000 +0200 +@@ -29,6 +29,9 @@ + #include <locale.h> + + #include <tcl.h> ++#if (TCL_MAJOR_VERSION < 8) || (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6) ++#define Tcl_GetErrorLine(interp) (interp->errorLine) ++#endif + + #include "defines.h" + #include "guidefs.h" Added: head/editors/e93/files/patch-shell.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/e93/files/patch-shell.c Wed May 22 08:03:52 2013 (r318746) @@ -0,0 +1,20 @@ +--- shell.c.orig 2013-05-22 09:35:54.000000000 +0200 ++++ shell.c 2013-05-22 09:44:04.000000000 +0200 +@@ -992,7 +992,7 @@ + Tcl_SetVar(interpreter,"SCRIPTPATH",scriptPath,TCL_LEAVE_ERR_MSG); + if(Tcl_EvalFile(interpreter,scriptPath)!=TCL_OK) + { +- SetError("%s:%d:%s",scriptPath,interpreter->errorLine,Tcl_GetStringResult(interpreter)); ++ SetError("%s:%d:%s",scriptPath,Tcl_GetErrorLine(interpreter),Tcl_GetStringResult(interpreter)); + fail=true; + } + } +@@ -1066,7 +1066,7 @@ + } + else + { +- SetError("Failed to Tcl_Init(): %s",tclInterpreter->result); ++ SetError("Failed to Tcl_Init(): %s",Tcl_GetStringResult(tclInterpreter)); + } + UnInitChannels(tclInterpreter); + } Added: head/editors/e93/files/patch-shellcmd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/e93/files/patch-shellcmd.c Wed May 22 08:03:52 2013 (r318746) @@ -0,0 +1,11 @@ +--- shellcmd.c.orig 2013-05-22 09:45:47.000000000 +0200 ++++ shellcmd.c 2013-05-22 09:46:25.000000000 +0200 +@@ -6354,7 +6354,7 @@ + { + if(tclResult!=TCL_OK) + { +- sprintf(tempString,"Error in line %d: ",localInterpreter->errorLine); ++ sprintf(tempString,"Error in line %d: ",Tcl_GetErrorLine(localInterpreter)); + EditorAuxInsert(buffer,(UINT8 *)tempString,(UINT32)strlen(tempString)); + } + EditorAuxInsert(buffer,(UINT8 *)stringResult,(UINT32)strlen(stringResult));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305220803.r4M83qRb090779>