From 6d177a1b3bc1bd07bcc1ccd53c8b1399e348c1b2 Mon Sep 17 00:00:00 2001 From: minskim Date: Tue, 18 Apr 2017 00:44:27 +0000 Subject: Update ruby-itex2MML to 1.5.5 Changelog unavailable. --- textproc/ruby-itex2MML/Makefile | 6 ++-- textproc/ruby-itex2MML/PLIST | 8 ++--- textproc/ruby-itex2MML/distinfo | 13 ++++--- textproc/ruby-itex2MML/patches/patch-aa | 47 ++----------------------- textproc/ruby-itex2MML/patches/patch-itex2MML.y | 24 ------------- 5 files changed, 16 insertions(+), 82 deletions(-) delete mode 100644 textproc/ruby-itex2MML/patches/patch-itex2MML.y (limited to 'textproc') diff --git a/textproc/ruby-itex2MML/Makefile b/textproc/ruby-itex2MML/Makefile index aeed2d488ca..488c8063a27 100644 --- a/textproc/ruby-itex2MML/Makefile +++ b/textproc/ruby-itex2MML/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/10/25 06:56:57 asau Exp $ +# $NetBSD: Makefile,v 1.10 2017/04/18 00:44:27 minskim Exp $ DISTNAME= itexToMML PKGNAME= ${RUBY_PKGPREFIX}-itex2MML-${ITEX2MML_VERSION} @@ -13,14 +13,14 @@ LICENSE= gnu-gpl-v2 OR gnu-lgpl-v2 OR mpl-1.0 BUILD_DEPENDS+= swig>=1.3:../../devel/swig -ITEX2MML_VERSION= 1.4.5 +ITEX2MML_VERSION= 1.5.5 USE_TOOLS+= bison flex gmake WRKSRC= ${WRKDIR}/${DISTNAME}/itex-src BUILD_TARGET= ruby INSTALL_TARGET= install_ruby -INSTALLATION_DIRS+= ${RUBY_VENDORARCHLIB} +INSTALLATION_DIRS+= ${RUBY_SITEARCHLIB} MAKE_ENV+= RUBY=${RUBY:Q} .include "../../lang/ruby/modules.mk" diff --git a/textproc/ruby-itex2MML/PLIST b/textproc/ruby-itex2MML/PLIST index 4ac29396c4d..987839b53af 100644 --- a/textproc/ruby-itex2MML/PLIST +++ b/textproc/ruby-itex2MML/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2010/09/10 08:15:55 taca Exp $ -${RUBY_VENDORLIB}/itex_stringsupport.rb -${RUBY_VENDORLIB}/itextomml.rb -${RUBY_VENDORARCHLIB}/itex2MML.${RUBY_DLEXT} +@comment $NetBSD: PLIST,v 1.4 2017/04/18 00:44:27 minskim Exp $ +${RUBY_SITELIB}/itex_stringsupport.rb +${RUBY_SITELIB}/itextomml.rb +${RUBY_SITEARCHLIB}/itex2MML.${RUBY_DLEXT} diff --git a/textproc/ruby-itex2MML/distinfo b/textproc/ruby-itex2MML/distinfo index 46078f204ea..4bfd2684655 100644 --- a/textproc/ruby-itex2MML/distinfo +++ b/textproc/ruby-itex2MML/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.8 2015/11/04 02:00:08 agc Exp $ +$NetBSD: distinfo,v 1.9 2017/04/18 00:44:27 minskim Exp $ -SHA1 (itex2MML-1.4.5/itexToMML.tar.gz) = 11631ab52daab19cf315dbe6da75b4b3a32416bb -RMD160 (itex2MML-1.4.5/itexToMML.tar.gz) = 0b68c9c81e305206e7908d994618b8bb161fa6c6 -SHA512 (itex2MML-1.4.5/itexToMML.tar.gz) = 03116aa7e8c63135f3d454cbd09b2e2e579bf219cb4222ec1e69a1a11a284f0bc8422d3059a6ebad05dbfab40cb979a1ebeff8acacb173d067b50b6e88c471bb -Size (itex2MML-1.4.5/itexToMML.tar.gz) = 166814 bytes -SHA1 (patch-aa) = 3fac9c3621424c80511163f0229c705c51f09bf6 -SHA1 (patch-itex2MML.y) = b082b5c10c3910e61312855abcd1299f7cb51e1c +SHA1 (itex2MML-1.5.5/itexToMML.tar.gz) = 05c64ac84e20458fecdedb13cd03cd2c72736461 +RMD160 (itex2MML-1.5.5/itexToMML.tar.gz) = 6088d89b567b5cb7a4b0c5fc80ad0c4f0a18ee0a +SHA512 (itex2MML-1.5.5/itexToMML.tar.gz) = 452436fe6f72d2c99c2bf3aec0d5d74d0bd754b6f54948428e45f50b037927a64ae3148386c387d3065d35392c3744ec6467d3e6fb8c25d46a3872d92d35ce2d +Size (itex2MML-1.5.5/itexToMML.tar.gz) = 155205 bytes +SHA1 (patch-aa) = 26ff67a98dac373230054efb63098846c782ca40 diff --git a/textproc/ruby-itex2MML/patches/patch-aa b/textproc/ruby-itex2MML/patches/patch-aa index fcb517c5d34..c6b64049697 100644 --- a/textproc/ruby-itex2MML/patches/patch-aa +++ b/textproc/ruby-itex2MML/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.5 2015/09/19 15:42:44 taca Exp $ +$NetBSD: patch-aa,v 1.6 2017/04/18 00:44:27 minskim 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.orig 2016-08-15 17:12:01.000000000 +0000 +++ Makefile @@ -1,9 +1,8 @@ #YACC=yacc @@ -19,48 +19,7 @@ $NetBSD: patch-aa,v 1.5 2015/09/19 15:42:44 taca Exp $ RM=rm -f INSTALL=install -c -@@ -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"]') --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 -@@ -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: +@@ -77,5 +76,5 @@ test_ruby: $(RUBY) ./itextomml.rb install_ruby: itex2MML.$(DYLIB_EXT) diff --git a/textproc/ruby-itex2MML/patches/patch-itex2MML.y b/textproc/ruby-itex2MML/patches/patch-itex2MML.y deleted file mode 100644 index 7df90e7c790..00000000000 --- a/textproc/ruby-itex2MML/patches/patch-itex2MML.y +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-itex2MML.y,v 1.1 2013/09/11 15:14:00 taca Exp $ - -Fix build with bison-3.0 - ---- itex2MML.y.orig 2010-10-03 07:11:13.000000000 +0000 -+++ itex2MML.y -@@ -2,6 +2,8 @@ - * itex2MML.y last modified 10/2/2010 - */ - -+%parse-param {char **ret_str} -+ - %{ - #include - #include -@@ -27,7 +29,7 @@ - - void (*itex2MML_error) (const char * msg) = itex2MML_default_error; - -- static void yyerror (char * s) -+ static void yyerror (char **ret_str, char * s) - { - char * msg = itex2MML_copy3 (s, " at token ", yytext); - if (itex2MML_error) -- cgit v1.2.3