Changes 2.9.1:

Features:
Support for Python3,
Add xmlXPathSetContextNode and xmlXPathNodeEval

Documentation:
Add documentation for xmllint --xpath
Fix the URL of the SAX documentation from James
Fix spelling of "length"

Portability:
Fix python bindings with versions older than 2.7
rebuild docs:Makefile.am
elfgcchack.h after rebuild in doc
elfgcchack for buf module
Fix a uneeded and wrong extra link parameter
Few cleanup patches for Windows
Fix rpmbuild --nocheck
Fix for win32/configure.js and WITH_THREAD_ALLOC
Fix Broken multi-arch support in xml2-config
Fix a portability issue for GCC < 3.4.0
Windows build fixes
Fix a thread portability problem
Downgrade autoconf requirement to 2.63

Bug Fixes:
Fix a linking error for python bindings
Fix a couple of return without value
Improve the hashing functions
Improve handling of xmlStopParser()
Remove risk of lockup in dictionary initialization
Activate detection of encoding in external subset
Fix an output buffer flushing conversion bug
Fix an old bug in xmlSchemaValidateOneElement
Fix configure cannot remove messages
fix schema validation in combination with xsi:nil
xmlCtxtReadFile doesn't work with literal IPv6 URLs
Fix a few problems with setEntityLoader
Detect excessive entities expansion upon replacement
Fix the flushing out of raw buffers on encoding conversions
Fix some buffer conversion issues
When calling xmlNodeDump make sure we grow the buffer quickly
Fix an error in the progressive DTD parsing code
xmllint should not load DTD by default when using the reader
Try IBM-037 when looking for EBCDIC handlers
Fix potential out of bound access
Fix large parse of file from memory
Fix a bug in the nsclean option of the parser
Fix a regression in 2.9.0 breaking validation while streaming
Remove potential calls to exit()

Improvements:
Regenerated API, and testapi, rebuild documentation
Fix tree iterators broken by 2to3 script
update all tests for Python3 and Python2
A few more fixes for python 3 affecting libxml2.py
Fix compilation on Python3
Converting apibuild.py to python3
First pass at starting porting to python3
updated configure.in for python3
Add support for xpathRegisterVariable in Python
Added a regression tests from bug 694228 data
Cache presence of '<' in entities content
Avoid extra processing on entities
Python binding for xmlRegisterInputCallback
Python bindings: DOM casts everything to xmlNode
Define LIBXML_THREAD_ALLOC_ENABLED via xmlversion.h
Adding streaming validation to runtest checks
Add a --pushsmall option to xmllint

Cleanups:
Switched comment in file to UTF-8 encoding
Extend gitignore
Silent the new python test on input
Cleanup of a duplicate test
Cleanup on duplicate test expressions
Fix compiler warning after 153cf15905cf4ec080612ada6703757d10caba1e
Spec cleanups and a fix for multiarch support
Silence a clang warning
Cleanup the Copyright to be pure MIT Licence wording
rand_seed should be static in dict.c
Fix typos in parser comments

11 files changed, 26 insertions, 274 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 040f69e0108..9905daad0d0 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.124 2013/04/18 10:17:42 drochner Exp $
+# $NetBSD: Makefile,v 1.125 2013/05/26 09:22:14 adam Exp $
 
-DISTNAME=	libxml2-2.9.0
-PKGREVISION=	3
+DISTNAME=	libxml2-2.9.1
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://xmlsoft.org/libxml2/ \
 		http://xmlsoft.org/sources/
diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST
index d82de5897c1..593be8e00f1 100644
--- a/textproc/libxml2/PLIST
+++ b/textproc/libxml2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.43 2012/09/15 10:23:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.44 2013/05/26 09:22:14 adam Exp $
 bin/xml2-config
 bin/xmlcatalog
 bin/xmllint
@@ -117,6 +117,7 @@ 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/libxml-xzlib.html
 share/doc/libxml2/html/right.png
 share/doc/libxml2/html/up.png
 share/doc/libxml2/io1.c
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 232f4d66db7..5f321ae9d1e 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,17 +1,13 @@
-$NetBSD: distinfo,v 1.100 2013/04/19 09:47:43 drochner Exp $
+$NetBSD: distinfo,v 1.101 2013/05/26 09:22:14 adam Exp $
 
-SHA1 (libxml2-2.9.0.tar.gz) = a43d7c0a8e463ac5a7846254f2a732a9af146fab
-RMD160 (libxml2-2.9.0.tar.gz) = d025639320bb34adbc45a43f46354190f6bbb7b5
-Size (libxml2-2.9.0.tar.gz) = 5161069 bytes
-SHA1 (patch-CVE-2012-5134) = 22caaed2b03334d42253b2b1c5a43473e6c8b4dc
-SHA1 (patch-CVE-2013-0338-CVE-2013-0339) = d9eb3fe147dff5afd6920d818e5f982505e0663f
-SHA1 (patch-SA53061_1) = ee1e4494c137aa7a294ad97a147f28f6bde11f30
-SHA1 (patch-SA53061_2) = c6a61235f0fcb6a00677a3582450700281eaa3ed
-SHA1 (patch-aa) = 6fcfb2e1ac374a7a047ee188a61ef218106ee54a
-SHA1 (patch-ab) = 8a7a5ae0c9d129826485c74f29cf4de3199212e7
+SHA1 (libxml2-2.9.1.tar.gz) = eb3e2146c6d68aea5c2a4422ed76fe196f933c21
+RMD160 (libxml2-2.9.1.tar.gz) = 257285d9ac070ed9f58666b7bd7c4653651c871b
+Size (libxml2-2.9.1.tar.gz) = 5172503 bytes
+SHA1 (patch-aa) = 589a279df1a5fac8b1b2dbd0018a1bbf0c5ab169
+SHA1 (patch-ab) = 11567fe9a3fde42f3901fd4ab4620bf845fe634b
 SHA1 (patch-ac) = 101cd554fd22e8e9817e21591240eb784b1219b5
 SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177
-SHA1 (patch-ae) = 035e015abf401b15af9bf052a108a1c7b8db6c79
+SHA1 (patch-ae) = 2823276343f65c7d244d22e548faa6a517445819
 SHA1 (patch-ag) = 19afd69713298ecbd247ba733a7c0c13464ae572
 SHA1 (patch-aj) = 988c30b4b09a1cbaf9e7db02bb8981da0f1beaa7
