Update to 2.4.2, provided by Martti Kuparinen in pkg/13741.

Changes: Bugfixes and speedups, details at http://xmlsoft.org (News).

8 files changed, 37 insertions, 78 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index d3ad67d899b..620ec650d9d 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/06/29 11:47:12 rh Exp $
+# $NetBSD: Makefile,v 1.2 2001/08/24 16:59:01 wiz Exp $
 
-DISTNAME=	libxml2-2.3.12
+DISTNAME=	libxml2-2.4.2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/libxml/}
 
diff --git a/textproc/libxml2/buildlink.mk b/textproc/libxml2/buildlink.mk
index 8dcb22b6ec8..7c92e1d58c4 100644
--- a/textproc/libxml2/buildlink.mk
+++ b/textproc/libxml2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/08/17 21:14:15 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/08/24 16:59:01 wiz Exp $
 #
 # This Makefile fragment is included by packages that use libxml2.
 #
@@ -17,7 +17,7 @@ LIBXML2_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.3.12
+BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.4.2
 DEPENDS+=	${BUILDLINK_DEPENDS.libxml2}:../../textproc/libxml2
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libxml2=libxml2
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 2798d887653..16f75dd1909 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/06/29 11:47:12 rh Exp $
+$NetBSD: distinfo,v 1.2 2001/08/24 16:59:01 wiz Exp $
 
-SHA1 (libxml2-2.3.12.tar.gz) = b02096785468468f3559c65c88fb2e2e6c551ffa
-Size (libxml2-2.3.12.tar.gz) = 1324052 bytes
-SHA1 (patch-xml2Conf.sh.in) = ab1d503d904201bb480836cbed41f8386c800a64
-SHA1 (patch-aa) = cc3192cf4f204d863296e1d8a8248bf0f029fb3a
-SHA1 (patch-ab) = d2c31f3e4f78495cce9535823ab9ec9f0c10747a
+SHA1 (libxml2-2.4.2.tar.gz) = fc9c2ce9289c64e8d871bc1895489701b1555e41
+Size (libxml2-2.4.2.tar.gz) = 1431796 bytes
+SHA1 (patch-aa) = c68980c8cd8b0c125127e1ae2a717cd75ac5ae52
+SHA1 (patch-ab) = 08bf886034f5404fa0f07bad09fb24f4338d453e
 SHA1 (patch-ac) = 30a934bdfe298e67725452ea92b428e0d27d40bc
-SHA1 (patch-ad) = 440ab0b6f485c0dcac9d62615bed37c65f6aa9b2
-SHA1 (patch-ae) = 81a322069f0c0ee33c9899593cd9d9552f0ba4f7
+SHA1 (patch-ad) = 715a93a65cebcc4216da647f148903974ffc31f0
+SHA1 (patch-ae) = 59710f78f727524979b3a9bac2f6f0c61b299a91
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa
index 76d31496d94..edd380183ad 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/06/29 11:47:12 rh Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/24 16:59:03 wiz Exp $
 
---- configure.orig	Tue Jun 26 18:10:46 2001
-+++ configure	Fri Jun 29 09:58:07 2001
-@@ -2636,7 +2636,7 @@
+--- configure.orig	Wed Aug 15 14:26:09 2001
++++ configure
+@@ -6152,7 +6152,7 @@
  
  
  if test "x$with_html_dir" = "x" ; then
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/06/29 11:47:12 rh Exp $
  else
    HTML_DIR=$with_html_dir
  fi
-@@ -3582,7 +3582,7 @@
+@@ -7086,7 +7086,7 @@
  fi
  
  
@@ -20,43 +20,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/06/29 11:47:12 rh Exp $
  XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
  
  XML_CFLAGS=""
