Update to 2.5.8; add test target.

Changes since 2.5.7:
- bugfixes: XPath, XInclude, file/URI mapping, UTF-16 save (Mark
  Itzcovitz), UTF-8 checking, URI saving, error printing (William Brack),
  PI related memleak, compilation without schemas or without xpath (Joerg
  Schmitz-Linneweber/Garry Pennington), xmlUnlinkNode problem with DTDs,
  rpm problem on , i86_64, removed a few compilation problems from 2.5.7,
  xmlIOParseDTD, and xmlSAXParseDTD (Malcolm Tredinnick)
- portability: DJGPP (MsDos) , OpenVMS (Craig A. Berry)
- William Brack fixed multithreading lock problems
- IPv6 patch for FTP and HTTP accesses (Archana Shah/Wipro)
- Windows fixes (Igor Zlatkovic,  Eric Zurcher), threading (Stéphane
  Bidoul)
- A few W3C Schemas Structure improvements
- W3C Schemas Datatype improvements (Charlie Bozeman)
- Python bindings for thread globals (Stéphane Bidoul), and method/class
  generator
- added --nonet option to xmllint
- documentation improvements (John Fleck)

4 files changed, 31 insertions, 27 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 1e6b4dce63d..0e4c257db2f 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2003/07/04 10:03:37 skrll Exp $
+# $NetBSD: Makefile,v 1.32 2003/07/11 23:28:04 wiz Exp $
 
 DISTNAME=	libxml2-${LIBXML_VERSION}
-PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.5/}
 
@@ -15,7 +14,7 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libxml-2.0.pc.in
 
-LIBXML_VERSION=		2.5.7
+LIBXML_VERSION=		2.5.8
 PLIST_SUBST+=		LIBXML_VERSION=${LIBXML_VERSION}
 
 GNU_CONFIGURE=		yes
@@ -25,6 +24,8 @@ CONFIGURE_ARGS+=	--without-python
 
 MAKE_ENV+=		PAX=${PAX:Q}
 
+TEST_TARGET=		check
+
 CFLAGS+=	-DXML_SGML_DEFAULT_CATALOG=\"\\\"${SGML_DEFAULT_CATALOG}\\\"\"
 CFLAGS+=	-DXML_XML_DEFAULT_CATALOG=\"\\\"${XML_DEFAULT_CATALOG}\\\"\"
 
diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST
index c379038b10d..24c1eda6ba1 100644
--- a/textproc/libxml2/PLIST
+++ b/textproc/libxml2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2003/07/01 09:45:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.20 2003/07/11 23:28:04 wiz 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.7
+lib/libxml2.so.7.8
 lib/pkgconfig/libxml-2.0.pc
 lib/xml2Conf.sh
 man/man1/xml2-config.1
@@ -57,34 +57,34 @@ share/doc/html/libxml2/Libxml2-Logo-180x168.gif
 share/doc/html/libxml2/Libxml2-Logo-90x34.gif
 share/doc/html/libxml2/book1.html
 share/doc/html/libxml2/encoding.html
-share/doc/html/libxml2/index.sgml
+share/doc/html/libxml2/index.html
+share/doc/html/libxml2/libxml-DOCBparser.html
+share/doc/html/libxml2/libxml-HTMLparser.html
+share/doc/html/libxml2/libxml-HTMLtree.html
+share/doc/html/libxml2/libxml-SAX.html
 share/doc/html/libxml2/libxml-c14n.html
 share/doc/html/libxml2/libxml-catalog.html
-share/doc/html/libxml2/libxml-debugxml.html
-share/doc/html/libxml2/libxml-docbparser.html
+share/doc/html/libxml2/libxml-debugXML.html
 share/doc/html/libxml2/libxml-encoding.html
 share/doc/html/libxml2/libxml-entities.html
 share/doc/html/libxml2/libxml-globals.html
 share/doc/html/libxml2/libxml-hash.html
-share/doc/html/libxml2/libxml-htmlparser.html
-share/doc/html/libxml2/libxml-htmltree.html
 share/doc/html/libxml2/libxml-lib.html
 share/doc/html/libxml2/libxml-nanoftp.html
 share/doc/html/libxml2/libxml-nanohttp.html
 share/doc/html/libxml2/libxml-notes.html
 share/doc/html/libxml2/libxml-parser.html
-share/doc/html/libxml2/libxml-parserinternals.html
+share/doc/html/libxml2/libxml-parserInternals.html
 share/doc/html/libxml2/libxml-relaxng.html
-share/doc/html/libxml2/libxml-sax.html
-share/doc/html/libxml2/libxml-schemasinternals.html
+share/doc/html/libxml2/libxml-schemasInternals.html
 share/doc/html/libxml2/libxml-threads.html
 share/doc/html/libxml2/libxml-tree.html
 share/doc/html/libxml2/libxml-uri.html
 share/doc/html/libxml2/libxml-valid.html
 share/doc/html/libxml2/libxml-xinclude.html