-SHA1 (patch-threads.c) = ed7339037e857707cf20217fa4c191d071e492f3
+SHA1 (patch-threads.c) = 70bb0a779dff6611f755128d609f82360a492f9a
diff --git a/textproc/libxml2/patches/patch-CVE-2012-5134 b/textproc/libxml2/patches/patch-CVE-2012-5134
deleted file mode 100644
index a81f5d908a0..00000000000
--- a/textproc/libxml2/patches/patch-CVE-2012-5134
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-CVE-2012-5134,v 1.1 2012/12/15 12:39:24 drochner Exp $
-
---- parser.c.orig	2012-09-11 04:24:08.000000000 +0000
-+++ parser.c
-@@ -4075,7 +4075,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr
-         goto error;
- 
-     if ((in_space) && (normalize)) {
--        while (buf[len - 1] == 0x20) len--;
-+        while ((len > 0) && (buf[len - 1] == 0x20)) len--;
-     }
-     buf[len] = 0;
-     if (RAW == '<') {
diff --git a/textproc/libxml2/patches/patch-CVE-2013-0338-CVE-2013-0339 b/textproc/libxml2/patches/patch-CVE-2013-0338-CVE-2013-0339
deleted file mode 100644
index 83aaef4ade9..00000000000
--- a/textproc/libxml2/patches/patch-CVE-2013-0338-CVE-2013-0339
+++ /dev/null
@@ -1,151 +0,0 @@
-$NetBSD: patch-CVE-2013-0338-CVE-2013-0339,v 1.1 2013/03/08 23:59:31 tez Exp $
-
-Fix for CVE-2013-0338 & CVE-2013-0339
-
-From 23f05e0c33987d6605387b300c4be5da2120a7ab Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Tue, 19 Feb 2013 02:21:49 +0000
-Subject: Detect excessive entities expansion upon replacement
-
-If entities expansion in the XML parser is asked for,
-it is possble to craft relatively small input document leading
-to excessive on-the-fly content generation.
-This patch accounts for those replacement and stop parsing
-after a given threshold. it can be bypassed as usual with the
-HUGE parser option.
-
-
---- include/libxml/parser.h
-+++ include/libxml/parser.h
-@@ -310,6 +310,7 @@ struct _xmlParserCtxt {
-     xmlParserNodeInfo *nodeInfoTab;   /* array of nodeInfos */
- 
-     int                input_id;      /* we need to label inputs */
-+    unsigned long      sizeentcopy;   /* volume of entity copy */
- };
- 
- /**
-
-
---- parser.c
-+++ parser.c
-@@ -122,7 +122,7 @@ xmlCreateEntityParserCtxtInternal(const xmlChar *URL, const xmlChar *ID,
-  */
- static int
- xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
--                     xmlEntityPtr ent)
-+                     xmlEntityPtr ent, size_t replacement)
- {
-     size_t consumed = 0;
- 
-@@ -130,7 +130,24 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
-         return (0);
-     if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP)
-         return (1);
--    if (size != 0) {
-+    if (replacement != 0) {
-+	if (replacement < XML_MAX_TEXT_LENGTH)
-+	    return(0);
-+
-+        /*
-+	 * If the volume of entity copy reaches 10 times the
-+	 * amount of parsed data and over the large text threshold
-+	 * then that's very likely to be an abuse.
-+	 */
-+        if (ctxt->input != NULL) {
-+	    consumed = ctxt->input->consumed +
-+	               (ctxt->input->cur - ctxt->input->base);
-+	}
-+        consumed += ctxt->sizeentities;
-+
-+        if (replacement < XML_PARSER_NON_LINEAR * consumed)
-+	    return(0);
-+    } else if (size != 0) {
-         /*
-          * Do the check based on the replacement size of the entity
-          */
-@@ -176,7 +193,6 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
-          */
-         return (0);
-     }
--
-     xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);
-     return (1);
- }
-@@ -2743,7 +2759,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
- 		    while (*current != 0) { /* non input consuming loop */
- 			buffer[nbchars++] = *current++;
- 			if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
--			    if (xmlParserEntityCheck(ctxt, nbchars, ent))
-+			    if (xmlParserEntityCheck(ctxt, nbchars, ent, 0))
- 				goto int_error;
- 			    growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
- 			}
-@@ -2785,7 +2801,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
- 		    while (*current != 0) { /* non input consuming loop */
- 			buffer[nbchars++] = *current++;
- 			if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
--			    if (xmlParserEntityCheck(ctxt, nbchars, ent))
-+			    if (xmlParserEntityCheck(ctxt, nbchars, ent, 0))
- 			        goto int_error;
- 			    growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
- 			}
-@@ -7203,7 +7219,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
- 	    xmlFreeNodeList(list);
- 	    return;
- 	}
--	if (xmlParserEntityCheck(ctxt, 0, ent)) {
-+	if (xmlParserEntityCheck(ctxt, 0, ent, 0)) {
- 	    xmlFreeNodeList(list);
- 	    return;
- 	}
-@@ -7361,6 +7377,13 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
- 		xmlNodePtr nw = NULL, cur, firstChild = NULL;
- 
- 		/*
-+		 * We are copying here, make sure there is no abuse
-+		 */
-+		ctxt->sizeentcopy += ent->length;
-+		if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy))
-+		    return;
-+
-+		/*
- 		 * when operating on a reader, the entities definitions
- 		 * are always owning the entities subtree.
- 		if (ctxt->parseMode == XML_PARSE_READER)
-@@ -7400,6 +7423,14 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
- 	    } else if ((list == NULL) || (ctxt->inputNr > 0)) {
- 		xmlNodePtr nw = NULL, cur, next, last,
- 			   firstChild = NULL;
-+
-+		/*
-+		 * We are copying here, make sure there is no abuse
-+		 */
-+		ctxt->sizeentcopy += ent->length;
-+		if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy))
-+		    return;
-+
- 		/*
- 		 * Copy the entity child list and make it the new
- 		 * entity child list. The goal is to make sure any
-@@ -14767,6 +14798,7 @@ xmlCtxtReset(xmlParserCtxtPtr ctxt)
-     ctxt->catalogs = NULL;
-     ctxt->nbentities = 0;
-     ctxt->sizeentities = 0;
-+    ctxt->sizeentcopy = 0;
-     xmlInitNodeInfoSeq(&ctxt->node_seq);
- 
-     if (ctxt->attsDefault != NULL) {
-
-
---- parserInternals.c
-+++ parserInternals.c
-@@ -1719,6 +1719,8 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt)
-     ctxt->charset = XML_CHAR_ENCODING_UTF8;
-     ctxt->catalogs = NULL;
-     ctxt->nbentities = 0;
-+    ctxt->sizeentities = 0;
-+    ctxt->sizeentcopy = 0;
-     ctxt->input_id = 1;
-     xmlInitNodeInfoSeq(&ctxt->node_seq);
-     return(0);
diff --git a/textproc/libxml2/patches/patch-SA53061_1 b/textproc/libxml2/patches/patch-SA53061_1
deleted file mode 100644
index 950d5b97580..00000000000
--- a/textproc/libxml2/patches/patch-SA53061_1
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-CVE-2013-1969
-upstream commit de0cc20c29cb3f056062925395e0f68d2250a46f
-
---- HTMLparser.c.orig	2012-09-11 04:23:25.000000000 +0000
-+++ HTMLparser.c
-@@ -6054,6 +6054,8 @@ htmlParseChunk(htmlParserCtxtPtr ctxt, c
- 	    if ((in->encoder != NULL) && (in->buffer != NULL) &&
- 		    (in->raw != NULL)) {
- 		int nbchars;
-+		size_t base = xmlBufGetInputBase(in->buffer, ctxt->input);
-+		size_t current = ctxt->input->cur - ctxt->input->base;
- 
- 		nbchars = xmlCharEncInput(in);
- 		if (nbchars < 0) {
-@@ -6061,6 +6063,7 @@ htmlParseChunk(htmlParserCtxtPtr ctxt, c
- 			         "encoder error\n", NULL, NULL);
- 		    return(XML_ERR_INVALID_ENCODING);
- 		}
-+		xmlBufSetInputBaseCur(in->buffer, ctxt->input, base, current);
- 	    }
- 	}
-     }
diff --git a/textproc/libxml2/patches/patch-SA53061_2 b/textproc/libxml2/patches/patch-SA53061_2
deleted file mode 100644
index cf3618bdd5f..00000000000
--- a/textproc/libxml2/patches/patch-SA53061_2
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-SA53061_2,v 1.1 2013/04/18 10:17:42 drochner Exp $
-
-upstream commit de0cc20c29cb3f056062925395e0f68d2250a46f
-
---- parser.c.orig	2013-04-18 10:04:15.000000000 +0000
-+++ parser.c
-@@ -12156,7 +12156,7 @@ xmldecl_done:
-                 remain = 0;
-             }
-         }
--	res =xmlParserInputBufferPush(ctxt->input->buf, size, chunk);
-+	res = xmlParserInputBufferPush(ctxt->input->buf, size, chunk);
- 	if (res < 0) {
- 	    ctxt->errNo = XML_PARSER_EOF;
- 	    ctxt->disableSAX = 1;
-@@ -12173,6 +12173,8 @@ xmldecl_done:
- 	    if ((in->encoder != NULL) && (in->buffer != NULL) &&
- 		    (in->raw != NULL)) {
- 		int nbchars;
-+		size_t base = xmlBufGetInputBase(in->buffer, ctxt->input);
-+		size_t current = ctxt->input->cur - ctxt->input->base;
- 
- 		nbchars = xmlCharEncInput(in);
- 		if (nbchars < 0) {
-@@ -12181,6 +12183,7 @@ xmldecl_done:
- 				    "xmlParseChunk: encoder error\n");
- 		    return(XML_ERR_INVALID_ENCODING);
- 		}
-+		xmlBufSetInputBaseCur(in->buffer, ctxt->input, base, current);
- 	    }
- 	}
-     }
-@@ -12220,7 +12223,14 @@ xmldecl_done:
-     }
-     if ((end_in_lf == 1) && (ctxt->input != NULL) &&
-         (ctxt->input->buf != NULL)) {
-+	size_t base = xmlBufGetInputBase(ctxt->input->buf->buffer,
-+					 ctxt->input);
-+	size_t current = ctxt->input->cur - ctxt->input->base;
-+
- 	xmlParserInputBufferPush(ctxt->input->buf, 1, "\r");
-+
-+	xmlBufSetInputBaseCur(ctxt->input->buf->buffer, ctxt->input,
-+			      base, current);
-     }
-     if (terminate) {
- 	/*
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa
index 15f18264acb..822c133b332 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.26 2012/09/15 10:23:38 adam Exp $
+$NetBSD: patch-aa,v 1.27 2013/05/26 09:22:14 adam Exp $
 
 --- Makefile.in.orig	2010-11-04 17:28:16.000000000 +0000
 +++ Makefile.in
-@@ -743,7 +743,7 @@ pkgconfig_DATA = libxml-2.0.pc
+@@ -765,7 +765,7 @@ pkgconfig_DATA = libxml-2.0.pc
  #
  BASE_DIR = $(datadir)/doc
  DOC_MODULE = libxml2-$(VERSION)
diff --git a/textproc/libxml2/patches/patch-ab b/textproc/libxml2/patches/patch-ab
index f6c2b25d5a0..19be1f61529 100644
--- a/textproc/libxml2/patches/patch-ab
+++ b/textproc/libxml2/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.26 2013/01/15 15:31:57 joerg Exp $
+$NetBSD: patch-ab,v 1.27 2013/05/26 09:22:14 adam Exp $
 
---- configure.orig	2012-09-11 06:55:35.000000000 +0000
+--- configure.orig	2013-04-19 07:36:11.000000000 +0000
 +++ configure
-@@ -13971,7 +13971,7 @@ fi
+@@ -13948,7 +13948,7 @@ fi
  fi
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.26 2013/01/15 15:31:57 joerg Exp $
  XML_INCLUDEDIR='-I${includedir}/libxml2'
  
  XML_CFLAGS=""
-@@ -14436,13 +14436,13 @@ else
+@@ -14417,13 +14417,13 @@ else
          if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
              ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
  if test "x$ac_cv_header_pthread_h" = xyes; then :
@@ -28,7 +28,7 @@ $NetBSD: patch-ab,v 1.26 2013/01/15 15:31:57 joerg Exp $
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -14474,7 +14474,7 @@ fi
+@@ -14455,7 +14455,7 @@ fi
  $as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
  if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then :
  
@@ -37,7 +37,7 @@ $NetBSD: patch-ab,v 1.26 2013/01/15 15:31:57 joerg Exp $
  
  $as_echo "#define HAVE_LIBPTHREAD /**/" >>confdefs.h
  
-@@ -14496,12 +14496,12 @@ fi
+@@ -14477,12 +14477,12 @@ fi
         *beos*) WITH_THREADS="1"
  	   THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
         ;;
@@ -52,7 +52,7 @@ $NetBSD: patch-ab,v 1.26 2013/01/15 15:31:57 joerg Exp $
  	           if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null
  		   then
  		       THREAD_LIBS=""
-@@ -14518,6 +14518,10 @@ fi
+@@ -14499,6 +14499,10 @@ fi
  	       fi
  	   fi
         ;;
@@ -63,7 +63,7 @@ $NetBSD: patch-ab,v 1.26 2013/01/15 15:31:57 joerg Exp $
      esac
      if test "$WITH_THREADS" = "1" ; then
  	THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
-@@ -14787,7 +14791,7 @@ else
+@@ -14769,7 +14773,7 @@ else
      TEST_SAX=SAXtests
  fi
  
@@ -72,7 +72,7 @@ $NetBSD: patch-ab,v 1.26 2013/01/15 15:31:57 joerg Exp $
    WITH_SAX1_SOURCES_TRUE=
    WITH_SAX1_SOURCES_FALSE='#'
  else
-@@ -15209,10 +15213,6 @@ case "$host" in
+@@ -15191,10 +15195,6 @@ case "$host" in
  
  $as_echo "#define _WINSOCKAPI_ 1" >>confdefs.h
  
diff --git a/textproc/libxml2/patches/patch-ae b/textproc/libxml2/patches/patch-ae
index a581ec25f33..a6563afeefa 100644
--- a/textproc/libxml2/patches/patch-ae
+++ b/textproc/libxml2/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.12 2012/09/15 10:23:38 adam Exp $
+$NetBSD: patch-ae,v 1.13 2013/05/26 09:22:14 adam Exp $
 
 --- doc/examples/Makefile.in.orig	2012-09-11 06:55:36.000000000 +0000
 +++ doc/examples/Makefile.in
-@@ -822,7 +822,7 @@ uninstall-am:
+@@ -844,7 +844,7 @@ uninstall-am:
  
  install-data-local: 
  	$(MKDIR_P) $(DESTDIR)$(HTML_DIR)
diff --git a/textproc/libxml2/patches/patch-threads.c b/textproc/libxml2/patches/patch-threads.c
index 9d687c26e89..16c2ed343fc 100644
--- a/textproc/libxml2/patches/patch-threads.c
+++ b/textproc/libxml2/patches/patch-threads.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-threads.c,v 1.3 2012/09/15 10:23:39 adam Exp $
+$NetBSD: patch-threads.c,v 1.4 2013/05/26 09:22:14 adam Exp $
 
 * Treat OpenBSD and MirBSD same as Linux to avoid linking with libpthread
 * NetBSD<4.99.36 and FreeBSD<7.0 lack pthread_equal() stub function in libc
@@ -36,12 +36,3 @@ $NetBSD: patch-threads.c,v 1.3 2012/09/15 10:23:39 adam Exp $
  #endif /* HAVE_PTHREAD_H */
  
  /*
-@@ -915,7 +923,7 @@ xmlCleanupThreads(void)
- #ifdef HAVE_PTHREAD_H
-     if ((libxml_is_threaded)  && (pthread_key_delete != NULL))
-         pthread_key_delete(globalkey);
--    once_control = PTHREAD_ONCE_INIT;
-+    once_control = (pthread_once_t)PTHREAD_ONCE_INIT;
- #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
-     if (globalkey != TLS_OUT_OF_INDEXES) {
-         xmlGlobalStateCleanupHelperParams *p;