Date: Mon, 3 Jun 2013 12:08:41 +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: r319774 - in head/devel/tclmore: . files Message-ID: <201306031208.r53C8fmc072251@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Mon Jun 3 12:08:40 2013 New Revision: 319774 URL: http://svnweb.freebsd.org/changeset/ports/319774 Log: - Fix build on CURRENT [1] - Fix build with Tcl 8.6 PR: 178050 [1] Submitted by: Pietro Cerutti <gahr@FreeBSD.org> Approved by: maintainer (> 1 month timeout) Added: head/devel/tclmore/files/patch-generic_commands.c (contents, props changed) Modified: head/devel/tclmore/Makefile (contents, props changed) head/devel/tclmore/files/patch-configure (contents, props changed) Modified: head/devel/tclmore/Makefile ============================================================================== --- head/devel/tclmore/Makefile Mon Jun 3 11:54:46 2013 (r319773) +++ head/devel/tclmore/Makefile Mon Jun 3 12:08:40 2013 (r319774) @@ -19,18 +19,11 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes USE_TCL= yes -USE_TCL_BUILD= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/_src$//} INFO= ${PORTNAME} -CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR} \ - --with-tclinclude=${TCL_INCLUDEDIR} +CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \ + --enable-threads -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 900000 -BROKEN= does not build -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/tclmore/files/patch-configure ============================================================================== --- head/devel/tclmore/files/patch-configure Mon Jun 3 11:54:46 2013 (r319773) +++ head/devel/tclmore/files/patch-configure Mon Jun 3 12:08:40 2013 (r319774) @@ -1,5 +1,18 @@ ---- configure.orig Fri May 21 20:24:40 2004 -+++ configure Wed Apr 26 10:55:55 2006 +--- configure.orig 2004-05-21 18:24:40.000000000 +0200 ++++ configure 2013-04-22 13:44:49.000000000 +0200 +@@ -6702,9 +6702,9 @@ + # Special check for weird MP-RAS system (uname returns weird + # results, and the version is kept in special file). + +- if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then +- system=MP-RAS-`awk '{print }' /etc/.relid'` +- fi ++# if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then ++# system=MP-RAS-`awk '{print $1}' /etc/.relid'` ++# fi + if test "`uname -s`" = "AIX" ; then + system=AIX-`uname -v`.`uname -r` + fi @@ -7847,11 +7847,12 @@ EXTRA_CFLAGS="-pthread" LDFLAGS="$LDFLAGS -pthread" Added: head/devel/tclmore/files/patch-generic_commands.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/tclmore/files/patch-generic_commands.c Mon Jun 3 12:08:40 2013 (r319774) @@ -0,0 +1,20 @@ +--- generic/commands.c.orig 2013-06-03 14:05:27.000000000 +0200 ++++ generic/commands.c 2013-06-03 14:06:34.000000000 +0200 +@@ -83,7 +83,7 @@ + return TCL_OK; + + case TCL_ERROR: +- sprintf(infomsg, "\n (\"do\" body line %d)", frame->interp->errorLine); ++ sprintf(infomsg, "\n (\"do\" body line %d)", Tcl_GetErrorLine(frame->interp)); + Tcl_AddErrorInfo(frame->interp, infomsg); + return TCL_ERROR; + +@@ -124,7 +124,7 @@ + return TCL_OK; + + case TCL_ERROR: +- sprintf(infomsg, "\n (\"loop\" body line %d)", frame->interp->errorLine); ++ sprintf(infomsg, "\n (\"loop\" body line %d)", Tcl_GetErrorLine(frame->interp)); + Tcl_AddErrorInfo(frame->interp, infomsg); + return TCL_ERROR; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306031208.r53C8fmc072251>