Update to 2.5.3.

Changes in the package:
- Enable threading.
- Move html documentation and examples where they should be.
- Use catalogs.mk to get and set default system-wide catalogs.

Changes since 2.4.25:

2.5.3: Feb 10 2003:
   - RelaxNG and XML Schemas datatypes improvements, and added a first
    version of RelaxNG Python bindings
   - Fixes: XLink (Sean Chittenden), XInclude (Sean Chittenden), API fix for
    serializing namespace nodes, encoding conversion bug, XHTML1
  serialization
   - Portability fixes: Windows (Igor), AMD 64bits RPM spec file
2.5.2: Feb 5 2003:
   - First implementation of RelaxNG, added --relaxng flag to xmllint
   - Schemas support now compiled in by default.
   - Bug fixes: DTD validation, namespace checking, XInclude and entities,
    delegateURI in XML Catalogs, HTML parser, XML reader (Stéphane Bidoul),
    XPath parser and evaluation,  UTF8ToUTF8 serialization, XML reader memory
    consumption, HTML parser, HTML serialization in the presence of
  namespaces
   - added an HTML API to check elements and attributes.
   - Documentation improvement, PDF for the tutorial (John Fleck), doc
    patches (Stefan Kost)
   - Portability fixes: NetBSD (Julio Merino), Windows (Igor Zlatkovic)
   - Added python bindings for XPointer, contextual error reporting
    (Stéphane Bidoul)
   - URI/file escaping problems (Stefano Zacchiroli)
2.5.1: Jan 8 2003:
   - Fixes a memory leak and configuration/compilation problems in 2.5.0
   - documentation updates (John)
   - a couple of XmlTextReader fixes
2.5.0: Jan 6 2003:
   - New XmltextReader interface based on C#
    API (with help of Stéphane Bidoul)
   - Windows: more exports, including the new API (Igor)
   - XInclude fallback fix
   - Python: bindings for the new API, packaging (Stéphane Bidoul),
    drv_libxml2.py Python xml.sax driver (Stéphane Bidoul), fixes, speedup
    and iterators for Python-2.2 (Hannu Krosing)
   - Tutorial fixes (john Fleck and Niraj Tolia) xmllint man update
  (John)
   - Fix an XML parser bug raised by Vyacheslav Pindyura
   - Fix for VMS serialization (Nigel Hall) and config (Craig A. Berry)
   - Entities handling fixes
   - new API to optionally track node creation and deletion (Lukas
  Schroeder)
   - Added documentation for the XmltextReader interface and some XML guidelines
2.4.30: Dec 12 2002:
   - 2.4.29 broke the python bindings, rereleasing
   - Improvement/fixes of the XML API generator, and couple of minor code
    fixes.
2.4.29: Dec 11 2002:
   - Windows fixes (Igor): Windows CE port, pthread linking, python bindings
    (Stéphane Bidoul), Mingw (Magnus Henoch), and export list updates
   - Fix for prev in python bindings (ERDI Gergo)
   - Fix for entities handling (Marcus Clarke)
   - Refactored the XML and HTML dumps to a single code path, fixed XHTML1
    dump
   - Fix for URI parsing when handling URNs with fragment identifiers
   - Fix for HTTP URL escaping problem
   - added an TextXmlReader (C#) like API (work in progress)
   - Rewrote the API in XML generation script, includes a C parser and saves
    more informations needed for C# bindings
2.4.28: Nov 22 2002:
   - a couple of python binding fixes
   - 2 bug fixes in the XML push parser
   - potential memory leak removed (Martin Stoilov)
   - fix to the configure script for Unix (Dimitri Papadopoulos)
   - added encoding support for XInclude parse="text"
   - autodetection of XHTML1 and specific serialization rules added
   - nasty threading bug fixed (William Brack)
2.4.27: Nov 17 2002:
   - fixes for the Python bindings
   - a number of bug fixes: SGML catalogs, xmlParseBalancedChunkMemory(),
    HTML parser,  Schemas (Charles Bozeman), document fragment support
    (Christian Glahn), xmlReconciliateNs (Brian Stafford), XPointer,
    xmlFreeNode(), xmlSAXParseMemory (Peter Jones), xmlGetNodePath (Petr
    Pajas), entities processing
   - added grep to xmllint --shell
   - VMS update patch from Craig A. Berry
   - cleanup of the Windows build with support for more compilers (Igor),
    better thread support on Windows
   - cleanup of Unix Makefiles and spec file
   - Improvements to the documentation (John Fleck)
2.4.26: Oct 18 2002:
   - Patches for Windows CE port, improvements on Windows paths handling
   - Fixes to the validation  code (DTD and Schemas), xmlNodeGetPath() ,
    HTML serialization, Namespace compliance,  and a number of small
  problems

7 files changed, 163 insertions, 93 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 1811e28cac7..701b96ef17c 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2002/11/06 07:56:51 tron Exp $
+# $NetBSD: Makefile,v 1.22 2003/02/24 20:40:15 jmmv Exp $
 
 DISTNAME=	libxml2-${LIBXML_VERSION}
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.5/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://xmlsoft.org/
@@ -12,16 +12,23 @@ USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/libxml-2.0.pc.in
 
-LIBXML_VERSION=		2.4.25
+LIBXML_VERSION=		2.5.3
 PLIST_SUBST+=		LIBXML_VERSION=${LIBXML_VERSION}
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--without-python
+CONFIGURE_ARGS+=	--with-threads
+
+CFLAGS+=	-DXML_SGML_DEFAULT_CATALOG=\"\\\"${SGML_DEFAULT_CATALOG}\\\"\"
+CFLAGS+=	-DXML_XML_DEFAULT_CATALOG=\"\\\"${XML_DEFAULT_CATALOG}\\\"\"
 
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../converters/libiconv/buildlink2.mk"
+.include "../../textproc/xmlcatmgr/catalogs.mk"
 
+.include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libxml2/PLIST b/textproc/libxml2/PLIST
index 69800c1b3da..73ed8b15bed 100644
--- a/textproc/libxml2/PLIST
+++ b/textproc/libxml2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2003/01/02 22:44:48 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.14 2003/02/24 20:40:16 jmmv Exp $
 bin/xml2-config
 bin/xmlcatalog
 bin/xmllint
@@ -18,6 +18,7 @@ include/libxml2/libxml/nanoftp.h
 include/libxml2/libxml/nanohttp.h
 include/libxml2/libxml/parser.h
 include/libxml2/libxml/parserInternals.h
+include/libxml2/libxml/relaxng.h
 include/libxml2/libxml/schemasInternals.h
 include/libxml2/libxml/threads.h
 include/libxml2/libxml/tree.h
@@ -29,20 +30,20 @@ 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
 include/libxml2/libxml/xmlunicode.h
 include/libxml2/libxml/xmlversion.h
-include/libxml2/libxml/xmlwin32version.h
 include/libxml2/libxml/xpath.h
 include/libxml2/libxml/xpathInternals.h
 include/libxml2/libxml/xpointer.h
 lib/libxml2.a
 lib/libxml2.la
 lib/libxml2.so
-lib/libxml2.so.6
-lib/libxml2.so.6.25
+lib/libxml2.so.7
+lib/libxml2.so.7.3
 lib/pkgconfig/libxml-2.0.pc
 lib/xml2Conf.sh
 man/man1/xml2-config.1
@@ -50,55 +51,109 @@ man/man1/xmlcatalog.1
 man/man1/xmllint.1
 man/man3/libxml.3
 share/aclocal/libxml.m4
-share/doc/libxml2-${LIBXML_VERSION}/Copyright
-share/doc/libxml2-${LIBXML_VERSION}/examples/testHTML.c
-share/doc/libxml2-${LIBXML_VERSION}/examples/testSAX.c
-share/doc/libxml2-${LIBXML_VERSION}/examples/testXPath.c
-share/doc/libxml2-${LIBXML_VERSION}/examples/xmllint.c
-share/doc/libxml2/html/DOM.gif
-share/doc/libxml2/html/FAQ.html
-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/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-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-sax.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-xmlerror.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/libxml.gif
-share/doc/libxml2/html/redhat.gif
-share/doc/libxml2/html/smallfootonly.gif
-share/doc/libxml2/html/structure.gif
-share/doc/libxml2/html/w3c.png
-share/doc/libxml2/html/xml.html
+share/doc/examples/libxml2/testHTML.c
+share/doc/examples/libxml2/testSAX.c
+share/doc/examples/libxml2/testXPath.c
+share/doc/examples/libxml2/xmllint.c
+share/doc/html/libxml2/DOM.gif
+share/doc/html/libxml2/FAQ.html
+share/doc/html/libxml2/Libxml2-Logo-180x168.gif
+share/doc/html/libxml2/Libxml2-Logo-90x34.gif
+share/doc/html/libxml2/book1.html
+share/doc/html/libxml2/encoding.html
+share/doc/html/libxml2/index.sgml
+share/doc/html/libxml2/libxml-c14n.html
+share/doc/html/libxml2/libxml-catalog.html
+share/doc/html/libxml2/libxml-debugxml.html
+share/doc/html/libxml2/libxml-docbparser.html
+share/doc/html/libxml2/libxml-encoding.html
+share/doc/html/libxml2/libxml-entities.html
+share/doc/html/libxml2/libxml-globals.html
+share/doc/html/libxml2/libxml-hash.html
+share/doc/html/libxml2/libxml-htmlparser.html
+share/doc/html/libxml2/libxml-htmltree.html
+share/doc/html/libxml2/libxml-lib.html
+share/doc/html/libxml2/libxml-nanoftp.html
+share/doc/html/libxml2/libxml-nanohttp.html
+share/doc/html/libxml2/libxml-notes.html
+share/doc/html/libxml2/libxml-parser.html
+share/doc/html/libxml2/libxml-parserinternals.html
+share/doc/html/libxml2/libxml-sax.html
+share/doc/html/libxml2/libxml-schemasinternals.html
+share/doc/html/libxml2/libxml-threads.html
+share/doc/html/libxml2/libxml-tree.html
+share/doc/html/libxml2/libxml-uri.html
+share/doc/html/libxml2/libxml-valid.html
+share/doc/html/libxml2/libxml-xinclude.html
+share/doc/html/libxml2/libxml-xmlautomata.html
+share/doc/html/libxml2/libxml-xmlerror.html
+share/doc/html/libxml2/libxml-xmlio.html
+share/doc/html/libxml2/libxml-xmlmemory.html
+share/doc/html/libxml2/libxml-xmlregexp.html
+share/doc/html/libxml2/libxml-xmlschemas.html
+share/doc/html/libxml2/libxml-xmlschemastypes.html
+share/doc/html/libxml2/libxml-xmlunicode.html
+share/doc/html/libxml2/libxml-xpath.html
+share/doc/html/libxml2/libxml-xpathinternals.html
+share/doc/html/libxml2/libxml-xpointer.html
+share/doc/html/libxml2/libxml.gif
+share/doc/html/libxml2/redhat.gif
+share/doc/html/libxml2/smallfootonly.gif
+share/doc/html/libxml2/structure.gif
+share/doc/html/libxml2/tutorial/apa.html
+share/doc/html/libxml2/tutorial/apb.html
+share/doc/html/libxml2/tutorial/apc.html
+share/doc/html/libxml2/tutorial/apd.html
+share/doc/html/libxml2/tutorial/ape.html
+share/doc/html/libxml2/tutorial/apf.html
+share/doc/html/libxml2/tutorial/apg.html
+share/doc/html/libxml2/tutorial/ar01s02.html
+share/doc/html/libxml2/tutorial/ar01s03.html
+share/doc/html/libxml2/tutorial/ar01s04.html
+share/doc/html/libxml2/tutorial/ar01s05.html
+share/doc/html/libxml2/tutorial/ar01s06.html
+share/doc/html/libxml2/tutorial/ar01s07.html
+share/doc/html/libxml2/tutorial/ar01s08.html
+share/doc/html/libxml2/tutorial/images/blank.png
+share/doc/html/libxml2/tutorial/images/callouts/1.png
+share/doc/html/libxml2/tutorial/images/callouts/10.png
+share/doc/html/libxml2/tutorial/images/callouts/2.png
+share/doc/html/libxml2/tutorial/images/callouts/3.png
+share/doc/html/libxml2/tutorial/images/callouts/4.png
+share/doc/html/libxml2/tutorial/images/callouts/5.png
+share/doc/html/libxml2/tutorial/images/callouts/6.png
+share/doc/html/libxml2/tutorial/images/callouts/7.png
+share/doc/html/libxml2/tutorial/images/callouts/8.png
+share/doc/html/libxml2/tutorial/images/callouts/9.png
+share/doc/html/libxml2/tutorial/images/caution.png
+share/doc/html/libxml2/tutorial/images/draft.png
+share/doc/html/libxml2/tutorial/images/home.png
+share/doc/html/libxml2/tutorial/images/important.png
+share/doc/html/libxml2/tutorial/images/next.png
+share/doc/html/libxml2/tutorial/images/note.png
+share/doc/html/libxml2/tutorial/images/prev.png
+share/doc/html/libxml2/tutorial/images/tip.png
+share/doc/html/libxml2/tutorial/images/toc-blank.png
+share/doc/html/libxml2/tutorial/images/toc-minus.png
+share/doc/html/libxml2/tutorial/images/toc-plus.png
+share/doc/html/libxml2/tutorial/images/up.png
+share/doc/html/libxml2/tutorial/images/warning.png
+share/doc/html/libxml2/tutorial/includeaddattribute.c
+share/doc/html/libxml2/tutorial/includeaddkeyword.c
+share/doc/html/libxml2/tutorial/includeconvert.c
+share/doc/html/libxml2/tutorial/includegetattribute.c
+share/doc/html/libxml2/tutorial/includekeyword.c
+share/doc/html/libxml2/tutorial/index.html
+share/doc/html/libxml2/tutorial/xmltutorial.pdf
+share/doc/html/libxml2/w3c.png
+share/doc/html/libxml2/xml.html
+share/doc/libxml2/Copyright
+@dirrm share/doc/libxml2
+@dirrm share/doc/html/libxml2/tutorial/images/callouts
+@dirrm share/doc/html/libxml2/tutorial/images
+@dirrm share/doc/html/libxml2/tutorial
+@dirrm share/doc/html/libxml2
+@dirrm share/doc/examples/libxml2
+@dirrm share/doc/examples
 @dirrm include/libxml2/libxml
 @dirrm include/libxml2
-@dirrm share/doc/libxml2-${LIBXML_VERSION}/examples
-@dirrm share/doc/libxml2-${LIBXML_VERSION}
-@dirrm share/doc/libxml2/html
-@dirrm share/doc/libxml2
diff --git a/textproc/libxml2/buildlink2.mk b/textproc/libxml2/buildlink2.mk
index 04be2198a0d..b9f00f6dea1 100644
--- a/textproc/libxml2/buildlink2.mk
+++ b/textproc/libxml2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/09/11 09:25:10 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/02/24 20:40:16 jmmv Exp $
 
 .if !defined(LIBXML2_BUILDLINK2_MK)
 LIBXML2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libxml2
-BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.4.24nb1
+BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.5.3
 BUILDLINK_PKGSRCDIR.libxml2?=	../../textproc/libxml2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libxml2=libxml2
@@ -14,6 +14,7 @@ BUILDLINK_FILES.libxml2+=	lib/libxml2.*
 
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../converters/libiconv/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
 
 BUILDLINK_TARGETS+=	libxml2-buildlink
 
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index a6e231275dd..0c9186e3319 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.18 2002/11/06 07:56:51 tron Exp $
+$NetBSD: distinfo,v 1.19 2003/02/24 20:40:16 jmmv Exp $
 
-SHA1 (libxml2-2.4.25.tar.gz) = b2dd81d77389d3999b520b7c4aad03a3a6b83800
-Size (libxml2-2.4.25.tar.gz) = 2119273 bytes
-SHA1 (patch-aa) = 3e89009c72b79420828069ebe967f25c5d193177
-SHA1 (patch-ac) = b398c9a9c570fd188fd090f190422c1d58919a8c
-SHA1 (patch-ad) = 976f18fa7f127ff8e54c83053feb9aa04bcd1ea5
+SHA1 (libxml2-2.5.3.tar.gz) = b457779ef38c1c8fa8a61ec9611d413307c2d33e
+Size (libxml2-2.5.3.tar.gz) = 2909711 bytes
+SHA1 (patch-aa) = c079f9cc5083fa6d9817c1161ff20ae782e86c92
+SHA1 (patch-ad) = 0e2bed5a5bb88d69c005c8cbe0b5f785f80e26ec
 SHA1 (patch-ae) = a94390e26b8344b94d78b0faa4b9ce50390e5e5b
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa
index 736ef39bed7..566017f5442 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-aa
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.11 2002/10/03 14:06:15 martti Exp $
+$NetBSD: patch-aa,v 1.12 2003/02/24 20:40:16 jmmv Exp $
 
---- configure.orig	Thu Sep 26 20:17:42 2002
-+++ configure	Thu Oct  3 12:51:09 2002
-@@ -7101,7 +7101,7 @@
- fi
- 
- 
--XML_LIBDIR='-L${libdir}'
-+XML_LIBDIR='-L${libdir} -Wl,-R${libdir}'
- XML_INCLUDEDIR='-I${includedir}/libxml2'
- 
- XML_CFLAGS=""
+--- Makefile.in.orig	2003-02-24 18:11:25.000000000 +0100
++++ Makefile.in
+@@ -271,8 +271,8 @@ pkgconfig_DATA = libxml-2.0.pc
+ # Instll the tests program sources as examples 
+ #
+ BASE_DIR = $(datadir)/doc
+-DOC_MODULE = libxml2-$(VERSION)
+-EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
++DOC_MODULE = libxml2
++EXAMPLES_DIR = $(BASE_DIR)/examples/$(DOC_MODULE)
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
diff --git a/textproc/libxml2/patches/patch-ac b/textproc/libxml2/patches/patch-ac
deleted file mode 100644
index c03b52c6df4..00000000000
--- a/textproc/libxml2/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/01/29 07:40:11 martti Exp $
-
---- libxml-2.0.pc.in.orig	Mon Dec 10 04:35:05 2001
-+++ libxml-2.0.pc.in	Mon Jan 28 15:45:49 2002
-@@ -8,5 +8,5 @@
- Version: @VERSION@
- Description: libXML library version2.
- Requires:
--Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @M_LIBS@ @LIBS@
--Cflags: -I${includedir}/libxml2 @XML_CFLAGS@
-+Libs: @XML_LIBDIR@ -lxml2 @Z_LIBS@ @M_LIBS@ @LIBS@
-+Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-ad
index 2f0c01c363a..c0e476a9a1e 100644
--- a/textproc/libxml2/patches/patch-ad
+++ b/textproc/libxml2/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2002/10/03 14:06:15 martti Exp $
+$NetBSD: patch-ad,v 1.8 2003/02/24 20:40:17 jmmv Exp $
 
---- doc/Makefile.in.orig	Thu Sep 26 20:18:03 2002
-+++ doc/Makefile.in	Thu Oct  3 12:51:30 2002
-@@ -136,7 +136,7 @@
+--- doc/Makefile.in.orig	2003-02-10 17:28:02.000000000 +0100
++++ doc/Makefile.in
+@@ -137,7 +137,7 @@ XPTR_OBJ = @XPTR_OBJ@
  Z_CFLAGS = @Z_CFLAGS@
  Z_LIBS = @Z_LIBS@
  
@@ -11,3 +11,21 @@ $NetBSD: patch-ad,v 1.7 2002/10/03 14:06:15 martti Exp $
  
  # The top-level SGML file.
  DOC_MAIN_SGML_FILE = gnome-xml.sgml
+@@ -147,7 +147,7 @@ DOC_SOURCE_DIR = ..
+ 
+ HTML_DIR = $(datadir)/doc
+ 
+-TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html
++TARGET_DIR = $(HTML_DIR)/html/$(DOC_MODULE)
+ PAGES = architecture.html bugs.html contribs.html docs.html DOM.html \
+     downloads.html entities.html example.html help.html index.html \
+     interface.html intro.html library.html namespaces.html news.html \
+@@ -370,7 +370,7 @@ install-data-local: 
+ 	-@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
+ 	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
+ 	-(cd $(DESTDIR); gtkdoc-fixxref --module=libxml --html-dir=$(HTML_DIR))
+-	-@(tar cf - tutorial | (cd $(DESTDIR)$(TARGET_DIR) && tar xvf -))
++	-@(tar cf - tutorial | (cd $(DESTDIR)$(TARGET_DIR) && tar xmvf -))
+ 
+ .PHONY : html sgml templates scan
+