Update libxml2 to 2.4.5. Relevant changes from version 2.4.2 include:

* Bug fixes.
* Do not output hexadecimal charrefs when serializing HTML since some version
  of Netscape can't grok it, generate decimal ones.
* Moved includes to includedir/libxml2/libxml.
* Added a --convert option to xmlcatalog to convert SGML ones to the XML
  syntax.
* Added a catalog PI.

6 files changed, 36 insertions, 52 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 6ddd2360a92..f47aa009a13 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2001/09/14 06:53:34 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/26 23:22:17 jlam Exp $
 
-DISTNAME=	libxml2-2.4.2
+DISTNAME=	libxml2-2.4.5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/libxml/}
 
@@ -17,6 +17,7 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
 .include "../../devel/zlib/buildlink.mk"
 .include "../../converters/libiconv/buildlink.mk"
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 18355fb2325..362dab2c381 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/09/14 06:56:13 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/09/26 23:22:17 jlam Exp $
 
-SHA1 (libxml2-2.4.2.tar.gz) = fc9c2ce9289c64e8d871bc1895489701b1555e41
-Size (libxml2-2.4.2.tar.gz) = 1431796 bytes
-SHA1 (patch-aa) = deba30762d82d131ab562ed91d57b29879112509
-SHA1 (patch-ab) = 08bf886034f5404fa0f07bad09fb24f4338d453e
-SHA1 (patch-ac) = 30a934bdfe298e67725452ea92b428e0d27d40bc
+SHA1 (libxml2-2.4.5.tar.gz) = ed176cd56154894c466afb9f4e68b5f273b86621
+Size (libxml2-2.4.5.tar.gz) = 1447735 bytes
+SHA1 (patch-aa) = c01c9cf0837cf8f2f53d50c9e851364b75da4caf
+SHA1 (patch-ac) = d4018cb6eb27d3b7712dab54366e71507e7bd1f3
 SHA1 (patch-ad) = 715a93a65cebcc4216da647f148903974ffc31f0
-SHA1 (patch-ae) = 59710f78f727524979b3a9bac2f6f0c61b299a91
+SHA1 (patch-ae) = c72945c7484828b3a6f72c83edb508a6de7427cc
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa
index b8fa2f26a0f..3c9bff441ac 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-aa
@@ -1,24 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2001/09/14 06:56:13 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2001/09/26 23:22:17 jlam Exp $
 
---- configure.orig	Wed Aug 15 08:26:09 2001
+--- configure.orig	Fri Sep 14 13:36:02 2001
 +++ configure
-@@ -6152,7 +6152,7 @@
- 
- 
- if test "x$with_html_dir" = "x" ; then
--  HTML_DIR='$(prefix)/doc'
-+  HTML_DIR='$(prefix)/share/doc'
- else
-   HTML_DIR=$with_html_dir
- fi
-@@ -7086,8 +7086,8 @@
+@@ -7086,7 +7086,7 @@
  fi
  
  
 -XML_LIBDIR='-L${libdir}'
--XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
 +XML_LIBDIR='-L${libdir} -Wl,-R${libdir}'
-+XML_INCLUDEDIR='-I${includedir}/libxml2/libxml -I${includedir}/libxml2'
+ XML_INCLUDEDIR='-I${includedir}/libxml2/libxml -I${includedir}/libxml2'
  
  XML_CFLAGS=""
- RDL_LIBS=""
diff --git a/textproc/libxml2/patches/patch-ac b/textproc/libxml2/patches/patch-ac
index 035e1c15146..c9a2edd562d 100644
--- a/textproc/libxml2/patches/patch-ac
+++ b/textproc/libxml2/patches/patch-ac
@@ -1,11 +1,12 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/06/29 11:47:12 rh Exp $
+$NetBSD: patch-ac,v 1.2 2001/09/26 23:22:17 jlam Exp $
 
---- libxml-2.0.pc.in.orig	Thu Jun 28 16:05:32 2001
-+++ libxml-2.0.pc.in	Thu Jun 28 16:06:03 2001
+--- libxml-2.0.pc.in.orig	Thu Sep 13 22:35:09 2001
++++ libxml-2.0.pc.in
 @@ -8,5 +8,5 @@
  Version: @VERSION@
- Description: libXML library.
+ Description: libXML library version2.
  Requires:
 -Libs: -L${libdir} -lxml2 @Z_LIBS@ @M_LIBS@ @LIBS@
-+Libs: -L${libdir} -Wl,-R${libdir} -lxml2 @Z_LIBS@ @M_LIBS@ @LIBS@
- Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
+-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-ae b/textproc/libxml2/patches/patch-ae
index c478b557c43..1cd0007f6f5 100644
--- a/textproc/libxml2/patches/patch-ae
+++ b/textproc/libxml2/patches/patch-ae
@@ -1,21 +1,12 @@
-$NetBSD: patch-ae,v 1.2 2001/08/24 16:59:03 wiz Exp $
+$NetBSD: patch-ae,v 1.3 2001/09/26 23:22:17 jlam Exp $
 
---- include/libxml/Makefile.in.orig	Wed Aug 15 14:26:40 2001
+--- include/libxml/Makefile.in.orig	Fri Sep 14 13:36:37 2001
 +++ include/libxml/Makefile.in
-@@ -120,7 +120,7 @@
- Z_CFLAGS = @Z_CFLAGS@
- Z_LIBS = @Z_LIBS@
- 
--xmlincdir = $(includedir)/libxml
-+xmlincdir = $(includedir)/libxml2/libxml
- 
- xmlinc_HEADERS =  		SAX.h 		entities.h 		encoding.h 		parser.h 		parserInternals.h 		xmlerror.h 		HTMLparser.h 		HTMLtree.h 		debugXML.h 		tree.h 		list.h 		hash.h 		xpath.h 		xpathInternals.h 		xpointer.h 		xinclude.h 		xmlIO.h 		xmlmemory.h 		nanohttp.h 		nanoftp.h 		uri.h 		valid.h 		xlink.h 		xmlversion.h 		xmlwin32version.h 		DOCBparser.h 		catalog.h
- 
 @@ -279,7 +279,7 @@
  
  
  install-exec-hook:
--	$(mkinstalldirs) $(DESTDIR)$(xmlincdir) $(DESTDIR)$(xmlincdir)/libxml
+-	$(mkinstalldirs) $(DESTDIR)$(xmlincdir)/libxml2 $(DESTDIR)$(xmlincdir)/libxml2/libxml
 +	$(mkinstalldirs) $(DESTDIR)$(xmlincdir)
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/textproc/libxml2/pkg/PLIST b/textproc/libxml2/pkg/PLIST
index a4aba64ae56..306abfa60af 100644
--- a/textproc/libxml2/pkg/PLIST
+++ b/textproc/libxml2/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2001/08/24 16:59:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/09/26 23:22:17 jlam Exp $
 bin/xml2-config
+bin/xmlcatalog
 bin/xmllint
 include/libxml2/libxml/DOCBparser.h
 include/libxml2/libxml/HTMLparser.h
@@ -28,15 +29,16 @@ include/libxml2/libxml/xmlwin32version.h
 include/libxml2/libxml/xpath.h
 include/libxml2/libxml/xpathInternals.h
 include/libxml2/libxml/xpointer.h
-lib/pkgconfig/libxml-2.0.pc
-lib/libxml2.so.6.2
-lib/libxml2.so.6
-lib/libxml2.so
-lib/libxml2.la
 lib/libxml2.a
+lib/libxml2.la
+lib/libxml2.so
+lib/libxml2.so.6
+lib/libxml2.so.6.5
+lib/pkgconfig/libxml-2.0.pc
 lib/xml2Conf.sh
-man/man1/xmllint.1
 man/man1/xml2-config.1
+man/man1/xmlcatalog.1
+man/man1/xmllint.1
 man/man4/libxml.4
 share/aclocal/libxml.m4
 share/doc/libxml2/html/DOM.gif
@@ -44,7 +46,6 @@ 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/xml.html
 share/doc/libxml2/html/libxml-catalog.html
 share/doc/libxml2/html/libxml-debugxml.html
 share/doc/libxml2/html/libxml-docbparser.html
@@ -70,7 +71,9 @@ 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
-@dirrm include/libxml2/libxml
-@dirrm include/libxml2
+share/doc/libxml2/html/xml.html
 @dirrm share/doc/libxml2/html
 @dirrm share/doc/libxml2
+@dirrm include/libxml2/libxml
+@dirrm include/libxml2
+@unexec rmdir -p %D/lib/pkgconfig 2>/dev/null || true