Update libxml to version 1.4.0.

Features some parser enhancements and bug fixes.

7 files changed, 27 insertions, 60 deletions

diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 2631cf00ce9..8757095eb01 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.2 1999/05/20 20:09:52 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/07/31 19:02:03 rh Exp $
 #
 
-DISTNAME=	libxml-1.0.0
+DISTNAME=	libxml-1.4.0
 CATEGORIES=	textproc devel
-MASTER_SITES=	http://gd.tuwien.ac.at/hci/GNOME/sources/libxml/
+MASTER_SITES=	http://gd.tuwien.ac.at/hci/GNOME/sources/libxml/ \
+		ftp://gnomeftp.wgn.net/pub/gnome/sources/libxml/ \
+		ftp://ftp.fr.gnome.org/pub/gnome/sources/libxml/
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://rufus.w3.org/veillard/XML/xml.html
diff --git a/textproc/libxml/files/md5 b/textproc/libxml/files/md5
index 573eb7a9194..03f97c4d6c2 100644
--- a/textproc/libxml/files/md5
+++ b/textproc/libxml/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/05/03 17:43:58 rh Exp $
+$NetBSD: md5,v 1.2 1999/07/31 19:02:04 rh Exp $
 
-MD5 (libxml-1.0.0.tar.gz) = 50c6631b4feb0cd6360ae2225fef0fe8
+MD5 (libxml-1.4.0.tar.gz) = f7844f2e7e87a898ee75cc3ed0f4c07d
diff --git a/textproc/libxml/files/patch-sum b/textproc/libxml/files/patch-sum
index 0b284da13d3..4839fdf6d41 100644
--- a/textproc/libxml/files/patch-sum
+++ b/textproc/libxml/files/patch-sum
@@ -1,5 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:13 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/07/31 19:02:04 rh Exp $
 
-MD5 (patch-aa) = 58bcbd0bc5167aae7f0db537563432c7
-MD5 (patch-ab) = 761738a878cd36a982230466f0048906
-MD5 (patch-ac) = 70b3bbe970f10ff1ae5a30c99efb3f85
+MD5 (patch-aa) = dfcb4d7eb4344724546e14d6a2b17915
diff --git a/textproc/libxml/patches/patch-aa b/textproc/libxml/patches/patch-aa
index 67555aecc6a..72c84e994b7 100644
--- a/textproc/libxml/patches/patch-aa
+++ b/textproc/libxml/patches/patch-aa
@@ -1,24 +1,19 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/05/03 17:43:59 rh Exp $
+$NetBSD: patch-aa,v 1.2 1999/07/31 19:02:04 rh Exp $
 