-@@ -4071,7 +4071,7 @@
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char iconv();
-+char libiconv();
- 
- int main() {
- 
-@@ -4081,7 +4081,7 @@
- #if defined (__stub_iconv) || defined (__stub___iconv)
- choke me
- #else
--iconv();
-+libiconv();
- #endif
- 
- ; return 0; }
-@@ -4103,7 +4103,7 @@
-   :
- else
-   echo "$ac_t""no" 1>&6
--echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
-+echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
- echo "configure:4108: checking for iconv in -liconv" >&5
- ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -4117,10 +4117,10 @@
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char iconv();
-+char libiconv();
- 
- int main() {
--iconv()
-+libiconv()
- ; return 0; }
- EOF
- if { (eval echo configure:4127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff --git a/textproc/libxml2/patches/patch-ab b/textproc/libxml2/patches/patch-ab
index 6dff1ea1184..a6df453422d 100644
--- a/textproc/libxml2/patches/patch-ab
+++ b/textproc/libxml2/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/06/29 11:47:12 rh Exp $
+$NetBSD: patch-ab,v 1.2 2001/08/24 16:59:03 wiz Exp $
 
---- Makefile.in.orig	Thu Jun 28 15:57:27 2001
-+++ Makefile.in	Thu Jun 28 15:57:54 2001
-@@ -213,7 +213,7 @@
- @WITH_TRIO_SOURCES_FALSE@HTMLparser.lo HTMLtree.lo debugXML.lo xpath.lo \
- @WITH_TRIO_SOURCES_FALSE@xpointer.lo xinclude.lo nanohttp.lo nanoftp.lo \
- @WITH_TRIO_SOURCES_FALSE@DOCBparser.lo catalog.lo
+--- Makefile.in.orig	Wed Aug 15 14:26:06 2001
++++ Makefile.in
+@@ -223,7 +223,7 @@
+ bin_PROGRAMS =  xmllint$(EXEEXT)
+ noinst_PROGRAMS =  testSAX$(EXEEXT) testHTML$(EXEEXT) testXPath$(EXEEXT) \
+ testURI$(EXEEXT) testDocbook$(EXEEXT) testCatalog$(EXEEXT)
 -PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
 +PROGRAMS =
  
- xmllint_OBJECTS =  xmllint.o
- testSAX_OBJECTS =  testSAX.o
+ xmllint_OBJECTS =  xmllint.$(OBJEXT)
+ testSAX_OBJECTS =  testSAX.$(OBJEXT)
diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-ad
index e8dc3e6c084..673f06d5814 100644
--- a/textproc/libxml2/patches/patch-ad
+++ b/textproc/libxml2/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/06/29 11:47:12 rh Exp $
+$NetBSD: patch-ad,v 1.2 2001/08/24 16:59:03 wiz Exp $
 
---- 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 @@
+--- doc/Makefile.in.orig	Wed Aug 15 14:26:43 2001
++++ doc/Makefile.in
+@@ -121,7 +121,7 @@
  Z_CFLAGS = @Z_CFLAGS@
  Z_LIBS = @Z_LIBS@
  
diff --git a/textproc/libxml2/patches/patch-ae b/textproc/libxml2/patches/patch-ae
index efe38f93a1a..c478b557c43 100644
--- a/textproc/libxml2/patches/patch-ae
+++ b/textproc/libxml2/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/06/29 11:47:12 rh Exp $
+$NetBSD: patch-ae,v 1.2 2001/08/24 16:59:03 wiz Exp $
 
---- include/libxml/Makefile.in.orig	Tue Jun 26 18:11:28 2001
-+++ include/libxml/Makefile.in	Fri Jun 29 07:54:49 2001
-@@ -117,7 +117,7 @@
+--- include/libxml/Makefile.in.orig	Wed Aug 15 14:26:40 2001
++++ include/libxml/Makefile.in
+@@ -120,7 +120,7 @@
  Z_CFLAGS = @Z_CFLAGS@
  Z_LIBS = @Z_LIBS@
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/06/29 11:47:12 rh Exp $
  
  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
  
-@@ -276,7 +276,7 @@
+@@ -279,7 +279,7 @@
  
  
  install-exec-hook:
diff --git a/textproc/libxml2/pkg/PLIST b/textproc/libxml2/pkg/PLIST
index cfe52cb3330..a4aba64ae56 100644
--- a/textproc/libxml2/pkg/PLIST
+++ b/textproc/libxml2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/06/29 11:47:12 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/08/24 16:59:03 wiz Exp $
 bin/xml2-config
 bin/xmllint
 include/libxml2/libxml/DOCBparser.h
@@ -29,8 +29,8 @@ include/libxml2/libxml/xpath.h
 include/libxml2/libxml/xpathInternals.h
 include/libxml2/libxml/xpointer.h
 lib/pkgconfig/libxml-2.0.pc
-lib/libxml2.so.5.12
-lib/libxml2.so.5
+lib/libxml2.so.6.2
+lib/libxml2.so.6
 lib/libxml2.so
 lib/libxml2.la
 lib/libxml2.a