ports/178563: [patch] x11-toolkits/tix -- fix build with Tcl 8.6

[Pietro Cerutti]

>Number:         178563
>Category:       ports
>Synopsis:       [patch] x11-toolkits/tix -- fix build with Tcl 8.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 13 09:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        
>Organization:
The FreeBSD Project
>Environment:
>Description:
The following patch fixes the build of x11-toolkits/tix with Tcl/Tk 8.6. Also, I have fixed the Makefile header as per the new guidelines.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 313650)
+++ Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tix
-# Date created:		22 December 1996
-# Whom:			Thomas Gellekum <tg at freebsd.org>
-#
+# Created by: Thomas Gellekum <tg at freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	tix
 PORTVERSION=	8.4.3
@@ -23,7 +19,9 @@
 		--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-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})
Index: files/patch-generic_tixGrSort.c
===================================================================
--- files/patch-generic_tixGrSort.c	(revision 0)
+++ files/patch-generic_tixGrSort.c	(working copy)
@@ -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",

Property changes on: files/patch-generic_tixGrSort.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property


>Release-Note:
>Audit-Trail:
>Unformatted: