Updated libxml2 to 2.4.25

* bug fixes

5 files changed, 20 insertions, 39 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 9c70c1e6610..4e34ba7604f 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2002/09/10 16:06:49 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2002/10/03 14:06:15 martti Exp $
 
 DISTNAME=	libxml2-${LIBXML_VERSION}
-PKGREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/libxml/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.4/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://xmlsoft.org/
@@ -14,7 +13,7 @@ USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-LIBXML_VERSION=		2.4.24
+LIBXML_VERSION=		2.4.25
 PLIST_SUBST+=		LIBXML_VERSION=${LIBXML_VERSION}
 
 GNU_CONFIGURE=		yes
diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST
index 0bc6c6a35c2..873a4ace3a5 100644
--- a/textproc/libxml2/PLIST
+++ b/textproc/libxml2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2002/08/31 00:49:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2002/10/03 14:06:15 martti Exp $
 bin/xml2-config
 bin/xmlcatalog
 bin/xmllint
@@ -42,7 +42,7 @@ lib/libxml2.a
 lib/libxml2.la
 lib/libxml2.so
 lib/libxml2.so.6
-lib/libxml2.so.6.24
+lib/libxml2.so.6.25
 lib/pkgconfig/libxml-2.0.pc
 lib/xml2Conf.sh
 man/man1/xml2-config.1
@@ -55,26 +55,10 @@ share/doc/libxml2-${LIBXML_VERSION}/examples/testHTML.c
 share/doc/libxml2-${LIBXML_VERSION}/examples/testSAX.c
 share/doc/libxml2-${LIBXML_VERSION}/examples/testXPath.c
 share/doc/libxml2-${LIBXML_VERSION}/examples/xmllint.c
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/attribs.py
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/build.py
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/cutnpaste.py
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/error.py
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/invalid.xml
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/push.py
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/pushSAX.py
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/pushSAXhtml.py
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/serialize.py
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/tst.py
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/tst.xml
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/tstURI.py
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/tstxpath.py
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/valid.xml
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/validate.py
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/xpath.py
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/xpathext.py
-share/doc/libxml2-python-${LIBXML_VERSION}/examples/xpathret.py
 share/doc/libxml2/html/DOM.gif
 share/doc/libxml2/html/FAQ.html
+share/doc/libxml2/html/Libxml2-Logo-180x168.gif
+share/doc/libxml2/html/Libxml2-Logo-90x34.gif
 share/doc/libxml2/html/book1.html
 share/doc/libxml2/html/encoding.html
 share/doc/libxml2/html/index.sgml
@@ -116,8 +100,6 @@ share/doc/libxml2/html/xml.html
 @dirrm include/libxml2
 @dirrm share/doc/libxml2-${LIBXML_VERSION}/examples
 @dirrm share/doc/libxml2-${LIBXML_VERSION}
-@dirrm share/doc/libxml2-python-${LIBXML_VERSION}/examples
-@dirrm share/doc/libxml2-python-${LIBXML_VERSION}
 @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 2be749e8dc8..95b775c6c1c 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2002/08/31 00:49:25 wiz Exp $
+$NetBSD: distinfo,v 1.16 2002/10/03 14:06:15 martti Exp $
 
-SHA1 (libxml2-2.4.24.tar.gz) = 8f07250fd3cb29e897dba7c1e9bb323104368220
-Size (libxml2-2.4.24.tar.gz) = 2073571 bytes
-SHA1 (patch-aa) = 70f8af42212f1a1f91f8e74c97447fb27d7a7b4a
+SHA1 (libxml2-2.4.25.tar.gz) = b2dd81d77389d3999b520b7c4aad03a3a6b83800
+Size (libxml2-2.4.25.tar.gz) = 2119273 bytes
+SHA1 (patch-aa) = 3e89009c72b79420828069ebe967f25c5d193177
 SHA1 (patch-ac) = b398c9a9c570fd188fd090f190422c1d58919a8c
-SHA1 (patch-ad) = 0ef8f5c23aba922a5e1089a3cc9ad531e2856ea1
+SHA1 (patch-ad) = 976f18fa7f127ff8e54c83053feb9aa04bcd1ea5
 SHA1 (patch-ae) = a94390e26b8344b94d78b0faa4b9ce50390e5e5b
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa
index 00a2b296d60..736ef39bed7 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2002/08/25 18:40:12 jlam Exp $
+$NetBSD: patch-aa,v 1.11 2002/10/03 14:06:15 martti Exp $
 
---- configure.orig	Mon Apr 29 18:38:47 2002
-+++ configure	Fri May 17 14:51:28 2002
-@@ -7099,7 +7099,7 @@
+--- configure.orig	Thu Sep 26 20:17:42 2002
++++ configure	Thu Oct  3 12:51:09 2002
+@@ -7101,7 +7101,7 @@
  fi
  
  
diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-ad
index 33d5c79a689..2f0c01c363a 100644
--- a/textproc/libxml2/patches/patch-ad
+++ b/textproc/libxml2/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2002/08/25 18:40:12 jlam Exp $
+$NetBSD: patch-ad,v 1.7 2002/10/03 14:06:15 martti Exp $
 
---- doc/Makefile.in.orig	Mon Apr 29 18:39:10 2002
-+++ doc/Makefile.in	Fri May 17 14:51:51 2002
-@@ -133,7 +133,7 @@
+--- doc/Makefile.in.orig	Thu Sep 26 20:18:03 2002
++++ doc/Makefile.in	Thu Oct  3 12:51:30 2002
+@@ -136,7 +136,7 @@
  Z_CFLAGS = @Z_CFLAGS@
  Z_LIBS = @Z_LIBS@