Received: by mail.netbsd.org (Postfix, from userid 605) id 2836684F4A; Wed, 21 Mar 2018 09:15:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3D89D84F47 for ; Wed, 21 Mar 2018 09:15:05 +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 Q3UfnpAnAhoE for ; Wed, 21 Mar 2018 09:15:04 +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 5B96984DAF for ; Wed, 21 Mar 2018 09:15:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4CE8AFB40; Wed, 21 Mar 2018 09:15:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_152162370487150" MIME-Version: 1.0 Date: Wed, 21 Mar 2018 09:15:04 +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: <20180321091504.4CE8AFB40@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. --_----------=_152162370487150 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: taca Date: Wed Mar 21 09:15:04 UTC 2018 Modified Files: pkgsrc/lang/ruby: rails.mk Log Message: lang/ruby: Honor RUBY_RAILS_DEFAULT Honor RUBY_RAILS_DEFAULT and set RUBY_RAILS_REQD in environment. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 pkgsrc/lang/ruby/rails.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_152162370487150 Content-Disposition: inline Content-Length: 1207 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.64 pkgsrc/lang/ruby/rails.mk:1.65 --- pkgsrc/lang/ruby/rails.mk:1.64 Wed Mar 21 03:40:21 2018 +++ pkgsrc/lang/ruby/rails.mk Wed Mar 21 09:15:04 2018 @@ -1,4 +1,4 @@ -# $NetBSD: rails.mk,v 1.64 2018/03/21 03:40:21 taca Exp $ +# $NetBSD: rails.mk,v 1.65 2018/03/21 09:15:04 taca Exp $ .if !defined(_RUBY_RAILS_MK) _RUBY_RAILS_MK= # defined @@ -78,7 +78,11 @@ RUBY_RAILS= ${rr} .if !defined(RUBY_RAILS) . for rr in ${RUBY_RAILS_ACCEPTED} +. if ${rr} == ${RUBY_RAILS_DEFAULT} +RUBY_RAILS= ${rr} +. else RUBY_RAILS?= ${rr} +. endif . endfor .endif @@ -113,10 +117,12 @@ _RAILS_DEP= ${RUBY_RAILS}>=${RAILS_VERSI # MAKE_ENV+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \ - RUBY_RAILS_ACCEPTED=${RUBY_RAILS} + RUBY_RAILS_ACCEPTED=${RUBY_RAILS} \ + RUBY_RAILS_REQD=${RUBY_RAILS} # -MULTI+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \ - RUBY_RAILS_ACCEPTED=${RUBY_RAILS} +MULTI+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \ + RUBY_RAILS_ACCEPTED=${RUBY_RAILS} \ + RUBY_RAILS_REQD=${RUBY_RAILS} RUBY_ACTIVESUPPORT_DEPENDS= \ ${RUBY_PKGPREFIX}-activesupport${_RAILS_DEP}:../../devel/ruby-activesupport${RUBY_RAILS} --_----------=_152162370487150--