Wed Jul 14 12:53:51 2010 UTC ()
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.


(obache)
diff -r1.33 -r1.34 pkgsrc/net/yaz/Makefile
diff -r1.13 -r1.14 pkgsrc/net/yaz/PLIST
diff -r1.20 -r1.21 pkgsrc/net/yaz/distinfo
cvs diff -r1.33 -r1.34 pkgsrc/net/yaz/Makefile (expand / switch to unified diff)

--- pkgsrc/net/yaz/Makefile 2010/06/05 14:34:38 1.33
+++ pkgsrc/net/yaz/Makefile 2010/07/14 12:53:50 1.34
@@ -1,40 +1,37 @@ @@ -1,40 +1,37 @@
1# $NetBSD: Makefile,v 1.33 2010/06/05 14:34:38 wiz Exp $ 1# $NetBSD: Makefile,v 1.34 2010/07/14 12:53:50 obache Exp $
2# 2#
3 3
4DISTNAME= yaz-4.0.9 4DISTNAME= yaz-4.0.11
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://ftp.indexdata.dk/pub/yaz/ 6MASTER_SITES= http://ftp.indexdata.dk/pub/yaz/
7 7
8MAINTAINER= phil@NetBSD.org 8MAINTAINER= phil@NetBSD.org
9HOMEPAGE= http://indexdata.dk/yaz/ 9HOMEPAGE= http://indexdata.dk/yaz/
10COMMENT= C/C++ toolkit for the development of Z39.50v3/SRW clients and servers 10COMMENT= C/C++ toolkit for the development of Z39.50v3/SRW clients and servers
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13# needed during installation 
14BUILD_DEPENDS+= tcl-[0-9]*:../../lang/tcl 
15 
16PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
17 14
18GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
19USE_LIBTOOL= YES 16USE_LIBTOOL= YES
20USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config tclsh
21CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.libiconv} 18CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.libiconv}
22CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 19CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
23CONFIGURE_ARGS+= --with-xml2=${BUILDLINK_PREFIX.libxml2} 20CONFIGURE_ARGS+= --with-xml2=${BUILDLINK_PREFIX.libxml2}
24 21
25PTHREAD_OPTS+= native optional 22PTHREAD_OPTS+= native optional
26 23
27# don't depend on tcl, but fix the path to tclsh anyway 24# don't depend on tcl, but fix the path to tclsh anyway
28CHECK_INTERPRETER_SKIP= util/yaz-asncomp 25CHECK_INTERPRETER_SKIP= bin/yaz-asncomp
29SUBST_CLASSES+= tclsh 26REPLACE_INTERPRETER+= tclsh
30SUBST_SED.tclsh+= -e 's,/usr/bin/tclsh,${PREFIX}/bin/tclsh,' 27REPLACE.tclsh.old= .*tclsh
31SUBST_FILES.tclsh+= util/yaz-asncomp 28REPLACE.tclsh.new= ${TCLSH}
32SUBST_STAGE.tclsh+= post-build 29REPLACE_FILES.tclsh= util/yaz-asncomp
33 30
34.include "../../converters/libiconv/buildlink3.mk" 31.include "../../converters/libiconv/buildlink3.mk"
35.include "../../security/openssl/buildlink3.mk" 32.include "../../security/openssl/buildlink3.mk"
36.include "../../textproc/icu/buildlink3.mk" 33.include "../../textproc/icu/buildlink3.mk"
37.include "../../textproc/libxslt/buildlink3.mk" 34.include "../../textproc/libxslt/buildlink3.mk"
38.include "../../textproc/libxml2/buildlink3.mk" 35.include "../../textproc/libxml2/buildlink3.mk"
39.include "../../mk/pthread.buildlink3.mk" 36.include "../../mk/pthread.buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/net/yaz/PLIST (expand / switch to unified diff)

--- pkgsrc/net/yaz/PLIST 2010/06/05 14:34:38 1.13
+++ pkgsrc/net/yaz/PLIST 2010/07/14 12:53:51 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2010/06/05 14:34:38 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.14 2010/07/14 12:53:51 obache Exp $
2bin/yaz-asncomp 2bin/yaz-asncomp
3bin/yaz-client 3bin/yaz-client
4bin/yaz-config 4bin/yaz-config
5bin/yaz-iconv 5bin/yaz-iconv
6bin/yaz-icu 6bin/yaz-icu
7bin/yaz-illclient 7bin/yaz-illclient
8bin/yaz-json-parse 8bin/yaz-json-parse
9bin/yaz-marcdump 9bin/yaz-marcdump
10bin/yaz-ztest 10bin/yaz-ztest
11bin/zoomsh 11bin/zoomsh
12include/yaz/backend.h 12include/yaz/backend.h
13include/yaz/ccl.h 13include/yaz/ccl.h
14include/yaz/ccl_xml.h 14include/yaz/ccl_xml.h
@@ -80,26 +80,27 @@ include/yaz/yaz-iconv.h @@ -80,26 +80,27 @@ include/yaz/yaz-iconv.h
80include/yaz/yaz-util.h 80include/yaz/yaz-util.h
81include/yaz/yaz-version.h 81include/yaz/yaz-version.h
82include/yaz/yconfig.h 82include/yaz/yconfig.h
83include/yaz/z-accdes1.h 83include/yaz/z-accdes1.h
84include/yaz/z-accform1.h 84include/yaz/z-accform1.h
85include/yaz/z-acckrb1.h 85include/yaz/z-acckrb1.h
86include/yaz/z-charneg.h 86include/yaz/z-charneg.h
87include/yaz/z-core.h 87include/yaz/z-core.h
88include/yaz/z-date.h 88include/yaz/z-date.h
89include/yaz/z-diag1.h 89include/yaz/z-diag1.h
90include/yaz/z-espec1.h 90include/yaz/z-espec1.h
91include/yaz/z-estask.h 91include/yaz/z-estask.h
92include/yaz/z-exp.h 92include/yaz/z-exp.h
 93include/yaz/z-facet-1.h
