Received: by mail.netbsd.org (Postfix, from userid 605) id BCCFF84D58; Sun, 11 Apr 2021 12:16:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id ED5CA84DB5 for ; Sun, 11 Apr 2021 12:16:20 +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 JpoaCLmqxVpe for ; Sun, 11 Apr 2021 12:16:20 +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 5062084D58 for ; Sun, 11 Apr 2021 12:16:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 43D8DFA95; Sun, 11 Apr 2021 12:16:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_161814338044910" MIME-Version: 1.0 Date: Sun, 11 Apr 2021 12:16:20 +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: <20210411121620.43D8DFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_161814338044910 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: taca Date: Sun Apr 11 12:16:20 UTC 2021 Modified Files: pkgsrc/lang/ruby: rubyversion.mk Log Message: lang/ruby/rubyversion.mk: pass RUBY_RAILS_ACCEPTED Pass RUBY_RAILS_ACCEPTED to MAKEFLAGS unless it isn't empty. To generate a diff of this commit: cvs rdiff -u -r1.226 -r1.227 pkgsrc/lang/ruby/rubyversion.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_161814338044910 Content-Disposition: inline Content-Length: 859 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ruby/rubyversion.mk diff -u pkgsrc/lang/ruby/rubyversion.mk:1.226 pkgsrc/lang/ruby/rubyversion.mk:1.227 --- pkgsrc/lang/ruby/rubyversion.mk:1.226 Thu Apr 1 14:07:52 2021 +++ pkgsrc/lang/ruby/rubyversion.mk Sun Apr 11 12:16:20 2021 @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.226 2021/04/01 14:07:52 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.227 2021/04/11 12:16:20 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -586,6 +586,9 @@ MAKE_ENV+= RUBY=${RUBY:Q} RUBY_VER=${RU MAKEFLAGS+= RUBY_VER=${RUBY_VER:Q} \ RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q} +.if !empty(RUBY_RAILS_ACCEPTED) +MAKEFLAGS+= RUBY_RAILS_ACCEPTED=${RUBY_RAILS_ACCEPTED} +.endif PLIST_RUBY_DIRS= RUBY_INC=${RUBY_INC:Q} RUBY_ARCHINC=${RUBY_ARCHINC:Q} \ RUBY_LIB_BASE=${RUBY_LIB_BASE:Q} \ --_----------=_161814338044910--