[pkgsrc/trunk]: pkgsrc/lang/ruby lang/ruby: Honor RUBY_RAILS_DEFAULT

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/255e69318ab0
branches:  trunk
changeset: 377630:255e69318ab0
user:      taca <taca%pkgsrc.org@localhost>
date:      Wed Mar 21 09:15:04 2018 +0000

description:
lang/ruby: Honor RUBY_RAILS_DEFAULT

Honor RUBY_RAILS_DEFAULT and set RUBY_RAILS_REQD in environment.

diffstat:

 lang/ruby/rails.mk |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 37f60ff8c85c -r 255e69318ab0 lang/ruby/rails.mk
--- a/lang/ruby/rails.mk        Wed Mar 21 08:48:15 2018 +0000
+++ b/lang/ruby/rails.mk        Wed Mar 21 09:15:04 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rails.mk,v 1.64 2018/03/21 03:40:21 taca Exp $
+# $NetBSD: rails.mk,v 1.65 2018/03/21 09:15:04 taca Exp $
 
 .if !defined(_RUBY_RAILS_MK)
 _RUBY_RAILS_MK=        # defined
@@ -78,7 +78,11 @@
 
 .if !defined(RUBY_RAILS)
 .  for rr in ${RUBY_RAILS_ACCEPTED}
+.    if ${rr} == ${RUBY_RAILS_DEFAULT}
+RUBY_RAILS=    ${rr}
+.    else
 RUBY_RAILS?=   ${rr}
+.    endif
 .  endfor
 .endif
 
@@ -113,10 +117,12 @@
 
 #
 MAKE_ENV+=     RUBY_RAILS_DEFAULT=${RUBY_RAILS} \
-               RUBY_RAILS_ACCEPTED=${RUBY_RAILS}
+               RUBY_RAILS_ACCEPTED=${RUBY_RAILS} \
+               RUBY_RAILS_REQD=${RUBY_RAILS}
 #
-MULTI+=                        RUBY_RAILS_DEFAULT=${RUBY_RAILS} \
-                       RUBY_RAILS_ACCEPTED=${RUBY_RAILS}
+MULTI+=                RUBY_RAILS_DEFAULT=${RUBY_RAILS} \
+               RUBY_RAILS_ACCEPTED=${RUBY_RAILS}  \
+               RUBY_RAILS_REQD=${RUBY_RAILS}
 
 RUBY_ACTIVESUPPORT_DEPENDS= \
        ${RUBY_PKGPREFIX}-activesupport${_RAILS_DEP}:../../devel/ruby-activesupport${RUBY_RAILS}