misc/171143: [patch] lang/otcl -- fix build with Tcl 8.6 + remove limitation on unthreaded version

[Pietro Cerutti]

>Number:         171143
>Category:       misc
>Synopsis:       [patch] lang/otcl -- fix build with Tcl 8.6 + remove limitation on unthreaded version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 28 15:50:04 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        
>Organization:
The FreeBSD Project
>Environment:
>Description:
The patch attached allows to build lang/otcl against Tcl/Tk 8.6 In this release, direct access to the members errorLine and result of Tcl_Interp has been deprecated. The cpp defines USE_INTERP_ERRORLINE and USE_INTERP_RESULT allow to re-enable this feature.

Moreover, I have removed the limitation to use an unthreaded version of Tcl/Tk. I have successfully built and run otcl with Tcl/Tk 8.6 with threads.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 302796)
+++ Makefile	(working copy)
@@ -19,7 +19,6 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_TK=		82+
-USE_TK_NO_THREADS=	yes
 USE_XORG=	xext
 
 USE_AUTOTOOLS=	autoconf
@@ -37,6 +36,10 @@
 CFLAGS+=	-DHAVE_UNISTD_H
 CONFIGURE_ARGS+=	--with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER}
 
+.if ${USE_TCL} > 85
+CFLAGS+=	-DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
 		-e's|X11/Intrinsic.h|X11/Xlib.h|g' \


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