update to 2.6.27

changes:
-XPath improvements
-optimization / caching
-build and portability fixes
-bugfixes
-documentation improvements

pkgsrc change: seperate user doc and devhelp files - migrate the latter
to share/gtk-doc/html

4 files changed, 65 insertions, 81 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 884d5a834bc..ca816dd6928 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.82 2006/10/04 20:20:03 rillig Exp $
+# $NetBSD: Makefile,v 1.83 2006/10/30 20:57:30 drochner Exp $
 
-DISTNAME=	libxml2-2.6.26
+DISTNAME=	libxml2-2.6.27
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
-EXTRACT_SUFX=	.tar.bz2
-#MASTER_SITES=	ftp://xmlsoft.org/
+MASTER_SITES=	ftp://xmlsoft.org/libxml2/
+#MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
 
 MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://xmlsoft.org/
@@ -18,7 +17,6 @@ PKGCONFIG_OVERRIDE=	libxml-2.0.pc.in
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--with-html-subdir=libxml2
 CONFIGURE_ARGS+=	--without-python
 
diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST
index b67f44b664b..a6abce527f0 100644
--- a/textproc/libxml2/PLIST
+++ b/textproc/libxml2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2006/05/15 08:27:32 minskim Exp $
+@comment $NetBSD: PLIST,v 1.39 2006/10/30 20:57:30 drochner Exp $
 bin/xml2-config
 bin/xmlcatalog
 bin/xmllint
@@ -65,11 +65,8 @@ share/doc/libxml2/Libxml2-Logo-90x34.gif
 share/doc/libxml2/encoding.html
 share/doc/libxml2/examples.xml
 share/doc/libxml2/examples.xsl
-share/doc/libxml2/general.html
-share/doc/libxml2/home.png
 share/doc/libxml2/html/book1.html
 share/doc/libxml2/html/home.png
-share/doc/libxml2/html/index.html
 share/doc/libxml2/html/left.png
 share/doc/libxml2/html/libxml-DOCBparser.html
 share/doc/libxml2/html/libxml-HTMLparser.html
@@ -121,61 +118,11 @@ share/doc/libxml2/html/libxml-xpathInternals.html
 share/doc/libxml2/html/libxml-xpointer.html
 share/doc/libxml2/html/right.png
 share/doc/libxml2/html/up.png
-share/doc/libxml2/index.html
 share/doc/libxml2/io1.c
 share/doc/libxml2/io1.res
 share/doc/libxml2/io2.c
 share/doc/libxml2/io2.res
-share/doc/libxml2/left.png
 share/doc/libxml2/libxml.gif
-share/doc/libxml2/libxml2-DOCBparser.html
-share/doc/libxml2/libxml2-HTMLparser.html
-share/doc/libxml2/libxml2-HTMLtree.html
-share/doc/libxml2/libxml2-SAX.html
-share/doc/libxml2/libxml2-SAX2.html
-share/doc/libxml2/libxml2-c14n.html
-share/doc/libxml2/libxml2-catalog.html
-share/doc/libxml2/libxml2-chvalid.html
-share/doc/libxml2/libxml2-debugXML.html
-share/doc/libxml2/libxml2-dict.html
-share/doc/libxml2/libxml2-encoding.html
-share/doc/libxml2/libxml2-entities.html
-share/doc/libxml2/libxml2-globals.html
-share/doc/libxml2/libxml2-hash.html
-share/doc/libxml2/libxml2-list.html
-share/doc/libxml2/libxml2-nanoftp.html
-share/doc/libxml2/libxml2-nanohttp.html
-share/doc/libxml2/libxml2-parser.html
-share/doc/libxml2/libxml2-parserInternals.html
-share/doc/libxml2/libxml2-pattern.html
-share/doc/libxml2/libxml2-relaxng.html
-share/doc/libxml2/libxml2-schemasInternals.html
-share/doc/libxml2/libxml2-schematron.html
-share/doc/libxml2/libxml2-threads.html
-share/doc/libxml2/libxml2-tree.html
-share/doc/libxml2/libxml2-uri.html
-share/doc/libxml2/libxml2-valid.html
-share/doc/libxml2/libxml2-xinclude.html
-share/doc/libxml2/libxml2-xlink.html
-share/doc/libxml2/libxml2-xmlIO.html
-share/doc/libxml2/libxml2-xmlautomata.html
-share/doc/libxml2/libxml2-xmlerror.html
-share/doc/libxml2/libxml2-xmlexports.html
-share/doc/libxml2/libxml2-xmlmemory.html
-share/doc/libxml2/libxml2-xmlmodule.html
-share/doc/libxml2/libxml2-xmlreader.html
-share/doc/libxml2/libxml2-xmlregexp.html
-share/doc/libxml2/libxml2-xmlsave.html
-share/doc/libxml2/libxml2-xmlschemas.html
-share/doc/libxml2/libxml2-xmlschemastypes.html
-share/doc/libxml2/libxml2-xmlstring.html
-share/doc/libxml2/libxml2-xmlunicode.html
-share/doc/libxml2/libxml2-xmlversion.html
-share/doc/libxml2/libxml2-xmlwriter.html
-share/doc/libxml2/libxml2-xpath.html
-share/doc/libxml2/libxml2-xpathInternals.html
-share/doc/libxml2/libxml2-xpointer.html
-share/doc/libxml2/libxml2.devhelp
 share/doc/libxml2/parse1.c
 share/doc/libxml2/parse2.c
 share/doc/libxml2/parse3.c
@@ -188,10 +135,8 @@ share/doc/libxml2/reader3.res
 share/doc/libxml2/reader4.c
 share/doc/libxml2/reader4.res
 share/doc/libxml2/redhat.gif
-share/doc/libxml2/right.png
 share/doc/libxml2/smallfootonly.gif
 share/doc/libxml2/structure.gif
-share/doc/libxml2/style.css
 share/doc/libxml2/test1.xml
 share/doc/libxml2/test2.xml
 share/doc/libxml2/test3.xml
@@ -251,7 +196,6 @@ share/doc/libxml2/tutorial/includexpath.c
 share/doc/libxml2/tutorial/index.html
 share/doc/libxml2/tutorial/ix01.html
 share/doc/libxml2/tutorial/xmltutorial.pdf
-share/doc/libxml2/up.png
 share/doc/libxml2/w3c.png
 share/doc/libxml2/writer.xml
 share/doc/libxml2/xml.html
@@ -263,6 +207,62 @@ share/examples/libxml2/testHTML.c
 share/examples/libxml2/testSAX.c
 share/examples/libxml2/testXPath.c
 share/examples/libxml2/xmllint.c
+share/gtk-doc/html/libxml2/general.html
+share/gtk-doc/html/libxml2/home.png
+share/gtk-doc/html/libxml2/index.html
+share/gtk-doc/html/libxml2/left.png
+share/gtk-doc/html/libxml2/libxml2-DOCBparser.html
+share/gtk-doc/html/libxml2/libxml2-HTMLparser.html
+share/gtk-doc/html/libxml2/libxml2-HTMLtree.html
+share/gtk-doc/html/libxml2/libxml2-SAX.html
+share/gtk-doc/html/libxml2/libxml2-SAX2.html
+share/gtk-doc/html/libxml2/libxml2-c14n.html
+share/gtk-doc/html/libxml2/libxml2-catalog.html
+share/gtk-doc/html/libxml2/libxml2-chvalid.html
+share/gtk-doc/html/libxml2/libxml2-debugXML.html
+share/gtk-doc/html/libxml2/libxml2-dict.html
+share/gtk-doc/html/libxml2/libxml2-encoding.html
+share/gtk-doc/html/libxml2/libxml2-entities.html
+share/gtk-doc/html/libxml2/libxml2-globals.html
+share/gtk-doc/html/libxml2/libxml2-hash.html
+share/gtk-doc/html/libxml2/libxml2-list.html
+share/gtk-doc/html/libxml2/libxml2-nanoftp.html
+share/gtk-doc/html/libxml2/libxml2-nanohttp.html
+share/gtk-doc/html/libxml2/libxml2-parser.html
+share/gtk-doc/html/libxml2/libxml2-parserInternals.html
+share/gtk-doc/html/libxml2/libxml2-pattern.html
+share/gtk-doc/html/libxml2/libxml2-relaxng.html
+share/gtk-doc/html/libxml2/libxml2-schemasInternals.html
+share/gtk-doc/html/libxml2/libxml2-schematron.html
+share/gtk-doc/html/libxml2/libxml2-threads.html
+share/gtk-doc/html/libxml2/libxml2-tree.html
+share/gtk-doc/html/libxml2/libxml2-uri.html
+share/gtk-doc/html/libxml2/libxml2-valid.html
+share/gtk-doc/html/libxml2/libxml2-xinclude.html
+share/gtk-doc/html/libxml2/libxml2-xlink.html
+share/gtk-doc/html/libxml2/libxml2-xmlIO.html
+share/gtk-doc/html/libxml2/libxml2-xmlautomata.html
+share/gtk-doc/html/libxml2/libxml2-xmlerror.html
+share/gtk-doc/html/libxml2/libxml2-xmlexports.html
+share/gtk-doc/html/libxml2/libxml2-xmlmemory.html
+share/gtk-doc/html/libxml2/libxml2-xmlmodule.html
+share/gtk-doc/html/libxml2/libxml2-xmlreader.html
+share/gtk-doc/html/libxml2/libxml2-xmlregexp.html
+share/gtk-doc/html/libxml2/libxml2-xmlsave.html
+share/gtk-doc/html/libxml2/libxml2-xmlschemas.html
+share/gtk-doc/html/libxml2/libxml2-xmlschemastypes.html
+share/gtk-doc/html/libxml2/libxml2-xmlstring.html
+share/gtk-doc/html/libxml2/libxml2-xmlunicode.html
+share/gtk-doc/html/libxml2/libxml2-xmlversion.html
+share/gtk-doc/html/libxml2/libxml2-xmlwriter.html
+share/gtk-doc/html/libxml2/libxml2-xpath.html
+share/gtk-doc/html/libxml2/libxml2-xpathInternals.html
+share/gtk-doc/html/libxml2/libxml2-xpointer.html
+share/gtk-doc/html/libxml2/libxml2.devhelp
+share/gtk-doc/html/libxml2/right.png
+share/gtk-doc/html/libxml2/style.css
+share/gtk-doc/html/libxml2/up.png
+@dirrm share/gtk-doc/html/libxml2
 @dirrm share/examples/libxml2
 @dirrm share/doc/libxml2/tutorial/images/callouts
 @dirrm share/doc/libxml2/tutorial/images
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index ff14ca7f1d9..e5a17aaf108 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.59 2006/06/09 21:16:38 drochner Exp $
+$NetBSD: distinfo,v 1.60 2006/10/30 20:57:30 drochner Exp $
 
