5 files changed, 65 insertions, 55 deletions

diff --git a/textproc/linux-libxml2/Makefile b/textproc/linux-libxml2/Makefile
index 6fe21428c138..28208690e8d8 100644
--- a/textproc/linux-libxml2/Makefile
+++ b/textproc/linux-libxml2/Makefile
@@ -6,11 +6,7 @@
 #
 
 PORTNAME=	libxml
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION=	1.4.0
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION=	1.7.3
-.endif
+PORTVERSION=	1.8.10
 CATEGORIES=	textproc linux
 
 MAINTAINER=	taoka@FreeBSD.org
diff --git a/textproc/linux-libxml2/distinfo.alpha b/textproc/linux-libxml2/distinfo.alpha
index 1027492a73d7..1ce207de3509 100644
--- a/textproc/linux-libxml2/distinfo.alpha
+++ b/textproc/linux-libxml2/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libxml-1.7.3-1.alpha.rpm) = 47e751ca9e2c23f308adec225186f7cf
+MD5 (rpm/libxml-1.8.10-1.alpha.rpm) = 1ab67e6081335f42063e3679e22045ed
diff --git a/textproc/linux-libxml2/distinfo.i386 b/textproc/linux-libxml2/distinfo.i386
index bf9358308428..de8b4f3eb900 100644
--- a/textproc/linux-libxml2/distinfo.i386
+++ b/textproc/linux-libxml2/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libxml-1.4.0-1.i386.rpm) = dd6f59b17753b33d7a1f9e0a36f1cf7e
+MD5 (rpm/libxml-1.8.10-1.i386.rpm) = 8eeee1724345d8fc5bebb803adbdd73b
diff --git a/textproc/linux-libxml2/pkg-plist.alpha b/textproc/linux-libxml2/pkg-plist.alpha
index afce2985558d..1eae478b1532 100644
--- a/textproc/linux-libxml2/pkg-plist.alpha
+++ b/textproc/linux-libxml2/pkg-plist.alpha
@@ -1,26 +1,32 @@
-usr/doc/libxml-1.7.3/AUTHORS
-usr/doc/libxml-1.7.3/COPYING
-usr/doc/libxml-1.7.3/COPYING.LIB
-usr/doc/libxml-1.7.3/ChangeLog
-usr/doc/libxml-1.7.3/NEWS
-usr/doc/libxml-1.7.3/README
-usr/doc/libxml-1.7.3/TODO
-usr/doc/libxml-1.7.3/html/book1.html
-usr/doc/libxml-1.7.3/html/gnome-xml-entities.html
-usr/doc/libxml-1.7.3/html/gnome-xml-error.html
-usr/doc/libxml-1.7.3/html/gnome-xml-htmlparser.html
-usr/doc/libxml-1.7.3/html/gnome-xml-htmltree.html
-usr/doc/libxml-1.7.3/html/gnome-xml-nanohttp.html
-usr/doc/libxml-1.7.3/html/gnome-xml-parser.html
-usr/doc/libxml-1.7.3/html/gnome-xml-parserinternals.html
-usr/doc/libxml-1.7.3/html/gnome-xml-tree.html
-usr/doc/libxml-1.7.3/html/gnome-xml-valid.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xml-error.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xmlmemory.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xpath.html
-usr/doc/libxml-1.7.3/html/index.sgml
-usr/doc/libxml-1.7.3/html/libxml.html
+usr/lib/libxml.so.1.8.10
+usr/share/doc/libxml-1.8.10/AUTHORS
+usr/share/doc/libxml-1.8.10/COPYING
+usr/share/doc/libxml-1.8.10/COPYING.LIB
+usr/share/doc/libxml-1.8.10/ChangeLog
+usr/share/doc/libxml-1.8.10/NEWS
+usr/share/doc/libxml-1.8.10/README
+usr/share/doc/libxml-1.8.10/TODO
+usr/share/doc/libxml-1.8.10/html/book1.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-debugxml.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-encoding.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-entities.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-error.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-htmlparser.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-htmltree.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-nanoftp.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-nanohttp.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-parser.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-parserinternals.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-sax.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-tree.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-valid.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-xml-error.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlio.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlmemory.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-xpath.html
+usr/share/doc/libxml-1.8.10/html/index.sgml
+usr/share/doc/libxml-1.8.10/html/libxml-lib.html
+usr/share/doc/libxml-1.8.10/html/libxml-notes.html
 usr/lib/libxml.so.1
-usr/lib/libxml.so.1.7.3
-@dirrm usr/doc/libxml-1.7.3/html
-@dirrm usr/doc/libxml-1.7.3
+@dirrm usr/share/doc/libxml-1.8.10/html
+@dirrm usr/share/doc/libxml-1.8.10
diff --git a/textproc/linux-libxml2/pkg-plist.i386 b/textproc/linux-libxml2/pkg-plist.i386
index 8ea390199bbc..1eae478b1532 100644
--- a/textproc/linux-libxml2/pkg-plist.i386
+++ b/textproc/linux-libxml2/pkg-plist.i386
@@ -1,24 +1,32 @@
-usr/doc/libxml-1.4.0/AUTHORS
-usr/doc/libxml-1.4.0/COPYING
-usr/doc/libxml-1.4.0/COPYING.LIB
-usr/doc/libxml-1.4.0/ChangeLog
-usr/doc/libxml-1.4.0/NEWS
-usr/doc/libxml-1.4.0/README
-usr/doc/libxml-1.4.0/TODO
-usr/doc/libxml-1.4.0/html/book1.html
-usr/doc/libxml-1.4.0/html/gnome-xml-entities.html
-usr/doc/libxml-1.4.0/html/gnome-xml-error.html
-usr/doc/libxml-1.4.0/html/gnome-xml-htmlparser.html
-usr/doc/libxml-1.4.0/html/gnome-xml-htmltree.html
-usr/doc/libxml-1.4.0/html/gnome-xml-parser.html
-usr/doc/libxml-1.4.0/html/gnome-xml-parserinternals.html
-usr/doc/libxml-1.4.0/html/gnome-xml-tree.html
-usr/doc/libxml-1.4.0/html/gnome-xml-valid.html
-usr/doc/libxml-1.4.0/html/gnome-xml-xml-error.html
-usr/doc/libxml-1.4.0/html/gnome-xml-xpath.html
-usr/doc/libxml-1.4.0/html/index.sgml
-usr/doc/libxml-1.4.0/html/libxml.html
+usr/lib/libxml.so.1.8.10
+usr/share/doc/libxml-1.8.10/AUTHORS
+usr/share/doc/libxml-1.8.10/COPYING
+usr/share/doc/libxml-1.8.10/COPYING.LIB
+usr/share/doc/libxml-1.8.10/ChangeLog
+usr/share/doc/libxml-1.8.10/NEWS
+usr/share/doc/libxml-1.8.10/README
+usr/share/doc/libxml-1.8.10/TODO
+usr/share/doc/libxml-1.8.10/html/book1.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-debugxml.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-encoding.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-entities.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-error.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-htmlparser.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-htmltree.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-nanoftp.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-nanohttp.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-parser.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-parserinternals.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-sax.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-tree.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-valid.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-xml-error.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlio.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlmemory.html
+usr/share/doc/libxml-1.8.10/html/gnome-xml-xpath.html
+usr/share/doc/libxml-1.8.10/html/index.sgml
+usr/share/doc/libxml-1.8.10/html/libxml-lib.html
+usr/share/doc/libxml-1.8.10/html/libxml-notes.html
 usr/lib/libxml.so.1
-usr/lib/libxml.so.1.4.0
-@dirrm usr/doc/libxml-1.4.0/html
-@dirrm usr/doc/libxml-1.4.0
+@dirrm usr/share/doc/libxml-1.8.10/html
+@dirrm usr/share/doc/libxml-1.8.10