pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/ruby lang/ruby: better handling for dependency



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbbcfcc0acb1
branches:  trunk
changeset: 384679:cbbcfcc0acb1
user:      taca <taca%pkgsrc.org@localhost>
date:      Sat Sep 03 15:33:16 2022 +0000

description:
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.

diffstat:

 lang/ruby/rails.mk |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (27 lines):

diff -r 770780b05161 -r cbbcfcc0acb1 lang/ruby/rails.mk
--- a/lang/ruby/rails.mk        Sat Sep 03 15:06:54 2022 +0000
+++ b/lang/ruby/rails.mk        Sat Sep 03 15:33:16 2022 +0000
@@ -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 @@
 #
 
 .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
 
 #



Home | Main Index | Thread Index | Old Index