Update to 2.5.8.

3 files changed, 14 insertions, 50 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 859dd10bea1d..52e5b81ac6d6 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.5.7
-PORTREVISION=	1
+PORTVERSION=	2.5.8
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index dc9a3e6829eb..84157a5565b7 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libxml2-2.5.7.tar.bz2) = d4eb34a61f44e1cf0694ca0035e46451
+MD5 (gnome2/libxml2-2.5.8.tar.bz2) = 526b84406f163d8f514f40f9ba46c336
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index a77c5e732d88..9905799c989c 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -42,43 +42,8 @@ include/libxml2/libxml/xpointer.h
 lib/libxml2.a
 lib/libxml2.so
 lib/libxml2.so.5
-%%PYTHON:%%lib/%%PYTHON_VERSION%%/site-packages/drv_libxml2.py
-%%PYTHON:%%lib/%%PYTHON_VERSION%%/site-packages/libxml2.py
-%%PYTHON:%%lib/%%PYTHON_VERSION%%/site-packages/libxml2mod.so
 libdata/pkgconfig/libxml-2.0.pc
 share/aclocal/libxml.m4
-%%PYTHON:%%share/doc/libxml2-python/TODO
-%%PYTHON:%%share/doc/libxml2-python/examples/attribs.py
-%%PYTHON:%%share/doc/libxml2-python/examples/build.py
-%%PYTHON:%%share/doc/libxml2-python/examples/ctxterror.py
-%%PYTHON:%%share/doc/libxml2-python/examples/cutnpaste.py
-%%PYTHON:%%share/doc/libxml2-python/examples/error.py
-%%PYTHON:%%share/doc/libxml2-python/examples/inbuf.py
-%%PYTHON:%%share/doc/libxml2-python/examples/invalid.xml
-%%PYTHON:%%share/doc/libxml2-python/examples/outbuf.py
-%%PYTHON:%%share/doc/libxml2-python/examples/push.py
-%%PYTHON:%%share/doc/libxml2-python/examples/pushSAX.py
-%%PYTHON:%%share/doc/libxml2-python/examples/pushSAXhtml.py
-%%PYTHON:%%share/doc/libxml2-python/examples/reader.py
-%%PYTHON:%%share/doc/libxml2-python/examples/reader2.py
-%%PYTHON:%%share/doc/libxml2-python/examples/reader3.py
-%%PYTHON:%%share/doc/libxml2-python/examples/reader4.py
-%%PYTHON:%%share/doc/libxml2-python/examples/reader5.py
-%%PYTHON:%%share/doc/libxml2-python/examples/reader6.py
-%%PYTHON:%%share/doc/libxml2-python/examples/readererr.py
-%%PYTHON:%%share/doc/libxml2-python/examples/regexp.py
-%%PYTHON:%%share/doc/libxml2-python/examples/relaxng.py
-%%PYTHON:%%share/doc/libxml2-python/examples/resolver.py
-%%PYTHON:%%share/doc/libxml2-python/examples/serialize.py
-%%PYTHON:%%share/doc/libxml2-python/examples/tst.py
-%%PYTHON:%%share/doc/libxml2-python/examples/tst.xml
-%%PYTHON:%%share/doc/libxml2-python/examples/tstURI.py
-%%PYTHON:%%share/doc/libxml2-python/examples/tstxpath.py
-%%PYTHON:%%share/doc/libxml2-python/examples/valid.xml
-%%PYTHON:%%share/doc/libxml2-python/examples/validate.py
-%%PYTHON:%%share/doc/libxml2-python/examples/xpath.py
-%%PYTHON:%%share/doc/libxml2-python/examples/xpathext.py
-%%PYTHON:%%share/doc/libxml2-python/examples/xpathret.py
 share/doc/libxml2/Copyright
 share/doc/libxml2/examples/testHTML.c
 share/doc/libxml2/examples/testSAX.c
@@ -90,34 +55,34 @@ 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
+share/doc/libxml2/html/index.html
+share/doc/libxml2/html/libxml-DOCBparser.html
+share/doc/libxml2/html/libxml-HTMLparser.html
+share/doc/libxml2/html/libxml-HTMLtree.html
+share/doc/libxml2/html/libxml-SAX.html
 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
+share/doc/libxml2/html/libxml-debugXML.html
 share/doc/libxml2/html/libxml-encoding.html
 share/doc/libxml2/html/libxml-entities.html
 share/doc/libxml2/html/libxml-globals.html
 share/doc/libxml2/html/libxml-hash.html
-share/doc/libxml2/html/libxml-htmlparser.html
-share/doc/libxml2/html/libxml-htmltree.html
 share/doc/libxml2/html/libxml-lib.html
 share/doc/libxml2/html/libxml-nanoftp.html
 share/doc/libxml2/html/libxml-nanohttp.html
 share/doc/libxml2/html/libxml-notes.html
 share/doc/libxml2/html/libxml-parser.html
-share/doc/libxml2/html/libxml-parserinternals.html
+share/doc/libxml2/html/libxml-parserInternals.html
 share/doc/libxml2/html/libxml-relaxng.html
-share/doc/libxml2/html/libxml-sax.html
-share/doc/libxml2/html/libxml-schemasinternals.html
+share/doc/libxml2/html/libxml-schemasInternals.html
 share/doc/libxml2/html/libxml-threads.html
 share/doc/libxml2/html/libxml-tree.html
 share/doc/libxml2/html/libxml-uri.html
 share/doc/libxml2/html/libxml-valid.html
 share/doc/libxml2/html/libxml-xinclude.html
+share/doc/libxml2/html/libxml-xmlIO.html
 share/doc/libxml2/html/libxml-xmlautomata.html
 share/doc/libxml2/html/libxml-xmlerror.html
-share/doc/libxml2/html/libxml-xmlio.html
 share/doc/libxml2/html/libxml-xmlmemory.html
 share/doc/libxml2/html/libxml-xmlreader.html
 share/doc/libxml2/html/libxml-xmlregexp.html
@@ -125,7 +90,7 @@ share/doc/libxml2/html/libxml-xmlschemas.html
 share/doc/libxml2/html/libxml-xmlschemastypes.html
 share/doc/libxml2/html/libxml-xmlunicode.html
 share/doc/libxml2/html/libxml-xpath.html
-share/doc/libxml2/html/libxml-xpathinternals.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
@@ -138,6 +103,7 @@ share/doc/libxml2/html/tutorial/apd.html
 share/doc/libxml2/html/tutorial/ape.html
 share/doc/libxml2/html/tutorial/apf.html
 share/doc/libxml2/html/tutorial/apg.html
+share/doc/libxml2/html/tutorial/aph.html
 share/doc/libxml2/html/tutorial/ar01s02.html
 share/doc/libxml2/html/tutorial/ar01s03.html
 share/doc/libxml2/html/tutorial/ar01s04.html
@@ -175,6 +141,7 @@ share/doc/libxml2/html/tutorial/includeconvert.c
 share/doc/libxml2/html/tutorial/includegetattribute.c
 share/doc/libxml2/html/tutorial/includekeyword.c
 share/doc/libxml2/html/tutorial/index.html
+share/doc/libxml2/html/tutorial/ix01.html
 share/doc/libxml2/html/tutorial/xmltutorial.pdf
 share/doc/libxml2/html/w3c.png
 share/doc/libxml2/html/xml.html
@@ -182,8 +149,6 @@ share/doc/libxml2/html/xml.html
 @dirrm share/doc/libxml2/html/tutorial/images
 @dirrm share/doc/libxml2/html/tutorial
 @dirrm share/doc/libxml2/html
-%%PYTHON:%%@dirrm share/doc/libxml2-python/examples
-%%PYTHON:%%@dirrm share/doc/libxml2-python
 @dirrm share/doc/libxml2/examples
 @dirrm share/doc/libxml2
 @dirrm include/libxml2/libxml