diff options
| author | taca <taca@pkgsrc.org> | 2018-03-18 14:21:19 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2018-03-18 14:21:19 +0000 |
| commit | 076d12b0cdbbc92d8299a532171df2fae9faf396 (patch) | |
| tree | bc65a9bf0aa141d54a5633556f57a53143f27105 /lang/ruby | |
| parent | 9de5504134ab867e097de637bd763dd278762c5d (diff) | |
| download | pkgsrc-076d12b0cdbbc92d8299a532171df2fae9faf396.tar.gz | |
lang/ruby: replace RUBY_RAILS_SUPPORTED to RUBY_RAILS_ACCEPTED
Change RUBY_RAILS_SUPPORTED to RUBY_RAILS_ACCEPTED for better wording.
Diffstat (limited to 'lang/ruby')
| -rw-r--r-- | lang/ruby/modules.mk | 6 | ||||
| -rw-r--r-- | lang/ruby/rails.mk | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk index d9040a752ea..33185a33326 100644 --- a/lang/ruby/modules.mk +++ b/lang/ruby/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.41 2017/05/30 16:02:00 taca Exp $ +# $NetBSD: modules.mk,v 1.42 2018/03/18 14:21:21 taca Exp $ # # # Package-settable variables: @@ -27,7 +27,7 @@ .if !defined(_RUBY_MODULE_MK) _RUBY_MODULE_MK= # defined -.if defined(RUBY_RAILS_SUPPORTED) +.if defined(RUBY_RAILS_ACCEPTED) USE_TOOLS+= expr .endif @@ -44,7 +44,7 @@ DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} .include "../../lang/ruby/buildlink3.mk" .endif -.if defined(RUBY_RAILS_SUPPORTED) +.if defined(RUBY_RAILS_ACCEPTED) .include "../../lang/ruby/rails.mk" .endif diff --git a/lang/ruby/rails.mk b/lang/ruby/rails.mk index 2513e52f223..eada25a8fd7 100644 --- a/lang/ruby/rails.mk +++ b/lang/ruby/rails.mk @@ -1,4 +1,4 @@ -# $NetBSD: rails.mk,v 1.62 2018/03/13 16:28:48 taca Exp $ +# $NetBSD: rails.mk,v 1.63 2018/03/18 14:21:21 taca Exp $ .if !defined(_RUBY_RAILS_MK) _RUBY_RAILS_MK= # defined @@ -15,7 +15,7 @@ _RUBY_RAILS_MK= # defined # # === Package-settable variables === # -# RUBY_RAILS_SUPPORTED +# RUBY_RAILS_ACCEPTED # The Ruby on Rails versions that are acceptable for the package. # Currently, only one value is accepted. # @@ -42,13 +42,13 @@ _RUBY_RAILS_MK= # defined RUBY_RAILS32_VERSION?= 3.2.22.5 RUBY_RAILS42_VERSION?= 4.2.10 -RUBY_RAILS_SUPPORTED?= # defined +RUBY_RAILS_ACCEPTED?= # defined RUBY_RAILS_DEFAULT?= 32 RUBY_RAILS_STRICT_DEP?= no -.if !empty(RUBY_RAILS_SUPPORTED) && ${RUBY_RAILS_SUPPORTED:[\#]} == 1 -RUBY_RAILS= ${RUBY_RAILS_SUPPORTED} +.if !empty(RUBY_RAILS_ACCEPTED) && ${RUBY_RAILS_ACCEPTED:[\#]} == 1 +RUBY_RAILS= ${RUBY_RAILS_ACCEPTED} .endif RUBY_RAILS?= ${RUBY_RAILS_DEFAULT} @@ -82,10 +82,10 @@ _RAILS_DEP= ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_NEXT} # MAKE_ENV+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \ - RUBY_RAILS_SUPPORTED=${RUBY_RAILS} + RUBY_RAILS_ACCEPTED=${RUBY_RAILS} # MULTI+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \ - RUBY_RAILS_SUPPORTED=${RUBY_RAILS} + RUBY_RAILS_ACCEPTED=${RUBY_RAILS} RUBY_ACTIVESUPPORT_DEPENDS= \ ${RUBY_PKGPREFIX}-activesupport${_RAILS_DEP}:../../devel/ruby-activesupport${RUBY_RAILS} |