4 files changed, 57 insertions, 19 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 23b6070a5434..fa101b338cd6 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.4.28
-PORTREVISION=	2
+PORTVERSION=	2.5.1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -22,6 +21,8 @@ RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-iconv=${LOCALBASE} \
@@ -73,10 +74,6 @@ pre-everything::
 	@${ECHO_MSG} "		WITH_THREAD_ALLOC=yes	Turns on per-thread memory"
 	@${ECHO_MSG} ""
 
-pre-patch:
-	@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/catalog.c ${WRKSRC}/xmlcatalog.c
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index e4b8a5c46e0f..f8c1870f5da7 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libxml2-2.4.28.tar.bz2) = af6eeb630cd4229e243eb36b839554b2
+MD5 (gnome2/libxml2-2.5.1.tar.bz2) = 60c2149d466d46e3662339d940a8cd24
diff --git a/textproc/libxml2/files/patch-parser.c b/textproc/libxml2/files/patch-parser.c
deleted file mode 100644
index 2582f29acb77..000000000000
--- a/textproc/libxml2/files/patch-parser.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- parser.c.orig	Mon Nov 25 00:39:37 2002
-+++ parser.c	Mon Nov 25 01:49:31 2002
-@@ -9820,7 +9820,7 @@
- 	ctxt->myDoc = oldctxt->myDoc;
-         content = ctxt->myDoc->children;
-     }
--    ctxt->myDoc->children = xmlNewDocNode(newDoc, NULL,
-+    ctxt->myDoc->children = xmlNewDocNode(ctxt->myDoc, NULL,
- 	                                  BAD_CAST "pseudoroot", NULL);
-     if (ctxt->myDoc->children == NULL) {
- 	ctxt->sax = oldsax;
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index 470385c501c0..cc44b6b9ec93 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -29,6 +29,7 @@ include/libxml2/libxml/xmlIO.h
 include/libxml2/libxml/xmlautomata.h
 include/libxml2/libxml/xmlerror.h
 include/libxml2/libxml/xmlmemory.h
+include/libxml2/libxml/xmlreader.h
 include/libxml2/libxml/xmlregexp.h
 include/libxml2/libxml/xmlschemas.h
 include/libxml2/libxml/xmlschemastypes.h
@@ -55,6 +56,9 @@ share/aclocal/libxml.m4
 %%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/regexp.py
 %%PYTHON:%%share/doc/libxml2-python/examples/resolver.py
 %%PYTHON:%%share/doc/libxml2-python/examples/serialize.py
@@ -117,8 +121,56 @@ share/doc/libxml2/html/libxml.gif
 share/doc/libxml2/html/redhat.gif
 share/doc/libxml2/html/smallfootonly.gif
 share/doc/libxml2/html/structure.gif
+share/doc/libxml2/html/tutorial/apa.html
+share/doc/libxml2/html/tutorial/apb.html
+share/doc/libxml2/html/tutorial/apc.html
+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/ar01s02.html
+share/doc/libxml2/html/tutorial/ar01s03.html
+share/doc/libxml2/html/tutorial/ar01s04.html
+share/doc/libxml2/html/tutorial/ar01s05.html
+share/doc/libxml2/html/tutorial/ar01s06.html
+share/doc/libxml2/html/tutorial/ar01s07.html
+share/doc/libxml2/html/tutorial/ar01s08.html
+share/doc/libxml2/html/tutorial/images/blank.png
+share/doc/libxml2/html/tutorial/images/callouts/1.png
+share/doc/libxml2/html/tutorial/images/callouts/10.png
+share/doc/libxml2/html/tutorial/images/callouts/2.png
+share/doc/libxml2/html/tutorial/images/callouts/3.png
+share/doc/libxml2/html/tutorial/images/callouts/4.png
+share/doc/libxml2/html/tutorial/images/callouts/5.png
+share/doc/libxml2/html/tutorial/images/callouts/6.png
+share/doc/libxml2/html/tutorial/images/callouts/7.png
+share/doc/libxml2/html/tutorial/images/callouts/8.png
+share/doc/libxml2/html/tutorial/images/callouts/9.png
+share/doc/libxml2/html/tutorial/images/caution.png
+share/doc/libxml2/html/tutorial/images/draft.png
+share/doc/libxml2/html/tutorial/images/home.png
+share/doc/libxml2/html/tutorial/images/important.png
+share/doc/libxml2/html/tutorial/images/next.png
+share/doc/libxml2/html/tutorial/images/note.png
+share/doc/libxml2/html/tutorial/images/prev.png
+share/doc/libxml2/html/tutorial/images/tip.png
+share/doc/libxml2/html/tutorial/images/toc-blank.png
+share/doc/libxml2/html/tutorial/images/toc-minus.png
+share/doc/libxml2/html/tutorial/images/toc-plus.png
+share/doc/libxml2/html/tutorial/images/up.png
+share/doc/libxml2/html/tutorial/images/warning.png
+share/doc/libxml2/html/tutorial/includeaddattribute.c
+share/doc/libxml2/html/tutorial/includeaddkeyword.c
+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/xmltutorial.pdf
 share/doc/libxml2/html/w3c.png
 share/doc/libxml2/html/xml.html
+@dirrm share/doc/libxml2/html/tutorial/images/callouts
+@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