Update to 2.4.26.

4 files changed, 8 insertions, 58 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 86ef6911cb5c..fb5407a93833 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.4.25
-PORTREVISION=	1
+PORTVERSION=	2.4.26
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 4a7ffa98c9fe..03e8db16f242 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libxml2-2.4.25.tar.bz2) = 1783360685323bd2a7d185a456c605bd
+MD5 (gnome2/libxml2-2.4.26.tar.bz2) = feef1cfa822fed07c25b94d4d335f137
diff --git a/textproc/libxml2/files/patch-temp b/textproc/libxml2/files/patch-temp
deleted file mode 100644
index 8d351d583eb2..000000000000
--- a/textproc/libxml2/files/patch-temp
+++ /dev/null
@@ -1,55 +0,0 @@
-This patch is from CVS and fixes a seg fault due to some bad memory
-management.  This will be fixed in the next release.
-
---- valid.c.orig	Wed Oct  9 12:03:48 2002
-+++ valid.c	Wed Oct  9 12:06:17 2002
-@@ -4551,9 +4551,9 @@
-        xmlElementPtr elemDecl, int warn, xmlNodePtr parent) {
-     int ret = 1;
- #ifndef  LIBXML_REGEXP_ENABLED
--    xmlNodePtr last = NULL;
-+    xmlNodePtr last = NULL, last = NULL, tmp;
- #endif
--    xmlNodePtr repl = NULL, cur, tmp;
-+    xmlNodePtr cur;
-     xmlElementContentPtr cont;
-     const xmlChar *name;
- 
-@@ -4571,6 +4571,9 @@
-     } else {
- 	xmlRegExecCtxtPtr exec;
- 
-+	ctxt->nodeMax = 0;
-+	ctxt->nodeNr = 0;
-+	ctxt->nodeTab = NULL;
- 	exec = xmlRegNewExecCtxt(elemDecl->contModel, NULL, NULL);
- 	if (exec != NULL) {
- 	    cur = child;
-@@ -4762,9 +4765,11 @@
- 	    expr[0] = 0;
- 	    xmlSnprintfElementContent(expr, 5000, cont, 1);
- 	    list[0] = 0;
-+#ifndef LIBXML_REGEXP_ENABLED
- 	    if (repl != NULL)
- 		xmlSnprintfElements(list, 5000, repl, 1);
- 	    else
-+#endif /* LIBXML_REGEXP_ENABLED */
- 		xmlSnprintfElements(list, 5000, child, 1);
- 
- 	    if (name != NULL) {
-@@ -4797,7 +4802,6 @@
- 
- #ifndef  LIBXML_REGEXP_ENABLED
- done:
--#endif
-     /*
-      * Deallocate the copy if done, and free up the validation stack
-      */
-@@ -4811,6 +4815,7 @@
- 	xmlFree(ctxt->vstateTab);
- 	ctxt->vstateTab = NULL;
-     }
-+#endif
-     ctxt->nodeMax = 0;
-     ctxt->nodeNr = 0;
-     if (ctxt->nodeTab != NULL) {
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index 069e1412bb1c..b2c9ac20b879 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -97,14 +97,20 @@ share/doc/libxml2/html/libxml-notes.html
 share/doc/libxml2/html/libxml-parser.html
 share/doc/libxml2/html/libxml-parserinternals.html
 share/doc/libxml2/html/libxml-sax.html
+share/doc/libxml2/html/libxml-schemasinternals.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-xmlautomata.html
 share/doc/libxml2/html/libxml-xmlerror.html
 share/doc/libxml2/html/libxml-xmlio.html
 share/doc/libxml2/html/libxml-xmlmemory.html
+share/doc/libxml2/html/libxml-xmlregexp.html
+share/doc/libxml2/html/libxml-xmlschemas.html
+share/doc/libxml2/html/libxml-xmlschemastypes.html
+share/doc/libxml2/html/libxml-xmlunicode.html
 share/doc/libxml2/html/libxml-xpath.html
 share/doc/libxml2/html/libxml-xpathinternals.html
 share/doc/libxml2/html/libxml-xpointer.html