diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2013-07-24 07:30:43 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2013-07-24 07:30:43 +0000 |
| commit | 269e71880e094085d58f03a7b34f14ca9aed5a0e (patch) | |
| tree | 15341dff9c00f916869b82968144c795af96959c | |
| parent | - Update to 1.55 (diff) | |
- Fix build with Tcl/Tk 8.6
Reported by: bapt
Notes
Notes:
svn path=/head/; revision=323575
| -rw-r--r-- | net/zebra-server/Makefile | 2 | ||||
| -rw-r--r-- | net/zebra-server/files/patch-index_mod_grs_regx.c | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/net/zebra-server/Makefile b/net/zebra-server/Makefile index 728ae106c2f4..b975963e799a 100644 --- a/net/zebra-server/Makefile +++ b/net/zebra-server/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --with-yaz=${LOCALBASE}/bin \ 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 diff --git a/net/zebra-server/files/patch-index_mod_grs_regx.c b/net/zebra-server/files/patch-index_mod_grs_regx.c new file mode 100644 index 000000000000..acf450aea56b --- /dev/null +++ b/net/zebra-server/files/patch-index_mod_grs_regx.c @@ -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]"); + } + } |