update tp 2.6.21

2.6.21: Sep 4 2005:
   - build fixes: Cygwin portability fixes (Gerrit P. Haase), calling
      convention problems on Windows (Marcus Boerger), cleanups based on
      Linus' sparse tool, update of win32/configure.js (Rob Richards),
      remove warnings on Windows(Marcus Boerger), compilation without SAX1,
      detection of the Python binary, use $GCC inestad of $CC = 'gcc' (Andrew
      W. Nosenko), compilation/link with threads and old gcc, compile
      problem by C370 on Z/OS,
   - bug fixes: http_proxy environments (Peter Breitenlohner), HTML UTF-8
      bug (Jiri Netolicky), XPath NaN compare bug (William Brack),
      htmlParseScript potential bug, Schemas regexp handling of spaces,
      Base64 Schemas comparisons NIST passes, automata build error xsd:all,
      xmlGetNodePath for namespaced attributes (Alexander Pohoyda),
      xmlSchemas foreign namespaces handling, XML Schemas facet comparison
      (Kupriyanov Anatolij), xmlSchemaPSimpleTypeErr error report (Kasimier
      Buchcik), xml: namespace ahndling in Schemas (Kasimier), empty model
      group in Schemas (Kasimier), wilcard in Schemas (Kasimier), URI
      composition (William), xs:anyType in Schemas (Kasimier), Python resolver
      emmitting error messages directly, Python xmlAttr.parent (Jakub Piotr
      Clapa), trying to fix the file path/URI conversion,
      xmlTextReaderGetAttribute fix (Rob Richards), xmlSchemaFreeAnnot memleak
      (Kasimier), HTML UTF-8 serialization, streaming XPath, Schemas determinism
      detection problem, XInclude bug, Schemas context type (Dean Hill),
      validation fix (Derek Poon), xmlTextReaderGetAttribute[Ns] namespaces
      (Rob Richards), Schemas type fix (Kuba Nowakowski), UTF-8 parser bug,
      error in encoding handling, xmlGetLineNo fixes, bug on entities handling,
      entity name extraction in error handling with XInclude, text nodes
      in HTML body tags (Gary Coady), xml:id and IDness at the treee level
      fixes, XPath streaming patterns bugs.
   - improvements: structured interfaces for schemas and RNG error reports
      (Marcus Boerger), optimization of the char data inner loop parsing
      (thanks to Behdad Esfahbod for the idea), schematron validation
      though not finished yet, xmlSaveOption to omit XML declaration,
      keyref match error reports (Kasimier), formal expression handling
      code not plugged yet, more lax mode for the HTML parser,
      parser XML_PARSE_COMPACT option for text nodes allocation.
   - documentation: xmllint man page had --nonet duplicated

5 files changed, 19 insertions, 17 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 6c02893d396..1cb0d5ebfc3 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2005/09/03 14:23:50 xtraeme Exp $
+# $NetBSD: Makefile,v 1.72 2005/09/05 07:37:50 recht Exp $
 
-DISTNAME=	libxml2-2.6.20
+DISTNAME=	libxml2-2.6.21
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST
index 1cc00138103..7a0252cc4bb 100644
--- a/textproc/libxml2/PLIST
+++ b/textproc/libxml2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2005/01/16 22:28:34 recht Exp $
+@comment $NetBSD: PLIST,v 1.36 2005/09/05 07:37:50 recht Exp $
 bin/xml2-config
 bin/xmlcatalog
 bin/xmllint
@@ -24,6 +24,7 @@ include/libxml2/libxml/parserInternals.h
 include/libxml2/libxml/pattern.h
 include/libxml2/libxml/relaxng.h
 include/libxml2/libxml/schemasInternals.h
+include/libxml2/libxml/schematron.h
 include/libxml2/libxml/threads.h
 include/libxml2/libxml/tree.h
 include/libxml2/libxml/uri.h
@@ -88,6 +89,7 @@ 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
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index ee7c0b394ce..c54b6d1a9db 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.51 2005/07/12 21:15:21 recht Exp $
+$NetBSD: distinfo,v 1.52 2005/09/05 07:37:50 recht Exp $
 
-SHA1 (libxml2-2.6.20.tar.bz2) = 3ed04f5f5ffffef5b8116da2b18fb06f73aa5f9e
-RMD160 (libxml2-2.6.20.tar.bz2) = 1e8dc9effc2c34bb77adb1c806ccb6fbc292159d
-Size (libxml2-2.6.20.tar.bz2) = 3115868 bytes
-SHA1 (patch-aa) = 435e487da648a0eca86a0fb9da66275034387bda
-SHA1 (patch-ab) = 8dda3540fa766eed2f92aeb4e014de2259cf47d1
+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 (patch-aa) = 67cfa73ad1f105b69d6a424e636f6bb816d15878
+SHA1 (patch-ab) = 4b644838667a460cf4169e8228bf2d83a5aeebd6
 SHA1 (patch-ac) = 264c75cf9fff5319105b971c122cdf5fc103c04e
 SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa
index da4f45494c3..cee350394f3 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.21 2005/07/12 21:15:21 recht Exp $
+$NetBSD: patch-aa,v 1.22 2005/09/05 07:37:50 recht Exp $
 
---- Makefile.in.orig	2005-07-11 00:53:22.000000000 +0200
-+++ Makefile.in
-@@ -550,7 +550,7 @@ pkgconfig_DATA = libxml-2.0.pc
+--- Makefile.in.orig	2005-09-04 23:50:49.000000000 +0200
++++ Makefile.in	2005-09-05 08:32:11.000000000 +0200
+@@ -554,7 +554,7 @@
  #
  BASE_DIR = $(datadir)/doc
  DOC_MODULE = libxml2-$(VERSION)
diff --git a/textproc/libxml2/patches/patch-ab b/textproc/libxml2/patches/patch-ab
index 4422cb8b1c8..b18f14ff89e 100644
--- a/textproc/libxml2/patches/patch-ab
+++ b/textproc/libxml2/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.13 2005/07/12 21:15:21 recht Exp $
+$NetBSD: patch-ab,v 1.14 2005/09/05 07:37:50 recht Exp $
 
---- configure.orig	2005-07-10 23:46:36.000000000 +0200
-+++ configure
-@@ -27505,7 +27505,7 @@ fi
+--- configure.orig	2005-09-04 20:27:56.000000000 +0200
++++ configure	2005-09-05 08:32:36.000000000 +0200
+@@ -27521,7 +27521,7 @@
  fi