Updated to 2.6.2 provided by Min Sik Kim PR pkg/23488.

Changes:

2.6.2: Nov 4 2003:
   - XPath context unregistration fixes
   - text node coalescing fixes (Mark Lilback)
   - API to screate a W3C Schemas from an existing document (Steve Ball)
   - BeOS patches (Marcin 'Shard' Konicki)
   - xmlStrVPrintf function added (Aleksey Sanin)
   - compilation fixes (Mark Vakoc)
   - stdin parsing fix (William Brack)
   - a posteriori DTD validation fixes
   - xmlReader bug fixes: Walker fixes, python bindings
   - fixed xmlStopParser() to really stop the parser and errors
   - always generate line numbers when using the new xmlReadxxx
  functions
   - added XInclude support to the xmlReader interface
   - implemented XML_PARSE_NONET parser option
   - DocBook XSLT processing bug fixed
   - HTML serialization for <p> elements (William Brack and me)
   - XPointer failure in XInclude are now handled as resource errors
   - fixed xmllint --html to use the HTML serializer on output (added
    --xmlout to implement the previous behaviour of saving it using the XML
    serializer)

2.6.1: Oct 28 2003:
   - Mostly bugfixes after the big 2.6.0 changes
   - Unix compilation patches: libxml.m4 (Patrick Welche), warnings cleanup
    (William Brack)
   - Windows compilation patches (Joachim Bauch, Stephane Bidoul, Igor
    Zlatkovic)
   - xmlWriter bugfix (Alfred Mickautsch)
   - chvalid.[ch]: couple of fixes from Stephane Bidoul
   - context reset: error state reset, push parser reset (Graham
  Bennett)
   - context reuse: generate errors if file is not readable
   - defaulted attributes for element coming from internal entities
    (Stephane Bidoul)
   - Python: tab and spaces mix (William Brack)
   - Error handler could crash in DTD validation in 2.6.0
   - xmlReader: do not use the document or element _private field
   - testSAX.c: avoid a problem with some PIs (Massimo Morara)
   - general bug fixes: mandatory encoding in text decl, serializing
    Document Fragment nodes, xmlSearchNs 2.6.0 problem (Kasimier Buchcik),
    XPath errors not reported,  slow HTML parsing of large documents.

2.6.0: Oct 20 2003:
   - Major revision release: should be API and ABI compatible but got a lot
    of change
   - Increased the library modularity, far more options can be stripped out,
    a --with-minimum configuration will weight around 160KBytes
   - Use per parser and per document dictionnary, allocate names and small
    text nodes from the dictionnary
   - Switch to a SAX2 like parser rewrote most of the XML parser core,
    provides namespace resolution and defaulted attributes, minimize memory
    allocations and copies, namespace checking and specific error handling,
    immutable buffers, make predefined entities static structures, etc...
   - rewrote all the error handling in the library, all errors can be
    intercepted at a structured level, with precise information
  available.
   - New simpler and more generic XML and HTML parser APIs, allowing to
    easilly modify the parsing options and reuse parser context for multiple
    consecutive documents.
   - Similar new APIs for the xmlReader, for options and reuse, provided new
    functions to access content as const strings, use them for Python
  bindings
   - a  lot of other smaller API improvements: xmlStrPrintf (Aleksey Sanin),
    Walker i.e. reader on a document tree based on Alfred Mickautsch code,
    make room in nodes for line numbers, reference counting and future PSVI
    extensions, generation of character ranges to be checked with faster
    algorithm (William),  xmlParserMaxDepth (Crutcher Dunnavant), buffer
    access

6 files changed, 73 insertions, 74 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 476f3a954d8..ee768013fc2 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2003/11/02 07:02:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.39 2003/12/04 19:33:38 xtraeme Exp $
 
 DISTNAME=	libxml2-${LIBXML_VERSION}
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.5/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	xtraeme@NetBSD.org
@@ -15,7 +15,7 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libxml-2.0.pc.in
 
-LIBXML_VERSION=		2.5.11
+LIBXML_VERSION=		2.6.2
 PLIST_SUBST+=		LIBXML_VERSION=${LIBXML_VERSION}
 
 GNU_CONFIGURE=		yes
diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST
index a51aa4b7df3..d710cbb45a0 100644
--- a/textproc/libxml2/PLIST
+++ b/textproc/libxml2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2003/10/05 10:10:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2003/12/04 19:33:38 xtraeme Exp $
 bin/xml2-config
 bin/xmlcatalog
 bin/xmllint
@@ -6,9 +6,12 @@ include/libxml2/libxml/DOCBparser.h
 include/libxml2/libxml/HTMLparser.h
 include/libxml2/libxml/HTMLtree.h
 include/libxml2/libxml/SAX.h
+include/libxml2/libxml/SAX2.h
 include/libxml2/libxml/c14n.h
 include/libxml2/libxml/catalog.h
+include/libxml2/libxml/chvalid.h
 include/libxml2/libxml/debugXML.h
+include/libxml2/libxml/dict.h
 include/libxml2/libxml/encoding.h
 include/libxml2/libxml/entities.h
 include/libxml2/libxml/globals.h
@@ -29,6 +32,7 @@ include/libxml2/libxml/xlink.h
 include/libxml2/libxml/xmlIO.h
 include/libxml2/libxml/xmlautomata.h
 include/libxml2/libxml/xmlerror.h
+include/libxml2/libxml/xmlexports.h
 include/libxml2/libxml/xmlmemory.h
 include/libxml2/libxml/xmlreader.h
 include/libxml2/libxml/xmlregexp.h
@@ -36,14 +40,15 @@ include/libxml2/libxml/xmlschemas.h
 include/libxml2/libxml/xmlschemastypes.h
 include/libxml2/libxml/xmlunicode.h
 include/libxml2/libxml/xmlversion.h
+include/libxml2/libxml/xmlwriter.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.7
-lib/libxml2.so.7.11
+lib/libxml2.so.8
+lib/libxml2.so.8.2
 lib/pkgconfig/libxml-2.0.pc
 lib/xml2Conf.sh
 man/man1/xml2-config.1
@@ -55,45 +60,49 @@ share/doc/html/libxml2/DOM.gif
 share/doc/html/libxml2/FAQ.html
 share/doc/html/libxml2/Libxml2-Logo-180x168.gif
 share/doc/html/libxml2/Libxml2-Logo-90x34.gif
-share/doc/html/libxml2/book1.html
 share/doc/html/libxml2/encoding.html
-share/doc/html/libxml2/index.html
-share/doc/html/libxml2/libxml-DOCBparser.html
-share/doc/html/libxml2/libxml-HTMLparser.html
-share/doc/html/libxml2/libxml-HTMLtree.html
-share/doc/html/libxml2/libxml-SAX.html
-share/doc/html/libxml2/libxml-c14n.html
-share/doc/html/libxml2/libxml-catalog.html
-share/doc/html/libxml2/libxml-debugXML.html
-share/doc/html/libxml2/libxml-encoding.html
-share/doc/html/libxml2/libxml-entities.html
-share/doc/html/libxml2/libxml-globals.html
-share/doc/html/libxml2/libxml-hash.html
-share/doc/html/libxml2/libxml-lib.html
-share/doc/html/libxml2/libxml-nanoftp.html
-share/doc/html/libxml2/libxml-nanohttp.html
-share/doc/html/libxml2/libxml-notes.html
-share/doc/html/libxml2/libxml-parser.html
-share/doc/html/libxml2/libxml-parserInternals.html
-share/doc/html/libxml2/libxml-relaxng.html
-share/doc/html/libxml2/libxml-schemasInternals.html
-share/doc/html/libxml2/libxml-threads.html
-share/doc/html/libxml2/libxml-tree.html
-share/doc/html/libxml2/libxml-uri.html
-share/doc/html/libxml2/libxml-valid.html
-share/doc/html/libxml2/libxml-xinclude.html
-share/doc/html/libxml2/libxml-xmlIO.html
-share/doc/html/libxml2/libxml-xmlautomata.html
-share/doc/html/libxml2/libxml-xmlerror.html
-share/doc/html/libxml2/libxml-xmlmemory.html
-share/doc/html/libxml2/libxml-xmlreader.html
-share/doc/html/libxml2/libxml-xmlregexp.html
-share/doc/html/libxml2/libxml-xmlschemas.html
-share/doc/html/libxml2/libxml-xmlschemastypes.html
-share/doc/html/libxml2/libxml-xmlunicode.html
-share/doc/html/libxml2/libxml-xpath.html
-share/doc/html/libxml2/libxml-xpathInternals.html
-share/doc/html/libxml2/libxml-xpointer.html
+share/doc/html/libxml2/html/book1.html
+share/doc/html/libxml2/html/home.png
+share/doc/html/libxml2/html/index.html
+share/doc/html/libxml2/html/left.png
+share/doc/html/libxml2/html/libxml-DOCBparser.html
+share/doc/html/libxml2/html/libxml-HTMLparser.html
+share/doc/html/libxml2/html/libxml-HTMLtree.html
+share/doc/html/libxml2/html/libxml-SAX.html
+share/doc/html/libxml2/html/libxml-c14n.html
+share/doc/html/libxml2/html/libxml-catalog.html
+share/doc/html/libxml2/html/libxml-debugXML.html
+share/doc/html/libxml2/html/libxml-encoding.html
+share/doc/html/libxml2/html/libxml-entities.html
+share/doc/html/libxml2/html/libxml-globals.html
+share/doc/html/libxml2/html/libxml-hash.html
+share/doc/html/libxml2/html/libxml-lib.html
+share/doc/html/libxml2/html/libxml-nanoftp.html
+share/doc/html/libxml2/html/libxml-nanohttp.html
+share/doc/html/libxml2/html/libxml-notes.html
+share/doc/html/libxml2/html/libxml-parser.html
+share/doc/html/libxml2/html/libxml-parserInternals.html
+share/doc/html/libxml2/html/libxml-relaxng.html
+share/doc/html/libxml2/html/libxml-schemasInternals.html
+share/doc/html/libxml2/html/libxml-threads.html
+share/doc/html/libxml2/html/libxml-tree.html
+share/doc/html/libxml2/html/libxml-uri.html
+share/doc/html/libxml2/html/libxml-valid.html
+share/doc/html/libxml2/html/libxml-xinclude.html
+share/doc/html/libxml2/html/libxml-xmlIO.html
+share/doc/html/libxml2/html/libxml-xmlautomata.html
+share/doc/html/libxml2/html/libxml-xmlerror.html
+share/doc/html/libxml2/html/libxml-xmlmemory.html
+share/doc/html/libxml2/html/libxml-xmlreader.html
+share/doc/html/libxml2/html/libxml-xmlregexp.html
+share/doc/html/libxml2/html/libxml-xmlschemas.html
+share/doc/html/libxml2/html/libxml-xmlschemastypes.html
+share/doc/html/libxml2/html/libxml-xmlunicode.html
+share/doc/html/libxml2/html/libxml-xpath.html
+share/doc/html/libxml2/html/libxml-xpathInternals.html
+share/doc/html/libxml2/html/libxml-xpointer.html
+share/doc/html/libxml2/html/right.png
+share/doc/html/libxml2/html/up.png
 share/doc/html/libxml2/libxml.gif
 share/doc/html/libxml2/redhat.gif
 share/doc/html/libxml2/smallfootonly.gif
@@ -106,6 +115,7 @@ share/doc/html/libxml2/tutorial/ape.html
 share/doc/html/libxml2/tutorial/apf.html
 share/doc/html/libxml2/tutorial/apg.html
 share/doc/html/libxml2/tutorial/aph.html
+share/doc/html/libxml2/tutorial/api.html
 share/doc/html/libxml2/tutorial/ar01s02.html
 share/doc/html/libxml2/tutorial/ar01s03.html
 share/doc/html/libxml2/tutorial/ar01s04.html
@@ -113,6 +123,7 @@ share/doc/html/libxml2/tutorial/ar01s05.html
 share/doc/html/libxml2/tutorial/ar01s06.html
 share/doc/html/libxml2/tutorial/ar01s07.html
 share/doc/html/libxml2/tutorial/ar01s08.html
+share/doc/html/libxml2/tutorial/ar01s09.html
 share/doc/html/libxml2/tutorial/images/blank.png
 share/doc/html/libxml2/tutorial/images/callouts/1.png
 share/doc/html/libxml2/tutorial/images/callouts/10.png
@@ -142,6 +153,7 @@ share/doc/html/libxml2/tutorial/includeaddkeyword.c
 share/doc/html/libxml2/tutorial/includeconvert.c
 share/doc/html/libxml2/tutorial/includegetattribute.c
 share/doc/html/libxml2/tutorial/includekeyword.c
+share/doc/html/libxml2/tutorial/includexpath.c
 share/doc/html/libxml2/tutorial/index.html
 share/doc/html/libxml2/tutorial/ix01.html
 share/doc/html/libxml2/tutorial/xmltutorial.pdf
@@ -152,11 +164,12 @@ share/examples/libxml2/testHTML.c
 share/examples/libxml2/testSAX.c
 share/examples/libxml2/testXPath.c
 share/examples/libxml2/xmllint.c
+@dirrm share/examples/libxml2
 @dirrm share/doc/libxml2
 @dirrm share/doc/html/libxml2/tutorial/images/callouts
 @dirrm share/doc/html/libxml2/tutorial/images
 @dirrm share/doc/html/libxml2/tutorial
+@dirrm share/doc/html/libxml2/html
 @dirrm share/doc/html/libxml2
-@dirrm share/examples/libxml2
 @dirrm include/libxml2/libxml
 @dirrm include/libxml2
diff --git a/textproc/libxml2/buildlink2.mk b/textproc/libxml2/buildlink2.mk
index 53b0f274f98..472b4bc88ff 100644
--- a/textproc/libxml2/buildlink2.mk
+++ b/textproc/libxml2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/10/16 13:17:12 kim Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2003/12/04 19:33:38 xtraeme Exp $
 
 .if !defined(LIBXML2_BUILDLINK2_MK)
 LIBXML2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libxml2
-BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.5.10nb1
+BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.6.2
 BUILDLINK_PKGSRCDIR.libxml2?=	../../textproc/libxml2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libxml2=libxml2
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 3eecd163007..19077556213 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.29 2003/10/05 10:10:06 wiz Exp $
+$NetBSD: distinfo,v 1.30 2003/12/04 19:33:38 xtraeme Exp $
 
-SHA1 (libxml2-2.5.11.tar.bz2) = 65c31ae9de455131fae31f4cc43bf96c1f215ed4
-Size (libxml2-2.5.11.tar.bz2) = 2292354 bytes
+SHA1 (libxml2-2.6.2.tar.bz2) = f25c2a3216de2a0b0288eae082539939b63f2161
+Size (libxml2-2.6.2.tar.bz2) = 2488212 bytes
 SHA1 (patch-aa) = 2fafd2403a3477241cffe5c2655da349c84d8249
-SHA1 (patch-ad) = e092681097df687137d337a15bbd3faf58c548db
-SHA1 (patch-ae) = a94390e26b8344b94d78b0faa4b9ce50390e5e5b
+SHA1 (patch-ad) = ba14b0d8ab535472a65ffc59337d51d39edfb9f3
diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-ad
index ed3c6cc30df..aa9f491e8d1 100644
--- a/textproc/libxml2/patches/patch-ad
+++ b/textproc/libxml2/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.12 2003/08/29 11:22:22 xtraeme Exp $
+$NetBSD: patch-ad,v 1.13 2003/12/04 19:33:38 xtraeme Exp $
 
---- doc/Makefile.in.orig	2003-08-29 12:40:10.000000000 +0200
-+++ doc/Makefile.in	2003-08-29 12:41:11.000000000 +0200
-@@ -153,7 +153,7 @@
+--- doc/Makefile.in.orig	2003-12-04 18:41:38.000000000 +0100
++++ doc/Makefile.in	2003-12-04 18:43:47.000000000 +0100
+@@ -175,7 +175,7 @@
  pythondir = @pythondir@
  
  # The name of the module.
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.12 2003/08/29 11:22:22 xtraeme Exp $
  
  # The top-level SGML file.
  DOC_MAIN_XML_FILE = gnome-xml.xml
-@@ -164,7 +164,7 @@
+@@ -186,7 +186,7 @@
  # A file in win32 depends upon one of the doc files
  WIN32_DIR = $(top_srcdir)/win32
  
@@ -20,14 +20,11 @@ $NetBSD: patch-ad,v 1.12 2003/08/29 11:22:22 xtraeme Exp $
  PAGES = architecture.html bugs.html contribs.html docs.html DOM.html \
      downloads.html entities.html example.html help.html index.html \
      interface.html intro.html library.html namespaces.html news.html \
-@@ -433,8 +433,8 @@
- 	-@INSTALL@ -m 0644 $(srcdir)/xml.html $(srcdir)/encoding.html $(srcdir)/FAQ.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(srcdir)/smallfootonly.gif $(srcdir)/redhat.gif $(srcdir)/libxml.gif $(srcdir)/w3c.png $(srcdir)/Libxml2-Logo-180x168.gif $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(TARGET_DIR)
- 	-@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
- 	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
+@@ -467,7 +467,6 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial/images/callouts
+ 	-@INSTALL@ -m 0644 $(srcdir)/tutorial/images/callouts/*.* \
+ 		$(DESTDIR)$(TARGET_DIR)/tutorial/images/callouts
 -	-(cd $(DESTDIR); gtkdoc-fixxref --module=libxml --html-dir=$(HTML_DIR))
--	-@(tar cf - tutorial | (cd $(DESTDIR)$(TARGET_DIR) && tar xvf -))
-+	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial
-+	-@(cd tutorial && $(PAX) -rwpppm . $(DESTDIR)$(TARGET_DIR)/tutorial)
  
  .PHONY : html xml templates scan
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/textproc/libxml2/patches/patch-ae b/textproc/libxml2/patches/patch-ae
deleted file mode 100644
index 26e76e2a306..00000000000
--- a/textproc/libxml2/patches/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2002/04/26 10:32:38 martti Exp $
-
---- include/libxml/xmlerror.h.orig	Wed Mar 13 03:35:14 2002
-+++ include/libxml/xmlerror.h	Fri Apr 26 11:42:36 2002
-@@ -182,3 +182,5 @@
- }
- #endif
- #endif /* __XML_ERROR_H__ */
-+
-+#include <libxml/globals.h>