From bd853c4066e7cc5e1232324257eb44b4ed0426e8 Mon Sep 17 00:00:00 2001
From: steven <steven@openbsd.org>
Date: Sun, 11 Jun 2006 18:24:11 +0000
Subject: [PATCH] update to libxml 2.6.24

bulk build testing by naddy@
---
 textproc/libxml/Makefile                      |  6 +++---
 textproc/libxml/distinfo                      |  8 ++++----
 textproc/libxml/patches/patch-Makefile.in     | 10 +++++-----
 textproc/libxml/patches/patch-doc_Makefile_in | 12 ++++++++++++
 textproc/libxml/patches/patch-xmlIO_c         | 19 +++++++++++++++++++
 5 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 textproc/libxml/patches/patch-doc_Makefile_in
 create mode 100644 textproc/libxml/patches/patch-xmlIO_c

diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index f4032ffea4a..9bac0d3c24c 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.96 2006/05/12 16:08:36 steven Exp $
+# $OpenBSD: Makefile,v 1.97 2006/06/11 18:24:11 steven Exp $
 
 COMMENT=		"XML parsing library"
 
-VERSION=		2.6.23
+VERSION=		2.6.24
 DISTNAME=		libxml2-${VERSION}
 PKGNAME=		libxml-${VERSION}
-SHARED_LIBS=		xml2	9.1
+SHARED_LIBS=		xml2	9.2
 CATEGORIES=		textproc
 MASTER_SITES=		ftp://xmlsoft.org/libxml/ \
 			${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
diff --git a/textproc/libxml/distinfo b/textproc/libxml/distinfo
index c60c3fbe972..4799b5d857e 100644
--- a/textproc/libxml/distinfo
+++ b/textproc/libxml/distinfo
@@ -1,4 +1,4 @@
-MD5 (libxml2-2.6.23.tar.gz) = 0f37385e3ad73cc94db43d6873f4fc3b
-RMD160 (libxml2-2.6.23.tar.gz) = 9fc1640354d5d56b251e40ec06addb494349ac0c
-SHA1 (libxml2-2.6.23.tar.gz) = e0e58856532c49bd16447922ec802c7ac99d497d
-SIZE (libxml2-2.6.23.tar.gz) = 4513068
+MD5 (libxml2-2.6.24.tar.gz) = a0e913c13b5ddbd336fcca7104da6583
+RMD160 (libxml2-2.6.24.tar.gz) = 354791cbecf982adfeeae62cf47a603209e43562
+SHA1 (libxml2-2.6.24.tar.gz) = 12889612c69640360dee6ea8e2b94f40ffdbe825
+SIZE (libxml2-2.6.24.tar.gz) = 4546058
diff --git a/textproc/libxml/patches/patch-Makefile.in b/textproc/libxml/patches/patch-Makefile.in
index cdaa7ec0734..075e63221b2 100644
--- a/textproc/libxml/patches/patch-Makefile.in
+++ b/textproc/libxml/patches/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Jan  5 16:39:09 2006
-+++ Makefile.in	Sun Mar  5 12:00:07 2006
-@@ -524,7 +524,7 @@ testModule_DEPENDENCIES = $(DEPS)
+--- Makefile.in.orig	Fri Apr 28 18:32:52 2006
++++ Makefile.in	Sun May 21 10:21:45 2006
+@@ -522,7 +522,7 @@ testModule_DEPENDENCIES = $(DEPS)
  testModule_LDADD = $(LDADDS)
  noinst_LTLIBRARIES = testdso.la
  testdso_la_SOURCES = testdso.c
@@ -9,7 +9,7 @@
  testapi_SOURCES = testapi.c
  testapi_LDFLAGS = 
  testapi_DEPENDENCIES = $(DEPS)
-@@ -553,7 +553,7 @@ pkgconfig_DATA = libxml-2.0.pc
+@@ -551,7 +551,7 @@ pkgconfig_DATA = libxml-2.0.pc
  # Install the tests program sources as examples 
  #
  BASE_DIR = $(datadir)/doc
@@ -18,7 +18,7 @@
  EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -1909,6 +1909,7 @@ SVGtests : xmllint$(EXEEXT)
+@@ -1919,6 +1919,7 @@ SVGtests : xmllint$(EXEEXT)
  	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
  	  else \
  	      echo Testing $$name ; \
diff --git a/textproc/libxml/patches/patch-doc_Makefile_in b/textproc/libxml/patches/patch-doc_Makefile_in
new file mode 100644
index 00000000000..0abf1481fb1
--- /dev/null
+++ b/textproc/libxml/patches/patch-doc_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_Makefile_in,v 1.14 2006/06/11 18:24:11 steven Exp $
+--- doc/Makefile.in.orig	Sun May 21 10:40:09 2006
++++ doc/Makefile.in	Sun May 21 10:40:16 2006
+@@ -271,7 +271,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = devhelp examples
++SUBDIRS = examples
+ 
+ # The top-level SGML file.
+ DOC_MAIN_XML_FILE = gnome-xml.xml
diff --git a/textproc/libxml/patches/patch-xmlIO_c b/textproc/libxml/patches/patch-xmlIO_c
new file mode 100644
index 00000000000..876a5c8d03c
--- /dev/null
+++ b/textproc/libxml/patches/patch-xmlIO_c
@@ -0,0 +1,19 @@
+$OpenBSD: patch-xmlIO_c,v 1.1 2006/06/11 18:24:11 steven Exp $
+--- xmlIO.c.orig	Thu Apr 27 10:13:42 2006
++++ xmlIO.c	Thu Jun  1 19:55:05 2006
+@@ -589,6 +589,7 @@ xmlCleanupOutputCallbacks(void)
+ int
+ xmlCheckFilename (const char *path)
+ {
++    struct stat stat_buffer;
+ 	if (path == NULL)
+       return(0);
+   
+@@ -616,7 +617,6 @@ xmlCheckFilename (const char *path)
+ 	}
+ #else
+ #ifdef HAVE_STAT
+-    struct stat stat_buffer;
+ 
+     if (stat(path, &stat_buffer) == -1)
+         return 0;