Update to 2.6.8:

2.6.8: Mar 23 2004:
   - First step of the cleanup of the serialization code and APIs
   - XML Schemas: mixed content (Adam Dickmeiss), QName handling fixes (Adam
    Dickmeiss), anyURI for "" (John Belmonte)
   - Python: Canonicalization C14N support added (Anthony Carrico)
   - xmlDocCopyNode() extension (William)
   - Relax-NG: fix when processing XInclude results (William), external
    reference in interleave (William), missing error on <choice>
    failure (William), memory leak in schemas datatype facets.
   - xmlWriter: patch for better DTD support (Alfred Mickautsch)
   - bug fixes: xmlXPathLangFunction memory leak (Mike Hommey and William
    Brack), no ID errors if using HTML_PARSE_NOERROR, xmlcatalog fallbacks to
    URI on SYSTEM lookup failure, XInclude parse flags inheritance (William),
    XInclude and XPointer fixes for entities (William), XML parser bug
    reported by Holger Rauch, nanohttp fd leak (William),  regexps char
    groups '-' handling (William), dictionnary reference counting problems,
    do not close stderr.
   - performance patches from Petr Pajas
   - Documentation fixes: XML_CATALOG_FILES in man pages (Mike Hommey)
   - compilation and portability fixes: --without-valid, catalog cleanups
    (Peter Breitenlohner), MingW patch (Roland Schwingel), cross-compilation
    to Windows (Christophe de Vienne),  --with-html-dir fixup (Julio Merino
    Vidal), Windows build (Eric Zurcher)

6 files changed, 22 insertions, 60 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 064c04dfae8..20ac14181b2 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2004/03/22 22:25:59 snj Exp $
+# $NetBSD: Makefile,v 1.52 2004/03/28 21:31:46 jmmv Exp $
 
 DISTNAME=	libxml2-${LIBXML_VERSION}
 CATEGORIES=	textproc
@@ -16,12 +16,13 @@ USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE=	libxml-2.0.pc.in
 
-LIBXML_VERSION=		2.6.7
+LIBXML_VERSION=		2.6.8
 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+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-subdir=libxml2
 CONFIGURE_ARGS+=	--without-python
 
 # Don't use threads - it's not apparent whether it's necessary or not,
diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST
index 456ed2c80eb..4fdc07a02e6 100644
--- a/textproc/libxml2/PLIST
+++ b/textproc/libxml2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2004/02/23 21:49:05 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.28 2004/03/28 21:31:46 jmmv Exp $
 bin/xml2-config
 bin/xmlcatalog
 bin/xmllint
@@ -37,6 +37,7 @@ include/libxml2/libxml/xmlexports.h
 include/libxml2/libxml/xmlmemory.h
 include/libxml2/libxml/xmlreader.h
 include/libxml2/libxml/xmlregexp.h
+include/libxml2/libxml/xmlsave.h
 include/libxml2/libxml/xmlschemas.h
 include/libxml2/libxml/xmlschemastypes.h
 include/libxml2/libxml/xmlstring.h
@@ -50,7 +51,7 @@ lib/libxml2.a
 lib/libxml2.la
 lib/libxml2.so
 lib/libxml2.so.8
-lib/libxml2.so.8.7
+lib/libxml2.so.8.8
 lib/pkgconfig/libxml-2.0.pc
 lib/xml2Conf.sh
 man/man1/xml2-config.1
@@ -103,6 +104,7 @@ 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-xmlsave.html
 share/doc/html/libxml2/html/libxml-xmlschemas.html
 share/doc/html/libxml2/html/libxml-xmlschemastypes.html
 share/doc/html/libxml2/html/libxml-xmlstring.html
@@ -170,13 +172,13 @@ share/doc/html/libxml2/tutorial/ix01.html
 share/doc/html/libxml2/tutorial/xmltutorial.pdf
 share/doc/html/libxml2/w3c.png
 share/doc/html/libxml2/xml.html
-share/doc/libxml2/Copyright
+share/doc/${PKGNAME}/Copyright
 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/${PKGNAME}
 @dirrm share/doc/html/libxml2/tutorial/images/callouts
 @dirrm share/doc/html/libxml2/tutorial/images
 @dirrm share/doc/html/libxml2/tutorial
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 8019207fcd5..1fde442d697 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.35 2004/02/23 21:49:05 xtraeme Exp $
+$NetBSD: distinfo,v 1.36 2004/03/28 21:31:46 jmmv Exp $
 
-SHA1 (libxml2-2.6.7.tar.bz2) = 886c77a07555d9cba45a045acde2e5ffdcca34fb
-Size (libxml2-2.6.7.tar.bz2) = 2651941 bytes
-SHA1 (patch-aa) = 9013309e3a416de65bf5c86f0ade4303d05f0f0e
-SHA1 (patch-ab) = 9f715205d1ffb116b6b3793c1319f9c99410c4e4
-SHA1 (patch-ad) = 58da64df2e421d396e707044019787f066df68f3
+SHA1 (libxml2-2.6.8.tar.bz2) = 9f3435f4d02236880f68a236fbf8f13e8f16d5e2
+Size (libxml2-2.6.8.tar.bz2) = 2673629 bytes
+SHA1 (patch-aa) = 369701073e372382e247bc7b6a4b2c7e9dd5cb1d
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa
index ae775e8c3a2..d72c8423b27 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.15 2003/12/26 21:49:08 jmmv Exp $
+$NetBSD: patch-aa,v 1.16 2004/03/28 21:31:46 jmmv Exp $
 
---- Makefile.in.orig	2003-12-10 05:56:54.000000000 -0600
+--- Makefile.in.orig	2004-03-23 12:43:08.000000000 +0100
 +++ Makefile.in
-@@ -318,8 +318,8 @@ pkgconfig_DATA = libxml-2.0.pc
- # Instll the tests program sources as examples 
+@@ -522,7 +522,7 @@ pkgconfig_DATA = libxml-2.0.pc
  #
  BASE_DIR = $(datadir)/doc
--DOC_MODULE = libxml2-$(VERSION)
+ DOC_MODULE = libxml2-$(VERSION)
 -EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
-+DOC_MODULE = libxml2
-+EXAMPLES_DIR = $(datadir)/examples/$(DOC_MODULE)
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++EXAMPLES_DIR = $(datadir)/examples/libxml2
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
diff --git a/textproc/libxml2/patches/patch-ab b/textproc/libxml2/patches/patch-ab
deleted file mode 100644
index 7aa3cc9f94c..00000000000
--- a/textproc/libxml2/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 1d0caf5ea81..00000000000
--- a/textproc/libxml2/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.14 2003/12/26 21:49:08 jmmv Exp $
-
---- 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
-@@ -197,7 +197,7 @@ DOC_SOURCE_DIR = ..
- # A file in win32 depends upon one of the doc files
- WIN32_DIR = $(top_srcdir)/win32
- 
--TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html
-+TARGET_DIR = $(HTML_DIR)/html/$(DOC_MODULE)
- 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 \