Update to 2.6.22:

2.6.22: Sep 12 2005:
   - build fixes: compile without schematron (Stéphane Bidoul)
   - bug fixes: xmlDebugDumpNode on namespace node (Oleg Paraschenko)i,
      CDATA push parser bug, xmlElemDump problem with XHTML1 doc,
      XML_FEATURE_xxx clash with expat headers renamed XML_WITH_xxx,
      fix some output formatting for meta element (Rob Richards),
      script and style XHTML1 serialization (David Madore), Attribute
      derivation fixups in XSD (Kasimier Buchcik), better IDC error
      reports (Kasimier Buchcik)

   - improvements: add XML_SAVE_NO_EMPTY xmlSaveOption (Rob Richards),
      add XML_SAVE_NO_XHTML xmlSaveOption, XML Schemas improvements
      preparing for derive (Kasimier Buchcik).
   - documentation: generation of gtk-doc like docs, integration with
      devhelp.

pkgsrc change: install docs into share/doc instead of share/doc/html.

Ok'd by maintainer, recht.

4 files changed, 197 insertions, 128 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 4827fc86efc..510d1876b94 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2005/09/08 07:31:54 recht Exp $
+# $NetBSD: Makefile,v 1.74 2005/09/30 19:58:00 wiz Exp $
 
-DISTNAME=	libxml2-2.6.21
+DISTNAME=	libxml2-2.6.22
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +18,7 @@ PKGCONFIG_OVERRIDE=	libxml-2.0.pc.in
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--with-html-subdir=libxml2
 CONFIGURE_ARGS+=	--without-python
 
diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST
index 7a0252cc4bb..fabe6925768 100644
--- a/textproc/libxml2/PLIST
+++ b/textproc/libxml2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2005/09/05 07:37:50 recht Exp $
+@comment $NetBSD: PLIST,v 1.37 2005/09/30 19:58:00 wiz Exp $
 bin/xml2-config
 bin/xmlcatalog
 bin/xmllint
@@ -57,132 +57,187 @@ man/man1/xmlcatalog.1
 man/man1/xmllint.1
 man/man3/libxml.3
 share/aclocal/libxml.m4
-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/encoding.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-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-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-schematron.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-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-xmlmodule.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
-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
-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
-share/doc/html/libxml2/structure.gif
-share/doc/html/libxml2/tutorial/apa.html
-share/doc/html/libxml2/tutorial/apb.html
-share/doc/html/libxml2/tutorial/apc.html
-share/doc/html/libxml2/tutorial/apd.html
-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
-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
-share/doc/html/libxml2/tutorial/images/callouts/2.png
-share/doc/html/libxml2/tutorial/images/callouts/3.png
-share/doc/html/libxml2/tutorial/images/callouts/4.png
-share/doc/html/libxml2/tutorial/images/callouts/5.png
-share/doc/html/libxml2/tutorial/images/callouts/6.png
-share/doc/html/libxml2/tutorial/images/callouts/7.png
-share/doc/html/libxml2/tutorial/images/callouts/8.png
-share/doc/html/libxml2/tutorial/images/callouts/9.png
-share/doc/html/libxml2/tutorial/images/caution.png
-share/doc/html/libxml2/tutorial/images/draft.png
-share/doc/html/libxml2/tutorial/images/home.png
-share/doc/html/libxml2/tutorial/images/important.png
-share/doc/html/libxml2/tutorial/images/next.png
-share/doc/html/libxml2/tutorial/images/note.png
-share/doc/html/libxml2/tutorial/images/prev.png
-share/doc/html/libxml2/tutorial/images/tip.png
-share/doc/html/libxml2/tutorial/images/toc-blank.png
-share/doc/html/libxml2/tutorial/images/toc-minus.png
-share/doc/html/libxml2/tutorial/images/toc-plus.png
-share/doc/html/libxml2/tutorial/images/up.png
-share/doc/html/libxml2/tutorial/images/warning.png
-share/doc/html/libxml2/tutorial/includeaddattribute.c
-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
-share/doc/html/libxml2/w3c.png
-share/doc/html/libxml2/xml.html
 share/doc/${PKGNAME}/Copyright
