From owner-svn-ports-all@FreeBSD.ORG  Wed Jul 24 07:30:44 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 41D363F4;
 Wed, 24 Jul 2013 07:30:44 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
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 336802E5D;
 Wed, 24 Jul 2013 07:30:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6O7UiIh058709;
 Wed, 24 Jul 2013 07:30:44 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6O7Uhkp058707;
 Wed, 24 Jul 2013 07:30:43 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201307240730.r6O7Uhkp058707@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Wed, 24 Jul 2013 07:30:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323575 - in head/net/zebra-server: . 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jul 2013 07:30:44 -0000

Author: gahr
Date: Wed Jul 24 07:30:43 2013
New Revision: 323575
URL: http://svnweb.freebsd.org/changeset/ports/323575

Log:
  - Fix build with Tcl/Tk 8.6
  
  Reported by:	bapt

Added:
  head/net/zebra-server/files/
  head/net/zebra-server/files/patch-index_mod_grs_regx.c   (contents, props changed)
Modified:
  head/net/zebra-server/Makefile

Modified: head/net/zebra-server/Makefile
==============================================================================
--- head/net/zebra-server/Makefile	Wed Jul 24 07:22:03 2013	(r323574)
+++ head/net/zebra-server/Makefile	Wed Jul 24 07:30:43 2013	(r323575)
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--with-yaz=${LOCALBASE}/
 
 USES=		iconv
 USE_LDCONFIG=	yes
-USE_TCL=	84+
+USE_TCL=	yes
 
 MAN1=		idzebra-config-2.0.1 zebraidx-2.0.1
 MAN8=		zebrasrv-2.0.8

Added: head/net/zebra-server/files/patch-index_mod_grs_regx.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/zebra-server/files/patch-index_mod_grs_regx.c	Wed Jul 24 07:30:43 2013	(r323575)
@@ -0,0 +1,16 @@
+--- index/mod_grs_regx.c.orig	2010-06-29 10:57:13.000000000 +0200
++++ index/mod_grs_regx.c	2013-07-24 09:27:20.000000000 +0200
+@@ -1298,8 +1298,12 @@
+     {
+     	const char *err = Tcl_GetVar(spec->tcl_interp, "errorInfo", 0);
+ 	yaz_log(YLOG_FATAL, "Tcl error, line=%d, \"%s\"\n%s", 
++#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 5
+ 	    spec->tcl_interp->errorLine,
+-	    spec->tcl_interp->result,
++#else
++	    Tcl_GetErrorLine(spec->tcl_interp),
++#endif
++	    Tcl_GetStringResult(spec->tcl_interp),
+ 	    err ? err : "[NO ERRORINFO]");
+     }
+ }