Bug 178050
| Summary: | [patch] devel/tclmore -- fix build | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Pietro Cerutti <gahr> | ||||
| Component: | Individual Port(s) | Assignee: | freebsd-ports-bugs (Nobody) <ports-bugs> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
Maintainer of devel/tclmore,
Please note that PR ports/178050 has just been submitted.
If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.
The full text of the PR can be found at:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/178050
--
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 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; + _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" State Changed From-To: feedback->closed Committed. Thanks! |
The patch attached fixes the build of devel/tclmore on CURRENT. Please note that 11 of the test cases fail here: ==== do-2.1 wrong num args FAILED ---- Result was: wrong # args: should be "do body expr" ---- Result should have been (exact matching): wrong # args: should be "more do body expr" ==== do-2.1 FAILED ==== do-2.2 wrong num args FAILED ---- Result was: wrong # args: should be "do body expr" ---- Result should have been (exact matching): wrong # args: should be "more do body expr" ==== do-2.2 FAILED ==== do-2.4 invalid argument FAILED ---- Result was: invalid bareword "b" in expression "b"; should be "$b" or "{b}" or "b(...)" or ... ---- Result should have been (glob matching): syntax error * ==== do-2.4 FAILED ==== pipechan-4.1 write with no flush, close reader, data discarded, forward FAILED ---- Test generated error; Return code was: 1 ---- Return code should have been one of: 0 2 ---- errorInfo: broken pipe while executing "close $writable" ("uplevel" body line 7) invoked from within "uplevel 1 $script" ---- errorCode: POSIX EPIPE {broken pipe} ==== pipechan-4.1 FAILED ==== pipechan-4.2 write with no flush, close reader, data discarded, backward FAILED ---- Test generated error; Return code was: 1 ---- Return code should have been one of: 0 2 ---- errorInfo: broken pipe while executing "close $writable" ("uplevel" body line 7) invoked from within "uplevel 1 $script" ---- errorCode: POSIX EPIPE {broken pipe} ==== pipechan-4.2 FAILED ==== teechan-7.5 underlying channel option FAILED ---- Result was: 1000l ---- Result should have been (glob matching): 1000 ==== teechan-7.5 FAILED ==== teechan-7.6 underlying channel options FAILED ---- Result was: -blocking 1 -buffering full -buffersize 4096 -encoding utf-8 -eofchar {{} {}} -translation {auto lf} -invar {} -outvar {} -inputBufferSize 1000l -outputBufferSize 1000l ---- Result should have been (glob matching): * -inputBufferSize 1000 -outputBufferSize 1000 ==== teechan-7.6 FAILED ==== varchan-8.1 option FAILED ---- Result was: 5l ---- Result should have been (exact matching): 5 ==== varchan-8.1 FAILED ==== varchan-8.2 option FAILED ---- Result was: -blocking 1 -buffering full -buffersize 4096 -encoding utf-8 -eofchar {{} {}} -translation {auto lf} -inputBufferSize 5l -outputBufferSize 4096l ---- Result should have been (glob matching): * -inputBufferSize 5 * ==== varchan-8.2 FAILED ==== varchan-8.3 option FAILED ---- Result was: 5l ---- Result should have been (exact matching): 5 ==== varchan-8.3 FAILED ==== varchan-8.4 option FAILED ---- Result was: -blocking 1 -buffering full -buffersize 4096 -encoding utf-8 -eofchar {{} {}} -translation {auto lf} -inputBufferSize 4096l -outputBufferSize 5l ---- Result should have been (glob matching): * -outputBufferSize 5 ==== varchan-8.4 FAILED Fix: Patch attached with submission follows: