Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@120741 d073be05-634f-4543-b044-5fe20cf6d1d6
- Loading branch information
1 parent
ce9e4fb
commit 748a4a5
Showing
2 changed files
with
84 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 | ||
# $Id$ | ||
|
||
PortSystem 1.0 | ||
PortGroup active_variants 1.1 | ||
|
||
name tix | ||
version 8.4.3 | ||
platforms darwin | ||
categories x11 | ||
license BSD | ||
maintainers nomaintainer | ||
description Tk Interface eXtension | ||
long_description Tix, the Tk Interface eXtension, is a powerful set of \ | ||
user interface components that expands the capabilities \ | ||
of your Tcl/Tk and Python applications. Using Tix together \ | ||
with Tk will greatly enhance the appearance and functionality \ | ||
of your application. | ||
|
||
homepage http://tix.sourceforge.net/ | ||
|
||
# Set tclv and md5 checksum to the current MacPorts Tcl port version, though | ||
# port doesn't break if they aren't in sync. | ||
set tkv 8.6.1 | ||
master_sites sourceforge:project/tix/tix/${version}:tix \ | ||
sourceforge:project/tcl/Tcl/${tkv}:tcl | ||
|
||
dist_subdir tcltk | ||
distname Tix${version}-src | ||
|
||
distfiles ${distname}.tar.gz:tix \ | ||
tk${tkv}-src.tar.gz:tcl \ | ||
tcl${tkv}-src.tar.gz:tcl | ||
|
||
worksrcdir Tix${version} | ||
|
||
checksums Tix8.4.3-src.tar.gz \ | ||
rmd160 99249c4d7a19fcb8c27f11ab1b3ef6102911409d \ | ||
sha256 562f040ff7657e10b5cffc2c41935f1a53c6402eb3d5f3189113d734fd6c03cb \ | ||
tk8.6.1-src.tar.gz \ | ||
rmd160 9176fd2c5e7d36c84141333939e85614d3ba2e11 \ | ||
sha256 b691a2e84907392918665fe03a0deb913663a026bed2162185b4a9a14898162c \ | ||
tcl8.6.1-src.tar.gz \ | ||
rmd160 fbb181d26bb28fe9413bc2e07f333571b8e7e190 \ | ||
sha256 16ee769248e64ba1cae6b4834fcc4e4edd7470d881410e8d58f7dd1434343514 | ||
|
||
depends_lib port:tcl port:tk | ||
patch.pre_args -p1 | ||
patchfiles patch-generic-tixGrSort.c.diff | ||
|
||
# tix depends on x11 windowing | ||
require_active_variants tk x11 | ||
|
||
configure.args --mandir=${prefix}/share/man \ | ||
--with-tcl=${prefix}/lib \ | ||
--with-tk=${prefix}/lib | ||
configure.cppflags-append \ | ||
-I${workpath}/tcl${tkv}/generic \ | ||
-I${workpath}/tcl${tkv}/unix \ | ||
-I${workpath}/tk${tkv}/generic \ | ||
-I${workpath}/tk${tkv}/unix | ||
configure.ldflags-append \ | ||
-ltclstub8.6 | ||
|
||
test.run yes | ||
test.target test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
generic/tixGrSort.c | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/generic/tixGrSort.c b/generic/tixGrSort.c | ||
index 7dee30f..26ec054 100644 | ||
--- a/generic/tixGrSort.c | ||
+++ b/generic/tixGrSort.c | ||
@@ -447,8 +447,8 @@ SortCompareProc(first, second) | ||
* 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", |