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 (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 (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,224 +1,226 @@ @@ -1,224 +1,226 @@
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
15include/yaz/charneg.h 15include/yaz/charneg.h
16include/yaz/comstack.h 16include/yaz/comstack.h
17include/yaz/copy_types.h 17include/yaz/copy_types.h
18include/yaz/cql.h 18include/yaz/cql.h
19include/yaz/daemon.h 19include/yaz/daemon.h
20include/yaz/diagbib1.h 20include/yaz/diagbib1.h
21include/yaz/diagsru_update.h 21include/yaz/diagsru_update.h
22include/yaz/diagsrw.h 22include/yaz/diagsrw.h
23include/yaz/dirent.h 23include/yaz/dirent.h
24include/yaz/errno.h 24include/yaz/errno.h
25include/yaz/file_glob.h 25include/yaz/file_glob.h
26include/yaz/gettimeofday.h 26include/yaz/gettimeofday.h
27include/yaz/icu.h 27include/yaz/icu.h
28include/yaz/ill-core.h 28include/yaz/ill-core.h
29include/yaz/ill.h 29include/yaz/ill.h
30include/yaz/item-req.h 30include/yaz/item-req.h
31include/yaz/json.h 31include/yaz/json.h
32include/yaz/log.h 32include/yaz/log.h
33include/yaz/logrpn.h 33include/yaz/logrpn.h
34include/yaz/marcdisp.h 34include/yaz/marcdisp.h
35include/yaz/match_glob.h 35include/yaz/match_glob.h
36include/yaz/matchstr.h 36include/yaz/matchstr.h
37include/yaz/mutex.h 37include/yaz/mutex.h
38include/yaz/nmem.h 38include/yaz/nmem.h
39include/yaz/nmem_xml.h 39include/yaz/nmem_xml.h
40include/yaz/oclc-ill-req-ext.h 40include/yaz/oclc-ill-req-ext.h
41include/yaz/odr.h 41include/yaz/odr.h
42include/yaz/oid_db.h 42include/yaz/oid_db.h
43include/yaz/oid_std.h 43include/yaz/oid_std.h
44include/yaz/oid_util.h 44include/yaz/oid_util.h
45include/yaz/options.h 45include/yaz/options.h
46include/yaz/otherinfo.h 46include/yaz/otherinfo.h
47include/yaz/poll.h 47include/yaz/poll.h
48include/yaz/pquery.h 48include/yaz/pquery.h
49include/yaz/proto.h 49include/yaz/proto.h
50include/yaz/prt-ext.h 50include/yaz/prt-ext.h
51include/yaz/query-charset.h 51include/yaz/query-charset.h
52include/yaz/querytowrbuf.h 52include/yaz/querytowrbuf.h
53include/yaz/readconf.h 53include/yaz/readconf.h
54include/yaz/record_conv.h 54include/yaz/record_conv.h
55include/yaz/retrieval.h 55include/yaz/retrieval.h
56include/yaz/rpn2cql.h 56include/yaz/rpn2cql.h
57include/yaz/sc.h 57include/yaz/sc.h
58include/yaz/shptr.h 58include/yaz/shptr.h
59include/yaz/snprintf.h 59include/yaz/snprintf.h
60include/yaz/soap.h 60include/yaz/soap.h
61include/yaz/sortspec.h 61include/yaz/sortspec.h
62include/yaz/spipe.h 62include/yaz/spipe.h
63include/yaz/srw.h 63include/yaz/srw.h
64include/yaz/statserv.h 64include/yaz/statserv.h
65include/yaz/tcpip.h 65include/yaz/tcpip.h
66include/yaz/test.h 66include/yaz/test.h
67include/yaz/thread_create.h 67include/yaz/thread_create.h
68include/yaz/thread_id.h 68include/yaz/thread_id.h
69include/yaz/timing.h 69include/yaz/timing.h
70include/yaz/tokenizer.h 70include/yaz/tokenizer.h
71include/yaz/tpath.h 71include/yaz/tpath.h
72include/yaz/unix.h 72include/yaz/unix.h
73include/yaz/wrbuf.h 73include/yaz/wrbuf.h
74include/yaz/xmalloc.h 74include/yaz/xmalloc.h
75include/yaz/xml_include.h 75include/yaz/xml_include.h
76include/yaz/xmlquery.h 76include/yaz/xmlquery.h
77include/yaz/xmltypes.h 77include/yaz/xmltypes.h
78include/yaz/yaz-ccl.h 78include/yaz/yaz-ccl.h
79include/yaz/yaz-iconv.h 79include/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
106include/yaz/zes-order.h 107include/yaz/zes-order.h
107include/yaz/zes-pquery.h 108include/yaz/zes-pquery.h
108include/yaz/zes-psched.h 109include/yaz/zes-psched.h
109include/yaz/zes-pset.h 110include/yaz/zes-pset.h
110include/yaz/zes-update.h 111include/yaz/zes-update.h
111include/yaz/zes-update0.h 112include/yaz/zes-update0.h
112include/yaz/zgdu.h 113include/yaz/zgdu.h
113include/yaz/zoom.h 114include/yaz/zoom.h
114lib/libyaz.la 115lib/libyaz.la
115lib/libyaz_icu.la 116lib/libyaz_icu.la
116lib/libyaz_server.la 117lib/libyaz_server.la
117lib/pkgconfig/yaz.pc 118lib/pkgconfig/yaz.pc
118man/man1/yaz-asncomp.1 119man/man1/yaz-asncomp.1
119man/man1/yaz-client.1 120man/man1/yaz-client.1
120man/man1/yaz-iconv.1 121man/man1/yaz-iconv.1
121man/man1/yaz-icu.1 122man/man1/yaz-icu.1
122man/man1/yaz-illclient.1 123man/man1/yaz-illclient.1
123man/man1/yaz-json-parse.1 124man/man1/yaz-json-parse.1
124man/man1/yaz-marcdump.1 125man/man1/yaz-marcdump.1
125man/man1/zoomsh.1 126man/man1/zoomsh.1
126man/man7/bib1-attr.7 127man/man7/bib1-attr.7
127man/man7/yaz-log.7 128man/man7/yaz-log.7
128man/man7/yaz.7 129man/man7/yaz.7
129man/man8/yaz-config.8 130man/man8/yaz-config.8
130man/man8/yaz-ztest.8 131man/man8/yaz-ztest.8
131share/aclocal/yaz.m4 132share/aclocal/yaz.m4
132share/doc/yaz/apilayer.png 133share/doc/yaz/apilayer.png
133share/doc/yaz/asn.external.html 134share/doc/yaz/asn.external.html
134share/doc/yaz/asn.html 135share/doc/yaz/asn.html
135share/doc/yaz/asn.pdu.html 136share/doc/yaz/asn.pdu.html
136share/doc/yaz/asn.preparing.html 137share/doc/yaz/asn.preparing.html
137share/doc/yaz/bib1.html 138share/doc/yaz/bib1.html
138share/doc/yaz/common/id.png 139share/doc/yaz/common/id.png
139share/doc/yaz/common/style1.css 140share/doc/yaz/common/style1.css
140share/doc/yaz/comstack.addresses.html 141share/doc/yaz/comstack.addresses.html
141share/doc/yaz/comstack.client.html 142share/doc/yaz/comstack.client.html
142share/doc/yaz/comstack.common.html 143share/doc/yaz/comstack.common.html
143share/doc/yaz/comstack.diagnostics.html 144share/doc/yaz/comstack.diagnostics.html
144share/doc/yaz/comstack.html 145share/doc/yaz/comstack.html
145share/doc/yaz/comstack.introduction.html 146share/doc/yaz/comstack.introduction.html
146share/doc/yaz/comstack.server.html 147share/doc/yaz/comstack.server.html
147share/doc/yaz/comstack.ssl.html 148share/doc/yaz/comstack.ssl.html
148share/doc/yaz/comstack.summary.html 149share/doc/yaz/comstack.summary.html
149share/doc/yaz/credits.html 150share/doc/yaz/credits.html
150share/doc/yaz/future.html 151share/doc/yaz/future.html
151share/doc/yaz/index.html 152share/doc/yaz/index.html
152share/doc/yaz/indexdata.html 153share/doc/yaz/indexdata.html
153share/doc/yaz/installation.html 154share/doc/yaz/installation.html
154share/doc/yaz/installation.unix.html 155share/doc/yaz/installation.unix.html
155share/doc/yaz/installation.win32.html 156share/doc/yaz/installation.win32.html
156share/doc/yaz/introduction.api.html 157share/doc/yaz/introduction.api.html
157share/doc/yaz/introduction.html 158share/doc/yaz/introduction.html
158share/doc/yaz/license.html 159share/doc/yaz/license.html
159share/doc/yaz/list-oids.html 160share/doc/yaz/list-oids.html
160share/doc/yaz/marc.html 161share/doc/yaz/marc.html
161share/doc/yaz/odr.debugging.html 162share/doc/yaz/odr.debugging.html
162share/doc/yaz/odr.html 163share/doc/yaz/odr.html
163share/doc/yaz/odr.programming.html 164share/doc/yaz/odr.programming.html
164share/doc/yaz/odr.use.html 165share/doc/yaz/odr.use.html
165share/doc/yaz/reference.html 166share/doc/yaz/reference.html
166share/doc/yaz/server.backend.html 167share/doc/yaz/server.backend.html
167share/doc/yaz/server.backendfunctions.html 168share/doc/yaz/server.backendfunctions.html
168share/doc/yaz/server.frontend.html 169share/doc/yaz/server.frontend.html
169share/doc/yaz/server.html 170share/doc/yaz/server.html
170share/doc/yaz/server.invocation.html 171share/doc/yaz/server.invocation.html
171share/doc/yaz/server.main.html 172share/doc/yaz/server.main.html
172share/doc/yaz/server.vhosts.html 173share/doc/yaz/server.vhosts.html
173share/doc/yaz/soap.html 174share/doc/yaz/soap.html
174share/doc/yaz/soap.http.html 175share/doc/yaz/soap.http.html
175share/doc/yaz/soap.srw.html 176share/doc/yaz/soap.srw.html
176share/doc/yaz/soap.xml.html 177share/doc/yaz/soap.xml.html
177share/doc/yaz/tools.html 178share/doc/yaz/tools.html
178share/doc/yaz/tools.log.html 179share/doc/yaz/tools.log.html
179share/doc/yaz/tools.nmem.html 180share/doc/yaz/tools.nmem.html
180share/doc/yaz/tools.oid.html 181share/doc/yaz/tools.oid.html
181share/doc/yaz/tools.retrieval.html 182share/doc/yaz/tools.retrieval.html
182share/doc/yaz/yaz-asncomp.html 183share/doc/yaz/yaz-asncomp.html
183share/doc/yaz/yaz-client.html 184share/doc/yaz/yaz-client.html
184share/doc/yaz/yaz-config.html 185share/doc/yaz/yaz-config.html
185share/doc/yaz/yaz-iconv.html 186share/doc/yaz/yaz-iconv.html
186share/doc/yaz/yaz-icu.html 187share/doc/yaz/yaz-icu.html
187share/doc/yaz/yaz-illclient.html 188share/doc/yaz/yaz-illclient.html
188share/doc/yaz/yaz-json-parse.html 189share/doc/yaz/yaz-json-parse.html
189share/doc/yaz/yaz-log.html 190share/doc/yaz/yaz-log.html
190share/doc/yaz/yaz-marcdump.html 191share/doc/yaz/yaz-marcdump.html
191share/doc/yaz/yaz-ztest.html 192share/doc/yaz/yaz-ztest.html
192share/doc/yaz/yaz.html 193share/doc/yaz/yaz.html
193share/doc/yaz/zoom.events.html 194share/doc/yaz/zoom.events.html
194share/doc/yaz/zoom.extendedservices.html 195share/doc/yaz/zoom.extendedservices.html
195share/doc/yaz/zoom.html 196share/doc/yaz/zoom.html
196share/doc/yaz/zoom.options.html 197share/doc/yaz/zoom.options.html
197share/doc/yaz/zoom.query.html 198share/doc/yaz/zoom.query.html
198share/doc/yaz/zoom.records.html 199share/doc/yaz/zoom.records.html
199share/doc/yaz/zoom.resultsets.html 200share/doc/yaz/zoom.resultsets.html
200share/doc/yaz/zoom.scan.html 201share/doc/yaz/zoom.scan.html
201share/doc/yaz/zoomsh.html 202share/doc/yaz/zoomsh.html
202share/yaz/etc/MARC21slim2DC.xsl 203share/yaz/etc/MARC21slim2DC.xsl
203share/yaz/etc/MARC21slim2MODS.xsl 204share/yaz/etc/MARC21slim2MODS.xsl
204share/yaz/etc/MARC21slim2RDFDC.xsl 205share/yaz/etc/MARC21slim2RDFDC.xsl
205share/yaz/etc/MARC21slimUtils.xsl 206share/yaz/etc/MARC21slimUtils.xsl
206share/yaz/etc/cqlpass.properties 207share/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 (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