From 6272ee763b302fb660b07fba7b3d0c1cdef491da Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Thu, 27 Sep 2012 13:09:11 +0000
Subject: Fix build problem with libxml2 2.9.0.

---
 textproc/ruby-libxml/Makefile                          |  6 +++---
 textproc/ruby-libxml/distinfo                          |  3 ++-
 .../patches/patch-ext_libxml_ruby__xml__node.c         | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 textproc/ruby-libxml/patches/patch-ext_libxml_ruby__xml__node.c

(limited to 'textproc')

diff --git a/textproc/ruby-libxml/Makefile b/textproc/ruby-libxml/Makefile
index 58cf7ae13a5..613cba17828 100644
--- a/textproc/ruby-libxml/Makefile
+++ b/textproc/ruby-libxml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/09/16 11:29:03 taca Exp $
+# $NetBSD: Makefile,v 1.15 2012/09/27 13:09:11 taca Exp $
 
 DISTNAME=	libxml-ruby-2.3.3
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:C/ruby-//}
@@ -6,10 +6,10 @@ CATEGORIES=	textproc
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://libxml.rubyforge.org/
-COMMENT=	libxml2 interface module for Ruby
+COMMENT=	Support module for libxml2 library
 LICENSE=	mit
 
-GEM_CLEANBUILD+=	ext/libxml/*
+GEM_CLEANBUILD=	ext/libxml/*
 CONFIGURE_ARGS+=	\
 	--with-xml2-include=${BUILDLINK_PREFIX.libxml2}/include/libxml2
 
diff --git a/textproc/ruby-libxml/distinfo b/textproc/ruby-libxml/distinfo
index 502591f11a4..1abb505f863 100644
--- a/textproc/ruby-libxml/distinfo
+++ b/textproc/ruby-libxml/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10 2012/09/16 11:29:03 taca Exp $
+$NetBSD: distinfo,v 1.11 2012/09/27 13:09:11 taca Exp $
 
 SHA1 (libxml-ruby-2.3.3.gem) = 0959b85a9fbd75296f960aab5041d4b1c357560b
 RMD160 (libxml-ruby-2.3.3.gem) = b5a93eb306927e87d2b05be6066a91b8488f7415
 Size (libxml-ruby-2.3.3.gem) = 250368 bytes
+SHA1 (patch-ext_libxml_ruby__xml__node.c) = 4d95701695786f0b1dae0a47e9cbe20ab88e6f0c
diff --git a/textproc/ruby-libxml/patches/patch-ext_libxml_ruby__xml__node.c b/textproc/ruby-libxml/patches/patch-ext_libxml_ruby__xml__node.c
new file mode 100644
index 00000000000..05e2767bffd
--- /dev/null
+++ b/textproc/ruby-libxml/patches/patch-ext_libxml_ruby__xml__node.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-ext_libxml_ruby__xml__node.c,v 1.1 2012/09/27 13:09:11 taca Exp $
+
+Adopt to libxml 2.9.0.
+
+--- ext/libxml/ruby_xml_node.c.orig	2012-09-27 09:39:32.000000000 +0000
++++ ext/libxml/ruby_xml_node.c
+@@ -619,9 +619,9 @@ static VALUE rxml_node_to_s(int argc, VA
+   xmlOutputBufferFlush(output);
+ 
+   if (output->conv)
+-    result = rxml_new_cstr((const char*) output->conv->content, xencoding);
++    result = rxml_new_cstr((const char*) xmlBufContent(output->conv), xencoding);
+   else
+-    result = rxml_new_cstr((const char*) output->buffer->content, xencoding);
++    result = rxml_new_cstr((const char*) xmlBufContent(output->buffer), xencoding);
+ 
+   xmlOutputBufferClose(output);
+   
-- 
cgit v1.2.3