Update to 2.6.4, from Min Sik Kim in PR pkg/23895 with some changes by me:

2.6.4: Dec 24 2003:
   - Windows build fixes (Igor Zlatkovic)
   - Some serious XInclude problems reported by Oleg Paraschenko and
   - Unix and Makefile packaging fixes (me, William Brack,
   - Documentation improvements (John Fleck, William Brack), example fix
    (Lucas Brasilino)
   - bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of
    NULL strings (William Brack) , API building reader or parser from
    filedescriptor should not close it, changed XPath sorting to be stable
    again (William Brack), xmlGetNodePath() generating '(null)' (William
    Brack), DTD validation and namespace bug (William Brack), XML Schemas
    double inclusion behaviour

2.6.3: Dec 10 2003:
   - documentation updates and cleanup (DV, William Brack, John Fleck)
   - added a repository of examples, examples from Aleksey Sanin, Dodji
    Seketeli, Alfred Mickautsch
   - Windows updates: Mark Vakoc, Igor Zlatkovic, Eric Zurcher, Mingw
    (Kenneth Haley)
   - Unicode range checking (William Brack)
   - code cleanup (William Brack)
   - Python bindings: doc (John Fleck),  bug fixes
   - UTF-16 cleanup and BOM issues (William Brack)
   - bug fixes: ID and xmlReader validation, XPath (William Brack),
    xmlWriter (Alfred Mickautsch), hash.h inclusion problem, HTML parser
    (James Bursa), attribute defaulting and validation, some serialization
    cleanups, XML_GET_LINE macro, memory debug when using threads (William
    Brack), serialization of attributes and entities content, xmlWriter
    (Daniel Schulman)
   - XInclude bugfix, new APIs and update to the last version including the
    namespace change.
   - XML Schemas improvements: include (Robert Stepanek), import and
    namespace handling, fixed the regression tests troubles, added examples
    based on Eric van der Vlist book, regexp fixes
   - preliminary pattern support for streaming (needed for schemas
    constraints), added xmlTextReaderPreservePattern() to collect subdocument
    when streaming.
   - various fixes in the structured error handling

6 files changed, 45 insertions, 28 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index ee768013fc2..d2b9577329e 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2003/12/04 19:33:38 xtraeme Exp $
+# $NetBSD: Makefile,v 1.40 2003/12/26 21:49:08 jmmv Exp $
 
 DISTNAME=	libxml2-${LIBXML_VERSION}
 CATEGORIES=	textproc
@@ -15,7 +15,7 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libxml-2.0.pc.in
 
-LIBXML_VERSION=		2.6.2
+LIBXML_VERSION=		2.6.4
 PLIST_SUBST+=		LIBXML_VERSION=${LIBXML_VERSION}
 
 GNU_CONFIGURE=		yes
diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST
index d710cbb45a0..c62c0f4e6cd 100644
--- a/textproc/libxml2/PLIST
+++ b/textproc/libxml2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2003/12/04 19:33:38 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.24 2003/12/26 21:49:08 jmmv Exp $
 bin/xml2-config
 bin/xmlcatalog
 bin/xmllint
@@ -21,6 +21,7 @@ include/libxml2/libxml/nanoftp.h
 include/libxml2/libxml/nanohttp.h
 include/libxml2/libxml/parser.h
 include/libxml2/libxml/parserInternals.h
+include/libxml2/libxml/pattern.h
 include/libxml2/libxml/relaxng.h
 include/libxml2/libxml/schemasInternals.h
 include/libxml2/libxml/threads.h
@@ -48,7 +49,7 @@ lib/libxml2.a
 lib/libxml2.la
 lib/libxml2.so
 lib/libxml2.so.8
-lib/libxml2.so.8.2
+lib/libxml2.so.8.4
 lib/pkgconfig/libxml-2.0.pc
 lib/xml2Conf.sh
 man/man1/xml2-config.1
@@ -69,19 +70,23 @@ 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-SAX2.html
 share/doc/html/libxml2/html/libxml-c14n.html
 share/doc/html/libxml2/html/libxml-catalog.html
+share/doc/html/libxml2/html/libxml-chvalid.html
 share/doc/html/libxml2/html/libxml-debugXML.html
+share/doc/html/libxml2/html/libxml-dict.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-list.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-pattern.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
@@ -89,15 +94,19 @@ 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-xlink.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-xmlexports.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-xmlversion.html
+share/doc/html/libxml2/html/libxml-xmlwriter.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
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index cc4065e9634..33b66839d46 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.31 2003/12/04 21:03:02 xtraeme Exp $
+$NetBSD: distinfo,v 1.32 2003/12/26 21:49:08 jmmv Exp $
 
-SHA1 (libxml2-2.6.2.tar.bz2) = f25c2a3216de2a0b0288eae082539939b63f2161
-Size (libxml2-2.6.2.tar.bz2) = 2488212 bytes
-SHA1 (patch-aa) = 2fafd2403a3477241cffe5c2655da349c84d8249
-SHA1 (patch-ad) = 3e88c035cd580afe04d8a1c2ee6d3919c8de10a2
+SHA1 (libxml2-2.6.4.tar.bz2) = 69828400b55ce4f70215c49b62ce546623438d61
+Size (libxml2-2.6.4.tar.bz2) = 2644177 bytes
+SHA1 (patch-aa) = 9013309e3a416de65bf5c86f0ade4303d05f0f0e
+SHA1 (patch-ab) = 9f715205d1ffb116b6b3793c1319f9c99410c4e4
+SHA1 (patch-ad) = 58da64df2e421d396e707044019787f066df68f3
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa
index 8d339c59f44..ae775e8c3a2 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2003/08/29 11:22:22 xtraeme Exp $
+$NetBSD: patch-aa,v 1.15 2003/12/26 21:49:08 jmmv Exp $
 
---- Makefile.in.orig	2003-08-29 12:38:56.000000000 +0200
-+++ Makefile.in	2003-08-29 12:39:44.000000000 +0200
-@@ -289,8 +289,8 @@
+--- Makefile.in.orig	2003-12-10 05:56:54.000000000 -0600
++++ Makefile.in
+@@ -318,8 +318,8 @@ pkgconfig_DATA = libxml-2.0.pc
  # Instll the tests program sources as examples 
  #
  BASE_DIR = $(datadir)/doc
diff --git a/textproc/libxml2/patches/patch-ab b/textproc/libxml2/patches/patch-ab
new file mode 100644
index 00000000000..7aa3cc9f94c
--- /dev/null
+++ b/textproc/libxml2/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.7 2003/12/26 21:49:08 jmmv Exp $
+
+--- doc/examples/Makefile.in.orig	2003-12-24 12:53:04.000000000 +0100
++++ doc/examples/Makefile.in
+@@ -185,8 +185,8 @@ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+ pythondir = @pythondir@
+-DOC_MODULE = libxml2-$(VERSION)
+-TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/examples
++DOC_MODULE = libxml2
++TARGET_DIR = $(datadir)/examples/$(DOC_MODULE)
+ 
+ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@
+ DEPS = $(top_builddir)/libxml2.la
diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-ad
index aa9f491e8d1..1d0caf5ea81 100644
--- a/textproc/libxml2/patches/patch-ad
+++ b/textproc/libxml2/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.13 2003/12/04 19:33:38 xtraeme Exp $
+$NetBSD: patch-ad,v 1.14 2003/12/26 21:49:08 jmmv Exp $
 
---- 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 @@
+--- doc/Makefile.in.orig	2003-12-24 05:53:04.000000000 -0600
++++ doc/Makefile.in
+@@ -186,7 +186,7 @@ install_sh = @install_sh@
  pythondir = @pythondir@
- 
+ SUBDIRS = examples
  # The name of the module.
 -DOC_MODULE = libxml2-$(VERSION)
 +DOC_MODULE = libxml2
  
  # The top-level SGML file.
  DOC_MAIN_XML_FILE = gnome-xml.xml
-@@ -186,7 +186,7 @@
+@@ -197,7 +197,7 @@ DOC_SOURCE_DIR = ..
  # A file in win32 depends upon one of the doc files
  WIN32_DIR = $(top_srcdir)/win32
  
@@ -20,11 +20,3 @@ $NetBSD: patch-ad,v 1.13 2003/12/04 19:33:38 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 \
-@@ -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))
- 
- .PHONY : html xml templates scan
- # Tell versions [3.59,3.63) of GNU make to not export all variables.