diff --git a/net/yaz/Makefile b/net/yaz/Makefile index 9f55606b458..482a289d3b5 100644 --- a/net/yaz/Makefile +++ b/net/yaz/Makefile @@ -1,11 +1,10 @@ COMMENT= Z39.50/SR client and API library -DISTNAME= yaz-3.0.49 +DISTNAME= yaz-5.31.1 CATEGORIES= net -REVISION= 11 -SHARED_LIBS+= yaz 1.1 # 3.0 -SHARED_LIBS+= yaz_icu 1.2 # 3.0 -SHARED_LIBS+= yaz_server 1.1 # 3.0 +SHARED_LIBS+= yaz 1.2 # 5.0 +SHARED_LIBS+= yaz_icu 1.3 # 5.0 +SHARED_LIBS+= yaz_server 1.2 # 5.0 HOMEPAGE= http://www.indexdata.dk/yaz/ @@ -28,5 +27,6 @@ LIB_DEPENDS= textproc/libxml \ CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-gnutls +CONFIGURE_ENV+= LIBS="-lexecinfo" .include diff --git a/net/yaz/distinfo b/net/yaz/distinfo index 4de950a289b..d10cf7aaf54 100644 --- a/net/yaz/distinfo +++ b/net/yaz/distinfo @@ -1,2 +1,2 @@ -SHA256 (yaz-3.0.49.tar.gz) = Yui/cQeYympqDwGkYlAoPoxmFncqDCLpfXSHpQuQZjU= -SIZE (yaz-3.0.49.tar.gz) = 2147459 +SHA256 (yaz-5.31.1.tar.gz) = FMw00Z/R/SflRGGfTBMwDxTcgHCIoazGn8tcKNKbqhU= +SIZE (yaz-5.31.1.tar.gz) = 2601554 diff --git a/net/yaz/patches/patch-src_spipe_c b/net/yaz/patches/patch-src_spipe_c new file mode 100644 index 00000000000..8a9515db979 --- /dev/null +++ b/net/yaz/patches/patch-src_spipe_c @@ -0,0 +1,11 @@ +Index: src/spipe.c +--- src/spipe.c.orig ++++ src/spipe.c +@@ -12,6 +12,7 @@ + #include + #endif + ++#include + #include + #include + #include diff --git a/net/yaz/pkg/PLIST b/net/yaz/pkg/PLIST index 83542e9f0d6..7bab8b285c6 100644 --- a/net/yaz/pkg/PLIST +++ b/net/yaz/pkg/PLIST @@ -4,29 +4,40 @@ bin/yaz-config @bin bin/yaz-iconv @bin bin/yaz-icu @bin bin/yaz-illclient +@bin bin/yaz-json-parse @bin bin/yaz-marcdump +@bin bin/yaz-record-conv +@bin bin/yaz-url @bin bin/yaz-ztest @bin bin/zoomsh include/yaz/ include/yaz/backend.h +include/yaz/backtrace.h +include/yaz/base64.h include/yaz/ccl.h include/yaz/ccl_xml.h include/yaz/charneg.h include/yaz/comstack.h +include/yaz/cookie.h include/yaz/copy_types.h include/yaz/cql.h include/yaz/daemon.h include/yaz/diagbib1.h include/yaz/diagsru_update.h include/yaz/diagsrw.h +include/yaz/dirent.h include/yaz/errno.h +include/yaz/facet.h +include/yaz/file_glob.h +include/yaz/gettimeofday.h include/yaz/icu.h include/yaz/ill-core.h include/yaz/ill.h include/yaz/item-req.h -include/yaz/libxml2_error.h +include/yaz/json.h include/yaz/log.h include/yaz/logrpn.h +include/yaz/malloc_info.h include/yaz/marcdisp.h include/yaz/match_glob.h include/yaz/matchstr.h @@ -43,27 +54,39 @@ include/yaz/otherinfo.h include/yaz/poll.h include/yaz/pquery.h include/yaz/proto.h +include/yaz/proxunit.h include/yaz/prt-ext.h include/yaz/query-charset.h include/yaz/querytowrbuf.h include/yaz/readconf.h include/yaz/record_conv.h +include/yaz/record_render.h include/yaz/retrieval.h include/yaz/rpn2cql.h +include/yaz/rpn2solr.h include/yaz/sc.h +include/yaz/shptr.h include/yaz/snprintf.h include/yaz/soap.h +include/yaz/solr.h include/yaz/sortspec.h +include/yaz/spipe.h include/yaz/srw.h include/yaz/statserv.h +include/yaz/stemmer.h include/yaz/tcpip.h include/yaz/test.h +include/yaz/thread_create.h +include/yaz/thread_id.h include/yaz/timing.h include/yaz/tokenizer.h include/yaz/tpath.h include/yaz/unix.h +include/yaz/url.h include/yaz/wrbuf.h include/yaz/xmalloc.h +include/yaz/xml_get.h +include/yaz/xml_include.h include/yaz/xmlquery.h include/yaz/xmltypes.h include/yaz/yaz-ccl.h @@ -81,6 +104,7 @@ include/yaz/z-diag1.h include/yaz/z-espec1.h include/yaz/z-estask.h include/yaz/z-exp.h +include/yaz/z-facet-1.h include/yaz/z-grs.h include/yaz/z-mterm2.h include/yaz/z-oclcui.h @@ -102,27 +126,32 @@ include/yaz/zes-update.h include/yaz/zes-update0.h include/yaz/zgdu.h include/yaz/zoom.h -lib/libyaz.a +@static-lib lib/libyaz.a lib/libyaz.la @lib lib/libyaz.so.${LIByaz_VERSION} -lib/libyaz_icu.a +@static-lib lib/libyaz_icu.a lib/libyaz_icu.la @lib lib/libyaz_icu.so.${LIByaz_icu_VERSION} -lib/libyaz_server.a +@static-lib lib/libyaz_server.a lib/libyaz_server.la @lib lib/libyaz_server.so.${LIByaz_server_VERSION} +lib/pkgconfig/yaz-icu.pc +lib/pkgconfig/yaz-server.pc lib/pkgconfig/yaz.pc @man man/man1/yaz-asncomp.1 @man man/man1/yaz-client.1 +@man man/man1/yaz-config.1 @man man/man1/yaz-iconv.1 @man man/man1/yaz-icu.1 @man man/man1/yaz-illclient.1 +@man man/man1/yaz-json-parse.1 @man man/man1/yaz-marcdump.1 +@man man/man1/yaz-record-conv.1 +@man man/man1/yaz-url.1 @man man/man1/zoomsh.1 @man man/man7/bib1-attr.7 @man man/man7/yaz-log.7 @man man/man7/yaz.7 -@man man/man8/yaz-config.8 @man man/man8/yaz-ztest.8 share/aclocal/yaz.m4 share/doc/yaz/ @@ -131,6 +160,7 @@ share/doc/yaz/asn.external.html share/doc/yaz/asn.html share/doc/yaz/asn.pdu.html share/doc/yaz/asn.preparing.html +share/doc/yaz/bib1-diagnostics.html share/doc/yaz/bib1.html share/doc/yaz/common/ share/doc/yaz/common/id.png @@ -145,6 +175,7 @@ share/doc/yaz/comstack.server.html share/doc/yaz/comstack.ssl.html share/doc/yaz/comstack.summary.html share/doc/yaz/credits.html +share/doc/yaz/facets.html share/doc/yaz/future.html share/doc/yaz/index.html share/doc/yaz/indexdata.html @@ -172,6 +203,8 @@ share/doc/yaz/soap.html share/doc/yaz/soap.http.html share/doc/yaz/soap.srw.html share/doc/yaz/soap.xml.html +share/doc/yaz/sorting.html +share/doc/yaz/sru-diagnostics.html share/doc/yaz/tools.html share/doc/yaz/tools.log.html share/doc/yaz/tools.nmem.html @@ -183,15 +216,20 @@ share/doc/yaz/yaz-config.html share/doc/yaz/yaz-iconv.html share/doc/yaz/yaz-icu.html share/doc/yaz/yaz-illclient.html +share/doc/yaz/yaz-json-parse.html share/doc/yaz/yaz-log.html share/doc/yaz/yaz-marcdump.html +share/doc/yaz/yaz-record-iconv.html +share/doc/yaz/yaz-url.html share/doc/yaz/yaz-ztest.html share/doc/yaz/yaz.html share/doc/yaz/zoom.events.html share/doc/yaz/zoom.extendedservices.html +share/doc/yaz/zoom.facets.html share/doc/yaz/zoom.html share/doc/yaz/zoom.options.html share/doc/yaz/zoom.query.html +share/doc/yaz/zoom.queryconversions.html share/doc/yaz/zoom.records.html share/doc/yaz/zoom.resultsets.html share/doc/yaz/zoom.scan.html @@ -204,6 +242,7 @@ share/yaz/etc/MARC21slim2RDFDC.xsl share/yaz/etc/MARC21slimUtils.xsl share/yaz/etc/cqlpass.properties share/yaz/etc/maps.xml +share/yaz/etc/marc21_to_endnote.xsl share/yaz/etc/opacxml.xsd share/yaz/etc/pqf.properties share/yaz/etc/yazgfs.xml @@ -217,6 +256,7 @@ share/yaz/z39.50/charneg-3.asn share/yaz/z39.50/datetime.asn share/yaz/z39.50/esadmin.asn share/yaz/z39.50/esupdate.asn +share/yaz/z39.50/facet.asn share/yaz/z39.50/mterm2.asn share/yaz/z39.50/oclcui.asn share/yaz/z39.50/univres.asn