From owner-svn-ports-head@FreeBSD.ORG  Wed Aug 29 07:28:18 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E1047106566B;
	Wed, 29 Aug 2012 07:28:18 +0000 (UTC)
	(envelope-from gahr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CC6A18FC0A;
	Wed, 29 Aug 2012 07:28:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7T7SIM1004664;
	Wed, 29 Aug 2012 07:28:18 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7T7SIYw004662;
	Wed, 29 Aug 2012 07:28:18 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201208290728.q7T7SIYw004662@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Wed, 29 Aug 2012 07:28:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303320 - head/lang/otcl
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2012 07:28:19 -0000

Author: gahr
Date: Wed Aug 29 07:28:18 2012
New Revision: 303320
URL: http://svn.freebsd.org/changeset/ports/303320

Log:
  - Fix build against Tcl/Tk 8.6
  - Remove limitation on using a non-threaded version of Tcl/Tk
  
  PR:		171142
  Submitted by:	gahr
  Approved by:	Muhammad Moinur Rahman <5u623l20@gmail.com> (maintainer)

Modified:
  head/lang/otcl/Makefile

Modified: head/lang/otcl/Makefile
==============================================================================
--- head/lang/otcl/Makefile	Wed Aug 29 07:02:49 2012	(r303319)
+++ head/lang/otcl/Makefile	Wed Aug 29 07:28:18 2012	(r303320)
@@ -19,7 +19,6 @@ LICENSE=	MIT
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_TK=		82+
-USE_TK_NO_THREADS=	yes
 USE_XORG=	xext
 
 USE_AUTOTOOLS=	autoconf
@@ -37,6 +36,10 @@ PORTDOCS=	${DOCS:S/doc\///}
 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' \