svn commit: r323575 - in head/net/zebra-server: . files

[Pietro Cerutti]

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]");
+     }
+ }