diff options
| -rw-r--r-- | net/yaz/Makefile | 31 | ||||
| -rw-r--r-- | net/yaz/PLIST | 52 | ||||
| -rw-r--r-- | net/yaz/buildlink3.mk | 12 | ||||
| -rw-r--r-- | net/yaz/distinfo | 8 |
4 files changed, 67 insertions, 36 deletions
diff --git a/net/yaz/Makefile b/net/yaz/Makefile index 3f021eb2612..da73eab07de 100644 --- a/net/yaz/Makefile +++ b/net/yaz/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2008/07/14 12:56:11 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2008/10/16 21:21:56 wiz Exp $ # -DISTNAME= yaz-2.1.56 -PKGREVISION= 2 +DISTNAME= yaz-3.0.36 CATEGORIES= net MASTER_SITES= http://ftp.indexdata.dk/pub/yaz/ @@ -10,21 +9,31 @@ MAINTAINER= phil@NetBSD.org HOMEPAGE= http://indexdata.dk/yaz/ COMMENT= C/C++ toolkit for the development of Z39.50v3/SRW clients and servers +# needed during installation +BUILD_DEPENDS+= tcl-[0-9]*:../../lang/tcl + PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= YES GNU_CONFIGURE= YES +USE_LIBTOOL= YES +USE_TOOLS+= pkg-config +CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.libiconv} +CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} +CONFIGURE_ARGS+= --with-xml2=${BUILDLINK_PREFIX.libxml2} PTHREAD_OPTS+= native optional -.include "../../textproc/libxml2/buildlink3.mk" -CONFIGURE_ARGS+= --with-xml2=${BUILDLINK_PREFIX.libxml2} - -.include "../../security/openssl/buildlink3.mk" -CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} +# 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 .include "../../converters/libiconv/buildlink3.mk" -CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.libiconv} - +.include "../../security/openssl/buildlink3.mk" +.include "../../textproc/icu/buildlink3.mk" +.include "../../textproc/libxslt/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/yaz/PLIST b/net/yaz/PLIST index 94b276da903..4b34b0af933 100644 --- a/net/yaz/PLIST +++ b/net/yaz/PLIST @@ -1,21 +1,25 @@ -@comment $NetBSD: PLIST,v 1.5 2007/11/20 05:11:30 phil Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/10/16 21:21:56 wiz Exp $ bin/yaz-asncomp bin/yaz-client bin/yaz-config bin/yaz-iconv +bin/yaz-icu +bin/yaz-illclient bin/yaz-marcdump bin/yaz-ztest -bin/ziffy bin/zoomsh include/yaz/backend.h include/yaz/ccl.h include/yaz/ccl_xml.h include/yaz/charneg.h include/yaz/comstack.h +include/yaz/copy_types.h include/yaz/cql.h +include/yaz/daemon.h include/yaz/diagbib1.h include/yaz/diagsru_update.h include/yaz/diagsrw.h +include/yaz/icu.h include/yaz/ill-core.h include/yaz/ill.h include/yaz/item-req.h @@ -23,19 +27,28 @@ include/yaz/libxml2_error.h include/yaz/log.h include/yaz/logrpn.h include/yaz/marcdisp.h +include/yaz/match_glob.h +include/yaz/mutex.h include/yaz/nmem.h include/yaz/nmem_xml.h +include/yaz/oclc-ill-req-ext.h include/yaz/odr.h -include/yaz/oid.h +include/yaz/oid_db.h +include/yaz/oid_std.h +include/yaz/oid_util.h include/yaz/options.h include/yaz/otherinfo.h +include/yaz/poll.h include/yaz/pquery.h include/yaz/proto.h include/yaz/prt-ext.h +include/yaz/query-charset.h include/yaz/querytowrbuf.h include/yaz/readconf.h include/yaz/record_conv.h include/yaz/retrieval.h +include/yaz/rpn2cql.h +include/yaz/sc.h include/yaz/snprintf.h include/yaz/soap.h include/yaz/sortspec.h @@ -44,6 +57,7 @@ include/yaz/statserv.h include/yaz/tcpip.h include/yaz/test.h include/yaz/timing.h +include/yaz/tokenizer.h include/yaz/tpath.h include/yaz/unix.h include/yaz/wrbuf.h @@ -86,17 +100,16 @@ include/yaz/zes-update.h include/yaz/zes-update0.h include/yaz/zgdu.h include/yaz/zoom.h -lib/libyaz.a lib/libyaz.la -lib/libyaz.so -lib/libyaz.so.2 -lib/libyaz.so.2.0.1 +lib/libyaz_icu.la +lib/libyaz_server.la lib/pkgconfig/yaz.pc man/man1/yaz-asncomp.1 man/man1/yaz-client.1 man/man1/yaz-iconv.1 +man/man1/yaz-icu.1 +man/man1/yaz-illclient.1 man/man1/yaz-marcdump.1 -man/man1/ziffy.1 man/man1/zoomsh.1 man/man7/yaz-log.7 man/man7/yaz.7 @@ -106,13 +119,8 @@ share/aclocal/yaz.m4 share/doc/yaz/apilayer.png 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/client.commands.html -share/doc/yaz/client.html -share/doc/yaz/client.invoking.html -share/doc/yaz/client.searching.html share/doc/yaz/common/id.png share/doc/yaz/common/style1.css share/doc/yaz/comstack.addresses.html @@ -134,12 +142,13 @@ share/doc/yaz/installation.win32.html share/doc/yaz/introduction.api.html share/doc/yaz/introduction.html share/doc/yaz/license.html -share/doc/yaz/license.other.html +share/doc/yaz/list-oids.html share/doc/yaz/marc.html 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/reference.html share/doc/yaz/server.backend.html share/doc/yaz/server.backendfunctions.html share/doc/yaz/server.frontend.html @@ -156,8 +165,16 @@ share/doc/yaz/tools.log.html share/doc/yaz/tools.nmem.html share/doc/yaz/tools.oid.html share/doc/yaz/tools.retrieval.html -share/doc/yaz/ziffy.html -share/doc/yaz/ziffy.using.html +share/doc/yaz/yaz-asncomp.html +share/doc/yaz/yaz-client.html +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-log.html +share/doc/yaz/yaz-marcdump.html +share/doc/yaz/yaz-ztest.html +share/doc/yaz/yaz.html share/doc/yaz/zoom.events.html share/doc/yaz/zoom.extendedservices.html share/doc/yaz/zoom.html @@ -166,17 +183,20 @@ share/doc/yaz/zoom.query.html share/doc/yaz/zoom.records.html share/doc/yaz/zoom.resultsets.html share/doc/yaz/zoom.scan.html +share/doc/yaz/zoomsh.html share/yaz/etc/MARC21slim2DC.xsl share/yaz/etc/MARC21slim2MODS.xsl share/yaz/etc/MARC21slim2RDFDC.xsl share/yaz/etc/MARC21slimUtils.xsl share/yaz/etc/cqlpass.properties share/yaz/etc/maps.xml +share/yaz/etc/opacxml.xsd share/yaz/etc/pqf.properties share/yaz/etc/yazgfs.xml share/yaz/ill/ill.tcl share/yaz/ill/ill9702.asn share/yaz/ill/item-req.asn +share/yaz/ill/oclc-ill-req-ext.asn share/yaz/z39.50/charneg-3.asn share/yaz/z39.50/datetime.asn share/yaz/z39.50/esadmin.asn diff --git a/net/yaz/buildlink3.mk b/net/yaz/buildlink3.mk index ed7d7e4a83f..ee439e8d49c 100644 --- a/net/yaz/buildlink3.mk +++ b/net/yaz/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/01/18 05:08:52 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2008/10/16 21:21:56 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ YAZ_BUILDLINK3_MK:= ${YAZ_BUILDLINK3_MK}+ @@ -13,12 +13,14 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}yaz .if !empty(YAZ_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.yaz+= yaz>=2.0 -BUILDLINK_ABI_DEPENDS.yaz+= yaz>=2.1.56nb2 +BUILDLINK_ABI_DEPENDS.yaz+= yaz>=3.0 BUILDLINK_PKGSRCDIR.yaz?= ../../net/yaz .endif # YAZ_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} - -.include "../../textproc/libxml2/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.include "../../textproc/icu/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" +.include "../../textproc/libxslt/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/net/yaz/distinfo b/net/yaz/distinfo index f464f516436..701e325f661 100644 --- a/net/yaz/distinfo +++ b/net/yaz/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2007/11/20 05:11:30 phil Exp $ +$NetBSD: distinfo,v 1.6 2008/10/16 21:21:56 wiz Exp $ -SHA1 (yaz-2.1.56.tar.gz) = 85e7c2d4b2d3b7ebd31afa65530381a4a9f0b922 -RMD160 (yaz-2.1.56.tar.gz) = e6ef56188bd6de355e71202407af7d8163556627 -Size (yaz-2.1.56.tar.gz) = 1704271 bytes +SHA1 (yaz-3.0.36.tar.gz) = 7166a9ec46411ed0ca1c71fd0fddbea2a32329fc +RMD160 (yaz-3.0.36.tar.gz) = c0083c6eeab5def24a004609537d4267744ab802 +Size (yaz-3.0.36.tar.gz) = 2067444 bytes |