Attachment #137698 for bug #183355

View | Details | Raw Unified | Return to bug 183355
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	zebra-server
PORTVERSION=	2.0.55
CATEGORIES=	net
MASTER_SITES=	http://ftp.indexdata.dk/pub/zebra/
DISTNAME=	idzebra-${PORTVERSION}

MAINTAINER=	ben@gibbed.org
COMMENT=	Z39.50/SR server software

LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
		libyaz.so:${PORTSDIR}/net/yaz

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-yaz=${LOCALBASE}/bin \

USE_LDCONFIG=	yes
USE_TCL=	yes

MAN1=		idzebra-config-2.0.1 zebraidx-2.0.1
MAN8=		zebrasrv-2.0.8
MLINKS=		idzebra-config-2.0.1 idzebra-config.1 \
		zebraidx-2.0.1 zebraidx.1 \
		zebrasrv-2.0.8 zebrasrv.8

NO_STAGE=	yes
.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (idzebra-2.0.45.tar.gz) = 0300566042d9be05021d63d0ac2d904017897eecd420b1e02cc329b3744894e1	1	SHA256 (idzebra-2.0.55.tar.gz) = 0ee5aba21d50a2c293096cf1802794e109c9f8829dbe57a5743646e65d0c32f6
2	SIZE (idzebra-2.0.45.tar.gz) = 1785595	2	SIZE (idzebra-2.0.55.tar.gz) = 1819785




--- index/mod_grs_regx.c.orig	2013-01-08 10:26:06.000000000 +0100
+++ index/mod_grs_regx.c	2013-10-27 11:54:01.655086748 +0100
@@ -1301,8 +1301,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]");
     }
 }

Line 0 Link Here

(-)files/patch-index_zebrasrv.c (+11 lines)
	1	--- ./index/zebrasrv.c.orig 2013-10-27 11:58:33.890944518 +0100
	2	+++ ./index/zebrasrv.c 2013-10-27 11:59:27.837331279 +0100
	3	@@ -247,7 +247,7 @@
	4	case Z_Term_general:
	5	term->which = Z_Term_general;
	6	term->u.general = odr_malloc(r->stream, sizeof(*term->u.general));
	7	- term->u.general->size = term->u.general->len = len;
	8	+ term->u.general->len = len;
	9	term->u.general->buf = odr_malloc(r->stream, len);
	10	memcpy(term->u.general->buf, outbuf, len);
	11	break;

Lines 1-3 Link Here

(-)pkg-plist (+10 lines)
		1	bin/idzebra-abs2dom
1	bin/idzebra-config-2.0	2	bin/idzebra-config-2.0
2	bin/zebraidx	3	bin/zebraidx
3	bin/zebraidx-2.0	4	bin/zebraidx-2.0
Lines 43-48 Link Here
43	lib/libidzebra-2.0.la	44	lib/libidzebra-2.0.la
44	lib/libidzebra-2.0.so	45	lib/libidzebra-2.0.so
45	lib/libidzebra-2.0.so.0	46	lib/libidzebra-2.0.so.0
		47	man/man1/idzebra-abs2dom.1.gz
		48	man/man1/idzebra-config-2.0.1.gz
		49	man/man1/idzebra-config.1.gz
		50	man/man1/zebraidx-2.0.1.gz
		51	man/man1/zebraidx.1.gz
		52	man/man8/zebrasrv-2.0.8.gz
		53	man/man8/zebrasrv.8.gz
46	share/aclocal/idzebra-2.0.m4	54	share/aclocal/idzebra-2.0.m4
47	share/doc/idzebra-2.0/administration-extended-services.html	55	share/doc/idzebra-2.0/administration-extended-services.html
48	share/doc/idzebra-2.0/administration-ranking.html	56	share/doc/idzebra-2.0/administration-ranking.html
Lines 67-72 Link Here
67	share/doc/idzebra-2.0/grs-internal-representation.html	75	share/doc/idzebra-2.0/grs-internal-representation.html
68	share/doc/idzebra-2.0/grs.html	76	share/doc/idzebra-2.0/grs.html
69	share/doc/idzebra-2.0/icuchain-files.html	77	share/doc/idzebra-2.0/icuchain-files.html
		78	share/doc/idzebra-2.0/idzebra-abs2dom.html
