From owner-svn-ports-head@FreeBSD.ORG  Thu Nov 21 11:01:31 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E8B5567B;
 Thu, 21 Nov 2013 11:01:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D876E2CD7;
 Thu, 21 Nov 2013 11:01:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rALB1VSt053220;
 Thu, 21 Nov 2013 11:01:31 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rALB1VhM053218;
 Thu, 21 Nov 2013 11:01:31 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201311211101.rALB1VhM053218@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Thu, 21 Nov 2013 11:01:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334474 - in head/x11-toolkits/blt: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.16
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/options/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: Thu, 21 Nov 2013 11:01:32 -0000

Author: gahr
Date: Thu Nov 21 11:01:31 2013
New Revision: 334474
URL: http://svnweb.freebsd.org/changeset/ports/334474

Log:
  - Support Tcl/Tk 8.6
  
  Submitted by:	mi@

Modified:
  head/x11-toolkits/blt/Makefile
  head/x11-toolkits/blt/files/patch-generic_bltInt.h

Modified: head/x11-toolkits/blt/Makefile
==============================================================================
--- head/x11-toolkits/blt/Makefile	Thu Nov 21 10:54:15 2013	(r334473)
+++ head/x11-toolkits/blt/Makefile	Thu Nov 21 11:01:31 2013	(r334474)
@@ -3,6 +3,7 @@
 
 PORTNAME=	blt
 PORTVERSION=	2.5.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk
 MASTER_SITES=	SF/wize
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
@@ -16,7 +17,7 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/grap
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:R}
 
-USES+=		gmake tk:84,85
+USES+=		gmake tk
 USE_ZIP=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -42,4 +43,10 @@ post-patch:
 	${FIND} ${WRKSRC}/demos -name "*.tcl" | ${XARGS} \
 	    ${REINPLACE_CMD} -e 's|../src/bltwish|${LOCALBASE}/bin/bltwish|'
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${TCL_VER} > 8.5
+CFLAGS+=	-DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE
+.endif
+
+.include <bsd.port.post.mk>

Modified: head/x11-toolkits/blt/files/patch-generic_bltInt.h
==============================================================================
--- head/x11-toolkits/blt/files/patch-generic_bltInt.h	Thu Nov 21 10:54:15 2013	(r334473)
+++ head/x11-toolkits/blt/files/patch-generic_bltInt.h	Thu Nov 21 11:01:31 2013	(r334474)
@@ -14,7 +14,7 @@
  #ifdef TCL_UTF_MAX
  #define HAVE_UTF	1
 -extern FILE *Blt_OpenUtfFile _ANSI_ARGS_((char *fileName, char *mode));
-+extern FILE *Blt_OpenUtfFile _ANSI_ARGS_((CONST char *fileName, char *mode));
++extern FILE *Blt_OpenUtfFile _ANSI_ARGS_((CONST char *fileName, CONST char *mode));
  #define fopen(f,m)	Blt_OpenUtfFile((f),(m));
  #else
  #define HAVE_UTF	0