4 files changed, 36 insertions, 47 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 335103fe3d63..8b3b5ce70e76 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.3.3
+PORTVERSION=	2.3.5
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libxml
@@ -19,7 +19,8 @@ USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
-CONFIGURE_ARGS=	--with-iconv
+CONFIGURE_ARGS=	--with-iconv \
+		--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lgiconv"
 
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 40e23ecb2119..c7a27f5351a5 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (libxml2-2.3.3.tar.gz) = ba3cbd73f9336a8eae89a306a4ee2f48
+MD5 (libxml2-2.3.5.tar.gz) = 42f661fb90a50d768c3c94da9608f694
diff --git a/textproc/libxml2/files/patch-ad b/textproc/libxml2/files/patch-ad
index dc7b56a04051..950263cfa9fb 100644
--- a/textproc/libxml2/files/patch-ad
+++ b/textproc/libxml2/files/patch-ad
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- doc/Makefile.in.orig	Thu Feb  8 13:47:31 2001
-+++ doc/Makefile.in	Fri Feb  9 02:04:41 2001
+--- doc/Makefile.in.orig	Sat Mar 31 17:53:38 2001
++++ doc/Makefile.in	Sat Mar 31 17:54:08 2001
 @@ -112,7 +112,7 @@
  Z_CFLAGS = @Z_CFLAGS@
  Z_LIBS = @Z_LIBS@
@@ -12,12 +9,3 @@ $FreeBSD$
  
  # The top-level SGML file.
  DOC_MAIN_SGML_FILE = gnome-xml.sgml
-@@ -120,7 +120,7 @@
- # The directory containing the source code (if it contains documentation).
- DOC_SOURCE_DIR = ..
- 
--HTML_DIR = $(prefix)/doc
-+HTML_DIR = $(datadir)
- 
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index 2fb3f6850d0c..74bb2ce1b9a5 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -29,35 +29,35 @@ lib/libxml2.a
 lib/libxml2.so
 lib/libxml2.so.5
 share/aclocal/libxml.m4
-share/libxml2/html/DOM.gif
-share/libxml2/html/FAQ.html
-share/libxml2/html/book1.html
-share/libxml2/html/encoding.html
-share/libxml2/html/index.sgml
-share/libxml2/html/libxml-debugxml.html
-share/libxml2/html/libxml-encoding.html
-share/libxml2/html/libxml-entities.html
-share/libxml2/html/libxml-htmlparser.html
-share/libxml2/html/libxml-htmltree.html
-share/libxml2/html/libxml-lib.html
-share/libxml2/html/libxml-nanoftp.html
-share/libxml2/html/libxml-nanohttp.html
-share/libxml2/html/libxml-notes.html
-share/libxml2/html/libxml-parser.html
-share/libxml2/html/libxml-parserinternals.html
-share/libxml2/html/libxml-sax.html
-share/libxml2/html/libxml-tree.html
-share/libxml2/html/libxml-uri.html
-share/libxml2/html/libxml-valid.html
-share/libxml2/html/libxml-xinclude.html
-share/libxml2/html/libxml-xmlio.html
-share/libxml2/html/libxml-xmlmemory.html
-share/libxml2/html/libxml-xpath.html
-share/libxml2/html/libxml-xpathinternals.html
-share/libxml2/html/libxml-xpointer.html
-share/libxml2/html/structure.gif
-share/libxml2/html/xml.html
-@dirrm share/libxml2/html
-@dirrm share/libxml2
+share/doc/libxml2/html/DOM.gif
+share/doc/libxml2/html/FAQ.html
+share/doc/libxml2/html/book1.html
+share/doc/libxml2/html/encoding.html
+share/doc/libxml2/html/index.sgml
+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-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-sax.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-xmlmemory.html
+share/doc/libxml2/html/libxml-xpath.html
+share/doc/libxml2/html/libxml-xpathinternals.html
+share/doc/libxml2/html/libxml-xpointer.html
+share/doc/libxml2/html/structure.gif
+share/doc/libxml2/html/xml.html
+@dirrm share/doc/libxml2/html
+@dirrm share/doc/libxml2
 @dirrm include/libxml2/libxml
 @dirrm include/libxml2