diff --git a/net/yaz/Makefile b/net/yaz/Makefile index 20b15f03db8f..1fdb89fa85dc 100644 --- a/net/yaz/Makefile +++ b/net/yaz/Makefile @@ -1,55 +1,49 @@ PORTNAME= yaz -DISTVERSION= 5.31.1 -PORTREVISION= 8 +DISTVERSION= 5.35.0 CATEGORIES= net -MASTER_SITES= https://ftp.indexdata.dk/pub/yaz/ +MASTER_SITES= https://ftp.indexdata.dk/pub/${PORTNAME}/ MAINTAINER= nc@FreeBSD.org COMMENT= Z39.50/SR client and API library WWW= https://www.indexdata.com/resources/software/yaz/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libicuuc.so:devel/icu \ libgnutls.so:security/gnutls USES= autoreconf gnome iconv libtool ncurses pathfix \ - localbase:ldflags pkgconfig readline shebangfix tcl + localbase:ldflags pkgconfig readline shebangfix tcl:build,run SHEBANG_FILES= src/yaz-asncomp USE_GNOME= libxml2 libxslt USE_LDCONFIG= yes -MAKE_JOBS_UNSAFE= yes - GNU_CONFIGURE= yes +USE_CSTD= c89 +CFLAGS+= -Wno-error=int-conversion LIBS+= -lexecinfo PORTDOCS= * +INSTALL_TARGET= install-strip + CONFIGURE_ARGS= --enable-shared \ --enable-tcpd \ --with-iconv=${ICONV_PREFIX} \ --with-icu \ --with-xml2 \ --with-xslt OPTIONS_DEFINE= DOCS MEMCACHED REDIS MEMCACHED_DESC= Memcached distributed cache system support -MEMCACHED_CONFIGURE_WITH= memcached MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached +MEMCACHED_CONFIGURE_WITH= memcached -REDIS_CONFIGURE_WITH= redis REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis - -post-configure: - @${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${PREFIX}/share/man,' \ - ${WRKSRC}/doc/Makefile - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* +REDIS_CONFIGURE_WITH= redis .include diff --git a/net/yaz/distinfo b/net/yaz/distinfo index 607ac8683ca6..cb3bce091cc6 100644 --- a/net/yaz/distinfo +++ b/net/yaz/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640575808 -SHA256 (yaz-5.31.1.tar.gz) = 14cc34d19fd1fd27e544619f4c13300f14dc807088a1acc69fcb5c28d29baa15 -SIZE (yaz-5.31.1.tar.gz) = 2601554 +TIMESTAMP = 1747179682 +SHA256 (yaz-5.35.0.tar.gz) = df8203c8afe852ee79a54f9e05afd111ba81ca85c1608181decdaf29a5ec536c +SIZE (yaz-5.35.0.tar.gz) = 2701349 diff --git a/net/yaz/files/patch-m4_ac__check__icu.m4 b/net/yaz/files/patch-m4_ac__check__icu.m4 deleted file mode 100644 index 4c1776ba3dfd..000000000000 --- a/net/yaz/files/patch-m4_ac__check__icu.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- m4/ac_check_icu.m4.orig 2021-12-02 14:20:48 UTC -+++ m4/ac_check_icu.m4 -@@ -26,7 +26,7 @@ AC_DEFUN([AC_CHECK_ICU], - ICU_VERSION=`$pkgconfigpath --modversion icu-i18n` - ICU_CPPFLAGS="" - ICU_CFLAGS=`$pkgconfigpath --cflags icu-i18n` -- ICU_LIBS=`$pkgconfigpath --libs icu-i18n` -+ ICU_LIBS=`$pkgconfigpath --libs icu-i18n icu-uc` - else - AC_MSG_RESULT([not found]) - fi diff --git a/net/yaz/files/patch-src_spipe.c b/net/yaz/files/patch-src_spipe.c new file mode 100644 index 000000000000..c3c1e7909845 --- /dev/null +++ b/net/yaz/files/patch-src_spipe.c @@ -0,0 +1,11 @@ +--- src/spipe.c.orig 2025-05-14 00:41:10 UTC ++++ src/spipe.c +@@ -27,6 +27,8 @@ + #include + #endif + ++#include ++ + #ifdef WIN32 + #include + #define YAZ_INVALID_SOCKET INVALID_SOCKET diff --git a/net/yaz/pkg-plist b/net/yaz/pkg-plist index a8e294e07eac..d6a60e98b60d 100644 --- a/net/yaz/pkg-plist +++ b/net/yaz/pkg-plist @@ -1,182 +1,183 @@ bin/yaz-asncomp bin/yaz-client bin/yaz-config bin/yaz-iconv bin/yaz-icu bin/yaz-illclient bin/yaz-json-parse bin/yaz-marcdump bin/yaz-record-conv bin/yaz-url bin/yaz-ztest bin/zoomsh 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/json.h include/yaz/log.h include/yaz/logrpn.h include/yaz/malloc_info.h +include/yaz/marc_sax.h include/yaz/marcdisp.h include/yaz/match_glob.h include/yaz/matchstr.h include/yaz/mutex.h include/yaz/nmem.h include/yaz/nmem_xml.h include/yaz/oclc-ill-req-ext.h include/yaz/odr.h include/yaz/oid_db.h include/yaz/oid_std.h include/yaz/oid_util.h include/yaz/options.h 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 include/yaz/yaz-iconv.h include/yaz/yaz-util.h include/yaz/yaz-version.h include/yaz/yconfig.h include/yaz/z-accdes1.h include/yaz/z-accform1.h include/yaz/z-acckrb1.h include/yaz/z-charneg.h include/yaz/z-core.h include/yaz/z-date.h 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 include/yaz/z-opac.h include/yaz/z-rrf1.h include/yaz/z-rrf2.h include/yaz/z-sum.h include/yaz/z-sutrs.h include/yaz/z-uifr1.h include/yaz/z-univ.h include/yaz/zes-admin.h include/yaz/zes-expi.h include/yaz/zes-exps.h include/yaz/zes-order.h include/yaz/zes-pquery.h include/yaz/zes-psched.h include/yaz/zes-pset.h include/yaz/zes-update.h include/yaz/zes-update0.h include/yaz/zgdu.h include/yaz/zoom.h lib/libyaz.a lib/libyaz.so lib/libyaz.so.5 -lib/libyaz.so.5.0.0 +lib/libyaz.so.5.1.0 lib/libyaz_icu.a lib/libyaz_icu.so lib/libyaz_icu.so.5 -lib/libyaz_icu.so.5.0.0 +lib/libyaz_icu.so.5.1.0 lib/libyaz_server.a lib/libyaz_server.so lib/libyaz_server.so.5 -lib/libyaz_server.so.5.0.0 +lib/libyaz_server.so.5.1.0 libdata/pkgconfig/yaz-icu.pc libdata/pkgconfig/yaz-server.pc libdata/pkgconfig/yaz.pc share/aclocal/yaz.m4 share/man/man1/yaz-asncomp.1.gz share/man/man1/yaz-client.1.gz share/man/man1/yaz-config.1.gz share/man/man1/yaz-iconv.1.gz share/man/man1/yaz-icu.1.gz share/man/man1/yaz-illclient.1.gz share/man/man1/yaz-json-parse.1.gz share/man/man1/yaz-marcdump.1.gz share/man/man1/yaz-record-conv.1.gz share/man/man1/yaz-url.1.gz share/man/man1/zoomsh.1.gz share/man/man7/bib1-attr.7.gz share/man/man7/yaz-log.7.gz share/man/man7/yaz.7.gz share/man/man8/yaz-ztest.8.gz %%DATADIR%%/etc/MARC21slim2DC.xsl %%DATADIR%%/etc/MARC21slim2MODS.xsl %%DATADIR%%/etc/MARC21slim2RDFDC.xsl %%DATADIR%%/etc/MARC21slimUtils.xsl %%DATADIR%%/etc/cqlpass.properties %%DATADIR%%/etc/maps.xml %%DATADIR%%/etc/marc21_to_endnote.xsl %%DATADIR%%/etc/opacxml.xsd %%DATADIR%%/etc/pqf.properties %%DATADIR%%/etc/yazgfs.xml %%DATADIR%%/ill/ill.tcl %%DATADIR%%/ill/ill9702.asn %%DATADIR%%/ill/item-req.asn %%DATADIR%%/ill/oclc-ill-req-ext.asn %%DATADIR%%/z39.50/charneg-3.asn %%DATADIR%%/z39.50/datetime.asn %%DATADIR%%/z39.50/esadmin.asn %%DATADIR%%/z39.50/esupdate.asn %%DATADIR%%/z39.50/facet.asn %%DATADIR%%/z39.50/mterm2.asn %%DATADIR%%/z39.50/oclcui.asn %%DATADIR%%/z39.50/univres.asn %%DATADIR%%/z39.50/z.tcl %%DATADIR%%/z39.50/z3950v3.asn