summaryrefslogtreecommitdiff
path: root/textproc/ruby-itex2MML
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2011-03-08 15:33:48 +0000
committertaca <taca@pkgsrc.org>2011-03-08 15:33:48 +0000
commit27161324452c2db788eff70c604aa36a062b0a48 (patch)
treec754f9854cca686d798c092cd7214667327b1bad /textproc/ruby-itex2MML
parentc6e71f3ca66f3378cca61166a9a3cafbac78fd5a (diff)
downloadpkgsrc-27161324452c2db788eff70c604aa36a062b0a48.tar.gz
Update to ruby-itex2MML to 1.4.5 and should be fix PR pkg/44454.
* Now support Ruby 1.9.2. * introduced Extensible Arrows support with version 1.4.0 and later. Please refer full changes: http://golem.ph.utexas.edu/~distler/code/itexToMML/changes
Diffstat (limited to 'textproc/ruby-itex2MML')
-rw-r--r--textproc/ruby-itex2MML/Makefile6
-rw-r--r--textproc/ruby-itex2MML/distinfo10
-rw-r--r--textproc/ruby-itex2MML/patches/patch-aa20
3 files changed, 24 insertions, 12 deletions
diff --git a/textproc/ruby-itex2MML/Makefile b/textproc/ruby-itex2MML/Makefile
index 5ec153f8630..8c8a7f34d97 100644
--- a/textproc/ruby-itex2MML/Makefile
+++ b/textproc/ruby-itex2MML/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2011/02/21 16:01:20 taca Exp $
+# $NetBSD: Makefile,v 1.8 2011/03/08 15:33:48 taca Exp $
DISTNAME= itexToMML
PKGNAME= ${RUBY_PKGPREFIX}-itex2MML-${ITEX2MML_VERSION}
-PKGREVISION= 1
CATEGORIES= textproc ruby
MASTER_SITES= http://golem.ph.utexas.edu/~distler/blog/files/
DIST_SUBDIR= itex2MML-${ITEX2MML_VERSION}
@@ -16,8 +15,7 @@ BUILD_DEPENDS+= swig>=1.3:../../devel/swig
PKG_DESTDIR_SUPPORT= user-destdir
-ITEX2MML_VERSION= 1.3.25
-RUBY_VERSION_SUPPORTED= 18
+ITEX2MML_VERSION= 1.4.5
USE_TOOLS+= bison flex gmake
WRKSRC= ${WRKDIR}/${DISTNAME}/itex-src
diff --git a/textproc/ruby-itex2MML/distinfo b/textproc/ruby-itex2MML/distinfo
index 72bc06418b6..7ccc8fe0566 100644
--- a/textproc/ruby-itex2MML/distinfo
+++ b/textproc/ruby-itex2MML/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2010/09/10 08:15:55 taca Exp $
+$NetBSD: distinfo,v 1.5 2011/03/08 15:33:48 taca Exp $
-SHA1 (itex2MML-1.3.25/itexToMML.tar.gz) = 51295b3bc94eae1c585e41bc675436c6aaf51ab4
-RMD160 (itex2MML-1.3.25/itexToMML.tar.gz) = 0e2877bc8733ee53bd0a62cd12ca331f9a320136
-Size (itex2MML-1.3.25/itexToMML.tar.gz) = 159917 bytes
-SHA1 (patch-aa) = 51ff13b1d433ae3118e70f71d7647e44a983a350
+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
diff --git a/textproc/ruby-itex2MML/patches/patch-aa b/textproc/ruby-itex2MML/patches/patch-aa
index 4ecee1c47db..2f3cd9cd102 100644
--- a/textproc/ruby-itex2MML/patches/patch-aa
+++ b/textproc/ruby-itex2MML/patches/patch-aa
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2010/09/10 08:15:55 taca Exp $
+$NetBSD: patch-aa,v 1.4 2011/03/08 15:33:49 taca Exp $
* Make ruby and swig commands are settable.
* support DESTDIR.
+* Add an include directory for ruby 1.9 and later.
--- Makefile.orig 2010-06-09 17:13:08.000000000 +0000
+++ Makefile
@@ -17,7 +18,7 @@ $NetBSD: patch-aa,v 1.3 2010/09/10 08:15:55 taca Exp $
RM=rm -f
INSTALL=install -c
-@@ -44,8 +43,8 @@ RUBY_PREFIX = $(shell $(RUBY) -e 'requi
+@@ -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"]')
@@ -28,7 +29,20 @@ $NetBSD: patch-aa,v 1.3 2010/09/10 08:15:55 taca Exp $
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"]')
-@@ -77,5 +76,5 @@ test_ruby:
++RUBYARCHINCLUDE = $(shell $(RUBY) -e 'require "rbconfig"; if Config::CONFIG["ruby_version"] > "1.8"; print "-I" + File.join(Config::CONFIG["rubyhdrdir"], Config::CONFIG["arch"]); end ')
+
+ ifneq (, $(findstring darwin, $(RUBY_target_os)) )
+ EXTRA_CFLAGS = -DHAVE_SNPRINTF -DHAVE_STRUCT_TIMESPEC -DHAVE_STRUCT_TIMEZONE
+@@ -62,7 +62,7 @@ itex2MML_ruby.c: itex2MML.i
+ $(SWIG) -ruby -o itex2MML_ruby.c itex2MML.i
+
+ itex2MML_ruby.o: itex2MML_ruby.c
+- $(CC) $(RUBY_CFLAGS) $(EXTRA_CFLAGS) -c itex2MML_ruby.c -I$(RUBYHDRDIR) -I$(RUBYDIR) -o itex2MML_ruby.o
++ $(CC) $(RUBY_CFLAGS) $(EXTRA_CFLAGS) -c itex2MML_ruby.c -I$(RUBYHDRDIR) $(RUBYARCHINCLUDE) -I$(RUBYDIR) -o itex2MML_ruby.o
+
+ y.tab_ruby.o: y.tab.c
+ $(CC) $(RUBY_CFLAGS) -Ditex2MML_CAPTURE -c -o y.tab_ruby.o y.tab.c
+@@ -77,5 +77,5 @@ test_ruby:
$(RUBY) ./itextomml.rb
install_ruby: itex2MML.$(DYLIB_EXT)