+share/doc/html/libxml2/libxml-xmlIO.html
 share/doc/html/libxml2/libxml-xmlautomata.html
 share/doc/html/libxml2/libxml-xmlerror.html
-share/doc/html/libxml2/libxml-xmlio.html
 share/doc/html/libxml2/libxml-xmlmemory.html
 share/doc/html/libxml2/libxml-xmlreader.html
 share/doc/html/libxml2/libxml-xmlregexp.html
@@ -92,7 +92,7 @@ share/doc/html/libxml2/libxml-xmlschemas.html
 share/doc/html/libxml2/libxml-xmlschemastypes.html
 share/doc/html/libxml2/libxml-xmlunicode.html
 share/doc/html/libxml2/libxml-xpath.html
-share/doc/html/libxml2/libxml-xpathinternals.html
+share/doc/html/libxml2/libxml-xpathInternals.html
 share/doc/html/libxml2/libxml-xpointer.html
 share/doc/html/libxml2/libxml.gif
 share/doc/html/libxml2/redhat.gif
@@ -105,6 +105,7 @@ share/doc/html/libxml2/tutorial/apd.html
 share/doc/html/libxml2/tutorial/ape.html
 share/doc/html/libxml2/tutorial/apf.html
 share/doc/html/libxml2/tutorial/apg.html
+share/doc/html/libxml2/tutorial/aph.html
 share/doc/html/libxml2/tutorial/ar01s02.html
 share/doc/html/libxml2/tutorial/ar01s03.html
 share/doc/html/libxml2/tutorial/ar01s04.html
@@ -142,6 +143,7 @@ share/doc/html/libxml2/tutorial/includeconvert.c
 share/doc/html/libxml2/tutorial/includegetattribute.c
 share/doc/html/libxml2/tutorial/includekeyword.c
 share/doc/html/libxml2/tutorial/index.html
+share/doc/html/libxml2/tutorial/ix01.html
 share/doc/html/libxml2/tutorial/xmltutorial.pdf
 share/doc/html/libxml2/w3c.png
 share/doc/html/libxml2/xml.html
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index aaa1f939a37..166d10828c0 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2003/07/01 09:45:54 wiz Exp $
+$NetBSD: distinfo,v 1.27 2003/07/11 23:28:05 wiz Exp $
 
-SHA1 (libxml2-2.5.7.tar.gz) = b7f579caf99ff4c839a00d714f33fa5f8a015416
-Size (libxml2-2.5.7.tar.gz) = 3148602 bytes
+SHA1 (libxml2-2.5.8.tar.gz) = 10d1ec658974e488d46edb53849b5d4b95f133bb
+Size (libxml2-2.5.8.tar.gz) = 3049886 bytes
 SHA1 (patch-aa) = efb1f44c0fa3bee193cea7da966e6cbe257fe7c1
-SHA1 (patch-ad) = 798da20a3a596b9e321dac26150cdced19fa465c
+SHA1 (patch-ad) = 1bf290bf867d5f297657578f1d7f6fe3f178a174
 SHA1 (patch-ae) = a94390e26b8344b94d78b0faa4b9ce50390e5e5b
diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-ad
index 76443b544b7..d058947b23a 100644
--- a/textproc/libxml2/patches/patch-ad
+++ b/textproc/libxml2/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.10 2003/03/18 15:06:21 jmmv Exp $
+$NetBSD: patch-ad,v 1.11 2003/07/11 23:28:06 wiz Exp $
 
---- doc/Makefile.in.orig	2003-02-24 20:15:02.000000000 +0000
+--- doc/Makefile.in.orig	Sun Jul  6 23:14:59 2003
 +++ doc/Makefile.in
-@@ -138,7 +138,7 @@ XPTR_OBJ = @XPTR_OBJ@
- Z_CFLAGS = @Z_CFLAGS@
+@@ -139,7 +139,7 @@ Z_CFLAGS = @Z_CFLAGS@
  Z_LIBS = @Z_LIBS@
+ pythondir = @pythondir@
  
 -DOC_MODULE = libxml2-$(VERSION)
 +DOC_MODULE = libxml2
  
  # The top-level SGML file.
- DOC_MAIN_SGML_FILE = gnome-xml.sgml
-@@ -148,7 +148,7 @@ DOC_SOURCE_DIR = ..
+ DOC_MAIN_XML_FILE = gnome-xml.xml
+@@ -149,7 +149,7 @@ DOC_SOURCE_DIR = ..
  
  HTML_DIR = $(datadir)/doc
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.10 2003/03/18 15:06:21 jmmv Exp $
  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 \
-@@ -370,8 +370,8 @@ install-data-local: 
+@@ -379,8 +379,9 @@ install-data-local: 
  	-@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,6 +28,7 @@ $NetBSD: patch-ad,v 1.10 2003/03/18 15:06:21 jmmv 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 sgml templates scan
+ .PHONY : html xml templates scan