ports/183355: [PATCH] net/zebra-server update to version 2.0.55

[Pawel Pekala]

>Number:         183355
>Category:       ports
>Synopsis:       [PATCH] net/zebra-server update to version 2.0.55
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 27 11:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Pawel Pekala
>Release:        11.0-CURRENT
>Organization:
>Environment:
FreeBSD blaviken.slowicza.org 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r256917M: Tue Oct 22 19:14:57 CEST 2013     corn at blaviken.slowicza.org:/usr/obj/old/src/sys/GENERIC  amd64

>Description:
- Update to version 2.0.55
- Convert to new LIB_DEPENDS format
- Add support for STAGEDIR

*Note*

This update contains patch (files/patch-index_zebrasrv.c) that fixes
build with newer version of net/yaz I plan to commit when you will
approve this update.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(wersja 331739)
+++ Makefile	(kopia robocza)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zebra-server
-PORTVERSION=	2.0.45
+PORTVERSION=	2.0.55
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/zebra/
 DISTNAME=	idzebra-${PORTVERSION}
@@ -10,8 +10,8 @@
 MAINTAINER=	ben at gibbed.org
 COMMENT=	Z39.50/SR server software
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
-		yaz.4:${PORTSDIR}/net/yaz
+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libyaz.so:${PORTSDIR}/net/yaz
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-yaz=${LOCALBASE}/bin \
@@ -22,11 +22,4 @@
 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>
Index: distinfo
===================================================================
--- distinfo	(wersja 331739)
+++ distinfo	(kopia robocza)
@@ -1,2 +1,2 @@
-SHA256 (idzebra-2.0.45.tar.gz) = 0300566042d9be05021d63d0ac2d904017897eecd420b1e02cc329b3744894e1
-SIZE (idzebra-2.0.45.tar.gz) = 1785595
+SHA256 (idzebra-2.0.55.tar.gz) = 0ee5aba21d50a2c293096cf1802794e109c9f8829dbe57a5743646e65d0c32f6
+SIZE (idzebra-2.0.55.tar.gz) = 1819785
Index: files/patch-index_mod_grs_regx.c
===================================================================
--- files/patch-index_mod_grs_regx.c	(wersja 331739)
+++ files/patch-index_mod_grs_regx.c	(kopia robocza)
@@ -1,9 +1,9 @@
---- 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 @@
+--- 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", 
+ 	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,
@@ -10,7 +10,7 @@
 +#else
 +	    Tcl_GetErrorLine(spec->tcl_interp),
 +#endif
-+	    Tcl_GetStringResult(spec->tcl_interp),
++	    Tcl_GetStringResult(spec->tcl_interp),	    
  	    err ? err : "[NO ERRORINFO]");
      }
  }
Index: files/patch-index_zebrasrv.c
===================================================================
--- files/patch-index_zebrasrv.c	(wersja 0)
+++ files/patch-index_zebrasrv.c	(kopia robocza)
@@ -0,0 +1,11 @@
+--- ./index/zebrasrv.c.orig	2013-10-27 11:58:33.890944518 +0100
++++ ./index/zebrasrv.c	2013-10-27 11:59:27.837331279 +0100
+@@ -247,7 +247,7 @@
+         case Z_Term_general:
+             term->which = Z_Term_general;
+             term->u.general = odr_malloc(r->stream, sizeof(*term->u.general));
+-            term->u.general->size = term->u.general->len = len;
++            term->u.general->len = len;
+             term->u.general->buf = odr_malloc(r->stream, len);
+             memcpy(term->u.general->buf, outbuf, len);
+             break;
Index: pkg-plist
===================================================================
--- pkg-plist	(wersja 331739)
+++ pkg-plist	(kopia robocza)
@@ -1,3 +1,4 @@
+bin/idzebra-abs2dom
 bin/idzebra-config-2.0
 bin/zebraidx
 bin/zebraidx-2.0
@@ -43,6 +44,13 @@
 lib/libidzebra-2.0.la
 lib/libidzebra-2.0.so
 lib/libidzebra-2.0.so.0
+man/man1/idzebra-abs2dom.1.gz
+man/man1/idzebra-config-2.0.1.gz
+man/man1/idzebra-config.1.gz
+man/man1/zebraidx-2.0.1.gz
+man/man1/zebraidx.1.gz
+man/man8/zebrasrv-2.0.8.gz
+man/man8/zebrasrv.8.gz
 share/aclocal/idzebra-2.0.m4
 share/doc/idzebra-2.0/administration-extended-services.html
 share/doc/idzebra-2.0/administration-ranking.html
@@ -67,6 +75,7 @@
 share/doc/idzebra-2.0/grs-internal-representation.html
 share/doc/idzebra-2.0/grs.html
 share/doc/idzebra-2.0/icuchain-files.html
+share/doc/idzebra-2.0/idzebra-abs2dom.html
 share/doc/idzebra-2.0/idzebra-config.html
 share/doc/idzebra-2.0/index.html
 share/doc/idzebra-2.0/indexdata.html
@@ -152,6 +161,7 @@
 share/idzebra-2.0-examples/gils/records/esdd0077.grs
 share/idzebra-2.0-examples/gils/records/esdd0078.grs
 share/idzebra-2.0-examples/gils/records/esdd0079.grs
+share/idzebra-2.0-examples/gils/records/esdd0080.grs
 share/idzebra-2.0-examples/gils/zebra.cfg
 share/idzebra-2.0-examples/marc21/sample-marc
 share/idzebra-2.0-examples/marc21/zebra.cfg


>Release-Note:
>Audit-Trail:
>Unformatted: