update to 2.6.26

changes: fixes for bugs and memory leaks, minor optimizations

6 files changed, 12 insertions, 48 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 256b6dad31e..ba66b03e665 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.79 2006/05/15 08:27:31 minskim Exp $
+# $NetBSD: Makefile,v 1.80 2006/06/09 21:16:38 drochner Exp $
 
-DISTNAME=	libxml2-2.6.24
-PKGREVISION=	1
+DISTNAME=	libxml2-2.6.26
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index fe686fb355c..ff14ca7f1d9 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.58 2006/05/19 09:46:50 gavan Exp $
+$NetBSD: distinfo,v 1.59 2006/06/09 21:16:38 drochner Exp $
 
-SHA1 (libxml2-2.6.24.tar.bz2) = 637f4b4894c7195e6857449e46740473e2a944e7
-RMD160 (libxml2-2.6.24.tar.bz2) = 9fdde9634a5e49a79a67c0bf24ae860fb894fc5e
-Size (libxml2-2.6.24.tar.bz2) = 3419708 bytes
+SHA1 (libxml2-2.6.26.tar.bz2) = 7a3e175253d47c924e285e3b8e344ba59b5f1797
+RMD160 (libxml2-2.6.26.tar.bz2) = 374ad4860cff3bc37e159bf777302f0135be4c08
+Size (libxml2-2.6.26.tar.bz2) = 3418273 bytes
 SHA1 (patch-aa) = 67cfa73ad1f105b69d6a424e636f6bb816d15878
 SHA1 (patch-ab) = a8dc745539528db69bf1ccb8977a69c24fa818e3
 SHA1 (patch-ac) = 264c75cf9fff5319105b971c122cdf5fc103c04e
 SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177
 SHA1 (patch-ae) = fb6a05d5ecad8cba49d079ec6c54a061654b6351
 SHA1 (patch-ag) = 6ddd32565325e87cc6d7ff77e6eac2be029b7c2f
-SHA1 (patch-ah) = 4d97b98393a35cfa5518a5244836a7062bbc0752
-SHA1 (patch-ai) = f58b81881ac13d92d32cd8a79c13c499da5d2f06
diff --git a/textproc/libxml2/patches/patch-ah b/textproc/libxml2/patches/patch-ah
deleted file mode 100644
index e56ee1013a0..00000000000
--- a/textproc/libxml2/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/05/05 10:02:18 drochner Exp $
-
---- relaxng.c.orig	2006-05-05 11:39:00.000000000 +0200
-+++ relaxng.c
-@@ -7394,7 +7394,7 @@ xmlRelaxNGParse(xmlRelaxNGParserCtxtPtr 
-     if (root == NULL) {
-         xmlRngPErr(ctxt, (xmlNodePtr) doc,
- 	           XML_RNGP_EMPTY, "xmlRelaxNGParse: %s is empty\n",
--                   (ctxt->URL ? ctxt->URL : "schemas"), NULL);
-+                   (ctxt->URL ? ctxt->URL : (unsigned char *)"schemas"), NULL);
- 	
-         xmlFreeDoc(ctxt->document);
-         ctxt->document = NULL;
diff --git a/textproc/libxml2/patches/patch-ai b/textproc/libxml2/patches/patch-ai
deleted file mode 100644
index aa2d47d33b0..00000000000
--- a/textproc/libxml2/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/05/19 09:46:50 gavan Exp $
-
---- xmlIO.c.orig	Fri May 19 01:21:53 2006
-+++ xmlIO.c
-@@ -616,6 +616,7 @@ xmlCheckFilename (const char *path)
- 	}
- #else
- #ifdef HAVE_STAT
-+  {
-     struct stat stat_buffer;
- 
-     if (stat(path, &stat_buffer) == -1)
-@@ -625,6 +626,7 @@ xmlCheckFilename (const char *path)
-     if (S_ISDIR(stat_buffer.st_mode))
-         return 2;
- #endif /* S_ISDIR */
-+  }
- #endif /* HAVE_STAT */
- #endif /* WIN32 */
- 
diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
index 2c2afd8f23f..a733c2af04f 100644
--- a/textproc/py-libxml2/Makefile
+++ b/textproc/py-libxml2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2006/05/03 11:03:29 drochner Exp $
+# $NetBSD: Makefile,v 1.24 2006/06/09 21:16:39 drochner Exp $
 
-DISTNAME=	libxml2-2.6.24
+DISTNAME=	libxml2-2.6.26
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
diff --git a/textproc/py-libxml2/distinfo b/textproc/py-libxml2/distinfo
index 7ada0881dad..3a31280dcdb 100644
--- a/textproc/py-libxml2/distinfo
+++ b/textproc/py-libxml2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2006/05/03 11:03:29 drochner Exp $
+$NetBSD: distinfo,v 1.15 2006/06/09 21:16:39 drochner Exp $
 
-SHA1 (libxml2-2.6.24.tar.bz2) = 637f4b4894c7195e6857449e46740473e2a944e7
-RMD160 (libxml2-2.6.24.tar.bz2) = 9fdde9634a5e49a79a67c0bf24ae860fb894fc5e
-Size (libxml2-2.6.24.tar.bz2) = 3419708 bytes
+SHA1 (libxml2-2.6.26.tar.bz2) = 7a3e175253d47c924e285e3b8e344ba59b5f1797
+RMD160 (libxml2-2.6.26.tar.bz2) = 374ad4860cff3bc37e159bf777302f0135be4c08
+Size (libxml2-2.6.26.tar.bz2) = 3418273 bytes
 SHA1 (patch-aa) = 54ce6f91dd29144f22247d15093d6d273f5f433b