update to 2.7.7

changes:
-Adding a --xpath option to xmllint
-Make HTML parser non-recursive
-misc portability improvements and bugfixes

5 files changed, 11 insertions, 59 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 7544d6a8c61..40244220c8f 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.103 2009/10/31 03:05:20 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2010/04/13 16:04:09 drochner Exp $
 
-DISTNAME=	libxml2-2.7.6
+DISTNAME=	libxml2-2.7.7
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://xmlsoft.org/libxml2/ \
 		http://xmlsoft.org/sources/
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index b1bcf858144..129b080b7bc 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.76 2009/11/22 14:05:26 sno Exp $
+$NetBSD: distinfo,v 1.77 2010/04/13 16:04:09 drochner Exp $
 
-SHA1 (libxml2-2.7.6.tar.gz) = b0f6bf8408e759ac4b8b9650005ee8adea911e1d
-RMD160 (libxml2-2.7.6.tar.gz) = 849ded7b61f88e75ef0dacf0e5647ce8ad951261
-Size (libxml2-2.7.6.tar.gz) = 4854591 bytes
+SHA1 (libxml2-2.7.7.tar.gz) = 8592824a2788574a172cbddcdc72f734ff87abe3
+RMD160 (libxml2-2.7.7.tar.gz) = 9f72c778c3e9e348a68eada0cf624c012658c085
+Size (libxml2-2.7.7.tar.gz) = 4868502 bytes
 SHA1 (patch-aa) = bf7db00ddf8a36394521baf656cf83d99bd9cbd3
-SHA1 (patch-ab) = 456a866cd81dd129c1e593444f8f3bde12e25b3d
+SHA1 (patch-ab) = d7e61cdec90790c905f9d699919a2da397de3dcc
 SHA1 (patch-ac) = 264c75cf9fff5319105b971c122cdf5fc103c04e
 SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177
 SHA1 (patch-ae) = b9176919edbf3582cb24aff53f7c4f291e2b78c8
 SHA1 (patch-ag) = 30ec5c8daece4aba75a02bbc13db5373542dea7b
-SHA1 (patch-ah) = 5cdb10502f7d41cbe2570d2cbd1c46d6a25f0394
-SHA1 (patch-ai) = cad3a90c040f759c72ef0f3c161baa7270e60575
diff --git a/textproc/libxml2/patches/patch-ab b/textproc/libxml2/patches/patch-ab
index 658e280383b..367e0ad912d 100644
--- a/textproc/libxml2/patches/patch-ab
+++ b/textproc/libxml2/patches/patch-ab
@@ -1,17 +1,8 @@
-$NetBSD: patch-ab,v 1.17 2009/11/22 14:05:26 sno Exp $
+$NetBSD: patch-ab,v 1.18 2010/04/13 16:04:09 drochner Exp $
 
---- configure.orig	Tue Oct  6 18:31:12 2009
-+++ configure	Mon Nov 16 17:18:20 2009
-@@ -12149,8 +12149,6 @@
- VERSION_SCRIPT_FLAGS=
- $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
-     VERSION_SCRIPT_FLAGS=-Wl,--version-script=
--test "`uname`" == "SunOS" && \
--    VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
- 
-  if test -n "$VERSION_SCRIPT_FLAGS"; then
-   USE_VERSION_SCRIPT_TRUE=
-@@ -19725,7 +19723,7 @@
+--- configure.orig	2010-03-15 15:18:22.000000000 +0000
++++ configure
+@@ -19734,7 +19734,7 @@ fi
  fi
  
  
diff --git a/textproc/libxml2/patches/patch-ah b/textproc/libxml2/patches/patch-ah
deleted file mode 100644
index cd11a82ce74..00000000000
--- a/textproc/libxml2/patches/patch-ah
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2009/10/25 17:19:44 sno Exp $
-
-Fixes compiler error "operands have incompatible types"
-
---- relaxng.c.orig	2009-10-25 19:02:59.621179988 +0100
-+++ relaxng.c	2009-10-25 19:03:31.920058072 +0100
-@@ -5369,7 +5369,7 @@
-     } else {
-         xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT,
-                    "expecting name, anyName, nsName or choice : got %s\n",
--                   (node == NULL ? "nothing" : node->name), NULL);
-+                   (node == NULL ? (const xmlChar *)"nothing" : node->name), NULL);
-         return (NULL);
-     }
-     if (ret != def) {
-@@ -9459,7 +9459,7 @@
-             ctxt->states = NULL;
-             if (found == 0) {
-                 if (cur == NULL) {
--                    VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname");
-+                    VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, (const xmlChar *)"noname");
-                 } else {
-                     VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name);
-                 }
diff --git a/textproc/libxml2/patches/patch-ai b/textproc/libxml2/patches/patch-ai
deleted file mode 100644
index af4ab12113a..00000000000
--- a/textproc/libxml2/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2009/11/22 14:05:26 sno Exp $
-
---- configure.in.orig	Mon Nov 16 17:18:38 2009
-+++ configure.in	Mon Nov 16 17:20:27 2009
-@@ -74,8 +74,6 @@
- VERSION_SCRIPT_FLAGS=
- $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
-     VERSION_SCRIPT_FLAGS=-Wl,--version-script=
--test "`uname`" == "SunOS" && \
--    VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
- AC_SUBST(VERSION_SCRIPT_FLAGS)
- AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
-