93include/yaz/z-grs.h 94include/yaz/z-grs.h
94include/yaz/z-mterm2.h 95include/yaz/z-mterm2.h
95include/yaz/z-oclcui.h 96include/yaz/z-oclcui.h
96include/yaz/z-opac.h 97include/yaz/z-opac.h
97include/yaz/z-rrf1.h 98include/yaz/z-rrf1.h
98include/yaz/z-rrf2.h 99include/yaz/z-rrf2.h
99include/yaz/z-sum.h 100include/yaz/z-sum.h
100include/yaz/z-sutrs.h 101include/yaz/z-sutrs.h
101include/yaz/z-uifr1.h 102include/yaz/z-uifr1.h
102include/yaz/z-univ.h 103include/yaz/z-univ.h
103include/yaz/zes-admin.h 104include/yaz/zes-admin.h
104include/yaz/zes-expi.h 105include/yaz/zes-expi.h
105include/yaz/zes-exps.h 106include/yaz/zes-exps.h
@@ -207,18 +208,19 @@ share/yaz/etc/cqlpass.properties @@ -207,18 +208,19 @@ share/yaz/etc/cqlpass.properties
207share/yaz/etc/maps.xml 208share/yaz/etc/maps.xml
208share/yaz/etc/marc21_to_endnote.xsl 209share/yaz/etc/marc21_to_endnote.xsl
209share/yaz/etc/opacxml.xsd 210share/yaz/etc/opacxml.xsd
210share/yaz/etc/pqf.properties 211share/yaz/etc/pqf.properties
211share/yaz/etc/yazgfs.xml 212share/yaz/etc/yazgfs.xml
212share/yaz/ill/ill.tcl 213share/yaz/ill/ill.tcl
213share/yaz/ill/ill9702.asn 214share/yaz/ill/ill9702.asn
214share/yaz/ill/item-req.asn 215share/yaz/ill/item-req.asn
215share/yaz/ill/oclc-ill-req-ext.asn 216share/yaz/ill/oclc-ill-req-ext.asn
216share/yaz/z39.50/charneg-3.asn 217share/yaz/z39.50/charneg-3.asn
217share/yaz/z39.50/datetime.asn 218share/yaz/z39.50/datetime.asn
218share/yaz/z39.50/esadmin.asn 219share/yaz/z39.50/esadmin.asn
219share/yaz/z39.50/esupdate.asn 220share/yaz/z39.50/esupdate.asn
 221share/yaz/z39.50/facet.asn
220share/yaz/z39.50/mterm2.asn 222share/yaz/z39.50/mterm2.asn
221share/yaz/z39.50/oclcui.asn 223share/yaz/z39.50/oclcui.asn
222share/yaz/z39.50/univres.asn 224share/yaz/z39.50/univres.asn
223share/yaz/z39.50/z.tcl 225share/yaz/z39.50/z.tcl
224share/yaz/z39.50/z3950v3.asn 226share/yaz/z39.50/z3950v3.asn
cvs diff -r1.20 -r1.21 pkgsrc/net/yaz/distinfo (expand / switch to unified diff)

--- pkgsrc/net/yaz/distinfo 2010/06/05 14:34:38 1.20
+++ pkgsrc/net/yaz/distinfo 2010/07/14 12:53:51 1.21
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.20 2010/06/05 14:34:38 wiz Exp $ 1$NetBSD: distinfo,v 1.21 2010/07/14 12:53:51 obache Exp $
2 2
3SHA1 (yaz-4.0.9.tar.gz) = b2bfd1f44001a9316d25d96bc597f6e088a1b4f3 3SHA1 (yaz-4.0.11.tar.gz) = 2800d6f88c21404d5f017276d2308225bf1a67d9
4RMD160 (yaz-4.0.9.tar.gz) = b150a1f07a936d1edb17055855ba911e8022f945 4RMD160 (yaz-4.0.11.tar.gz) = 5b56d6e53dbb8b2edded13fe5602c88cca02d10c
5Size (yaz-4.0.9.tar.gz) = 2242501 bytes 5Size (yaz-4.0.11.tar.gz) = 2248742 bytes