>Number:         14016
>Category:       pkg
>Synopsis:       libxml2 update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Sep 20 00:11:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Martti Kuparinen
>Release:        NetBSD 1.5.2
>Organization:
>Environment:
System: NetBSD dhcp38 1.5.2 NetBSD 1.5.2 (OMNIBOOK) #1: Wed Aug 29 10:01:32 GMT 2001 root@dhcp38:/usr/src/sys/arch/i386/compile/OMNIBOOK i386


>Description:

Update libxml2 to the latest version. List of changes is
available in the ChangeLog file (too long to be included here).

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml2/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	2001/09/14 06:53:34	1.3
+++ Makefile	2001/09/20 07:02:29
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2001/09/14 06:53:34 jlam Exp $
 
-DISTNAME=	libxml2-2.4.2
+DISTNAME=	libxml2-2.4.5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/libxml/}
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml2/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	2001/09/14 06:56:13	1.4
+++ distinfo	2001/09/20 07:02:29
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.4 2001/09/14 06:56:13 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) = d69c56ff195d891e7616592c9a3bce039851b0e9
+SHA1 (patch-ab) = adbcd9ea4aad6bfc6f4da761201cc316f451042a
+SHA1 (patch-ac) = f5a9c3e3a676bf6e533b22f0ecebbf28c8e35e0f
 SHA1 (patch-ad) = 715a93a65cebcc4216da647f148903974ffc31f0
-SHA1 (patch-ae) = 59710f78f727524979b3a9bac2f6f0c61b299a91
+SHA1 (patch-ae) = aa4848ab7c48ccec390d8e63006c26a33365477a
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml2/patches/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- patch-aa	2001/09/14 06:56:13	1.4
+++ patch-aa	2001/09/20 07:02:29
@@ -1,7 +1,7 @@
 $NetBSD: patch-aa,v 1.4 2001/09/14 06:56:13 jlam Exp $
 
---- configure.orig	Wed Aug 15 08:26:09 2001
-+++ configure
+--- configure.orig	Fri Sep 14 17:36:02 2001
++++ configure	Thu Sep 20 08:47:45 2001
 @@ -6152,7 +6152,7 @@
  
  
@@ -11,14 +11,12 @@
  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=""
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml2/patches/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- patch-ab	2001/08/24 16:59:03	1.2
+++ patch-ab	2001/09/20 07:02:29
@@ -1,13 +1,13 @@
 $NetBSD: patch-ab,v 1.2 2001/08/24 16:59:03 wiz Exp $
 
---- Makefile.in.orig	Wed Aug 15 14:26:06 2001
-+++ Makefile.in
+--- Makefile.in.orig	Fri Sep 14 17:35:58 2001
++++ Makefile.in	Thu Sep 20 08:48:59 2001
 @@ -223,7 +223,7 @@
- bin_PROGRAMS =  xmllint$(EXEEXT)
+ bin_PROGRAMS =  xmllint$(EXEEXT) xmlcatalog$(EXEEXT)
  noinst_PROGRAMS =  testSAX$(EXEEXT) testHTML$(EXEEXT) testXPath$(EXEEXT) \
- testURI$(EXEEXT) testDocbook$(EXEEXT) testCatalog$(EXEEXT)
+ testURI$(EXEEXT) testDocbook$(EXEEXT)
 -PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
 +PROGRAMS =
  
  xmllint_OBJECTS =  xmllint.$(OBJEXT)
- testSAX_OBJECTS =  testSAX.$(OBJEXT)
+ xmlcatalog_OBJECTS =  xmlcatalog.$(OBJEXT)
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml2/patches/patch-ac,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ac
--- patch-ac	2001/06/29 11:47:12	1.1.1.1
+++ patch-ac	2001/09/20 07:02:29
@@ -1,11 +1,11 @@
 $NetBSD: patch-ac,v 1.1.1.1 2001/06/29 11:47:12 rh 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	Fri Sep 14 02:35:09 2001
++++ libxml-2.0.pc.in	Thu Sep 20 08:49:30 2001
 @@ -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@
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml2/patches/patch-ae,v
retrieving revision 1.2
diff -u -r1.2 patch-ae
--- patch-ae	2001/08/24 16:59:03	1.2
+++ patch-ae	2001/09/20 07:02:29
@@ -1,21 +1,12 @@
 $NetBSD: patch-ae,v 1.2 2001/08/24 16:59:03 wiz Exp $
 
---- 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@
- 
--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
- 
+--- include/libxml/Makefile.in.orig	Thu Sep 20 08:50:44 2001
++++ include/libxml/Makefile.in	Thu Sep 20 08:52:09 2001
 @@ -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.
Index: pkg/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml2/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- PLIST	2001/08/24 16:59:03	1.2
+++ PLIST	2001/09/20 07:02:29
@@ -29,7 +29,7 @@
 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.5
 lib/libxml2.so.6
 lib/libxml2.so
 lib/libxml2.la
>Release-Note:
>Audit-Trail:
>Unformatted: