Mon Feb 1 13:42:36 2016 UTC ()
Start update of Ruby on Rails to 3.2.22.1.

Also tweak _RAILS_{MAJOR,MINOR,TEENY} variable definition.


(taca)
diff -r1.52 -r1.53 pkgsrc/lang/ruby/rails.mk
cvs diff -r1.52 -r1.53 pkgsrc/lang/ruby/rails.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rails.mk 2015/06/22 13:49:38 1.52
+++ pkgsrc/lang/ruby/rails.mk 2016/02/01 13:42:36 1.53
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rails.mk,v 1.52 2015/06/22 13:49:38 taca Exp $ 1# $NetBSD: rails.mk,v 1.53 2016/02/01 13:42:36 taca Exp $
2 2
3.if !defined(_RUBY_RAILS_MK) 3.if !defined(_RUBY_RAILS_MK)
4_RUBY_RAILS_MK= # defined 4_RUBY_RAILS_MK= # defined
5 5
6# 6#
7# === User-settable variables === 7# === User-settable variables ===
8# 8#
9# RUBY_RAILS_DEFAULT 9# RUBY_RAILS_DEFAULT
10# Select default Ruby on Rails version. 10# Select default Ruby on Rails version.
11# 11#
12# Possible values: 32 12# Possible values: 32
13# Default: 32 13# Default: 32
14# 14#
@@ -28,27 +28,27 @@ _RUBY_RAILS_MK= # defined @@ -28,27 +28,27 @@ _RUBY_RAILS_MK= # defined
28# Default: no 28# Default: no
29# 29#
30# === Defined variables === 30# === Defined variables ===
31# 31#
32# RUBY_RAILS 32# RUBY_RAILS
33# Selected Ruby on Rails version. 33# Selected Ruby on Rails version.
34# 34#
35# Possible values: 32 35# Possible values: 32
36# 36#
37 37
38# 38#
39# current Ruby on Rails versions. 39# current Ruby on Rails versions.
40# 40#
41RUBY_RAILS32_VERSION?= 3.2.22 41RUBY_RAILS32_VERSION?= 3.2.22.1
42 42
43RUBY_RAILS_SUPPORTED?= # defined 43RUBY_RAILS_SUPPORTED?= # defined
44RUBY_RAILS_DEFAULT?= 32 44RUBY_RAILS_DEFAULT?= 32
45 45
46RUBY_RAILS_STRICT_DEP?= no 46RUBY_RAILS_STRICT_DEP?= no
47 47
48.if !empty(RUBY_RAILS_SUPPORTED) && ${RUBY_RAILS_SUPPORTED:[\#]} == 1 48.if !empty(RUBY_RAILS_SUPPORTED) && ${RUBY_RAILS_SUPPORTED:[\#]} == 1
49RUBY_RAILS= ${RUBY_RAILS_SUPPORTED} 49RUBY_RAILS= ${RUBY_RAILS_SUPPORTED}
50.endif 50.endif
51 51
52.if empty(RUBY_RAILS) 52.if empty(RUBY_RAILS)
53_RUBY_INSTALLED_RAILS!= \ 53_RUBY_INSTALLED_RAILS!= \
54 if ${PKG_INFO} -qe "${RUBY_PKGPREFIX}-rack>=1.4" || \ 54 if ${PKG_INFO} -qe "${RUBY_PKGPREFIX}-rack>=1.4" || \
@@ -59,29 +59,29 @@ _RUBY_INSTALLED_RAILS!= \ @@ -59,29 +59,29 @@ _RUBY_INSTALLED_RAILS!= \
59 fi 59 fi
60. if ${_RUBY_INSTALLED_RAILS} != "none" 60. if ${_RUBY_INSTALLED_RAILS} != "none"
61RUBY_RAILS:= ${_RUBY_INSTALLED_RAILS} 61RUBY_RAILS:= ${_RUBY_INSTALLED_RAILS}
62. else 62. else
63RUBY_RAILS:= ${RUBY_RAILS_DEFAULT} 63RUBY_RAILS:= ${RUBY_RAILS_DEFAULT}
64. endif 64. endif
65.endif 65.endif
66 66
67RUBY_RAILS_VERSION:= ${RUBY_RAILS32_VERSION} 67RUBY_RAILS_VERSION:= ${RUBY_RAILS32_VERSION}
68 68
69# 69#
70# Components of Ruby's version. 70# Components of Ruby's version.
71# 71#
72_RAILS_MAJOR= ${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} 72_RAILS_MAJOR= ${RUBY_RAILS_VERSION:C/([0-9]+)\..*/\1/}
73_RAILS_MINOR= ${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} 73_RAILS_MINOR= ${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\..*/\2/}
74_RAILS_TEENY= ${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/} 74_RAILS_TEENY= ${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/}
75 75
76# 76#
77# If RUBY_RAILS_STRICT_DEP is defined, match exact current Ruby no Rails 77# If RUBY_RAILS_STRICT_DEP is defined, match exact current Ruby no Rails
78# version. 78# version.
79# Otherwise allow greater minor version. 79# Otherwise allow greater minor version.
80 80
81.if !empty(RUBY_RAILS_STRICT_DEP:M[yY][eE][sS]) 81.if !empty(RUBY_RAILS_STRICT_DEP:M[yY][eE][sS])
82_RAILS_NEXT!= ${EXPR} ${_RAILS_TEENY} + 1 82_RAILS_NEXT!= ${EXPR} ${_RAILS_TEENY} + 1
83_RAILS_DEP= \ 83_RAILS_DEP= \
84 >=${RUBY_RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_MINOR}.${_RAILS_NEXT} 84 >=${RUBY_RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_MINOR}.${_RAILS_NEXT}
85.else 85.else
86_RAILS_NEXT!= ${EXPR} ${_RAILS_MINOR} + 1 86_RAILS_NEXT!= ${EXPR} ${_RAILS_MINOR} + 1
87_RAILS_DEP= >=${RUBY_RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_NEXT} 87_RAILS_DEP= >=${RUBY_RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_NEXT}