Updated libxml2 to 2.4.20

* lots of bug fixes

7 files changed, 59 insertions, 39 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 20e935b51ff..0a7f0c86159 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2002/01/29 07:40:11 martti Exp $
+# $NetBSD: Makefile,v 1.12 2002/04/26 10:32:37 martti Exp $
 
-DISTNAME=	libxml2-2.4.13
+DISTNAME=	libxml2-2.4.20
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/libxml/}
 
@@ -16,6 +16,7 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS+=	--without-python
 
 .include "../../devel/zlib/buildlink.mk"
 .include "../../converters/libiconv/buildlink.mk"
diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST
index f44aa92c596..05a45ec56a9 100644
--- a/textproc/libxml2/PLIST
+++ b/textproc/libxml2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/01/29 07:40:11 martti Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/04/26 10:32:37 martti Exp $
 bin/xml2-config
 bin/xmlcatalog
 bin/xmllint
@@ -6,6 +6,7 @@ include/libxml2/libxml/DOCBparser.h
 include/libxml2/libxml/HTMLparser.h
 include/libxml2/libxml/HTMLtree.h
 include/libxml2/libxml/SAX.h
+include/libxml2/libxml/c14n.h
 include/libxml2/libxml/catalog.h
 include/libxml2/libxml/debugXML.h
 include/libxml2/libxml/encoding.h
@@ -35,19 +36,42 @@ lib/libxml2.a
 lib/libxml2.la
 lib/libxml2.so
 lib/libxml2.so.6
-lib/libxml2.so.6.13
+lib/libxml2.so.6.20
 lib/pkgconfig/libxml-2.0.pc
 lib/xml2Conf.sh
 man/man1/xml2-config.1
 man/man1/xmlcatalog.1
 man/man1/xmllint.1
-man/man4/libxml.4
+man/man3/libxml.3
 share/aclocal/libxml.m4
+share/doc/libxml2-2.4.20/Copyright
+share/doc/libxml2-2.4.20/examples/testHTML.c
+share/doc/libxml2-2.4.20/examples/testSAX.c
+share/doc/libxml2-2.4.20/examples/testXPath.c
+share/doc/libxml2-2.4.20/examples/xmllint.c
+share/doc/libxml2-python-2.4.20/examples/attribs.py
+share/doc/libxml2-python-2.4.20/examples/build.py
+share/doc/libxml2-python-2.4.20/examples/cutnpaste.py
+share/doc/libxml2-python-2.4.20/examples/error.py
+share/doc/libxml2-python-2.4.20/examples/invalid.xml
+share/doc/libxml2-python-2.4.20/examples/push.py
+share/doc/libxml2-python-2.4.20/examples/pushSAX.py
+share/doc/libxml2-python-2.4.20/examples/serialize.py
+share/doc/libxml2-python-2.4.20/examples/tst.py
+share/doc/libxml2-python-2.4.20/examples/tst.xml
+share/doc/libxml2-python-2.4.20/examples/tstURI.py
+share/doc/libxml2-python-2.4.20/examples/tstxpath.py
+share/doc/libxml2-python-2.4.20/examples/valid.xml
+share/doc/libxml2-python-2.4.20/examples/validate.py
+share/doc/libxml2-python-2.4.20/examples/xpath.py
+share/doc/libxml2-python-2.4.20/examples/xpathext.py
+share/doc/libxml2-python-2.4.20/examples/xpathret.py
 share/doc/libxml2/html/DOM.gif
 share/doc/libxml2/html/FAQ.html
 share/doc/libxml2/html/book1.html
 share/doc/libxml2/html/encoding.html
 share/doc/libxml2/html/index.sgml
+share/doc/libxml2/html/libxml-c14n.html
 share/doc/libxml2/html/libxml-catalog.html
 share/doc/libxml2/html/libxml-debugxml.html
 share/doc/libxml2/html/libxml-docbparser.html
@@ -75,10 +99,18 @@ share/doc/libxml2/html/libxml-xmlmemory.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.gif
+share/doc/libxml2/html/redhat.gif
+share/doc/libxml2/html/smallfootonly.gif
 share/doc/libxml2/html/structure.gif
+share/doc/libxml2/html/w3c.png
 share/doc/libxml2/html/xml.html
-@dirrm share/doc/libxml2/html
-@dirrm share/doc/libxml2
 @dirrm include/libxml2/libxml
 @dirrm include/libxml2
+@dirrm share/doc/libxml2-2.4.20/examples
+@dirrm share/doc/libxml2-2.4.20
+@dirrm share/doc/libxml2-python-2.4.20/examples
+@dirrm share/doc/libxml2-python-2.4.20
+@dirrm share/doc/libxml2/html
+@dirrm share/doc/libxml2
 @unexec ${RMDIR} -p %D/lib/pkgconfig 2>/dev/null || ${TRUE}
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 818f2691aa2..c6613d081bc 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.10 2002/01/29 07:40:11 martti Exp $
+$NetBSD: distinfo,v 1.11 2002/04/26 10:32:37 martti Exp $
 
-SHA1 (libxml2-2.4.13.tar.gz) = b55f11d8f3f1cd3aded7747214597c9dc5b0cf7d
-Size (libxml2-2.4.13.tar.gz) = 1590219 bytes
-SHA1 (patch-aa) = e32b6734a924099f02c528a00d12dab4fe274cc3
-SHA1 (patch-ab) = c95673821868af6d3953c880202d9485ce9f396c
+SHA1 (libxml2-2.4.20.tar.gz) = bcfd754bb7b9bd5cd6c46997633f2a982c343c2d
+Size (libxml2-2.4.20.tar.gz) = 1932630 bytes
+SHA1 (patch-aa) = 8a730b34fa09b2383544ed3cc7d35ab30895cf9c
 SHA1 (patch-ac) = b398c9a9c570fd188fd090f190422c1d58919a8c
-SHA1 (patch-ad) = 01f1c8b14d199cee39c359254db2074e3d15f68f
-SHA1 (patch-ae) = 9d86b6dce63df5a44e376a66d7797b2ad1188bfe
+SHA1 (patch-ad) = adfcfa0d4cfe21465a141a314a76387dfa0682fd
+SHA1 (patch-ae) = a94390e26b8344b94d78b0faa4b9ce50390e5e5b
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa
index f2395aa7b05..27c5df87bf0 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2002/01/29 07:40:11 martti Exp $
+$NetBSD: patch-aa,v 1.8 2002/04/26 10:32:37 martti Exp $
 
---- configure.orig	Mon Jan 14 18:58:56 2002
-+++ configure	Mon Jan 28 15:45:08 2002
-@@ -7095,7 +7095,7 @@
+--- configure.orig	Mon Apr 15 17:20:23 2002
++++ configure	Fri Apr 26 11:43:56 2002
+@@ -7097,7 +7097,7 @@
  fi
  
  
 -XML_LIBDIR='-L${libdir}'
 +XML_LIBDIR='-L${libdir} -Wl,-R${libdir}'
- XML_INCLUDEDIR='-I${includedir}/libxml2/libxml -I${includedir}/libxml2'
+ XML_INCLUDEDIR='-I${includedir}/libxml2'
  
  XML_CFLAGS=""
diff --git a/textproc/libxml2/patches/patch-ab b/textproc/libxml2/patches/patch-ab
deleted file mode 100644
index 169ca6c76b4..00000000000
--- a/textproc/libxml2/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2002/01/29 07:40:11 martti Exp $
-
---- include/libxml/parser.h.orig	Tue Jan  1 04:36:27 2002
-+++ include/libxml/parser.h	Mon Jan 28 15:45:26 2002
-@@ -575,7 +575,5 @@
- }
- #endif
- 
--#include <libxml/globals.h>
--
- #endif /* __XML_PARSER_H__ */
- 
diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-ad
index c9ab1dd0367..109e47de761 100644
--- a/textproc/libxml2/patches/patch-ad
+++ b/textproc/libxml2/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2002/01/29 07:40:11 martti Exp $
+$NetBSD: patch-ad,v 1.4 2002/04/26 10:32:38 martti Exp $
 
---- doc/Makefile.in.orig	Mon Jan 14 18:59:16 2002
-+++ doc/Makefile.in	Mon Jan 28 15:46:20 2002
-@@ -125,7 +125,7 @@
+--- doc/Makefile.in.orig	Mon Apr 15 17:20:43 2002
++++ doc/Makefile.in	Fri Apr 26 11:42:13 2002
+@@ -131,7 +131,7 @@
  Z_CFLAGS = @Z_CFLAGS@
  Z_LIBS = @Z_LIBS@
  
diff --git a/textproc/libxml2/patches/patch-ae b/textproc/libxml2/patches/patch-ae
index 338f2e07872..26e76e2a306 100644
--- a/textproc/libxml2/patches/patch-ae
+++ b/textproc/libxml2/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2001/11/17 15:28:49 tron Exp $
+$NetBSD: patch-ae,v 1.6 2002/04/26 10:32:38 martti Exp $
 
---- include/libxml/xmlerror.h.orig	Sun Oct 14 04:35:07 2001
-+++ include/libxml/xmlerror.h	Sat Nov 17 14:24:12 2001
-@@ -175,3 +175,5 @@
+--- include/libxml/xmlerror.h.orig	Wed Mar 13 03:35:14 2002
++++ include/libxml/xmlerror.h	Fri Apr 26 11:42:36 2002
+@@ -182,3 +182,5 @@
  }
  #endif
  #endif /* __XML_ERROR_H__ */