summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2016-02-01 13:42:36 +0000
committertaca <taca@pkgsrc.org>2016-02-01 13:42:36 +0000
commit7770dc662576132ffa368d05c05caadf697a03a8 (patch)
treee02cdeac7b846ce89e0fbac2a75a09099ceadb5d /lang
parent6cc59dc7a72e76121f9929ecfd63a199cf37b884 (diff)
downloadpkgsrc-7770dc662576132ffa368d05c05caadf697a03a8.tar.gz
Start update of Ruby on Rails to 3.2.22.1.
Also tweak _RAILS_{MAJOR,MINOR,TEENY} variable definition.
Diffstat (limited to 'lang')
-rw-r--r--lang/ruby/rails.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/lang/ruby/rails.mk b/lang/ruby/rails.mk
index 9505cdfcbe2..58e37c63b05 100644
--- a/lang/ruby/rails.mk
+++ b/lang/ruby/rails.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rails.mk,v 1.52 2015/06/22 13:49:38 taca Exp $
+# $NetBSD: rails.mk,v 1.53 2016/02/01 13:42:36 taca Exp $
.if !defined(_RUBY_RAILS_MK)
_RUBY_RAILS_MK= # defined
@@ -38,7 +38,7 @@ _RUBY_RAILS_MK= # defined
#
# current Ruby on Rails versions.
#
-RUBY_RAILS32_VERSION?= 3.2.22
+RUBY_RAILS32_VERSION?= 3.2.22.1
RUBY_RAILS_SUPPORTED?= # defined
RUBY_RAILS_DEFAULT?= 32
@@ -69,9 +69,9 @@ RUBY_RAILS_VERSION:= ${RUBY_RAILS32_VERSION}
#
# Components of Ruby's version.
#
-_RAILS_MAJOR= ${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
-_RAILS_MINOR= ${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
-_RAILS_TEENY= ${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
+_RAILS_MAJOR= ${RUBY_RAILS_VERSION:C/([0-9]+)\..*/\1/}
+_RAILS_MINOR= ${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\..*/\2/}
+_RAILS_TEENY= ${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/}
#
# If RUBY_RAILS_STRICT_DEP is defined, match exact current Ruby no Rails