---- configure.orig	Thu Feb 25 12:01:40 1999
-+++ configure	Thu Apr  8 11:39:35 1999
-@@ -1516,6 +1516,7 @@
-   echo "$ac_t""no" 1>&6
- fi
+--- configure.orig	Thu Jul 15 16:48:03 1999
++++ configure	Fri Jul 30 18:15:28 1999
+@@ -2094,8 +2094,10 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
  
 +if false; then
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -1561,6 +1562,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 +fi
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -2403,10 +2405,12 @@
+@@ -2951,10 +2953,12 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/textproc/libxml/patches/patch-ab b/textproc/libxml/patches/patch-ab
deleted file mode 100644
index 12ba5e63195..00000000000
--- a/textproc/libxml/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/05/03 17:43:59 rh Exp $
-
---- doc/Makefile.in.orig	Thu Feb 25 12:01:51 1999
-+++ doc/Makefile.in	Thu Apr  8 14:34:10 1999
-@@ -226,10 +226,10 @@
- rebuild: gnome-xml-sections.txt templates sgml html
- 
- install-data-local: 
- 	install -d -m 0755 $(TARGET_DIR)
--	-install -m 0644 $(srcdir)/xml.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(TARGET_DIR)
--	-install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR)
--	-install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR)
-+	${INSTALL_DATA} $(srcdir)/xml.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(TARGET_DIR)
-+	${INSTALL_DATA} $(srcdir)/html/*.html $(TARGET_DIR)
-+	${INSTALL_DATA} $(srcdir)/html/index.sgml $(TARGET_DIR)
- 	-gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)
- 
- dist-hook:
diff --git a/textproc/libxml/patches/patch-ac b/textproc/libxml/patches/patch-ac
deleted file mode 100644
index 2d53c0a4c21..00000000000
--- a/textproc/libxml/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/05/03 17:43:59 rh Exp $
-
---- Makefile.in.orig	Thu Feb 25 12:01:50 1999
-+++ Makefile.in	Thu Apr  8 14:52:38 1999
-@@ -90,11 +90,11 @@
- 
- lib_LTLIBRARIES = libxml.la
- 
--libxml_la_SOURCES =  		SAX.c 		entities.c 		encoding.c 		error.c 		error.h 		parser.c 		debugXML.c 		tree.c 		valid.c
-+libxml_la_SOURCES =  		SAX.c 		entities.c 		encoding.c 		error.c 			parser.c 		debugXML.c 		tree.c 		valid.c
- 
- 
- xmlincdir = $(includedir)/gnome-xml
--xmlinc_HEADERS =  		entities.h 		encoding.h 		parser.h 		parserInternals.h 		debugXML.h 		tree.h 		valid.h
-+xmlinc_HEADERS =  		entities.h 		encoding.h 		parser.h 		parserInternals.h 		debugXML.h 		tree.h 		valid.h	error.h
- 
- 
- DEPS = $(top_builddir)/libxml.la
diff --git a/textproc/libxml/pkg/PLIST b/textproc/libxml/pkg/PLIST
index b8a31f33ae2..ba58a88e678 100644
--- a/textproc/libxml/pkg/PLIST
+++ b/textproc/libxml/pkg/PLIST
@@ -1,14 +1,18 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/05/03 17:43:58 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/07/31 19:02:04 rh Exp $
 bin/xml-config
 include/gnome-xml/entities.h
 include/gnome-xml/encoding.h
-include/gnome-xml/error.h
 include/gnome-xml/parser.h
+include/gnome-xml/HTMLparser.h
+include/gnome-xml/HTMLtree.h
 include/gnome-xml/parserInternals.h
 include/gnome-xml/debugXML.h
+include/gnome-xml/xml-error.h
 include/gnome-xml/tree.h
+include/gnome-xml/xpath.h
+include/gnome-xml/xmlIO.h
 include/gnome-xml/valid.h
-lib/libxml.so.0.0
+lib/libxml.so.5.0
 lib/libxml.a
 lib/xmlConf.sh
 share/gnome-xml/html/gnome-xml/xml.html
@@ -17,10 +21,14 @@ share/gnome-xml/html/gnome-xml/DOM.gif
 share/gnome-xml/html/gnome-xml/book1.html
 share/gnome-xml/html/gnome-xml/gnome-xml-entities.html
 share/gnome-xml/html/gnome-xml/gnome-xml-error.html
+share/gnome-xml/html/gnome-xml/gnome-xml-htmlparser.html
+share/gnome-xml/html/gnome-xml/gnome-xml-htmltree.html
 share/gnome-xml/html/gnome-xml/gnome-xml-parser.html
 share/gnome-xml/html/gnome-xml/gnome-xml-parserinternals.html
 share/gnome-xml/html/gnome-xml/gnome-xml-tree.html
 share/gnome-xml/html/gnome-xml/gnome-xml-valid.html
+share/gnome-xml/html/gnome-xml/gnome-xml-xml-error.html
+share/gnome-xml/html/gnome-xml/gnome-xml-xpath.html
 share/gnome-xml/html/gnome-xml/libxml.html
 share/gnome-xml/html/gnome-xml/index.sgml
 @dirrm include/gnome-xml