CVS commit: pkgsrc/textproc/ruby-itex2MML

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 23 21:25:54 UTC 2025

Modified Files:
        pkgsrc/textproc/ruby-itex2MML: distinfo
        pkgsrc/textproc/ruby-itex2MML/patches: patch-aa

Log Message:
ruby-itex2MML: use backquotes instead of gmake $(shell ...)

The build was randomly failing because one or more of the variables
with $(shell ...) weren't expanded yet, leading to
gcc: Missing argument for -I
or
gcc: Missing argument for -L


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/ruby-itex2MML/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/ruby-itex2MML/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/ruby-itex2MML/distinfo
diff -u pkgsrc/textproc/ruby-itex2MML/distinfo:1.11 pkgsrc/textproc/ruby-itex2MML/distinfo:1.12
--- pkgsrc/textproc/ruby-itex2MML/distinfo:1.11 Tue Oct 26 11:23:24 2021
+++ pkgsrc/textproc/ruby-itex2MML/distinfo      Thu Jan 23 21:25:54 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 11:23:24 nia Exp $
+$NetBSD: distinfo,v 1.12 2025/01/23 21:25:54 wiz Exp $
 
 BLAKE2s (itex2MML-1.5.5/itexToMML.tar.gz) = 1b50a40d64ffcc89fc6433e5a9dbf24a4a5344c5e6594cc07f2e39e73f50ef45
 SHA512 (itex2MML-1.5.5/itexToMML.tar.gz) = 452436fe6f72d2c99c2bf3aec0d5d74d0bd754b6f54948428e45f50b037927a64ae3148386c387d3065d35392c3744ec6467d3e6fb8c25d46a3872d92d35ce2d
 Size (itex2MML-1.5.5/itexToMML.tar.gz) = 155205 bytes
-SHA1 (patch-aa) = 26ff67a98dac373230054efb63098846c782ca40
+SHA1 (patch-aa) = dcdf4d01a608b58d59b0e714525229862b4902a8

Index: pkgsrc/textproc/ruby-itex2MML/patches/patch-aa
diff -u pkgsrc/textproc/ruby-itex2MML/patches/patch-aa:1.6 pkgsrc/textproc/ruby-itex2MML/patches/patch-aa:1.7
--- pkgsrc/textproc/ruby-itex2MML/patches/patch-aa:1.6  Tue Apr 18 00:44:27 2017
+++ pkgsrc/textproc/ruby-itex2MML/patches/patch-aa      Thu Jan 23 21:25:54 2025
@@ -1,9 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2017/04/18 00:44:27 minskim Exp $
+$NetBSD: patch-aa,v 1.7 2025/01/23 21:25:54 wiz 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.
+* Use backquotes instead of gmake $(shell) to make this more reliable
+* Add DESTDIR support.
 
 --- Makefile.orig      2016-08-15 17:12:01.000000000 +0000
 +++ Makefile
@@ -19,11 +18,44 @@ $NetBSD: patch-aa,v 1.6 2017/04/18 00:44
  
  RM=rm -f
  INSTALL=install -c
-@@ -77,5 +76,5 @@ test_ruby:
+@@ -37,18 +36,18 @@ clean:
+ install:      itex2MML
+               $(INSTALL) itex2MML $(BINDIR)
+ 
+-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["sitelibdir"]')
+-RUBY_SITEARCHDIR = $(shell $(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["sitearchdir"]')
+-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"]')
++RUBY_CFLAGS = `$(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["CFLAGS"]'`
++RUBY_LD = `$(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["LDSHARED"]'`
++RUBYLIBDIR = `$(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["libdir"]'`
++RUBY_PREFIX =  `$(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["rubylibdir"]'`
++RUBY_ARCH = `$(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["arch"]'`
++RUBYDIR = `$(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["archdir"]'`
++RUBYHDRDIR = `$(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["rubyhdrdir"]'`
++RUBY_SITEDIR = `$(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["sitelibdir"]'`
++RUBY_SITEARCHDIR = `$(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["sitearchdir"]'`
++LIBRUBYARG = `$(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["LIBRUBYARG"]'`
++DYLIB_EXT = `$(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["DLEXT"]'`
++RUBY_target_os = `$(RUBY) -e 'require "rbconfig"; print RbConfig::CONFIG["target_os"]'`
+ 
+ ifneq (, $(findstring darwin, $(RUBY_target_os)) )
+ EXTRA_CFLAGS = -DHAVE_SNPRINTF -DHAVE_STRUCT_TIMESPEC -DHAVE_STRUCT_TIMEZONE
+@@ -76,6 +75,6 @@ ruby:        itex2MML_ruby.o y.tab_ruby.o lex.y
+ test_ruby:
        $(RUBY) ./itextomml.rb
  
- install_ruby: itex2MML.$(DYLIB_EXT)
+-install_ruby: itex2MML.$(DYLIB_EXT)
 -      $(INSTALL) itex2MML.$(DYLIB_EXT) $(RUBY_SITEARCHDIR)
 -      $(INSTALL) itextomml.rb itex_stringsupport.rb $(RUBY_SITEDIR)
++install_ruby: ruby
 +      $(INSTALL) itex2MML.$(DYLIB_EXT) $(DESTDIR)$(RUBY_SITEARCHDIR)
 +      $(BSD_INSTALL_DATA) itextomml.rb itex_stringsupport.rb $(DESTDIR)$(RUBY_SITEDIR)