70	share/doc/idzebra-2.0/idzebra-config.html	79	share/doc/idzebra-2.0/idzebra-config.html
71	share/doc/idzebra-2.0/index.html	80	share/doc/idzebra-2.0/index.html
72	share/doc/idzebra-2.0/indexdata.html	81	share/doc/idzebra-2.0/indexdata.html
Lines 152-157 Link Here
152	share/idzebra-2.0-examples/gils/records/esdd0077.grs	161	share/idzebra-2.0-examples/gils/records/esdd0077.grs
153	share/idzebra-2.0-examples/gils/records/esdd0078.grs	162	share/idzebra-2.0-examples/gils/records/esdd0078.grs
154	share/idzebra-2.0-examples/gils/records/esdd0079.grs	163	share/idzebra-2.0-examples/gils/records/esdd0079.grs
		164	share/idzebra-2.0-examples/gils/records/esdd0080.grs
155	share/idzebra-2.0-examples/gils/zebra.cfg	165	share/idzebra-2.0-examples/gils/zebra.cfg
156	share/idzebra-2.0-examples/marc21/sample-marc	166	share/idzebra-2.0-examples/marc21/sample-marc
157	share/idzebra-2.0-examples/marc21/zebra.cfg	167	share/idzebra-2.0-examples/marc21/zebra.cfg

Return to bug 183355

Lines 2-8 Link Here

(-)Makefile (-10 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= zebra-server	4	PORTNAME= zebra-server
5	PORTVERSION= 2.0.45	5	PORTVERSION= 2.0.55
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= http://ftp.indexdata.dk/pub/zebra/	7	MASTER_SITES= http://ftp.indexdata.dk/pub/zebra/
8	DISTNAME= idzebra-${PORTVERSION}	8	DISTNAME= idzebra-${PORTVERSION}
Lines 10-17 Link Here
10	MAINTAINER= ben@gibbed.org	10	MAINTAINER= ben@gibbed.org
11	COMMENT= Z39.50/SR server software	11	COMMENT= Z39.50/SR server software
12		12
13	LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \	13	LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \
14	yaz.4:${PORTSDIR}/net/yaz	14	libyaz.so:${PORTSDIR}/net/yaz
15		15
16	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
17	CONFIGURE_ARGS= --with-yaz=${LOCALBASE}/bin \	17	CONFIGURE_ARGS= --with-yaz=${LOCALBASE}/bin \
Lines 22-32 Link Here
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
23	USE_TCL= yes	23	USE_TCL= yes
24		24
25	MAN1= idzebra-config-2.0.1 zebraidx-2.0.1
26	MAN8= zebrasrv-2.0.8
27	MLINKS= idzebra-config-2.0.1 idzebra-config.1 \
28	zebraidx-2.0.1 zebraidx.1 \
29	zebrasrv-2.0.8 zebrasrv.8
30
31	NO_STAGE= yes
32	.include <bsd.port.mk>	25	.include <bsd.port.mk>

Lines 1-9 Link Here

(-)files/patch-index_mod_grs_regx.c (-5 / +5 lines)
1	--- index/mod_grs_regx.c.orig 2010-06-29 10:57:13.000000000 +0200	1	--- index/mod_grs_regx.c.orig 2013-01-08 10:26:06.000000000 +0100
2	+++ index/mod_grs_regx.c 2013-07-24 09:27:20.000000000 +0200	2	+++ index/mod_grs_regx.c 2013-10-27 11:54:01.655086748 +0100
3	@@ -1298,8 +1298,12 @@	3	@@ -1301,8 +1301,12 @@
4	{	4	{
5	const char *err = Tcl_GetVar(spec->tcl_interp, "errorInfo", 0);	5	const char *err = Tcl_GetVar(spec->tcl_interp, "errorInfo", 0);
6	yaz_log(YLOG_FATAL, "Tcl error, line=%d, \"%s\"\n%s",	6	yaz_log(YLOG_FATAL, "Tcl error, line=%d, \"%s\"\n%s",
7	+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 5	7	+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 5
8	spec->tcl_interp->errorLine,	8	spec->tcl_interp->errorLine,
9	- spec->tcl_interp->result,	9	- spec->tcl_interp->result,
Lines 10-16 Link Here
10	+#else	10	+#else
11	+ Tcl_GetErrorLine(spec->tcl_interp),	11	+ Tcl_GetErrorLine(spec->tcl_interp),
12	+#endif	12	+#endif
13	+ Tcl_GetStringResult(spec->tcl_interp),	13	+ Tcl_GetStringResult(spec->tcl_interp),
14	err ? err : "[NO ERRORINFO]");	14	err ? err : "[NO ERRORINFO]");
15	}	15	}
16	}	16	}