+share/doc/libxml2/DOM.gif
+share/doc/libxml2/FAQ.html
+share/doc/libxml2/Libxml2-Logo-180x168.gif
+share/doc/libxml2/Libxml2-Logo-90x34.gif
+share/doc/libxml2/encoding.html
+share/doc/libxml2/general.html
+share/doc/libxml2/home.png
+share/doc/libxml2/html/book1.html
+share/doc/libxml2/html/home.png
+share/doc/libxml2/html/index.html
+share/doc/libxml2/html/left.png
+share/doc/libxml2/html/libxml-DOCBparser.html
+share/doc/libxml2/html/libxml-HTMLparser.html
+share/doc/libxml2/html/libxml-HTMLtree.html
+share/doc/libxml2/html/libxml-SAX.html
+share/doc/libxml2/html/libxml-SAX2.html
+share/doc/libxml2/html/libxml-c14n.html
+share/doc/libxml2/html/libxml-catalog.html
+share/doc/libxml2/html/libxml-chvalid.html
+share/doc/libxml2/html/libxml-debugXML.html
+share/doc/libxml2/html/libxml-dict.html
+share/doc/libxml2/html/libxml-encoding.html
+share/doc/libxml2/html/libxml-entities.html
+share/doc/libxml2/html/libxml-globals.html
+share/doc/libxml2/html/libxml-hash.html
+share/doc/libxml2/html/libxml-lib.html
+share/doc/libxml2/html/libxml-list.html
+share/doc/libxml2/html/libxml-nanoftp.html
+share/doc/libxml2/html/libxml-nanohttp.html
+share/doc/libxml2/html/libxml-parser.html
+share/doc/libxml2/html/libxml-parserInternals.html
+share/doc/libxml2/html/libxml-pattern.html
+share/doc/libxml2/html/libxml-relaxng.html
+share/doc/libxml2/html/libxml-schemasInternals.html
+share/doc/libxml2/html/libxml-schematron.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-xlink.html
+share/doc/libxml2/html/libxml-xmlIO.html
+share/doc/libxml2/html/libxml-xmlautomata.html
+share/doc/libxml2/html/libxml-xmlerror.html
+share/doc/libxml2/html/libxml-xmlexports.html
+share/doc/libxml2/html/libxml-xmlmemory.html
+share/doc/libxml2/html/libxml-xmlmodule.html
+share/doc/libxml2/html/libxml-xmlreader.html
+share/doc/libxml2/html/libxml-xmlregexp.html
+share/doc/libxml2/html/libxml-xmlsave.html
+share/doc/libxml2/html/libxml-xmlschemas.html
+share/doc/libxml2/html/libxml-xmlschemastypes.html
+share/doc/libxml2/html/libxml-xmlstring.html
+share/doc/libxml2/html/libxml-xmlunicode.html
+share/doc/libxml2/html/libxml-xmlversion.html
+share/doc/libxml2/html/libxml-xmlwriter.html
+share/doc/libxml2/html/libxml-xpath.html
+share/doc/libxml2/html/libxml-xpathInternals.html
+share/doc/libxml2/html/libxml-xpointer.html
+share/doc/libxml2/html/right.png
+share/doc/libxml2/html/up.png
+share/doc/libxml2/index.html
+share/doc/libxml2/left.png
+share/doc/libxml2/libxml.gif
+share/doc/libxml2/libxml2-DOCBparser.html
+share/doc/libxml2/libxml2-HTMLparser.html
+share/doc/libxml2/libxml2-HTMLtree.html
+share/doc/libxml2/libxml2-SAX.html
+share/doc/libxml2/libxml2-SAX2.html
+share/doc/libxml2/libxml2-c14n.html
+share/doc/libxml2/libxml2-catalog.html
+share/doc/libxml2/libxml2-chvalid.html
+share/doc/libxml2/libxml2-debugXML.html
+share/doc/libxml2/libxml2-dict.html
+share/doc/libxml2/libxml2-encoding.html
+share/doc/libxml2/libxml2-entities.html
+share/doc/libxml2/libxml2-globals.html
+share/doc/libxml2/libxml2-hash.html
+share/doc/libxml2/libxml2-list.html
+share/doc/libxml2/libxml2-nanoftp.html
+share/doc/libxml2/libxml2-nanohttp.html
+share/doc/libxml2/libxml2-parser.html
+share/doc/libxml2/libxml2-parserInternals.html
+share/doc/libxml2/libxml2-pattern.html
+share/doc/libxml2/libxml2-relaxng.html
+share/doc/libxml2/libxml2-schemasInternals.html
+share/doc/libxml2/libxml2-schematron.html
+share/doc/libxml2/libxml2-threads.html
+share/doc/libxml2/libxml2-tree.html
+share/doc/libxml2/libxml2-uri.html
+share/doc/libxml2/libxml2-valid.html
+share/doc/libxml2/libxml2-xinclude.html
+share/doc/libxml2/libxml2-xlink.html
+share/doc/libxml2/libxml2-xmlIO.html
+share/doc/libxml2/libxml2-xmlautomata.html
+share/doc/libxml2/libxml2-xmlerror.html
+share/doc/libxml2/libxml2-xmlexports.html
+share/doc/libxml2/libxml2-xmlmemory.html
+share/doc/libxml2/libxml2-xmlmodule.html
+share/doc/libxml2/libxml2-xmlreader.html
+share/doc/libxml2/libxml2-xmlregexp.html
+share/doc/libxml2/libxml2-xmlsave.html
+share/doc/libxml2/libxml2-xmlschemas.html
+share/doc/libxml2/libxml2-xmlschemastypes.html
+share/doc/libxml2/libxml2-xmlstring.html
+share/doc/libxml2/libxml2-xmlunicode.html
+share/doc/libxml2/libxml2-xmlversion.html
+share/doc/libxml2/libxml2-xmlwriter.html
+share/doc/libxml2/libxml2-xpath.html
+share/doc/libxml2/libxml2-xpathInternals.html
+share/doc/libxml2/libxml2-xpointer.html
+share/doc/libxml2/libxml2.devhelp
+share/doc/libxml2/redhat.gif
+share/doc/libxml2/right.png
+share/doc/libxml2/smallfootonly.gif
+share/doc/libxml2/structure.gif
+share/doc/libxml2/style.css
+share/doc/libxml2/tutorial/apa.html
+share/doc/libxml2/tutorial/apb.html
+share/doc/libxml2/tutorial/apc.html
+share/doc/libxml2/tutorial/apd.html
+share/doc/libxml2/tutorial/ape.html
+share/doc/libxml2/tutorial/apf.html
+share/doc/libxml2/tutorial/apg.html
+share/doc/libxml2/tutorial/aph.html
+share/doc/libxml2/tutorial/api.html
+share/doc/libxml2/tutorial/ar01s02.html
+share/doc/libxml2/tutorial/ar01s03.html
+share/doc/libxml2/tutorial/ar01s04.html
+share/doc/libxml2/tutorial/ar01s05.html
+share/doc/libxml2/tutorial/ar01s06.html
+share/doc/libxml2/tutorial/ar01s07.html
+share/doc/libxml2/tutorial/ar01s08.html
+share/doc/libxml2/tutorial/ar01s09.html
+share/doc/libxml2/tutorial/images/blank.png
+share/doc/libxml2/tutorial/images/callouts/1.png
+share/doc/libxml2/tutorial/images/callouts/10.png
+share/doc/libxml2/tutorial/images/callouts/2.png
+share/doc/libxml2/tutorial/images/callouts/3.png
+share/doc/libxml2/tutorial/images/callouts/4.png
+share/doc/libxml2/tutorial/images/callouts/5.png
+share/doc/libxml2/tutorial/images/callouts/6.png
+share/doc/libxml2/tutorial/images/callouts/7.png
+share/doc/libxml2/tutorial/images/callouts/8.png
+share/doc/libxml2/tutorial/images/callouts/9.png
+share/doc/libxml2/tutorial/images/caution.png
+share/doc/libxml2/tutorial/images/draft.png
+share/doc/libxml2/tutorial/images/home.png
+share/doc/libxml2/tutorial/images/important.png
+share/doc/libxml2/tutorial/images/next.png
+share/doc/libxml2/tutorial/images/note.png
+share/doc/libxml2/tutorial/images/prev.png
+share/doc/libxml2/tutorial/images/tip.png
+share/doc/libxml2/tutorial/images/toc-blank.png
+share/doc/libxml2/tutorial/images/toc-minus.png
+share/doc/libxml2/tutorial/images/toc-plus.png
+share/doc/libxml2/tutorial/images/up.png
+share/doc/libxml2/tutorial/images/warning.png
+share/doc/libxml2/tutorial/includeaddattribute.c
+share/doc/libxml2/tutorial/includeaddkeyword.c
+share/doc/libxml2/tutorial/includeconvert.c
+share/doc/libxml2/tutorial/includegetattribute.c
+share/doc/libxml2/tutorial/includekeyword.c
+share/doc/libxml2/tutorial/includexpath.c
+share/doc/libxml2/tutorial/index.html
+share/doc/libxml2/tutorial/ix01.html
+share/doc/libxml2/tutorial/xmltutorial.pdf
+share/doc/libxml2/up.png
+share/doc/libxml2/w3c.png
+share/doc/libxml2/xml.html
 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/${PKGNAME}
