4 files changed, 124 insertions, 111 deletions

diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 38e61a9767d8..86650426a128 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	yaz
-PORTVERSION=	2.1.53
+PORTVERSION=	3.0.26
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/yaz/
 
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=--enable-shared --with-openssl=${OPENSSLBASE} \
 USE_LDCONFIG=	yes
 
 MAN1=		yaz-asncomp.1 yaz-client.1 yaz-iconv.1 yaz-marcdump.1 \
-		ziffy.1 zoomsh.1
+		zoomsh.1 yaz-icu.1 yaz-illclient.1
 MAN7=		yaz-log.7 yaz.7
 MAN8=		yaz-config.8 yaz-ztest.8
 
@@ -33,8 +33,5 @@ pre-install:
 	cd ${WRKSRC}/doc && \
 		${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${PREFIX}/man,' \
 		Makefile
-	cd ${WRKSRC}/ziffy && \
-		${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${PREFIX}/man,' \
-		Makefile
 
 .include <bsd.port.mk>
diff --git a/net/yaz/distinfo b/net/yaz/distinfo
index 1b6c2a14aeb1..bf8ccfe67f3d 100644
--- a/net/yaz/distinfo
+++ b/net/yaz/distinfo
@@ -1,3 +1,3 @@
-MD5 (yaz-2.1.53.tar.gz) = b2ef7593ae022a28651b2b3221775c09
-SHA256 (yaz-2.1.53.tar.gz) = ceeac7a6e71745b04fa9933f6b7b1a99b5825f8091b0882a9d1b3978bedd726b
-SIZE (yaz-2.1.53.tar.gz) = 1736575
+MD5 (yaz-3.0.26.tar.gz) = 2b06e2d930fa329ac806b0e14d5714c8
+SHA256 (yaz-3.0.26.tar.gz) = 0d7a1ddb8dc5c06122101eac6247018f64e8e9811b727dcc8ff5e43b0e7134a6
+SIZE (yaz-3.0.26.tar.gz) = 1915958
diff --git a/net/yaz/files/patch-configure b/net/yaz/files/patch-configure
deleted file mode 100644
index 9472159dbd57..000000000000
--- a/net/yaz/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Aug 14 19:41:49 2006
-+++ configure	Mon Aug 14 19:42:04 2006
-@@ -22561,7 +22561,7 @@
-     fi
-     { echo "$as_me:$LINENO: checking for working tcpd.h" >&5
- echo $ECHO_N "checking for working tcpd.h... $ECHO_C" >&6; }
--    LIBS="$LIBS -lwrap -lnsl"
-+    LIBS="$LIBS -lwrap"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/net/yaz/pkg-plist b/net/yaz/pkg-plist
index ada57281c648..4bac3d6d1825 100644
--- a/net/yaz/pkg-plist
+++ b/net/yaz/pkg-plist
@@ -2,19 +2,23 @@ bin/yaz-asncomp
 bin/yaz-client
 bin/yaz-config
 bin/yaz-iconv
+bin/yaz-icu
+bin/yaz-illclient
 bin/yaz-marcdump
 bin/yaz-ztest
-bin/ziffy
 bin/zoomsh
 include/yaz/backend.h
 include/yaz/ccl.h
 include/yaz/ccl_xml.h
 include/yaz/charneg.h
 include/yaz/comstack.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/icu.h
 include/yaz/ill-core.h
 include/yaz/ill.h
 include/yaz/item-req.h
@@ -22,15 +26,22 @@ include/yaz/libxml2_error.h
 include/yaz/log.h
 include/yaz/logrpn.h
 include/yaz/marcdisp.h
+include/yaz/match_glob.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.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/prt-ext.h
+include/yaz/query-charset.h
 include/yaz/querytowrbuf.h
 include/yaz/readconf.h
 include/yaz/record_conv.h
@@ -43,6 +54,7 @@ include/yaz/statserv.h
 include/yaz/tcpip.h
 include/yaz/test.h
 include/yaz/timing.h
+include/yaz/tokenizer.h
 include/yaz/tpath.h
 include/yaz/unix.h
 include/yaz/wrbuf.h
@@ -88,96 +100,111 @@ include/yaz/zoom.h
 lib/libyaz.a
 lib/libyaz.la
 lib/libyaz.so
-lib/libyaz.so.2
+lib/libyaz.so.3
+lib/libyaz_icu.a
+lib/libyaz_icu.la
+lib/libyaz_icu.so
+lib/libyaz_icu.so.3
+lib/libyaz_server.a
+lib/libyaz_server.la
+lib/libyaz_server.so
+lib/libyaz_server.so.3
 libdata/pkgconfig/yaz.pc
 share/aclocal/yaz.m4
-%%DOCSDIR%%/apilayer.png
-%%DOCSDIR%%/asn.external.html
-%%DOCSDIR%%/asn.html
-%%DOCSDIR%%/asn.oid.html
-%%DOCSDIR%%/asn.pdu.html
-%%DOCSDIR%%/asn.preparing.html
-%%DOCSDIR%%/client.commands.html
-%%DOCSDIR%%/client.html
-%%DOCSDIR%%/client.invoking.html
-%%DOCSDIR%%/client.searching.html
-%%DOCSDIR%%/common/id.png
-%%DOCSDIR%%/common/style1.css
-%%DOCSDIR%%/comstack.addresses.html
-%%DOCSDIR%%/comstack.client.html
-%%DOCSDIR%%/comstack.common.html
-%%DOCSDIR%%/comstack.diagnostics.html
-%%DOCSDIR%%/comstack.html
-%%DOCSDIR%%/comstack.introduction.html
-%%DOCSDIR%%/comstack.server.html
-%%DOCSDIR%%/comstack.ssl.html
-%%DOCSDIR%%/comstack.summary.html
-%%DOCSDIR%%/credits.html
-%%DOCSDIR%%/future.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/indexdata.html
-%%DOCSDIR%%/installation.html
-%%DOCSDIR%%/installation.unix.html
-%%DOCSDIR%%/installation.win32.html
-%%DOCSDIR%%/introduction.api.html
-%%DOCSDIR%%/introduction.html
-%%DOCSDIR%%/license.html
-%%DOCSDIR%%/license.other.html
-%%DOCSDIR%%/marc.html
-%%DOCSDIR%%/odr.debugging.html
-%%DOCSDIR%%/odr.html
-%%DOCSDIR%%/odr.programming.html
-%%DOCSDIR%%/odr.use.html
-%%DOCSDIR%%/server.backend.html
-%%DOCSDIR%%/server.backendfunctions.html
-%%DOCSDIR%%/server.frontend.html
-%%DOCSDIR%%/server.html
-%%DOCSDIR%%/server.invocation.html
-%%DOCSDIR%%/server.main.html
-%%DOCSDIR%%/server.vhosts.html
-%%DOCSDIR%%/soap.html
-%%DOCSDIR%%/soap.http.html
-%%DOCSDIR%%/soap.srw.html
-%%DOCSDIR%%/soap.xml.html
-%%DOCSDIR%%/tools.html
-%%DOCSDIR%%/tools.log.html
-%%DOCSDIR%%/tools.nmem.html
-%%DOCSDIR%%/tools.oid.html
-%%DOCSDIR%%/tools.retrieval.html
-%%DOCSDIR%%/ziffy.html
-%%DOCSDIR%%/ziffy.using.html
-%%DOCSDIR%%/zoom.events.html
-%%DOCSDIR%%/zoom.extendedservices.html
-%%DOCSDIR%%/zoom.html
-%%DOCSDIR%%/zoom.options.html
-%%DOCSDIR%%/zoom.query.html
-%%DOCSDIR%%/zoom.records.html
-%%DOCSDIR%%/zoom.resultsets.html
-%%DOCSDIR%%/zoom.scan.html
-%%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/pqf.properties
-%%DATADIR%%/etc/yazgfs.xml
-%%DATADIR%%/ill/ill.tcl
-%%DATADIR%%/ill/ill9702.asn
-%%DATADIR%%/ill/item-req.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/mterm2.asn
-%%DATADIR%%/z39.50/oclcui.asn
-%%DATADIR%%/z39.50/univres.asn
-%%DATADIR%%/z39.50/z.tcl
-%%DATADIR%%/z39.50/z3950v3.asn
-@dirrm %%DATADIR%%/z39.50
-@dirrm %%DATADIR%%/ill
-@dirrm %%DATADIR%%/etc
-@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%/common
-@dirrm %%DOCSDIR%%
+share/doc/yaz/apilayer.png
+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/common/id.png
+share/doc/yaz/common/style1.css
+share/doc/yaz/comstack.addresses.html
+share/doc/yaz/comstack.client.html
+share/doc/yaz/comstack.common.html
+share/doc/yaz/comstack.diagnostics.html
+share/doc/yaz/comstack.html
+share/doc/yaz/comstack.introduction.html
+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/future.html
+share/doc/yaz/index.html
+share/doc/yaz/indexdata.html
+share/doc/yaz/installation.html
+share/doc/yaz/installation.unix.html
+share/doc/yaz/installation.win32.html
+share/doc/yaz/introduction.api.html
+share/doc/yaz/introduction.html
+share/doc/yaz/license.html
+share/doc/yaz/list-oids.html
+share/doc/yaz/marc.html
+share/doc/yaz/odr.debugging.html
+share/doc/yaz/odr.html
+share/doc/yaz/odr.programming.html
+share/doc/yaz/odr.use.html
+share/doc/yaz/reference.html
+share/doc/yaz/server.backend.html
+share/doc/yaz/server.backendfunctions.html
+share/doc/yaz/server.frontend.html
+share/doc/yaz/server.html
+share/doc/yaz/server.invocation.html
+share/doc/yaz/server.main.html
+share/doc/yaz/server.vhosts.html
+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/tools.html
+share/doc/yaz/tools.log.html
+share/doc/yaz/tools.nmem.html
+share/doc/yaz/tools.oid.html
+share/doc/yaz/tools.retrieval.html
+share/doc/yaz/yaz-asncomp.html
+share/doc/yaz/yaz-client.html
+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-log.html
+share/doc/yaz/yaz-marcdump.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.html
+share/doc/yaz/zoom.options.html
+share/doc/yaz/zoom.query.html
+share/doc/yaz/zoom.records.html
+share/doc/yaz/zoom.resultsets.html
+share/doc/yaz/zoom.scan.html
+share/doc/yaz/zoomsh.html
+share/yaz/etc/MARC21slim2DC.xsl
+share/yaz/etc/MARC21slim2MODS.xsl
+share/yaz/etc/MARC21slim2RDFDC.xsl
+share/yaz/etc/MARC21slimUtils.xsl
+share/yaz/etc/cqlpass.properties
+share/yaz/etc/maps.xml
+share/yaz/etc/opacxml.xsd
+share/yaz/etc/pqf.properties
+share/yaz/etc/yazgfs.xml
+share/yaz/ill/ill.tcl
+share/yaz/ill/ill9702.asn
+share/yaz/ill/item-req.asn
+share/yaz/ill/oclc-ill-req-ext.asn
+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/mterm2.asn
+share/yaz/z39.50/oclcui.asn
+share/yaz/z39.50/univres.asn
+share/yaz/z39.50/z.tcl
+share/yaz/z39.50/z3950v3.asn
+@dirrm share/yaz/z39.50
+@dirrm share/yaz/ill
+@dirrm share/yaz/etc
+@dirrm share/yaz
+@dirrm share/doc/yaz/common
+@dirrm share/doc/yaz
 @dirrm include/yaz