-SHA1 (libxml2-2.6.26.tar.bz2) = 7a3e175253d47c924e285e3b8e344ba59b5f1797
-RMD160 (libxml2-2.6.26.tar.bz2) = 374ad4860cff3bc37e159bf777302f0135be4c08
-Size (libxml2-2.6.26.tar.bz2) = 3418273 bytes
+SHA1 (libxml2-2.6.27.tar.gz) = 875ac4d3b5829f2edf0222f6c96b76b46ec72374
+RMD160 (libxml2-2.6.27.tar.gz) = 795efee7c91484eb11dd0b275744057d2c82719d
+Size (libxml2-2.6.27.tar.gz) = 4590835 bytes
 SHA1 (patch-aa) = 67cfa73ad1f105b69d6a424e636f6bb816d15878
 SHA1 (patch-ab) = a8dc745539528db69bf1ccb8977a69c24fa818e3
 SHA1 (patch-ac) = 264c75cf9fff5319105b971c122cdf5fc103c04e
 SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177
 SHA1 (patch-ae) = fb6a05d5ecad8cba49d079ec6c54a061654b6351
-SHA1 (patch-ag) = 6ddd32565325e87cc6d7ff77e6eac2be029b7c2f
diff --git a/textproc/libxml2/patches/patch-ag b/textproc/libxml2/patches/patch-ag
deleted file mode 100644
index ccd3fdbf7fc..00000000000
--- a/textproc/libxml2/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/09/30 19:58:00 wiz Exp $
-
---- doc/devhelp/Makefile.in.orig	2005-09-12 23:44:43.000000000 +0200
-+++ doc/devhelp/Makefile.in
-@@ -258,7 +258,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--DEVHELP_DIR = $(datadir)/gtk-doc/html/libxml2
-+DEVHELP_DIR = ${HTML_DIR}
- HTML_FILES = index.html general.html $(HTML_MODULES)
- HTML_MODULES = \
- 	libxml2-c14n.html		\