ports/159150: [PATCH] update japanese/tomoe to work with Ruby 1.9

[Steve Wills]

>Number:         159150
>Category:       ports
>Synopsis:       [PATCH] update japanese/tomoe to work with Ruby 1.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 24 02:40:05 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Steve Wills
>Release:        
>Organization:
>Environment:
>Description:
The japanese/tomoe port doesn't work with Ruby 1.9. The attached patch fixes it.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/tomoe/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	31 May 2010 01:59:29 -0000	1.17
+++ Makefile	24 Jul 2011 02:17:41 -0000
@@ -106,7 +106,9 @@
 PLIST_SUB+=	UNIHAN="@comment "
 .endif
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/ruby-${RUBY_VER} \
+		-I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}" \
 		PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \
 		pyexecdir=${PYTHON_SITELIBDIR} \
 		GMSGFMT="${LOCALBASE}/bin/msgfmt"
Index: files/patch-bindings_ruby_tomoe-rb-char.c
===================================================================
RCS file: files/patch-bindings_ruby_tomoe-rb-char.c
diff -N files/patch-bindings_ruby_tomoe-rb-char.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-bindings_ruby_tomoe-rb-char.c	24 Jul 2011 02:23:33 -0000
@@ -0,0 +1,11 @@
+--- bindings/ruby/tomoe-rb-char.c.orig	2011-07-24 02:20:26.000000000 +0000
++++ bindings/ruby/tomoe-rb-char.c	2011-07-24 02:22:22.000000000 +0000
+@@ -13,7 +13,7 @@
+     if (NIL_P(xml)) {
+         chr = tomoe_char_new();
+     } else {
+-        chr = tomoe_char_new_from_xml_data(RVAL2CSTR(xml), RSTRING(xml)->len);
++        chr = tomoe_char_new_from_xml_data(RVAL2CSTR(xml), RSTRING_LEN(xml));
+     }
+ 
+     G_INITIALIZE(self, chr);


>Release-Note:
>Audit-Trail:
>Unformatted: