Tue Jul 13 11:53:25 2021 UTC ()
ruby: fix substution on rails ALTERNATIVES files


(markd)
diff -r1.103 -r1.104 pkgsrc/lang/ruby/rails.mk
cvs diff -r1.103 -r1.104 pkgsrc/lang/ruby/rails.mk (switch to unified diff)

--- pkgsrc/lang/ruby/rails.mk 2021/07/04 07:55:12 1.103
+++ pkgsrc/lang/ruby/rails.mk 2021/07/13 11:53:25 1.104
@@ -1,159 +1,160 @@ @@ -1,159 +1,160 @@
1# $NetBSD: rails.mk,v 1.103 2021/07/04 07:55:12 taca Exp $ 1# $NetBSD: rails.mk,v 1.104 2021/07/13 11:53:25 markd 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: 52 60 61 12# Possible values: 52 60 61
13# Default: 52 13# Default: 52
14# 14#
15# 15#
16# === Infrastructure variables === 16# === Infrastructure variables ===
17# 17#
18# RUBY_RAILS_REQD 18# RUBY_RAILS_REQD
19# Ruby Rails version to use. This variable should not be set in 19# Ruby Rails version to use. This variable should not be set in
20# packages. 20# packages.
21# 21#
22# Possible values: ${RUBY_RAILS_ACCEPTED} 22# Possible values: ${RUBY_RAILS_ACCEPTED}
23# Default: ${RUBY_RAILS_DEFAULT} 23# Default: ${RUBY_RAILS_DEFAULT}
24# 24#
25# === Package-settable variables === 25# === Package-settable variables ===
26# 26#
27# RUBY_RAILS_ACCEPTED 27# RUBY_RAILS_ACCEPTED
28# The Ruby on Rails versions that are acceptable for the package. 28# The Ruby on Rails versions that are acceptable for the package.
29# 29#
30# Possible values: 52 60 61 30# Possible values: 52 60 61
31# Default: (empty) 31# Default: (empty)
32# 32#
33# RUBY_RAILS_STRICT_DEP 33# RUBY_RAILS_STRICT_DEP
34# Strict dependency to Ruby on Rails component packages. 34# Strict dependency to Ruby on Rails component packages.
35# 35#
36# Possible value: yes no 36# Possible value: yes no
37# Default: no 37# Default: no
38# 38#
39# === Defined variables === 39# === Defined variables ===
40# 40#
41# RUBY_RAILS 41# RUBY_RAILS
42# Selected Ruby on Rails version. 42# Selected Ruby on Rails version.
43# 43#
44# Possible values: 52 60 61 44# Possible values: 52 60 61
45# 45#
46 46
47# 47#
48# current Ruby on Rails versions. 48# current Ruby on Rails versions.
49# 49#
50RUBY_RAILS52_VERSION?= 5.2.6 50RUBY_RAILS52_VERSION?= 5.2.6
51RUBY_RAILS60_VERSION?= 6.0.4 51RUBY_RAILS60_VERSION?= 6.0.4
52RUBY_RAILS61_VERSION?= 6.1.4 52RUBY_RAILS61_VERSION?= 6.1.4
53 53
54RUBY_RAILS_ACCEPTED?= # defined 54RUBY_RAILS_ACCEPTED?= # defined
55RUBY_RAILS_DEFAULT?= 52 55RUBY_RAILS_DEFAULT?= 52
56 56
57RUBY_RAILS_STRICT_DEP?= no 57RUBY_RAILS_STRICT_DEP?= no
58 58
59RUBY_RAILS_SUPPORTED= 52 60 61 59RUBY_RAILS_SUPPORTED= 52 60 61
60 60
61.if empty(RUBY_RAILS_SUPPORTED:M${RUBY_RAILS_DEFAULT}) 61.if empty(RUBY_RAILS_SUPPORTED:M${RUBY_RAILS_DEFAULT})
62. error Unsupported RUBY_RAILS_DEFAULT: ${RUBY_RAILS_DEFAULT} 62. error Unsupported RUBY_RAILS_DEFAULT: ${RUBY_RAILS_DEFAULT}
63.endif 63.endif
64 64
65.if empty(RUBY_RAILS_ACCEPTED) 65.if empty(RUBY_RAILS_ACCEPTED)
66RUBY_RAILS_ACCEPTED= ${RUBY_RAILS_SUPPORTED} 66RUBY_RAILS_ACCEPTED= ${RUBY_RAILS_SUPPORTED}
67.endif 67.endif
68 68
69.if defined(RUBY_RAILS_REQD) 69.if defined(RUBY_RAILS_REQD)
70. if empty(RUBY_RAILS_ACCEPTED:M${RUBY_RAILS_REQD}) 70. if empty(RUBY_RAILS_ACCEPTED:M${RUBY_RAILS_REQD})
71. error Unsupported RUBY_RAILS_REQD: ${RUBY_RAILS_REQD} 71. error Unsupported RUBY_RAILS_REQD: ${RUBY_RAILS_REQD}
72. endif 72. endif
73. for rr in ${RUBY_RAILS_ACCEPTED} 73. for rr in ${RUBY_RAILS_ACCEPTED}
74. if ${rr} == ${RUBY_RAILS_REQD} 74. if ${rr} == ${RUBY_RAILS_REQD}
75RUBY_RAILS= ${rr} 75RUBY_RAILS= ${rr}
76. endif 76. endif
77. endfor 77. endfor
78.endif 78.endif
79 79
80.if !defined(RUBY_RAILS) 80.if !defined(RUBY_RAILS)
81. for rr in ${RUBY_RAILS_ACCEPTED} 81. for rr in ${RUBY_RAILS_ACCEPTED}
82. if ${rr} == ${RUBY_RAILS_DEFAULT} 82. if ${rr} == ${RUBY_RAILS_DEFAULT}
83RUBY_RAILS= ${rr} 83RUBY_RAILS= ${rr}
84. else 84. else
85RUBY_RAILS?= ${rr} 85RUBY_RAILS?= ${rr}
86. endif 86. endif
87. endfor 87. endfor
88.endif 88.endif
89 89
90RUBY_RAILS?= ${RUBY_RAILS_SUPPORTED} 90RUBY_RAILS?= ${RUBY_RAILS_SUPPORTED}
91 91
92.if ${RUBY_RAILS} == "61" 92.if ${RUBY_RAILS} == "61"
93RAILS_VERSION:= ${RUBY_RAILS61_VERSION} 93RAILS_VERSION:= ${RUBY_RAILS61_VERSION}
94.elif ${RUBY_RAILS} == "60" 94.elif ${RUBY_RAILS} == "60"
95RAILS_VERSION:= ${RUBY_RAILS60_VERSION} 95RAILS_VERSION:= ${RUBY_RAILS60_VERSION}
96.elif ${RUBY_RAILS} == "52" 96.elif ${RUBY_RAILS} == "52"
97RAILS_VERSION:= ${RUBY_RAILS52_VERSION} 97RAILS_VERSION:= ${RUBY_RAILS52_VERSION}
98.endif 98.endif
99 99
100# 100#
101# Components of Ruby's version. 101# Components of Ruby's version.
102# 102#
103_RAILS_MAJOR= ${RAILS_VERSION:C/([0-9]+)\..*/\1/} 103_RAILS_MAJOR= ${RAILS_VERSION:C/([0-9]+)\..*/\1/}
104_RAILS_MINOR= ${RAILS_VERSION:C/([0-9]+)\.([0-9]+)\..*/\2/} 104_RAILS_MINOR= ${RAILS_VERSION:C/([0-9]+)\.([0-9]+)\..*/\2/}
105_RAILS_TEENY= ${RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/} 105_RAILS_TEENY= ${RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/}
106 106
107# 107#
108# If RUBY_RAILS_STRICT_DEP is defined, match exact current Ruby no Rails 108# If RUBY_RAILS_STRICT_DEP is defined, match exact current Ruby no Rails
109# version. 109# version.
110# Otherwise allow greater minor version. 110# Otherwise allow greater minor version.
111 111
112.if !empty(RUBY_RAILS_STRICT_DEP:M[yY][eE][sS]) 112.if !empty(RUBY_RAILS_STRICT_DEP:M[yY][eE][sS])
113_RAILS_NEXT!= ${EXPR} ${_RAILS_TEENY} + 1 113_RAILS_NEXT!= ${EXPR} ${_RAILS_TEENY} + 1
114_RAILS_DEP= \ 114_RAILS_DEP= \
115 ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_MINOR}.${_RAILS_NEXT} 115 ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_MINOR}.${_RAILS_NEXT}
116.else 116.else
117_RAILS_NEXT!= ${EXPR} ${_RAILS_MINOR} + 1 117_RAILS_NEXT!= ${EXPR} ${_RAILS_MINOR} + 1
118_RAILS_DEP= ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_NEXT} 118_RAILS_DEP= ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_NEXT}
119.endif 119.endif
120 120
121# 121#
122MAKE_ENV+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \ 122MAKE_ENV+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \
123 RUBY_RAILS_ACCEPTED=${RUBY_RAILS} 123 RUBY_RAILS_ACCEPTED=${RUBY_RAILS}
124# 124#
125MULTI+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \ 125MULTI+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \
126 RUBY_RAILS_ACCEPTED=${RUBY_RAILS} 126 RUBY_RAILS_ACCEPTED=${RUBY_RAILS}
127 127
128PLIST_SUBST+= RUBY_RAILS=${RUBY_RAILS} 128PLIST_SUBST+= RUBY_RAILS=${RUBY_RAILS}
 129FILES_SUBST+= RUBY_RAILS=${RUBY_RAILS}
129 130
130RUBY_ACTIVESUPPORT_DEPENDS= \ 131RUBY_ACTIVESUPPORT_DEPENDS= \
131 ${RUBY_PKGPREFIX}-activesupport${_RAILS_DEP}:../../devel/ruby-activesupport${RUBY_RAILS} 132 ${RUBY_PKGPREFIX}-activesupport${_RAILS_DEP}:../../devel/ruby-activesupport${RUBY_RAILS}
132RUBY_ACTIVEMODEL_DEPENDS= \ 133RUBY_ACTIVEMODEL_DEPENDS= \
133 ${RUBY_PKGPREFIX}-activemodel${_RAILS_DEP}:../../devel/ruby-activemodel${RUBY_RAILS} 134 ${RUBY_PKGPREFIX}-activemodel${_RAILS_DEP}:../../devel/ruby-activemodel${RUBY_RAILS}
134RUBY_ACTIONPACK_DEPENDS= \ 135RUBY_ACTIONPACK_DEPENDS= \
135 ${RUBY_PKGPREFIX}-actionpack${_RAILS_DEP}:../../www/ruby-actionpack${RUBY_RAILS} 136 ${RUBY_PKGPREFIX}-actionpack${_RAILS_DEP}:../../www/ruby-actionpack${RUBY_RAILS}
136RUBY_ACTIVERECORD_DEPENDS= \ 137RUBY_ACTIVERECORD_DEPENDS= \
137 ${RUBY_PKGPREFIX}-activerecord${_RAILS_DEP}:../../databases/ruby-activerecord${RUBY_RAILS} 138 ${RUBY_PKGPREFIX}-activerecord${_RAILS_DEP}:../../databases/ruby-activerecord${RUBY_RAILS}
138RUBY_ACTIONMAILER_DEPENDS= \ 139RUBY_ACTIONMAILER_DEPENDS= \
139 ${RUBY_PKGPREFIX}-actionmailer${_RAILS_DEP}:../../mail/ruby-actionmailer${RUBY_RAILS} 140 ${RUBY_PKGPREFIX}-actionmailer${_RAILS_DEP}:../../mail/ruby-actionmailer${RUBY_RAILS}
140RUBY_RAILTIES_DEPENDS= \ 141RUBY_RAILTIES_DEPENDS= \
141 ${RUBY_PKGPREFIX}-railties${_RAILS_DEP}:../../devel/ruby-railties${RUBY_RAILS} 142 ${RUBY_PKGPREFIX}-railties${_RAILS_DEP}:../../devel/ruby-railties${RUBY_RAILS}
142RUBY_RAILS_DEPENDS= \ 143RUBY_RAILS_DEPENDS= \
143 ${RUBY_PKGPREFIX}-rails${_RAILS_DEP}:../../www/ruby-rails${RUBY_RAILS} 144 ${RUBY_PKGPREFIX}-rails${_RAILS_DEP}:../../www/ruby-rails${RUBY_RAILS}
144RUBY_ACTIONVIEW_DEPENDS= \ 145RUBY_ACTIONVIEW_DEPENDS= \
145 ${RUBY_PKGPREFIX}-actionview${_RAILS_DEP}:../../www/ruby-actionview${RUBY_RAILS} 146 ${RUBY_PKGPREFIX}-actionview${_RAILS_DEP}:../../www/ruby-actionview${RUBY_RAILS}
146RUBY_ACTIVEJOB_DEPENDS= \ 147RUBY_ACTIVEJOB_DEPENDS= \
147 ${RUBY_PKGPREFIX}-activejob${_RAILS_DEP}:../../devel/ruby-activejob${RUBY_RAILS} 148 ${RUBY_PKGPREFIX}-activejob${_RAILS_DEP}:../../devel/ruby-activejob${RUBY_RAILS}
148RUBY_ACTIONCABLE_DEPENDS= \ 149RUBY_ACTIONCABLE_DEPENDS= \
149 ${RUBY_PKGPREFIX}-actioncable${_RAILS_DEP}:../../www/ruby-actioncable${RUBY_RAILS} 150 ${RUBY_PKGPREFIX}-actioncable${_RAILS_DEP}:../../www/ruby-actioncable${RUBY_RAILS}
150RUBY_ACTIVESTORAGE_DEPENDS= \ 151RUBY_ACTIVESTORAGE_DEPENDS= \
151 ${RUBY_PKGPREFIX}-activestorage${_RAILS_DEP}:../../devel/ruby-activestorage${RUBY_RAILS} 152 ${RUBY_PKGPREFIX}-activestorage${_RAILS_DEP}:../../devel/ruby-activestorage${RUBY_RAILS}
152.if ${RUBY_RAILS} >= 60 153.if ${RUBY_RAILS} >= 60
153RUBY_ACTIONMAILBOX_DEPENDS= \ 154RUBY_ACTIONMAILBOX_DEPENDS= \
154 ${RUBY_PKGPREFIX}-actionmailbox${_RAILS_DEP}:../../mail/ruby-actionmailbox${RUBY_RAILS} 155 ${RUBY_PKGPREFIX}-actionmailbox${_RAILS_DEP}:../../mail/ruby-actionmailbox${RUBY_RAILS}
155RUBY_ACTIONTEXT_DEPENDS= \ 156RUBY_ACTIONTEXT_DEPENDS= \
156 ${RUBY_PKGPREFIX}-actiontext${_RAILS_DEP}:../../textproc/ruby-actiontext${RUBY_RAILS} 157 ${RUBY_PKGPREFIX}-actiontext${_RAILS_DEP}:../../textproc/ruby-actiontext${RUBY_RAILS}
157.endif 158.endif
158 159
159.endif 160.endif