Fix build problem with ruby22.

2 files changed, 31 insertions, 13 deletions

diff --git a/textproc/ruby-itex2MML/distinfo b/textproc/ruby-itex2MML/distinfo
index 801623cd1df..689b7dfa4ca 100644
--- a/textproc/ruby-itex2MML/distinfo
+++ b/textproc/ruby-itex2MML/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2013/09/11 15:14:00 taca Exp $
+$NetBSD: distinfo,v 1.7 2015/09/19 15:42:44 taca Exp $
 
 SHA1 (itex2MML-1.4.5/itexToMML.tar.gz) = 11631ab52daab19cf315dbe6da75b4b3a32416bb
 RMD160 (itex2MML-1.4.5/itexToMML.tar.gz) = 0b68c9c81e305206e7908d994618b8bb161fa6c6
 Size (itex2MML-1.4.5/itexToMML.tar.gz) = 166814 bytes
-SHA1 (patch-aa) = 7b6bbeffe5089642b9ed1cb87a5d568206f4cf8b
+SHA1 (patch-aa) = 3fac9c3621424c80511163f0229c705c51f09bf6
 SHA1 (patch-itex2MML.y) = b082b5c10c3910e61312855abcd1299f7cb51e1c
diff --git a/textproc/ruby-itex2MML/patches/patch-aa b/textproc/ruby-itex2MML/patches/patch-aa
index 2f3cd9cd102..fcb517c5d34 100644
--- a/textproc/ruby-itex2MML/patches/patch-aa
+++ b/textproc/ruby-itex2MML/patches/patch-aa
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.4 2011/03/08 15:33:49 taca Exp $
+$NetBSD: patch-aa,v 1.5 2015/09/19 15:42:44 taca Exp $
 
 * Make ruby and swig commands are settable.
 * support DESTDIR.
 * Add an include directory for ruby 1.9 and later.
+* Fix build for Ruby 2.2 and later.
 
 --- Makefile.orig	2010-06-09 17:13:08.000000000 +0000
 +++ Makefile
@@ -18,18 +19,35 @@ $NetBSD: patch-aa,v 1.4 2011/03/08 15:33:49 taca Exp $
  
  RM=rm -f
  INSTALL=install -c
-@@ -44,11 +43,12 @@ RUBY_PREFIX =  $(shell $(RUBY) -e 'requi
- RUBY_ARCH = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["arch"]')
- RUBYDIR = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["archdir"]')
- RUBYHDRDIR = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["rubyhdrdir"]')
+@@ -37,18 +36,19 @@ clean:		
+ install:	itex2MML
+ 		$(INSTALL) itex2MML $(BINDIR)
+ 
+-RUBY_CFLAGS = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["CFLAGS"]')
+-RUBY_LD = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["LDSHARED"]')
+-RUBYLIBDIR =$(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["libdir"]') 
+-RUBY_PREFIX =  $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["rubylibdir"]')
+-RUBY_ARCH = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["arch"]')
+-RUBYDIR = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["archdir"]')
+-RUBYHDRDIR = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["rubyhdrdir"]')
 -RUBY_SITEDIR = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["sitelibdir"]')
 -RUBY_SITEARCHDIR = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["sitearchdir"]')
-+RUBY_SITEDIR = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["vendorlibdir"]')
-+RUBY_SITEARCHDIR = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["vendorarchdir"]')
- LIBRUBYARG = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["LIBRUBYARG"]')
- DYLIB_EXT = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["DLEXT"]')
- RUBY_target_os = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["target_os"]')
-+RUBYARCHINCLUDE = $(shell $(RUBY) -e 'require "rbconfig"; if Config::CONFIG["ruby_version"] > "1.8"; print "-I" + File.join(Config::CONFIG["rubyhdrdir"], Config::CONFIG["arch"]); end ')
+-LIBRUBYARG = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["LIBRUBYARG"]')
+-DYLIB_EXT = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["DLEXT"]')
+-RUBY_target_os = $(shell $(RUBY) -e 'require "rbconfig"; print Config::CONFIG["target_os"]')
++RUBY_CFLAGS = $(shell $(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["CFLAGS"]')
++RUBY_LD = $(shell $(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["LDSHARED"]')
++RUBYLIBDIR =$(shell $(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["libdir"]') 
++RUBY_PREFIX =  $(shell $(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["rubylibdir"]')
++RUBY_ARCH = $(shell $(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["arch"]')
++RUBYDIR = $(shell $(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["archdir"]')
++RUBYHDRDIR = $(shell $(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["rubyhdrdir"]')
++RUBY_SITEDIR = $(shell $(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["vendorlibdir"]')
++RUBY_SITEARCHDIR = $(shell $(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["vendorarchdir"]')
++LIBRUBYARG = $(shell $(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["LIBRUBYARG"]')
++DYLIB_EXT = $(shell $(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["DLEXT"]')
++RUBY_target_os = $(shell $(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["target_os"]')
++RUBYARCHINCLUDE = $(shell $(RUBY) -e 'require "rbconfig"; if RbConfig::CONFIG["ruby_version"] > "1.8"; print "-I" + File.join(RbConfig::CONFIG["rubyhdrdir"], RbConfig::CONFIG["arch"]); end ')
  
  ifneq (, $(findstring darwin, $(RUBY_target_os)) )
  EXTRA_CFLAGS = -DHAVE_SNPRINTF -DHAVE_STRUCT_TIMESPEC -DHAVE_STRUCT_TIMEZONE