From d4411c6427d90b3f8a55410360a42e15ed1ce291 Mon Sep 17 00:00:00 2001 From: martti Date: Fri, 17 May 2002 13:02:29 +0000 Subject: Updated libxml2 to 2.4.21 (only bug fixes according to ChangeLog) --- textproc/libxml2/Makefile | 7 +++-- textproc/libxml2/PLIST | 62 +++++++++++++++++++++------------------ textproc/libxml2/distinfo | 10 +++---- textproc/libxml2/patches/patch-aa | 8 ++--- textproc/libxml2/patches/patch-ad | 8 ++--- 5 files changed, 52 insertions(+), 43 deletions(-) diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 5dce63c5ee5..6d4b82f8179 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2002/04/28 22:12:05 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2002/05/17 13:02:29 martti Exp $ -DISTNAME= libxml2-2.4.20 +DISTNAME= libxml2-${LIBXML_VERSION} CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/libxml/} @@ -13,6 +13,9 @@ USE_GMAKE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBXML_VERSION= 2.4.21 +PLIST_SUBST+= LIBXML_VERSION=${LIBXML_VERSION} + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_DIR} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST index 05a45ec56a9..2a39fb5cdba 100644 --- a/textproc/libxml2/PLIST +++ b/textproc/libxml2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/04/26 10:32:37 martti Exp $ +@comment $NetBSD: PLIST,v 1.6 2002/05/17 13:02:29 martti Exp $ bin/xml2-config bin/xmlcatalog bin/xmllint @@ -18,6 +18,7 @@ include/libxml2/libxml/nanoftp.h include/libxml2/libxml/nanohttp.h include/libxml2/libxml/parser.h include/libxml2/libxml/parserInternals.h +include/libxml2/libxml/schemasInternals.h include/libxml2/libxml/threads.h include/libxml2/libxml/tree.h include/libxml2/libxml/uri.h @@ -25,8 +26,13 @@ include/libxml2/libxml/valid.h include/libxml2/libxml/xinclude.h include/libxml2/libxml/xlink.h include/libxml2/libxml/xmlIO.h +include/libxml2/libxml/xmlautomata.h include/libxml2/libxml/xmlerror.h include/libxml2/libxml/xmlmemory.h +include/libxml2/libxml/xmlregexp.h +include/libxml2/libxml/xmlschemas.h +include/libxml2/libxml/xmlschemastypes.h +include/libxml2/libxml/xmlunicode.h include/libxml2/libxml/xmlversion.h include/libxml2/libxml/xmlwin32version.h include/libxml2/libxml/xpath.h @@ -36,7 +42,7 @@ lib/libxml2.a lib/libxml2.la lib/libxml2.so lib/libxml2.so.6 -lib/libxml2.so.6.20 +lib/libxml2.so.6.21 lib/pkgconfig/libxml-2.0.pc lib/xml2Conf.sh man/man1/xml2-config.1 @@ -44,28 +50,28 @@ man/man1/xmlcatalog.1 man/man1/xmllint.1 man/man3/libxml.3 share/aclocal/libxml.m4 -share/doc/libxml2-2.4.20/Copyright -share/doc/libxml2-2.4.20/examples/testHTML.c -share/doc/libxml2-2.4.20/examples/testSAX.c -share/doc/libxml2-2.4.20/examples/testXPath.c -share/doc/libxml2-2.4.20/examples/xmllint.c -share/doc/libxml2-python-2.4.20/examples/attribs.py -share/doc/libxml2-python-2.4.20/examples/build.py -share/doc/libxml2-python-2.4.20/examples/cutnpaste.py -share/doc/libxml2-python-2.4.20/examples/error.py -share/doc/libxml2-python-2.4.20/examples/invalid.xml -share/doc/libxml2-python-2.4.20/examples/push.py -share/doc/libxml2-python-2.4.20/examples/pushSAX.py -share/doc/libxml2-python-2.4.20/examples/serialize.py -share/doc/libxml2-python-2.4.20/examples/tst.py -share/doc/libxml2-python-2.4.20/examples/tst.xml -share/doc/libxml2-python-2.4.20/examples/tstURI.py -share/doc/libxml2-python-2.4.20/examples/tstxpath.py -share/doc/libxml2-python-2.4.20/examples/valid.xml -share/doc/libxml2-python-2.4.20/examples/validate.py -share/doc/libxml2-python-2.4.20/examples/xpath.py -share/doc/libxml2-python-2.4.20/examples/xpathext.py -share/doc/libxml2-python-2.4.20/examples/xpathret.py +share/doc/libxml2-${LIBXML_VERSION}/Copyright +share/doc/libxml2-${LIBXML_VERSION}/examples/testHTML.c +share/doc/libxml2-${LIBXML_VERSION}/examples/testSAX.c +share/doc/libxml2-${LIBXML_VERSION}/examples/testXPath.c +share/doc/libxml2-${LIBXML_VERSION}/examples/xmllint.c +share/doc/libxml2-python-${LIBXML_VERSION}/examples/attribs.py +share/doc/libxml2-python-${LIBXML_VERSION}/examples/build.py +share/doc/libxml2-python-${LIBXML_VERSION}/examples/cutnpaste.py +share/doc/libxml2-python-${LIBXML_VERSION}/examples/error.py +share/doc/libxml2-python-${LIBXML_VERSION}/examples/invalid.xml +share/doc/libxml2-python-${LIBXML_VERSION}/examples/push.py +share/doc/libxml2-python-${LIBXML_VERSION}/examples/pushSAX.py +share/doc/libxml2-python-${LIBXML_VERSION}/examples/serialize.py +share/doc/libxml2-python-${LIBXML_VERSION}/examples/tst.py +share/doc/libxml2-python-${LIBXML_VERSION}/examples/tst.xml +share/doc/libxml2-python-${LIBXML_VERSION}/examples/tstURI.py +share/doc/libxml2-python-${LIBXML_VERSION}/examples/tstxpath.py +share/doc/libxml2-python-${LIBXML_VERSION}/examples/valid.xml +share/doc/libxml2-python-${LIBXML_VERSION}/examples/validate.py +share/doc/libxml2-python-${LIBXML_VERSION}/examples/xpath.py +share/doc/libxml2-python-${LIBXML_VERSION}/examples/xpathext.py +share/doc/libxml2-python-${LIBXML_VERSION}/examples/xpathret.py share/doc/libxml2/html/DOM.gif share/doc/libxml2/html/FAQ.html share/doc/libxml2/html/book1.html @@ -107,10 +113,10 @@ share/doc/libxml2/html/w3c.png share/doc/libxml2/html/xml.html @dirrm include/libxml2/libxml @dirrm include/libxml2 -@dirrm share/doc/libxml2-2.4.20/examples -@dirrm share/doc/libxml2-2.4.20 -@dirrm share/doc/libxml2-python-2.4.20/examples -@dirrm share/doc/libxml2-python-2.4.20 +@dirrm share/doc/libxml2-${LIBXML_VERSION}/examples +@dirrm share/doc/libxml2-${LIBXML_VERSION} +@dirrm share/doc/libxml2-python-${LIBXML_VERSION}/examples +@dirrm share/doc/libxml2-python-${LIBXML_VERSION} @dirrm share/doc/libxml2/html @dirrm share/doc/libxml2 @unexec ${RMDIR} -p %D/lib/pkgconfig 2>/dev/null || ${TRUE} diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo index c6613d081bc..fdb9a50c7ad 100644 --- a/textproc/libxml2/distinfo +++ b/textproc/libxml2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.11 2002/04/26 10:32:37 martti Exp $ +$NetBSD: distinfo,v 1.12 2002/05/17 13:02:29 martti Exp $ -SHA1 (libxml2-2.4.20.tar.gz) = bcfd754bb7b9bd5cd6c46997633f2a982c343c2d -Size (libxml2-2.4.20.tar.gz) = 1932630 bytes -SHA1 (patch-aa) = 8a730b34fa09b2383544ed3cc7d35ab30895cf9c +SHA1 (libxml2-2.4.21.tar.gz) = d65d8f48258866470074179bf037f663f10a0a18 +Size (libxml2-2.4.21.tar.gz) = 2016580 bytes +SHA1 (patch-aa) = 70f8af42212f1a1f91f8e74c97447fb27d7a7b4a SHA1 (patch-ac) = b398c9a9c570fd188fd090f190422c1d58919a8c -SHA1 (patch-ad) = adfcfa0d4cfe21465a141a314a76387dfa0682fd +SHA1 (patch-ad) = 0ef8f5c23aba922a5e1089a3cc9ad531e2856ea1 SHA1 (patch-ae) = a94390e26b8344b94d78b0faa4b9ce50390e5e5b diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa index 27c5df87bf0..4b9d0116e67 100644 --- a/textproc/libxml2/patches/patch-aa +++ b/textproc/libxml2/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.8 2002/04/26 10:32:37 martti Exp $ +$NetBSD: patch-aa,v 1.9 2002/05/17 13:02:30 martti Exp $ ---- configure.orig Mon Apr 15 17:20:23 2002 -+++ configure Fri Apr 26 11:43:56 2002 -@@ -7097,7 +7097,7 @@ +--- configure.orig Mon Apr 29 18:38:47 2002 ++++ configure Fri May 17 14:51:28 2002 +@@ -7099,7 +7099,7 @@ fi diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-ad index 109e47de761..300b081a74c 100644 --- a/textproc/libxml2/patches/patch-ad +++ b/textproc/libxml2/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.4 2002/04/26 10:32:38 martti Exp $ +$NetBSD: patch-ad,v 1.5 2002/05/17 13:02:30 martti Exp $ ---- doc/Makefile.in.orig Mon Apr 15 17:20:43 2002 -+++ doc/Makefile.in Fri Apr 26 11:42:13 2002 -@@ -131,7 +131,7 @@ +--- doc/Makefile.in.orig Mon Apr 29 18:39:10 2002 ++++ doc/Makefile.in Fri May 17 14:51:51 2002 +@@ -133,7 +133,7 @@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ -- cgit v1.2.3