diff options
| author | gahr <gahr@FreeBSD.org> | 2013-05-13 23:42:49 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2013-05-13 23:42:49 +0800 |
| commit | 18062944b46035c0f86ee62037ab17007d202078 (patch) | |
| tree | 673dbd4d524811daaa302e2ed43baddf17a8b2a9 /x11-toolkits | |
| parent | 2aeffcde44baf5aff4e1eb972a6fbd3ff319105a (diff) | |
| download | freebsd-ports-gnome-18062944b46035c0f86ee62037ab17007d202078.tar.gz freebsd-ports-gnome-18062944b46035c0f86ee62037ab17007d202078.tar.zst freebsd-ports-gnome-18062944b46035c0f86ee62037ab17007d202078.zip | |
- Fix build with Tcl 8.6
Reported by: miwi (Tcl/Tk 86 exp-run)
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/tix/Makefile | 12 | ||||
| -rw-r--r-- | x11-toolkits/tix/files/patch-generic_tixGrSort.c | 13 |
2 files changed, 18 insertions, 7 deletions
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile index df8ac7e3cefe..1f7c95af6a61 100644 --- a/x11-toolkits/tix/Makefile +++ b/x11-toolkits/tix/Makefile @@ -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-sam \ --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}) diff --git a/x11-toolkits/tix/files/patch-generic_tixGrSort.c b/x11-toolkits/tix/files/patch-generic_tixGrSort.c new file mode 100644 index 000000000000..5961b5e33b12 --- /dev/null +++ b/x11-toolkits/tix/files/patch-generic_tixGrSort.c @@ -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", |