svn commit: r318659 - head/www/tdom/files

[Pietro Cerutti]

On 2013-May-21, 18:15, Bryan Drewery wrote:
> On 5/21/2013 3:29 AM, Pietro Cerutti wrote:
> > Author: gahr
> > Date: Tue May 21 08:29:04 2013
> > New Revision: 318659
> > URL: http://svnweb.freebsd.org/changeset/ports/318659
> > 
> > Log:
> >   - Fix build with Tcl 8.6
> >   
> >   Reported by:	miwi (Tcl/Tk 86 exp-run)
> >   Approved by:	portmgr
> > 
> > Added:
> >   head/www/tdom/files/patch-generic-tcldom.c   (contents, props changed)
> > 
> > Added: head/www/tdom/files/patch-generic-tcldom.c
> > ==============================================================================
> > --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> > +++ head/www/tdom/files/patch-generic-tcldom.c	Tue May 21 08:29:04 2013	(r318659)
> > @@ -0,0 +1,11 @@
> > +--- ../generic/tcldom.c.orig	2013-05-13 11:36:27.000000000 +0200
> > ++++ ../generic/tcldom.c	2013-05-13 11:39:00.000000000 +0200
> > +@@ -5934,7 +5934,7 @@
> > +     if (ret == TCL_ERROR) {
> > +         char msg[64 + TCL_INTEGER_SPACE];
> > +         sprintf(msg, "\n    (\"%s %s\" body line %d)", Tcl_GetString(objv[0]),
> > +-                Tcl_GetString(objv[1]), interp->errorLine);
> > ++                Tcl_GetString(objv[1]), Tcl_GetErrorLine(interp));
> > +         Tcl_AddErrorInfo(interp, msg);
> > +     }
> > + 
> > 
> 
> This seems to break WITH_TCL_VER=85:
> 
> > /usr/bin/env LANG=C make -C /wrkdirs/usr/ports/www/tdom/work/tDOM-0.8.3/unix test
> > TCL_LIBRARY=`echo /wrkdirs/usr/ports/lang/tcl85/work/tcl8.5.14/library`  LD_LIBRARY_PATH=".:/usr/local/lib/tcl8.5:"  PATH=".:/usr/local/lib/tcl8.5:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:/root/bin"  TCLLIBPATH="." /usr/local/bin/tclsh8.5 `echo ./../tests/all.tcl` -constraints longRunning
> > couldn't load file "./libtdom0.8.3.so": ./libtdom0.8.3.so: Undefined symbol "Tcl_GetErrorLine"
> >     while executing
> > "load ./libtdom0.8.3.so"
> >     ("package ifneeded tdom 0.8.3" script)
> >     invoked from within
> > "package require -exact tdom 0.8.3"
> >     invoked from within
> > "if {[catch {package present -exact tdom 0.8.3}]} {
> >     package require -exact tdom 0.8.3
> > } else {
> >     if {[lsearch [namespace children] ::tDOM] == -1}..."
> >     (file "./../tests/loadtdom.tcl" line 20)
> >     invoked from within
> > "source [file join [file dir [info script]] loadtdom.tcl]"
> >     (file "./../tests/all.tcl" line 12)
> > *** Error code 1
> > 
> > Stop in /wrkdirs/usr/ports/www/tdom/work/tDOM-0.8.3/unix.
> > *** Error code 1

Fixed, thanks!

-- 
Pietro Cerutti
The FreeBSD Project
gahr at FreeBSD.org

PGP Public Key:
http://gahr.ch/pgp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20130522/46f2a737/attachment.sig>