CVS commit: pkgsrc/lang/ruby

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Sep  3 15:33:17 UTC 2022

Modified Files:
        pkgsrc/lang/ruby: rails.mk

Log Message:
lang/ruby: better handling for dependency

Instead of "expr" command, make commands to make's variable and
later evaluate with :sh modifier.

Thank Jonathan Perkin provides problem and solution.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/lang/ruby/rails.mk

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

Modified files:

Index: pkgsrc/lang/ruby/rails.mk
diff -u pkgsrc/lang/ruby/rails.mk:1.133 pkgsrc/lang/ruby/rails.mk:1.134
--- pkgsrc/lang/ruby/rails.mk:1.133     Sat Sep  3 13:15:06 2022
+++ pkgsrc/lang/ruby/rails.mk   Sat Sep  3 15:33:16 2022
@@ -1,4 +1,4 @@
-# $NetBSD: rails.mk,v 1.133 2022/09/03 13:15:06 taca Exp $
+# $NetBSD: rails.mk,v 1.134 2022/09/03 15:33:16 taca Exp $
 
 .if !defined(_RUBY_RAILS_MK)
 _RUBY_RAILS_MK=        # defined
@@ -113,12 +113,12 @@ _RAILS_TEENY=     ${RAILS_VERSION:C/([0-9]+)
 #
 
 .if !empty(RUBY_RAILS_STRICT_DEP:M[yY][eE][sS])
-_RAILS_NEXT!=  expr ${_RAILS_TEENY} + 1
-_RAILS_DEP=    \
-       ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_MINOR}.${_RAILS_NEXT}
+_RAILS_NEXT_CMD=       ${EXPR} ${_RAILS_TEENY} + 1
+_RAILS_DEP= \
+       ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_MINOR}.${_RAILS_NEXT_CMD:sh}
 .else
-_RAILS_NEXT!=  expr ${_RAILS_MINOR} + 1
-_RAILS_DEP=    ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_NEXT}
+_RAILS_NEXT_CMD=       ${EXPR} ${_RAILS_MINOR} + 1
+_RAILS_DEP=    ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_NEXT_CMD:sh}
 .endif
 
 #