-@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/doc/libxml2/tutorial/images/callouts
+@dirrm share/doc/libxml2/tutorial/images
+@dirrm share/doc/libxml2/tutorial
+@dirrm share/doc/libxml2/html
+@dirrm share/doc/libxml2
 @dirrm include/libxml2/libxml
 @dirrm include/libxml2
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index c54b6d1a9db..5f304e0f917 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.52 2005/09/05 07:37:50 recht Exp $
+$NetBSD: distinfo,v 1.53 2005/09/30 19:58:00 wiz Exp $
 
-SHA1 (libxml2-2.6.21.tar.bz2) = 909a19bc750bd730125fb3233596b5e571dfae10
-RMD160 (libxml2-2.6.21.tar.bz2) = de7a91241d53911b65bb557a9d1b33e996df9c25
-Size (libxml2-2.6.21.tar.bz2) = 3216209 bytes
+SHA1 (libxml2-2.6.22.tar.bz2) = a9d2ad502244844b557545b42815353c859f5019
+RMD160 (libxml2-2.6.22.tar.bz2) = 41d45f462e2b690d0e01ad9f7d367fb9bfa49aea
+Size (libxml2-2.6.22.tar.bz2) = 3408455 bytes
 SHA1 (patch-aa) = 67cfa73ad1f105b69d6a424e636f6bb816d15878
 SHA1 (patch-ab) = 4b644838667a460cf4169e8228bf2d83a5aeebd6
 SHA1 (patch-ac) = 264c75cf9fff5319105b971c122cdf5fc103c04e
 SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177
+SHA1 (patch-ag) = 6ddd32565325e87cc6d7ff77e6eac2be029b7c2f
diff --git a/textproc/libxml2/patches/patch-ag b/textproc/libxml2/patches/patch-ag
new file mode 100644
index 00000000000..ccd3fdbf7fc
--- /dev/null
+++ b/textproc/libxml2/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2005/09/30 19:58:00 wiz Exp $
+
+--- doc/devhelp/Makefile.in.orig	2005-09-12 23:44:43.000000000 +0200
++++ doc/devhelp/Makefile.in
+@@ -258,7 +258,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-DEVHELP_DIR = $(datadir)/gtk-doc/html/libxml2
++DEVHELP_DIR = ${HTML_DIR}
+ HTML_FILES = index.html general.html $(HTML_MODULES)
+ HTML_MODULES = \
+ 	libxml2-c14n.html		\