Update to version 2.1.18.

PR:		96615
Submitted by:	Martin Wilke <freebsd@unixfreunde.de>

3 files changed, 93 insertions, 87 deletions

diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 647e4368b5d4..ce000a5688e0 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	yaz
-PORTVERSION=	2.1.8
+PORTVERSION=	2.1.18
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/yaz/
 
diff --git a/net/yaz/distinfo b/net/yaz/distinfo
index 074dc1391666..172e7468fa3d 100644
--- a/net/yaz/distinfo
+++ b/net/yaz/distinfo
@@ -1,3 +1,3 @@
-MD5 (yaz-2.1.8.tar.gz) = 002747c0dc58d18acd6a6440a069c3c0
-SHA256 (yaz-2.1.8.tar.gz) = 085cbe3b6e70547fa1c1ff70d984cea69b3d0560f6057f05e8e7695caacb53fd
-SIZE (yaz-2.1.8.tar.gz) = 1691980
+MD5 (yaz-2.1.18.tar.gz) = 7538fbda9fa6f10590f485cb4c99dec1
+SHA256 (yaz-2.1.18.tar.gz) = 2d8abafa10194cc421dd40301b1a83c426e28e1483b477c40cfe8389057d6d52
+SIZE (yaz-2.1.18.tar.gz) = 2028957
diff --git a/net/yaz/pkg-plist b/net/yaz/pkg-plist
index afc013a57cda..10ee3f300389 100644
--- a/net/yaz/pkg-plist
+++ b/net/yaz/pkg-plist
@@ -26,16 +26,19 @@ include/yaz/otherinfo.h
 include/yaz/pquery.h
 include/yaz/proto.h
 include/yaz/prt-ext.h
+include/yaz/querytowrbuf.h
 include/yaz/readconf.h
 include/yaz/soap.h
 include/yaz/sortspec.h
 include/yaz/srw.h
 include/yaz/statserv.h
 include/yaz/tcpip.h
+include/yaz/test.h
 include/yaz/tpath.h
 include/yaz/unix.h
 include/yaz/wrbuf.h
 include/yaz/xmalloc.h
+include/yaz/xmlquery.h
 include/yaz/yaz-ccl.h
 include/yaz/yaz-iconv.h
 include/yaz/yaz-util.h
@@ -81,87 +84,90 @@ lib/libyazthread.la
 lib/libyazthread.so
 lib/libyazthread.so.2
 share/aclocal/yaz.m4
-share/doc/yaz/apilayer.png
-share/doc/yaz/asn.external.html
-share/doc/yaz/asn.html
-share/doc/yaz/asn.oid.html
-share/doc/yaz/asn.pdu.html
-share/doc/yaz/asn.preparing.html
-share/doc/yaz/client.commands.html
-share/doc/yaz/client.html
-share/doc/yaz/client.invoking.html
-share/doc/yaz/client.searching.html
-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/id.png
-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.html
-share/doc/yaz/introduction.api.html
-share/doc/yaz/license.html
-share/doc/yaz/license.other.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/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.marc.html
-share/doc/yaz/tools.nmem.html
-share/doc/yaz/tools.oid.html
-share/doc/yaz/yaz.css
-share/doc/yaz/yaz.html
-share/doc/yaz/yaz.pdf
-share/doc/yaz/zoom.events.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/yaz/etc/MARC21slim2DC.xsl
-share/yaz/etc/MARC21slim2MODS.xsl
-share/yaz/etc/MARC21slim2RDFDC.xsl
-share/yaz/etc/MARC21slimUtils.xsl
-share/yaz/etc/maps.xml
-share/yaz/etc/pqf.properties
-share/yaz/ill/ill.tcl
-share/yaz/ill/ill9702.asn
-share/yaz/ill/item-req.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
+%%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%%/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%%/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.marc.html
+%%DOCSDIR%%/tools.nmem.html
+%%DOCSDIR%%/tools.oid.html
+%%DOCSDIR%%/yaz.html
+%%DOCSDIR%%/yaz.pdf
+%%DOCSDIR%%/zoom.events.html
+%%DOCSDIR%%/zoom.ext.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/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%%
 @dirrm include/yaz