Update yaz to 4.0.11.

Based on PR#43610 by Wen Heping.
While here, convert tclsh related matters to use pkgsrc frameworks.

--- 4.0.11 2010/07/09

CCL fixes: bug 2895 and bug 3539.

GR1-display: add comma in display - was removed by mistake in
version 4.0.0.

Windows installer: bundle MSVCP90.dll - used by icuuc42.dll.

SRU: Merge cookies on HTTP redirects (Giannis Kosmas <kosmas@lib.uoc.gr>).

--- 4.0.10 2010/06/18

ZOOM C: Add ZOOM_resultset_release. ZOOM_resultset_release releases a
result set from a connection. The result set will be on its own
thereafter; no operations on it will perform retrievals from a target.
Only cached copies are returned.

ZOOM C:fix case for HTTP servers responding with Connection:close.
Ensure that if there is a current task it is resumed (like fetching
more records in a result set) . Bug #3484.

PQF parser: use odr_atoi for Odr_int (not atoi)

Minor PQF encoding and decoding changes; reformat. PQF decoding: attribute
values that contain any non-digits are treated as string attributes
(previously decoding only checked for leading character ([0-9]). PQF
encoding: attribute string values are not surrounded by double-quotes.

3 files changed, 15 insertions, 16 deletions

diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index de9c548e80b..8750dc214ef 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2010/06/05 14:34:38 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2010/07/14 12:53:50 obache Exp $
 #
 
-DISTNAME=	yaz-4.0.9
+DISTNAME=	yaz-4.0.11
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/yaz/
 
@@ -10,14 +10,11 @@ HOMEPAGE=	http://indexdata.dk/yaz/
 COMMENT=	C/C++ toolkit for the development of Z39.50v3/SRW clients and servers
 LICENSE=	modified-bsd
 
-# needed during installation
-BUILD_DEPENDS+=	tcl-[0-9]*:../../lang/tcl
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pkg-config tclsh
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.libiconv}
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--with-xml2=${BUILDLINK_PREFIX.libxml2}
@@ -25,11 +22,11 @@ CONFIGURE_ARGS+=	--with-xml2=${BUILDLINK_PREFIX.libxml2}
 PTHREAD_OPTS+=	native optional
 
 # don't depend on tcl, but fix the path to tclsh anyway
-CHECK_INTERPRETER_SKIP=	util/yaz-asncomp
-SUBST_CLASSES+=		tclsh
-SUBST_SED.tclsh+=	-e 's,/usr/bin/tclsh,${PREFIX}/bin/tclsh,'
-SUBST_FILES.tclsh+=	util/yaz-asncomp
-SUBST_STAGE.tclsh+=	post-build
+CHECK_INTERPRETER_SKIP=	bin/yaz-asncomp
+REPLACE_INTERPRETER+=	tclsh
+REPLACE.tclsh.old=	.*tclsh
+REPLACE.tclsh.new=	${TCLSH}
+REPLACE_FILES.tclsh=	util/yaz-asncomp
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/yaz/PLIST b/net/yaz/PLIST
index f6dcdb6eedb..fc6626d2b66 100644
--- a/net/yaz/PLIST
+++ b/net/yaz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2010/06/05 14:34:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2010/07/14 12:53:51 obache Exp $
 bin/yaz-asncomp
 bin/yaz-client
 bin/yaz-config
@@ -90,6 +90,7 @@ 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
@@ -217,6 +218,7 @@ 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/facet.asn
 share/yaz/z39.50/mterm2.asn
 share/yaz/z39.50/oclcui.asn
 share/yaz/z39.50/univres.asn
diff --git a/net/yaz/distinfo b/net/yaz/distinfo
index e0c94119afe..8afde076fd8 100644
--- a/net/yaz/distinfo
+++ b/net/yaz/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2010/06/05 14:34:38 wiz Exp $
+$NetBSD: distinfo,v 1.21 2010/07/14 12:53:51 obache Exp $
 
-SHA1 (yaz-4.0.9.tar.gz) = b2bfd1f44001a9316d25d96bc597f6e088a1b4f3
-RMD160 (yaz-4.0.9.tar.gz) = b150a1f07a936d1edb17055855ba911e8022f945
-Size (yaz-4.0.9.tar.gz) = 2242501 bytes
+SHA1 (yaz-4.0.11.tar.gz) = 2800d6f88c21404d5f017276d2308225bf1a67d9
+RMD160 (yaz-4.0.11.tar.gz) = 5b56d6e53dbb8b2edded13fe5602c88cca02d10c
+Size (yaz-4.0.11.tar.gz) = 2248742 bytes