Update to 4.0.1, bump ABI depends for shlib major change.

--- 4.0.1 2010/01/26

New glob file pattern utility. Like POSIX glob. For Windows too. Refer to
yaz/file_glob.h.

New simple local-file XML include facility which allows file glob-patterns.
Refer to yaz/xml_include.h.

Utility yaz-json-parse which parses JSON and demonstrates the JSON parser
API.

ZOOM_record_get supports new parameter "format" which makes it format XML
record content.

Fix JSON parser WRT start symbol. The start grammar symbol (referred to as
JSONText in ECMA-262) is JSONValue, not JSONObject.

--- 4.0.0 2010/01/20

Windows binaries for YAZ now compiled with Visual Studio 2008 (VC9).
Older versions of YAZ was compiled with Visual Studio 6.0 (1998).

Update so/DLL to version 4. Windows version builds YAZ4.DLL.
POSIX/Unix builds .so with major version 4.

Remove old LOG_-defines from log.h. They have been obsolete and
undefined by default for the last 5 years.

Odr_int is now of type 'long long'. Used to be 'int' in YAZ 3 series.

GFS: Remove socket (int *fd) from search_rr handler. The socket
descriptor ptr is a facility that allowed a search handler to supply
a socket which would serve as a callback - when search was complete.
This facility has now been in use for years.

COMSTACK API changes: cs_stackerr, cs_addrstr. COMSTACK method cs_stackerr
removed. It is not implemented by tcpip or unix COMSTACK, perhaps for ISO
SR which was removed 7 years ago. COMSTACK macro / method cs_addrstr now
returns 'const char *' rather than 'char *. The returned string is
read-only and should not be modified by applications. COMSTACK cs_close is
now a void function - it no longer returns int. No applications check for
the value and the implementations has always returned 0.

ZOOM: use size_t for scan hit counts and str size. Functions
ZOOM_scanset_term and ZOOM_scanset_display_term have changed, so that
occ (hit count) and len (string length) are now of type size_t pointer
rather than int pointer. This is to be able to represent large hit counts
and to also just to use the proper type for string length (strlen result).

New JSON parser. Refer to include/yaz/json.h .

WRBUF API changes.. For size parameters for WRBUF size_t is now used ..
Used to be int in some cases. Many wrbuf_-functions used to return an int
indicating some length.. These return values were never used. And so they
are now void.

ODR: odr_malloc, odr_total now takes size_t for size.

clone_z_type: fix leak; occurred for encoding failures.

4 files changed, 16 insertions, 11 deletions

diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 7ecac840271..00b3166103b 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/01/17 12:02:37 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/02/04 11:17:06 wiz Exp $
 #
 
-DISTNAME=	yaz-3.0.52
-PKGREVISION=	1
+DISTNAME=	yaz-4.0.1
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/yaz/
 
diff --git a/net/yaz/PLIST b/net/yaz/PLIST
index fd8a22ef560..0991d63adec 100644
--- a/net/yaz/PLIST
+++ b/net/yaz/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.10 2009/11/15 21:22:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/02/04 11:17:06 wiz Exp $
 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-ztest
 bin/zoomsh
@@ -19,12 +20,14 @@ 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/file_glob.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/marcdisp.h
@@ -64,6 +67,7 @@ include/yaz/tpath.h
 include/yaz/unix.h
 include/yaz/wrbuf.h
 include/yaz/xmalloc.h
+include/yaz/xml_include.h
 include/yaz/xmlquery.h
 include/yaz/xmltypes.h
 include/yaz/yaz-ccl.h
@@ -111,6 +115,7 @@ man/man1/yaz-client.1
 man/man1/yaz-iconv.1
 man/man1/yaz-icu.1
 man/man1/yaz-illclient.1
+man/man1/yaz-json-parse.1
 man/man1/yaz-marcdump.1
 man/man1/zoomsh.1
 man/man7/bib1-attr.7
@@ -175,6 +180,7 @@ 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-ztest.html
diff --git a/net/yaz/buildlink3.mk b/net/yaz/buildlink3.mk
index 7aceefca1ae..92157530a7e 100644
--- a/net/yaz/buildlink3.mk
+++ b/net/yaz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2010/01/17 12:02:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/02/04 11:17:06 wiz Exp $
 
 BUILDLINK_TREE+=	yaz
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	yaz
 YAZ_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.yaz+=	yaz>=2.0
-BUILDLINK_ABI_DEPENDS.yaz+=	yaz>=3.0.52nb1
+BUILDLINK_ABI_DEPENDS.yaz+=	yaz>=4.0
 BUILDLINK_PKGSRCDIR.yaz?=	../../net/yaz
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/net/yaz/distinfo b/net/yaz/distinfo
index ecf2cfcd2d7..7880e96eccc 100644
--- a/net/yaz/distinfo
+++ b/net/yaz/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2009/12/08 21:17:45 wiz Exp $
+$NetBSD: distinfo,v 1.16 2010/02/04 11:17:06 wiz Exp $
 
-SHA1 (yaz-3.0.52.tar.gz) = 02a84fafb9bc3f2a16d98cf3229d5016b9d7fa87
-RMD160 (yaz-3.0.52.tar.gz) = 5829b009e692989f4e1e82902faaf26cbc683d04
-Size (yaz-3.0.52.tar.gz) = 2162836 bytes
+SHA1 (yaz-4.0.1.tar.gz) = bbe116f1e7b46cdebb0c93467a077d85cdb37d97
+RMD160 (yaz-4.0.1.tar.gz) = 777ed657adad65d2920e649092c0f00a3194cbcb
+Size (yaz-4.0.1.tar.gz) = 2190752 bytes