Date: Mon, 13 May 2013 15:42:49 +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: r318112 - in head/x11-toolkits/tix: . files Message-ID: <201305131542.r4DFgnON074973@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Mon May 13 15:42:49 2013 New Revision: 318112 URL: http://svnweb.freebsd.org/changeset/ports/318112 Log: - Fix build with Tcl 8.6 Reported by: miwi (Tcl/Tk 86 exp-run) Added: head/x11-toolkits/tix/files/patch-generic_tixGrSort.c (contents, props changed) Modified: head/x11-toolkits/tix/Makefile (contents, props changed) Modified: head/x11-toolkits/tix/Makefile ============================================================================== --- head/x11-toolkits/tix/Makefile Mon May 13 15:40:04 2013 (r318111) +++ head/x11-toolkits/tix/Makefile Mon May 13 15:42:49 2013 (r318112) @@ -1,9 +1,5 @@ -# New ports collection makefile for: tix -# Date created: 22 December 1996 -# Whom: Thomas Gellekum <tg@freebsd.org> -# +# Created by: Thomas Gellekum <tg@freebsd.org> # $FreeBSD$ -# PORTNAME= tix PORTVERSION= 8.4.3 @@ -23,7 +19,9 @@ CONFIGURE_ARGS= --enable-shared --enable --with-tclconfig="${TCL_LIBDIR}" \ --with-tkconfig="${TK_LIBDIR}" \ --with-tclinclude="${TCL_INCLUDEDIR}" \ - --with-tkinclude="${TK_INCLUDEDIR}" + --with-tkinclude="${TK_INCLUDEDIR}" \ + --prefix=${PREFIX} \ + --exec-prefix=${PREFIX} # this should probably be added to bsd.port.mk CONFIGURE_ENV= PREFIX=${PREFIX} MANN= TixIntro.n compound.n pixmap.n tix.n tixBalloon.n \ @@ -49,7 +47,7 @@ pre-extract: pre-configure: @(cd ${WRKSRC} && \ CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS}" \ - INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ + INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}) Added: head/x11-toolkits/tix/files/patch-generic_tixGrSort.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/tix/files/patch-generic_tixGrSort.c Mon May 13 15:42:49 2013 (r318112) @@ -0,0 +1,13 @@ +--- generic/tixGrSort.c.orig 2013-05-13 10:52:04.000000000 +0200 ++++ generic/tixGrSort.c 2013-05-13 10:53:38.000000000 +0200 +@@ -447,8 +447,8 @@ + * Parse the result of the command. + */ + +- order = strtol(sortInterp->result, &end, 0); +- if ((end == sortInterp->result) || (*end != 0)) { ++ order = strtol(Tcl_GetStringResult(sortInterp), &end, 0); ++ if ((end == Tcl_GetStringResult(sortInterp)) || (*end != 0)) { + Tcl_ResetResult(sortInterp); + Tcl_AppendResult(sortInterp, + "comparison command returned non-numeric result",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305131542.r4DFgnON074973>