>Number:         20229
>Category:       pkg
>Synopsis:       Update package textproc/libxml2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Feb 06 19:01:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Juan RP
>Release:        NetBSD 1.6N
>Organization:
HispaBSD
>Environment:
System: NetBSD xtraeme.dyndns.org 1.6N NetBSD 1.6N (xtrakernel) #0: Mon Feb 3 14:55:52 CET 2003 root@xtraeme.dyndns.org:/usr/obj/sys/arch/i386/compile.i386/xtrakernel i386
Architecture: i386
Machine: i386
>Description:

Own package libxml2 is out-of-date, out the latest version is 2.5.2,
this patch provide update to that version.

Changes:

2.5.2: Feb 5 2003

* First implementation of RelaxNG, added --relaxng flag to xmllint
* Schemas support now compiled in by default.
* Bug fixes: DTD validation, namespace checking, XInclude and
* entities, delegateURI in XML Catalogs, HTML parser, XML reader
* (Stéphane Bidoul), XPath parser and evaluation, UTF8ToUTF8
* serialization, XML reader memory consumption, HTML parser, HTML
* serialization in the presence of namespaces
* added an HTML API to check elements and attributes.
* Documentation improvement, PDF for the tutorial (John
* Fleck), doc patches (Stefan Kost)
* Portability fixes: NetBSD (Julio Merino), Windows
* (Igor Zlatkovic)
* Added python bindings for XPointer, contextual
* error reporting (Stéphane Bidoul)
* URI/file escaping problems (Stefano
* Zacchiroli)

2.5.1: Jan 8 2003

* Fixes a memory leak and
* configuration/compilation problems in
* 2.5.0
* documentation updates (John)
* a couple of XmlTextReader fixes

Many changes ... see this link for a full list of changes:

http://xmlsoft.org/news.html

>How-To-Repeat:


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml2/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	2002/11/06 07:56:51	1.21
+++ Makefile	2003/02/07 02:50:16
@@ -2,7 +2,7 @@
 
 DISTNAME=	libxml2-${LIBXML_VERSION}
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.5/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://xmlsoft.org/
@@ -13,15 +13,17 @@
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-LIBXML_VERSION=		2.4.25
+LIBXML_VERSION=		2.5.2
 PLIST_SUBST+=		LIBXML_VERSION=${LIBXML_VERSION}
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--without-python
+CONFIGURE_ARGS+=	--with-threads
+CONFIGURE_ARGS+=	--with-schema
 
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../converters/libiconv/buildlink2.mk"
-
+.include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml2/PLIST,v
retrieving revision 1.13
diff -u -r1.13 PLIST
--- PLIST	2003/01/02 22:44:48	1.13
+++ PLIST	2003/02/07 02:50:16
@@ -18,6 +18,7 @@
 include/libxml2/libxml/nanohttp.h
 include/libxml2/libxml/parser.h
 include/libxml2/libxml/parserInternals.h
+include/libxml2/libxml/relaxng.h
 include/libxml2/libxml/schemasInternals.h
 include/libxml2/libxml/threads.h
 include/libxml2/libxml/tree.h
@@ -29,20 +30,20 @@
 include/libxml2/libxml/xmlautomata.h
 include/libxml2/libxml/xmlerror.h
 include/libxml2/libxml/xmlmemory.h
+include/libxml2/libxml/xmlreader.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
 include/libxml2/libxml/xpathInternals.h
 include/libxml2/libxml/xpointer.h
 lib/libxml2.a
 lib/libxml2.la
 lib/libxml2.so
-lib/libxml2.so.6
-lib/libxml2.so.6.25
+lib/libxml2.so.7
+lib/libxml2.so.7.2
 lib/pkgconfig/libxml-2.0.pc
 lib/xml2Conf.sh
 man/man1/xml2-config.1
@@ -55,6 +56,51 @@
 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/html/tutorial/apa.html
+share/doc/libxml2/html/tutorial/apb.html
+share/doc/libxml2/html/tutorial/apc.html
+share/doc/libxml2/html/tutorial/ape.html
+share/doc/libxml2/html/tutorial/apd.html
+share/doc/libxml2/html/tutorial/apf.html
+share/doc/libxml2/html/tutorial/apg.html
+share/doc/libxml2/html/tutorial/ar01s02.html
+share/doc/libxml2/html/tutorial/ar01s03.html
+share/doc/libxml2/html/tutorial/ar01s04.html
+share/doc/libxml2/html/tutorial/ar01s05.html
+share/doc/libxml2/html/tutorial/ar01s06.html
+share/doc/libxml2/html/tutorial/ar01s07.html
+share/doc/libxml2/html/tutorial/ar01s08.html
+share/doc/libxml2/html/tutorial/includeaddattribute.c
+share/doc/libxml2/html/tutorial/includeaddkeyword.c
+share/doc/libxml2/html/tutorial/includeconvert.c
+share/doc/libxml2/html/tutorial/includegetattribute.c
+share/doc/libxml2/html/tutorial/includekeyword.c
+share/doc/libxml2/html/tutorial/index.html
+share/doc/libxml2/html/tutorial/xmltutorial.pdf
+share/doc/libxml2/html/tutorial/images/blank.png
+share/doc/libxml2/html/tutorial/images/caution.png
+share/doc/libxml2/html/tutorial/images/draft.png
+share/doc/libxml2/html/tutorial/images/home.png
+share/doc/libxml2/html/tutorial/images/important.png
+share/doc/libxml2/html/tutorial/images/next.png
+share/doc/libxml2/html/tutorial/images/note.png
+share/doc/libxml2/html/tutorial/images/prev.png
+share/doc/libxml2/html/tutorial/images/tip.png
+share/doc/libxml2/html/tutorial/images/toc-blank.png
+share/doc/libxml2/html/tutorial/images/toc-minus.png
+share/doc/libxml2/html/tutorial/images/toc-plus.png
+share/doc/libxml2/html/tutorial/images/up.png
+share/doc/libxml2/html/tutorial/images/warning.png
+share/doc/libxml2/html/tutorial/images/callouts/1.png
+share/doc/libxml2/html/tutorial/images/callouts/2.png
+share/doc/libxml2/html/tutorial/images/callouts/3.png
+share/doc/libxml2/html/tutorial/images/callouts/4.png
+share/doc/libxml2/html/tutorial/images/callouts/5.png
+share/doc/libxml2/html/tutorial/images/callouts/6.png
+share/doc/libxml2/html/tutorial/images/callouts/7.png
+share/doc/libxml2/html/tutorial/images/callouts/8.png
+share/doc/libxml2/html/tutorial/images/callouts/9.png
+share/doc/libxml2/html/tutorial/images/callouts/10.png
 share/doc/libxml2/html/DOM.gif
 share/doc/libxml2/html/FAQ.html
 share/doc/libxml2/html/Libxml2-Logo-180x168.gif
@@ -79,14 +125,20 @@
 share/doc/libxml2/html/libxml-parser.html
 share/doc/libxml2/html/libxml-parserinternals.html
 share/doc/libxml2/html/libxml-sax.html
+share/doc/libxml2/html/libxml-schemasinternals.html
 share/doc/libxml2/html/libxml-threads.html
 share/doc/libxml2/html/libxml-tree.html
 share/doc/libxml2/html/libxml-uri.html
 share/doc/libxml2/html/libxml-valid.html
 share/doc/libxml2/html/libxml-xinclude.html
+share/doc/libxml2/html/libxml-xmlautomata.html
 share/doc/libxml2/html/libxml-xmlerror.html
 share/doc/libxml2/html/libxml-xmlio.html
 share/doc/libxml2/html/libxml-xmlmemory.html
+share/doc/libxml2/html/libxml-xmlregexp.html
+share/doc/libxml2/html/libxml-xmlschemas.html
+share/doc/libxml2/html/libxml-xmlschemastypes.html
+share/doc/libxml2/html/libxml-xmlunicode.html
 share/doc/libxml2/html/libxml-xpath.html
 share/doc/libxml2/html/libxml-xpathinternals.html
 share/doc/libxml2/html/libxml-xpointer.html
@@ -96,9 +148,11 @@
 share/doc/libxml2/html/structure.gif
 share/doc/libxml2/html/w3c.png
 share/doc/libxml2/html/xml.html
-@dirrm include/libxml2/libxml
-@dirrm include/libxml2
-@dirrm share/doc/libxml2-${LIBXML_VERSION}/examples
-@dirrm share/doc/libxml2-${LIBXML_VERSION}
+@dirrm share/doc/libxml2/html/tutorial/images/callouts
+@dirrm share/doc/libxml2/html/tutorial/images
+@dirrm share/doc/libxml2/html/tutorial/
 @dirrm share/doc/libxml2/html
+@dirrm share/doc/libxml2-${LIBXML_VERSION}/examples
 @dirrm share/doc/libxml2
+@dirrm include/libxml2/libxml
+@dirrm include/libxml2
Index: buildlink2.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml2/buildlink2.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink2.mk
--- buildlink2.mk	2002/09/11 09:25:10	1.4
+++ buildlink2.mk	2003/02/07 02:50:16
@@ -1,16 +1,59 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/09/11 09:25:10 jlam Exp $
+# $NetBSD$
+#
+# This Makefile fragment is included by packages that use libxml2.
+#
+# This file was created automatically using createbuildlink 2.4.
+#
 
 .if !defined(LIBXML2_BUILDLINK2_MK)
 LIBXML2_BUILDLINK2_MK=	# defined
 
-BUILDLINK_PACKAGES+=		libxml2
-BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.4.24nb1
-BUILDLINK_PKGSRCDIR.libxml2?=	../../textproc/libxml2
+BUILDLINK_PACKAGES+=			libxml2
+BUILDLINK_DEPENDS.libxml2?=		libxml2>=2.5.2
+BUILDLINK_PKGSRCDIR.libxml2?=		../../textproc/libxml2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libxml2=libxml2
 BUILDLINK_PREFIX.libxml2_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.libxml2=	include/libxml2/libxml/*
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/DOCBparser.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/HTMLparser.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/HTMLtree.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/SAX.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/c14n.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/catalog.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/debugXML.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/encoding.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/entities.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/globals.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/hash.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/list.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/nanoftp.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/nanohttp.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/parser.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/parserInternals.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/relaxng.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/schemasInternals.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/threads.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/tree.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/uri.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/valid.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xinclude.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xlink.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xmlIO.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xmlautomata.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xmlerror.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xmlmemory.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xmlreader.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xmlregexp.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xmlschemas.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xmlschemastypes.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xmlunicode.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xmlversion.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xpath.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xpathInternals.h
+BUILDLINK_FILES.libxml2+=	include/libxml2/libxml/xpointer.h
 BUILDLINK_FILES.libxml2+=	lib/libxml2.*
+BUILDLINK_FILES.libxml2+=	lib/pkgconfig/libxml-2.0.pc
+BUILDLINK_FILES.libxml2+=	lib/xml2Conf.sh
 
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../converters/libiconv/buildlink2.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml2/distinfo,v
retrieving revision 1.18
diff -u -r1.18 distinfo
--- distinfo	2002/11/06 07:56:51	1.18
+++ distinfo	2003/02/07 02:50:16
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.18 2002/11/06 07:56:51 tron Exp $
 
-SHA1 (libxml2-2.4.25.tar.gz) = b2dd81d77389d3999b520b7c4aad03a3a6b83800
-Size (libxml2-2.4.25.tar.gz) = 2119273 bytes
+SHA1 (libxml2-2.5.2.tar.gz) = 6335ae3760a4d9a796032c09a74f86984ba45bf0
+Size (libxml2-2.5.2.tar.gz) = 3521134 bytes
 SHA1 (patch-aa) = 3e89009c72b79420828069ebe967f25c5d193177
-SHA1 (patch-ac) = b398c9a9c570fd188fd090f190422c1d58919a8c
+SHA1 (patch-ac) = 785363b5aad2cdc616e07d673d277e9a76fa91ad
 SHA1 (patch-ad) = 976f18fa7f127ff8e54c83053feb9aa04bcd1ea5
 SHA1 (patch-ae) = a94390e26b8344b94d78b0faa4b9ce50390e5e5b
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml2/patches/patch-ac,v
retrieving revision 1.3
diff -u -r1.3 patch-ac
--- patches/patch-ac	2002/01/29 07:40:11	1.3
+++ patches/patch-ac	2003/02/07 02:50:16
@@ -1,12 +1,10 @@
-$NetBSD: patch-ac,v 1.3 2002/01/29 07:40:11 martti Exp $
-
---- libxml-2.0.pc.in.orig	Mon Dec 10 04:35:05 2001
-+++ libxml-2.0.pc.in	Mon Jan 28 15:45:49 2002
+--- libxml-2.0.pc.in.orig	2003-02-07 02:35:58.000000000 +0100
++++ libxml-2.0.pc.in	2003-02-07 02:36:32.000000000 +0100
 @@ -8,5 +8,5 @@
  Version: @VERSION@
  Description: libXML library version2.
  Requires:
--Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @M_LIBS@ @LIBS@
--Cflags: -I${includedir}/libxml2 @XML_CFLAGS@
+-Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
+-Cflags: -I${includedir}/libxml2 @XML_INCLUDEDIR@ @XML_CFLAGS@
 +Libs: @XML_LIBDIR@ -lxml2 @Z_LIBS@ @M_LIBS@ @LIBS@
 +Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@


--- END ---

Thank you!

>Fix:
>Release-Note:
>Audit-Trail:
>Unformatted: