Updated to 2.5.10

Changes:

2.5.10: Aug 15 2003:
A bugfixes only release   - Windows Makefiles (William Brack)
   - UTF-16 support fixes (Mark Itzcovitz)
   - Makefile and portability (William Brack) automake, Linux alpha, Mingw
    on Windows (Mikhail Grushinskiy)
   - HTML parser (Oliver Stoeneberg)
   - XInclude performance problem reported by Kevin Ruscoe
   - XML parser performance problem reported by Grant Goodale
   - xmlSAXParseDTD() bug fix from Malcolm Tredinnick
   - and a couple other cleanup


2.5.9: Aug 9 2003:
   - bugfixes: IPv6 portability, xmlHasNsProp (Markus Keim), Windows build
    (Wiliam Brake, Jesse Pelton, Igor), Schemas (Peter Sobisch), threading
    (Rob Richards), hexBinary type (), UTF-16 BOM (Dodji Seketeli),
    xmlReader, Relax-NG schemas compilation, namespace handling,  EXSLT (Sean
    Griffin), HTML parsing problem (William Brack), DTD validation for mixed
    content + namespaces, HTML serialization, library initialization,
    progressive HTML parser
   - better interfaces for Relax-NG error handling (Joachim Bauch, )
   - adding xmlXIncludeProcessTree() for XInclud'ing in a subtree
   - doc fixes and improvements (John Fleck)
   - configure flag for -with-fexceptions when embedding in C++
   - couple of new UTF-8 helper functions (William Brack)
   - general encoding cleanup + ISO-8859-x without iconv (Peter Jacobi)
   - xmlTextReader cleanup + enum for node types (Bjorn Reese)
   - general compilation/warning cleanup Solaris/HP-UX/... (William
  Brack)

5 files changed, 25 insertions, 26 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 011593e45b4..4b763a0996e 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2003/07/17 22:54:29 grant Exp $
+# $NetBSD: Makefile,v 1.35 2003/08/29 11:22:21 xtraeme Exp $
 
 DISTNAME=	libxml2-${LIBXML_VERSION}
-PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.5/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://xmlsoft.org/
@@ -15,7 +15,7 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libxml-2.0.pc.in
 
-LIBXML_VERSION=		2.5.8
+LIBXML_VERSION=		2.5.10
 PLIST_SUBST+=		LIBXML_VERSION=${LIBXML_VERSION}
 
 GNU_CONFIGURE=		yes
diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST
index 24c1eda6ba1..470c05bc53f 100644
--- a/textproc/libxml2/PLIST
+++ b/textproc/libxml2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2003/07/11 23:28:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2003/08/29 11:22:22 xtraeme Exp $
 bin/xml2-config
 bin/xmlcatalog
 bin/xmllint
@@ -43,7 +43,7 @@ lib/libxml2.a
 lib/libxml2.la
 lib/libxml2.so
 lib/libxml2.so.7
-lib/libxml2.so.7.8
+lib/libxml2.so.7.10
 lib/pkgconfig/libxml-2.0.pc
 lib/xml2Conf.sh
 man/man1/xml2-config.1
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 166d10828c0..8dfce419344 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.27 2003/07/11 23:28:05 wiz Exp $
+$NetBSD: distinfo,v 1.28 2003/08/29 11:22:22 xtraeme Exp $
 
-SHA1 (libxml2-2.5.8.tar.gz) = 10d1ec658974e488d46edb53849b5d4b95f133bb
-Size (libxml2-2.5.8.tar.gz) = 3049886 bytes
-SHA1 (patch-aa) = efb1f44c0fa3bee193cea7da966e6cbe257fe7c1
-SHA1 (patch-ad) = 1bf290bf867d5f297657578f1d7f6fe3f178a174
+SHA1 (libxml2-2.5.10.tar.bz2) = bc1275cec07e555d372abb994e4602a76436a6ee
+Size (libxml2-2.5.10.tar.bz2) = 2438042 bytes
+SHA1 (patch-aa) = 2fafd2403a3477241cffe5c2655da349c84d8249
+SHA1 (patch-ad) = e092681097df687137d337a15bbd3faf58c548db
 SHA1 (patch-ae) = a94390e26b8344b94d78b0faa4b9ce50390e5e5b
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa
index 417dccb6315..8d339c59f44 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2003/07/01 09:45:54 wiz Exp $
+$NetBSD: patch-aa,v 1.14 2003/08/29 11:22:22 xtraeme Exp $
 
---- Makefile.in.orig	2003-02-24 18:11:25.000000000 +0100
-+++ Makefile.in
-@@ -271,8 +271,8 @@ pkgconfig_DATA = libxml-2.0.pc
+--- Makefile.in.orig	2003-08-29 12:38:56.000000000 +0200
++++ Makefile.in	2003-08-29 12:39:44.000000000 +0200
+@@ -289,8 +289,8 @@
  # Instll the tests program sources as examples 
  #
  BASE_DIR = $(datadir)/doc
@@ -10,6 +10,6 @@ $NetBSD: patch-aa,v 1.13 2003/07/01 09:45:54 wiz Exp $
 -EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
 +DOC_MODULE = libxml2
 +EXAMPLES_DIR = $(datadir)/examples/$(DOC_MODULE)
+ subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-ad
index d058947b23a..ed3c6cc30df 100644
--- a/textproc/libxml2/patches/patch-ad
+++ b/textproc/libxml2/patches/patch-ad
@@ -1,26 +1,26 @@
-$NetBSD: patch-ad,v 1.11 2003/07/11 23:28:06 wiz Exp $
+$NetBSD: patch-ad,v 1.12 2003/08/29 11:22:22 xtraeme Exp $
 
---- doc/Makefile.in.orig	Sun Jul  6 23:14:59 2003
-+++ doc/Makefile.in
-@@ -139,7 +139,7 @@ Z_CFLAGS = @Z_CFLAGS@
- Z_LIBS = @Z_LIBS@
+--- doc/Makefile.in.orig	2003-08-29 12:40:10.000000000 +0200
++++ doc/Makefile.in	2003-08-29 12:41:11.000000000 +0200
+@@ -153,7 +153,7 @@
  pythondir = @pythondir@
  
+ # The name of the module.
 -DOC_MODULE = libxml2-$(VERSION)
 +DOC_MODULE = libxml2
  
  # The top-level SGML file.
  DOC_MAIN_XML_FILE = gnome-xml.xml
-@@ -149,7 +149,7 @@ DOC_SOURCE_DIR = ..
- 
- HTML_DIR = $(datadir)/doc
+@@ -164,7 +164,7 @@
+ # A file in win32 depends upon one of the doc files
+ WIN32_DIR = $(top_srcdir)/win32
  
 -TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html
 +TARGET_DIR = $(HTML_DIR)/html/$(DOC_MODULE)
  PAGES = architecture.html bugs.html contribs.html docs.html DOM.html \
      downloads.html entities.html example.html help.html index.html \
      interface.html intro.html library.html namespaces.html news.html \
-@@ -379,8 +379,9 @@ install-data-local: 
+@@ -433,8 +433,8 @@
  	-@INSTALL@ -m 0644 $(srcdir)/xml.html $(srcdir)/encoding.html $(srcdir)/FAQ.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(srcdir)/smallfootonly.gif $(srcdir)/redhat.gif $(srcdir)/libxml.gif $(srcdir)/w3c.png $(srcdir)/Libxml2-Logo-180x168.gif $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(TARGET_DIR)
  	-@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
  	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
@@ -28,7 +28,6 @@ $NetBSD: patch-ad,v 1.11 2003/07/11 23:28:06 wiz Exp $
 -	-@(tar cf - tutorial | (cd $(DESTDIR)$(TARGET_DIR) && tar xvf -))
 +	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial
 +	-@(cd tutorial && $(PAX) -rwpppm . $(DESTDIR)$(TARGET_DIR)/tutorial)
-+
  
  .PHONY : html xml templates scan
- 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.