summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/yaz/Makefile16
-rw-r--r--net/yaz/PLIST36
-rw-r--r--net/yaz/buildlink3.mk6
-rw-r--r--net/yaz/distinfo8
-rw-r--r--net/yaz/patches/patch-aa144
5 files changed, 48 insertions, 162 deletions
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 812304f67db..c8990c9482e 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:03 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/06 15:58:26 jwise Exp $
#
-DISTNAME= yaz-2.0
-PKGREVISION= 2
+DISTNAME= yaz-2.1.6
CATEGORIES= net
MASTER_SITES= http://ftp.indexdata.dk/pub/yaz/
-MAINTAINER= tech-pkg@NetBSD.org
+MAINTAINER= jwise@NetBSD.org
HOMEPAGE= http://indexdata.dk/yaz
COMMENT= C/C++ toolkit for the development of Z39.50v3/SRW clients and servers
@@ -15,6 +14,15 @@ GNU_CONFIGURE= YES
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}
+
+.include "../../converters/libiconv/buildlink3.mk"
+CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.libiconv}
+
.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
PLIST_SUBST+= YAZTHREAD="@comment "
diff --git a/net/yaz/PLIST b/net/yaz/PLIST
index f4283a64630..b23bcf5ffbb 100644
--- a/net/yaz/PLIST
+++ b/net/yaz/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:50 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/06/06 15:58:26 jwise Exp $
+bin/yaz-asncomp
bin/yaz-client
-bin/yaz-comp
bin/yaz-config
+bin/yaz-iconv
+bin/yaz-marcdump
bin/yaz-ztest
bin/zoomsh
include/yaz/backend.h
@@ -10,6 +12,7 @@ include/yaz/charneg.h
include/yaz/comstack.h
include/yaz/cql.h
include/yaz/diagbib1.h
+include/yaz/diagsrw.h
include/yaz/ill-core.h
include/yaz/ill.h
include/yaz/item-req.h
@@ -51,6 +54,7 @@ include/yaz/z-estask.h
include/yaz/z-exp.h
include/yaz/z-grs.h
include/yaz/z-mterm2.h
+include/yaz/z-oclcui.h
include/yaz/z-opac.h
include/yaz/z-rrf1.h
include/yaz/z-rrf2.h
@@ -70,14 +74,15 @@ include/yaz/zes-update0.h
include/yaz/zgdu.h
include/yaz/zoom.h
lib/libyaz.la
-lib/libyazmalloc.la
${YAZTHREAD}lib/libyazthread.la
-man/man1/yaz-client-ssl.1
+man/man1/yaz-asncomp.1
man/man1/yaz-client.1
-man/man1/yaz-config.1
+man/man1/yaz-iconv.1
+man/man1/yaz-marcdump.1
man/man1/zoomsh.1
+man/man7/yaz-log.7
man/man7/yaz.7
-man/man8/yaz-ztest-ssl.8
+man/man8/yaz-config.8
man/man8/yaz-ztest.8
share/aclocal/yaz.m4
share/doc/yaz/apilayer.png
@@ -97,6 +102,7 @@ share/doc/yaz/comstack.diagnostics.html
share/doc/yaz/comstack.html
share/doc/yaz/comstack.introduction.html
share/doc/yaz/comstack.server.html
+share/doc/yaz/comstack.ssl.html
share/doc/yaz/comstack.summary.html
share/doc/yaz/credits.html
share/doc/yaz/future.html
@@ -119,13 +125,17 @@ share/doc/yaz/server.frontend.html
share/doc/yaz/server.html
share/doc/yaz/server.invocation.html
share/doc/yaz/server.main.html
+share/doc/yaz/server.vhosts.html
share/doc/yaz/soap.html
share/doc/yaz/soap.http.html
share/doc/yaz/soap.srw.html
share/doc/yaz/soap.xml.html
share/doc/yaz/tools.html
+share/doc/yaz/tools.log.html
+share/doc/yaz/tools.marc.html
share/doc/yaz/tools.nmem.html
share/doc/yaz/tools.oid.html
+share/doc/yaz/yaz.css
share/doc/yaz/yaz.html
share/doc/yaz/yaz.pdf
share/doc/yaz/zoom.events.html
@@ -135,6 +145,12 @@ 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/yaz/etc/MARC21slim2DC.xsl
+share/yaz/etc/MARC21slim2MODS.xsl
+share/yaz/etc/MARC21slim2RDFDC.xsl
+share/yaz/etc/MARC21slimUtils.xsl
+share/yaz/etc/maps.xml
+share/yaz/etc/pqf.properties
share/yaz/ill/ill.tcl
share/yaz/ill/ill9702.asn
share/yaz/ill/item-req.asn
@@ -143,11 +159,13 @@ share/yaz/z39.50/datetime.asn
share/yaz/z39.50/esadmin.asn
share/yaz/z39.50/esupdate.asn
share/yaz/z39.50/mterm2.asn
+share/yaz/z39.50/oclcui.asn
share/yaz/z39.50/univres.asn
share/yaz/z39.50/z.tcl
share/yaz/z39.50/z3950v3.asn
-@dirrm share/yaz/z39.50
+@dirrm include/yaz
+@dirrm share/doc/yaz
+@dirrm share/yaz/etc
@dirrm share/yaz/ill
+@dirrm share/yaz/z39.50
@dirrm share/yaz
-@dirrm share/doc/yaz
-@dirrm include/yaz
diff --git a/net/yaz/buildlink3.mk b/net/yaz/buildlink3.mk
index 6dcbc1f50aa..90810008bb1 100644
--- a/net/yaz/buildlink3.mk
+++ b/net/yaz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:02 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/06/06 15:58:26 jwise Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
YAZ_BUILDLINK3_MK:= ${YAZ_BUILDLINK3_MK}+
@@ -17,3 +17,7 @@ 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"
diff --git a/net/yaz/distinfo b/net/yaz/distinfo
index 662858ef0f3..f8ceb8899d3 100644
--- a/net/yaz/distinfo
+++ b/net/yaz/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 12:14:07 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/06/06 15:58:26 jwise Exp $
-SHA1 (yaz-2.0.tar.gz) = 5ded060bf62f12a734e77f8123bd3d72b9dc971f
-RMD160 (yaz-2.0.tar.gz) = 3112bde2e09c42e90c7221db156895a9935f144e
-Size (yaz-2.0.tar.gz) = 1047876 bytes
+SHA1 (yaz-2.1.6.tar.gz) = 491e6a2198f6c55ecb31c416fc03c3bc638ed084
+RMD160 (yaz-2.1.6.tar.gz) = dfd22bc45c5e887938daf77ccc2f23ea3c1c5ea0
+Size (yaz-2.1.6.tar.gz) = 1797967 bytes
SHA1 (patch-aa) = dac005456e824a99dba4fd3effc05ede0425c1cd
diff --git a/net/yaz/patches/patch-aa b/net/yaz/patches/patch-aa
deleted file mode 100644
index a3e03016e40..00000000000
--- a/net/yaz/patches/patch-aa
+++ /dev/null
@@ -1,144 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/05/16 12:17:27 dmcmahill Exp $
-
-These patches are needed to avoid unaligned accesses on 64 bit
-systems.
-
---- util/xmalloc.c.orig Mon Jan 6 08:20:28 2003
-+++ util/xmalloc.c
-@@ -23,9 +23,9 @@
-
- #if TRACE_XMALLOC > 1
-
--static const unsigned char head[] = {44, 33, 22, 11};
--static const unsigned char tail[] = {11, 22, 33, 44};
--static const unsigned char freed[] = {11, 22, 33, 44};
-+static const unsigned char head[] = {88, 77, 66, 55, 44, 33, 22, 11};
-+static const unsigned char tail[] = {11, 22, 33, 44, 55, 66, 77, 88};
-+static const unsigned char freed[] = {11, 22, 33, 44, 55, 66, 77, 88};
-
- struct dmalloc_info {
- int len;
-@@ -42,7 +42,7 @@ void *xmalloc_d(size_t nbytes, const cha
- char *res;
- struct dmalloc_info *dinfo;
-
-- if (!(res = (char*) malloc(nbytes + sizeof(*dinfo)+8*sizeof(char))))
-+ if (!(res = (char*) malloc(nbytes + sizeof(*dinfo)+16*sizeof(char))))
- return 0;
- dinfo = (struct dmalloc_info *) res;
- strncpy (dinfo->file, file, sizeof(dinfo->file)-1);
-@@ -56,9 +56,9 @@ void *xmalloc_d(size_t nbytes, const cha
- dinfo->next->prev = dinfo;
- dmalloc_list = dinfo;
-
-- memcpy(res + sizeof(*dinfo), head, 4*sizeof(char));
-- res += sizeof(*dinfo) + 4*sizeof(char);
-- memcpy(res + nbytes, tail, 4*sizeof(char));
-+ memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
-+ res += sizeof(*dinfo) + 8*sizeof(char);
-+ memcpy(res + nbytes, tail, 8*sizeof(char));
- return res;
- }
-
-@@ -69,13 +69,13 @@ void xfree_d(void *ptr, const char *file
- if (!ptr)
- return;
- dinfo = (struct dmalloc_info *)
-- ((char*)ptr - 4*sizeof(char) - sizeof(*dinfo));
-- if (memcmp(head, (char*) ptr - 4*sizeof(char), 4*sizeof(char)))
-+ ((char*)ptr - 8*sizeof(char) - sizeof(*dinfo));
-+ if (memcmp(head, (char*) ptr - 8*sizeof(char), 8*sizeof(char)))
- {
- yaz_log(LOG_FATAL, "xfree_d bad head, %s:%d, %p", file, line, ptr);
- abort();
- }
-- if (memcmp((char*) ptr + dinfo->len, tail, 4*sizeof(char)))
-+ if (memcmp((char*) ptr + dinfo->len, tail, 8*sizeof(char)))
- {
- yaz_log(LOG_FATAL, "xfree_d bad tail, %s:%d, %p", file, line, ptr);
- abort();
-@@ -86,7 +86,7 @@ void xfree_d(void *ptr, const char *file
- dmalloc_list = dinfo->next;
- if (dinfo->next)
- dinfo->next->prev = dinfo->prev;
-- memcpy ((char*) ptr - 4*sizeof(char), freed, 4*sizeof(char));
-+ memcpy ((char*) ptr - 8*sizeof(char), freed, 8*sizeof(char));
- free(dinfo);
- return;
- }
-@@ -101,18 +101,18 @@ void *xrealloc_d(void *p, size_t nbytes,
- {
- if (!nbytes)
- return 0;
-- res = (char *) malloc(nbytes + sizeof(*dinfo) + 8*sizeof(char));
-+ res = (char *) malloc(nbytes + sizeof(*dinfo) + 16*sizeof(char));
- }
- else
- {
-- if (memcmp(head, ptr - 4*sizeof(char), 4*sizeof(char)))
-+ if (memcmp(head, ptr - 8*sizeof(char), 8*sizeof(char)))
- {
- yaz_log(LOG_FATAL, "xrealloc_d bad head, %s:%d, %p",
- file, line, ptr);
- abort();
- }
-- dinfo = (struct dmalloc_info *) (ptr-4*sizeof(char) - sizeof(*dinfo));
-- if (memcmp(ptr + dinfo->len, tail, 4*sizeof(char)))
-+ dinfo = (struct dmalloc_info *) (ptr-8*sizeof(char) - sizeof(*dinfo));
-+ if (memcmp(ptr + dinfo->len, tail, 8*sizeof(char)))
- {
- yaz_log(LOG_FATAL, "xrealloc_d bad tail, %s:%d, %p",
- file, line, ptr);
-@@ -131,7 +131,7 @@ void *xrealloc_d(void *p, size_t nbytes,
- return 0;
- }
- res = (char *)
-- realloc(dinfo, nbytes + sizeof(*dinfo) + 8*sizeof(char));
-+ realloc(dinfo, nbytes + sizeof(*dinfo) + 16*sizeof(char));
- }
- if (!res)
- return 0;
-@@ -147,9 +147,9 @@ void *xrealloc_d(void *p, size_t nbytes,
- dmalloc_list->prev = dinfo;
- dmalloc_list = dinfo;
-
-- memcpy(res + sizeof(*dinfo), head, 4*sizeof(char));
-- res += sizeof(*dinfo) + 4*sizeof(char);
-- memcpy(res + nbytes, tail, 4*sizeof(char));
-+ memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
-+ res += sizeof(*dinfo) + 8*sizeof(char);
-+ memcpy(res + nbytes, tail, 8*sizeof(char));
- return res;
- }
-
-@@ -159,7 +159,7 @@ void *xcalloc_d(size_t nmemb, size_t siz
- struct dmalloc_info *dinfo;
- size_t nbytes = nmemb * size;
-
-- if (!(res = (char*) calloc(1, nbytes+sizeof(*dinfo)+8*sizeof(char))))
-+ if (!(res = (char*) calloc(1, nbytes+sizeof(*dinfo)+16*sizeof(char))))
- return 0;
- dinfo = (struct dmalloc_info *) res;
- strncpy (dinfo->file, file, sizeof(dinfo->file)-1);
-@@ -173,9 +173,9 @@ void *xcalloc_d(size_t nmemb, size_t siz
- dinfo->next->prev = dinfo;
- dmalloc_list = dinfo;
-
-- memcpy(res + sizeof(*dinfo), head, 4*sizeof(char));
-- res += sizeof(*dinfo) + 4*sizeof(char);
-- memcpy(res + nbytes, tail, 4*sizeof(char));
-+ memcpy(res + sizeof(*dinfo), head, 8*sizeof(char));
-+ res += sizeof(*dinfo) + 8*sizeof(char);
-+ memcpy(res + nbytes, tail, 8*sizeof(char));
- return res;
- }
-
-@@ -188,7 +188,7 @@ void xmalloc_trav_d(const char *file, in
- while (dinfo)
- {
- yaz_log (LOG_MALLOC, " %20s:%d p=%p size=%d", dinfo->file, dinfo->line,
-- ((char*) dinfo)+sizeof(*dinfo)+4*sizeof(char), dinfo->len);
-+ ((char*) dinfo)+sizeof(*dinfo)+8*sizeof(char), dinfo->len);
- size += dinfo->len;
- dinfo = dinfo->next;
- }
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-27 05:37:05 +0000