Date: Tue, 21 May 2013 13:46:08 +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: r318696 - head/net/nam/files Message-ID: <201305211346.r4LDk8lC003586@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue May 21 13:46:08 2013 New Revision: 318696 URL: http://svnweb.freebsd.org/changeset/ports/318696 Log: - Fix build with Tcl/Tk 8.6 Reported by: miwi (Tcl/Tk 8.6 exp-run latecomers) Approved by: portmgr Added: head/net/nam/files/patch-main.cc (contents, props changed) Added: head/net/nam/files/patch-main.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/nam/files/patch-main.cc Tue May 21 13:46:08 2013 (r318696) @@ -0,0 +1,38 @@ +--- main.cc.orig 2013-05-21 15:33:25.000000000 +0200 ++++ main.cc 2013-05-21 15:40:33.000000000 +0200 +@@ -222,7 +222,7 @@ + + static int cmd_version(ClientData , Tcl_Interp* tcl, int , CONST84 char **) + { +- tcl->result = version; ++ Tcl_SetObjResult(tcl, Tcl_NewStringObj(version, -1)); + return (TCL_OK); + } + +@@ -331,7 +331,7 @@ + + Tcl_Interp *interp = Tcl_CreateInterp(); + if (Tcl_Init(interp) == TCL_ERROR) { +- printf("%s\n", interp->result); ++ printf("%s\n", Tcl_GetStringResult(interp)); + abort(); + } + +@@ -350,7 +350,7 @@ + #endif + + if (Otcl_Init(interp) == TCL_ERROR) { +- printf("%s\n", interp->result); ++ printf("%s\n", Tcl_GetStringResult(interp)); + abort(); + } + #ifdef HAVE_LIBTCLDBG +@@ -372,7 +372,7 @@ + if (Tk_Init(tcl.interp()) == TCL_OK) + tk = Tk_MainWindow(tcl.interp()); + if (tk == 0) { +- fprintf(stderr, "nam: %s\n", interp->result); ++ fprintf(stderr, "nam: %s\n", Tcl_GetStringResult(interp)); + exit(1); + } + tcl.tkmain(tk);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305211346.r4LDk8lC003586>