Received: by mail.netbsd.org (Postfix, from userid 605) id 9640584DC1; Fri, 20 Mar 2020 16:42:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1E83784D2D for ; Fri, 20 Mar 2020 16:42:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ziTNi_759Fgb for ; Fri, 20 Mar 2020 16:42:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9837884CF1 for ; Fri, 20 Mar 2020 16:42:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8F7ADFB27; Fri, 20 Mar 2020 16:42:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1584722563134660" MIME-Version: 1.0 Date: Fri, 20 Mar 2020 16:42:43 +0000 From: "Takahiro Kambe" Subject: CVS commit: pkgsrc/lang/ruby To: pkgsrc-changes@NetBSD.org Reply-To: taca@netbsd.org X-Mailer: log_accum Message-Id: <20200320164243.8F7ADFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1584722563134660 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: taca Date: Fri Mar 20 16:42:43 UTC 2020 Modified Files: pkgsrc/lang/ruby: rails.mk Log Message: lang/ruby/rails.mk: add support for Ruby on Rails 6.0 Add add support for Ruby on Rails 6.0. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 pkgsrc/lang/ruby/rails.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1584722563134660 Content-Disposition: inline Content-Length: 2257 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ruby/rails.mk diff -u pkgsrc/lang/ruby/rails.mk:1.81 pkgsrc/lang/ruby/rails.mk:1.82 --- pkgsrc/lang/ruby/rails.mk:1.81 Fri Mar 20 15:36:25 2020 +++ pkgsrc/lang/ruby/rails.mk Fri Mar 20 16:42:43 2020 @@ -1,4 +1,4 @@ -# $NetBSD: rails.mk,v 1.81 2020/03/20 15:36:25 taca Exp $ +# $NetBSD: rails.mk,v 1.82 2020/03/20 16:42:43 taca Exp $ .if !defined(_RUBY_RAILS_MK) _RUBY_RAILS_MK= # defined @@ -9,7 +9,7 @@ _RUBY_RAILS_MK= # defined # RUBY_RAILS_DEFAULT # Select default Ruby on Rails version. # -# Possible values: 42 51 52 +# Possible values: 42 51 52 60 # Default: 52 # # @@ -27,7 +27,7 @@ _RUBY_RAILS_MK= # defined # RUBY_RAILS_ACCEPTED # The Ruby on Rails versions that are acceptable for the package. # -# Possible values: 42 51 52 +# Possible values: 42 51 52 60 # Default: (empty) # # RUBY_RAILS_STRICT_DEP @@ -41,7 +41,7 @@ _RUBY_RAILS_MK= # defined # RUBY_RAILS # Selected Ruby on Rails version. # -# Possible values: 42 51 52 +# Possible values: 42 51 52 60 # # @@ -50,13 +50,14 @@ _RUBY_RAILS_MK= # defined RUBY_RAILS42_VERSION?= 4.2.11.1 RUBY_RAILS51_VERSION?= 5.1.7 RUBY_RAILS52_VERSION?= 5.2.4.2 +RUBY_RAILS60_VERSION?= 6.0.2.2 RUBY_RAILS_ACCEPTED?= # defined RUBY_RAILS_DEFAULT?= 52 RUBY_RAILS_STRICT_DEP?= no -RUBY_RAILS_SUPPORTED= 42 51 52 +RUBY_RAILS_SUPPORTED= 42 51 52 60 .if empty(RUBY_RAILS_SUPPORTED:M${RUBY_RAILS_DEFAULT}) . error Unsupported RUBY_RAILS_DEFAULT: ${RUBY_RAILS_DEFAULT} @@ -89,7 +90,9 @@ RUBY_RAILS?= ${rr} RUBY_RAILS?= ${RUBY_RAILS_SUPPORTED} -.if ${RUBY_RAILS} == "52" +.if ${RUBY_RAILS} == "60" +RAILS_VERSION:= ${RUBY_RAILS60_VERSION} +.elif ${RUBY_RAILS} == "52" RAILS_VERSION:= ${RUBY_RAILS52_VERSION} .elif ${RUBY_RAILS} == "51" RAILS_VERSION:= ${RUBY_RAILS51_VERSION} @@ -153,5 +156,11 @@ RUBY_ACTIONCABLE_DEPENDS= \ RUBY_ACTIVESTORAGE_DEPENDS= \ ${RUBY_PKGPREFIX}-activestorage${_RAILS_DEP}:../../devel/ruby-activestorage${RUBY_RAILS} .endif +.if ${RUBY_RAILS} >= 60 +RUBY_ACTIONMAILBOX_DEPENDS= \ + ${RUBY_PKGPREFIX}-actionmailbox${_RAILS_DEP}:../../mail/ruby-actionmailbox${RUBY_RAILS} +RUBY_ACTIONTEXT_DEPENDS= \ + ${RUBY_PKGPREFIX}-actiontext${_RAILS_DEP}:../../textproc/ruby-actiontext${RUBY_RAILS} +.endif .endif --_----------=_1584722563134660--