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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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#
@@ -116,26 +116,27 @@ _RAILS_DEP= \ @@ -116,26 +116,27 @@ _RAILS_DEP= \
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}