Upgrade to 1.8

4 files changed, 126 insertions, 78 deletions

diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 1ccd9476818f..30eaaa475780 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	yaz
-PORTVERSION=	1.6
+PORTVERSION=	1.8
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/yaz/ \
 		${MASTER_SITE_LOCAL}
diff --git a/net/yaz/distinfo b/net/yaz/distinfo
index df59407e8724..5fc3447915c2 100644
--- a/net/yaz/distinfo
+++ b/net/yaz/distinfo
@@ -1 +1 @@
-MD5 (yaz-1.6.tar.gz) = 1c90c1b7c1f646786363f13cd13254e6
+MD5 (yaz-1.8.tar.gz) = 2ced205503d0d6c8fb19aa7c6b91d325
diff --git a/net/yaz/files/patch-ab b/net/yaz/files/patch-ab
index a4be884b1743..9857a5630e04 100644
--- a/net/yaz/files/patch-ab
+++ b/net/yaz/files/patch-ab
@@ -1,12 +1,10 @@
---- odr/ber_int.c.orig	Sat Sep 16 14:19:39 2000
-+++ odr/ber_int.c	Sat Sep 16 14:18:46 2000
-@@ -71,6 +71,9 @@
- #ifdef WIN32
+--- odr/ber_int.c.orig	Sat Oct 27 13:06:01 2001
++++ odr/ber_int.c	Sat Oct 27 13:06:19 2001
+@@ -75,6 +75,7 @@
  #include <winsock.h>
  #else
-+#include <sys/types.h>
+ #include <sys/types.h>
 +#include <sys/socket.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
+ #include <netinet/in.h>
  #endif
  
diff --git a/net/yaz/pkg-plist b/net/yaz/pkg-plist
index a9bd64c7c5fc..c4e242431c1d 100644
--- a/net/yaz/pkg-plist
+++ b/net/yaz/pkg-plist
@@ -1,56 +1,8 @@
+bin/yaz-client
 bin/yaz-comp
 bin/yaz-config
-bin/yaz-client
 bin/yaz-ztest
-share/yaz/tab/bib1.att
-share/yaz/tab/dan1.att
-share/yaz/tab/danmarc.abs
-share/yaz/tab/explain.abs
-share/yaz/tab/explain.att
-share/yaz/tab/explain.tag
-share/yaz/tab/generic.tag
-share/yaz/tab/gils-a.est
-share/yaz/tab/gils-b.est
-share/yaz/tab/gils-f.est
-share/yaz/tab/gils-g.est
-share/yaz/tab/gils-summary.map
-share/yaz/tab/gils-usmarc.map
-share/yaz/tab/gils-variant.est
-share/yaz/tab/gils.abs
-share/yaz/tab/gils.att
-share/yaz/tab/gils.tag
-share/yaz/tab/meta-b.est
-share/yaz/tab/meta-usmarc.map
-share/yaz/tab/meta.abs
-share/yaz/tab/meta.tag
-share/yaz/tab/summary.abs
-share/yaz/tab/summary.tag
-share/yaz/tab/tagsetg.tag
-share/yaz/tab/tagsetm.tag
-share/yaz/tab/usmarc-b.est
-share/yaz/tab/usmarc.abs
-share/yaz/tab/usmarc.mar
-share/yaz/tab/usmarc.tag
-share/yaz/tab/var1.var
-share/yaz/tab/wais-b.est
-share/yaz/tab/wais-variant.est
-share/yaz/tab/wais.abs
-share/doc/yaz/yaz.sgml
-share/doc/yaz/profiles.sgml
-share/doc/yaz/yaz.txt
-share/doc/yaz/yaz.ps
-share/doc/yaz/profiles.txt
-share/doc/yaz/profiles.ps
-share/doc/yaz/yaz.html
-share/doc/yaz/yaz-1.html
-share/doc/yaz/yaz-2.html
-share/doc/yaz/yaz-3.html
-share/doc/yaz/yaz-4.html
-share/doc/yaz/yaz-5.html
-share/doc/yaz/yaz-6.html
-share/doc/yaz/yaz-7.html
-share/doc/yaz/yaz-8.html
-share/doc/yaz/yaz-9.html
+bin/zoomsh
 include/yaz/backend.h
 include/yaz/ccl.h
 include/yaz/comstack.h
@@ -58,6 +10,9 @@ include/yaz/d1_attset.h
 include/yaz/d1_map.h
 include/yaz/data1.h
 include/yaz/diagbib1.h
+include/yaz/ill-core.h
+include/yaz/ill.h
+include/yaz/item-req.h
 include/yaz/log.h
 include/yaz/logrpn.h
 include/yaz/marcdisp.h
@@ -67,21 +22,20 @@ include/yaz/oid.h
 include/yaz/options.h
 include/yaz/otherinfo.h
 include/yaz/pquery.h
+include/yaz/proto.h
 include/yaz/prt-ext.h
 include/yaz/readconf.h
+include/yaz/sortspec.h
 include/yaz/statserv.h
 include/yaz/tcpip.h
 include/yaz/tpath.h
 include/yaz/wrbuf.h
 include/yaz/xmalloc.h
 include/yaz/yaz-ccl.h
+include/yaz/yaz-date.h
 include/yaz/yaz-util.h
 include/yaz/yaz-version.h
 include/yaz/yconfig.h
-include/yaz/proto.h
-include/yaz/ill.h
-include/yaz/ill-core.h
-include/yaz/item-req.h
 include/yaz/z-accdes1.h
 include/yaz/z-accform1.h
 include/yaz/z-acckrb1.h
@@ -93,13 +47,13 @@ include/yaz/z-estask.h
 include/yaz/z-exp.h
 include/yaz/z-grs.h
 include/yaz/z-opac.h
-include/yaz/z-proto.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
@@ -108,20 +62,116 @@ include/yaz/zes-psched.h
 include/yaz/zes-pset.h
 include/yaz/zes-update.h
 include/yaz/zes-update0.h
-include/yaz/prt-acc.h
-include/yaz/prt-add.h
-include/yaz/prt-arc.h
-include/yaz/prt-dat.h
-include/yaz/prt-dia.h
-include/yaz/prt-esp.h
-include/yaz/prt-exd.h
-include/yaz/prt-exp.h
-include/yaz/prt-grs.h
-include/yaz/prt-proto.h
-include/yaz/prt-rsc.h
-include/yaz/prt-univ.h
+include/yaz/zoom.h
 lib/libyaz.a
-@dirrm include/yaz
+lib/libyaz.la
+lib/libyazthread.a
+lib/libyazthread.la
+share/aclocal/yaz.m4
+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/asn.xml
+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/client.xml
+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.summary.html
+share/doc/yaz/comstack.xml
+share/doc/yaz/frontend.xml
+share/doc/yaz/future.html
+share/doc/yaz/future.xml
+share/doc/yaz/indexdata.html
+share/doc/yaz/indexdata.xml
+share/doc/yaz/installation.html
+share/doc/yaz/installation.unix.html
+share/doc/yaz/installation.win32.html
+share/doc/yaz/installation.xml
+share/doc/yaz/introduction.html
+share/doc/yaz/introduction.xml
+share/doc/yaz/license.html
+share/doc/yaz/license.other.html
+share/doc/yaz/license.xml
+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/odr.xml
+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/tools.html
+share/doc/yaz/tools.nmem.html
+share/doc/yaz/tools.oid.html
+share/doc/yaz/tools.xml
+share/doc/yaz/yaz.html
+share/doc/yaz/yaz.pdf
+share/doc/yaz/yaz.xml
+share/doc/yaz/zoom.events.html
+share/doc/yaz/zoom.html
+share/doc/yaz/zoom.options.html
+share/doc/yaz/zoom.records.html
+share/doc/yaz/zoom.resultsets.html
+share/doc/yaz/zoom.search.html
+share/doc/yaz/zoom.xml
+share/yaz/ill/ill.tcl
+share/yaz/ill/ill9702.asn
+share/yaz/ill/item-req.asn
+share/yaz/tab/bib1.att
+share/yaz/tab/dan1.att
+share/yaz/tab/danmarc.abs
+share/yaz/tab/danmarc.mar
+share/yaz/tab/explain.abs
+share/yaz/tab/explain.att
+share/yaz/tab/explain.tag
+share/yaz/tab/generic.tag
+share/yaz/tab/gils-a.est
+share/yaz/tab/gils-b.est
+share/yaz/tab/gils-f.est
+share/yaz/tab/gils-g.est
+share/yaz/tab/gils-summary.map
+share/yaz/tab/gils-usmarc.map
+share/yaz/tab/gils-variant.est
+share/yaz/tab/gils.abs
+share/yaz/tab/gils.att
+share/yaz/tab/gils.tag
+share/yaz/tab/meta-b.est
+share/yaz/tab/meta-usmarc.map
+share/yaz/tab/meta.abs
+share/yaz/tab/meta.tag
+share/yaz/tab/summary.abs
+share/yaz/tab/summary.tag
+share/yaz/tab/tagsetg.tag
+share/yaz/tab/tagsetm.tag
+share/yaz/tab/usmarc-b.est
+share/yaz/tab/usmarc.abs
+share/yaz/tab/usmarc.mar
+share/yaz/tab/usmarc.tag
+share/yaz/tab/var1.var
+share/yaz/tab/wais-b.est
+share/yaz/tab/wais-variant.est
+share/yaz/tab/wais.abs
+share/yaz/z39.50/datetime.asn
+share/yaz/z39.50/esadmin.asn
+share/yaz/z39.50/esupdate.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/tab
-@dirrm share/yaz
+@dirrm share/yaz/ill
 @dirrm share/doc/yaz
+@dirrm include/yaz