Date: Tue, 14 May 2013 14:16: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: r318162 - in head/x11-toolkits/pure-tk: . files Message-ID: <201305141416.r4EEGqLG051063@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue May 14 14:16:52 2013 New Revision: 318162 URL: http://svnweb.freebsd.org/changeset/ports/318162 Log: - Fix build with Tcl/Tk 8.6 [1] - Trim Makefile headers - Fix WWW line in pkg-descr - Remove article from COMMENT Reported by: miwi (Tcl/Tk 86 exp-run) Approved by: portmgr Added: head/x11-toolkits/pure-tk/files/ head/x11-toolkits/pure-tk/files/patch-tk.c (contents, props changed) Modified: head/x11-toolkits/pure-tk/Makefile head/x11-toolkits/pure-tk/pkg-descr (contents, props changed) Modified: head/x11-toolkits/pure-tk/Makefile ============================================================================== --- head/x11-toolkits/pure-tk/Makefile Tue May 14 14:05:09 2013 (r318161) +++ head/x11-toolkits/pure-tk/Makefile Tue May 14 14:16:52 2013 (r318162) @@ -1,19 +1,15 @@ -# New ports collection makefile for: pure-tk -# Date created: 2011-11-09 -# Whom: Zhihao Yuan <lichray@gmail.com> -# +# Created by: Zhihao Yuan <lichray@gmail.com> # $FreeBSD$ -# PORTNAME= pure-tk PORTVERSION= 0.3 CATEGORIES= x11-toolkits MAINTAINER= lichray@gmail.com -COMMENT= A basic interface between Pure and Tcl/Tk +COMMENT= Basic interface between Pure and Tcl/Tk USE_PURE= yes -USE_TK= 84+ +USE_TK= yes SHORT_TCL_VER= ${TCL_VER:S/8./8/} MAKE_ARGS+= tclvers=${TCL_VER} Added: head/x11-toolkits/pure-tk/files/patch-tk.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/pure-tk/files/patch-tk.c Tue May 14 14:16:52 2013 (r318162) @@ -0,0 +1,38 @@ +--- tk.c.orig 2013-05-14 16:10:31.000000000 +0200 ++++ tk.c 2013-05-14 16:13:05.000000000 +0200 +@@ -115,8 +115,9 @@ + /* start up a new interpreter */ + if (!(interp = Tcl_CreateInterp())) return false; + if (Tcl_Init(interp) != TCL_OK) { +- if (interp->result && *interp->result) +- set_result(result, interp->result); ++ const char *res = Tcl_GetStringResult(interp); ++ if (res && *res) ++ set_result(result, res); + else + set_result(result, "error initializing Tcl"); + tk_stop(); +@@ -128,8 +129,9 @@ + /* oddly, there are no `env' variables passed, and this one is needed */ + Tcl_SetVar2(interp, "env", "DISPLAY", getenv("DISPLAY"), TCL_GLOBAL_ONLY); + if (Tk_Init(interp) != TCL_OK) { +- if (interp->result && *interp->result) +- set_result(result, interp->result); ++ const char *res = Tcl_GetStringResult(interp); ++ if (res && *res) ++ set_result(result, res); + else + set_result(result, "error initializing Tk"); + tk_stop(); +@@ -182,8 +184,9 @@ + if (!cmd) return false; + strcpy(cmd, s); + status = Tcl_Eval(interp, cmd); +- if (interp && interp->result && *interp->result) +- set_result(result, interp->result); ++ const char *res = Tcl_GetStringResult(interp); ++ if (res && *res) ++ set_result(result, res); + else if (status == TCL_BREAK) + set_result(result, "invoked \"break\" outside of a loop"); + else if (status == TCL_CONTINUE) Modified: head/x11-toolkits/pure-tk/pkg-descr ============================================================================== --- head/x11-toolkits/pure-tk/pkg-descr Tue May 14 14:05:09 2013 (r318161) +++ head/x11-toolkits/pure-tk/pkg-descr Tue May 14 14:16:52 2013 (r318162) @@ -3,4 +3,4 @@ operations of this module allow you to e in the Tcl interpreter, set and retrieve variable values in the interpreter, and invoke Pure callbacks from Tcl/Tk. -WWW: http://docs.pure-lang.googlecode.com/hg/pure-tk.html +WWW: http://docs.pure-lang.googlecode.com/hg/pure-tk.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305141416.r4EEGqLG051063>