From owner-svn-ports-all@freebsd.org  Thu Nov  7 13:06:35 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id CED0A1B37F8;
 Thu,  7 Nov 2019 13:06:35 +0000 (UTC)
 (envelope-from meta@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4783ZM53rRz4cg7;
 Thu,  7 Nov 2019 13:06:35 +0000 (UTC)
 (envelope-from meta@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9177CE204;
 Thu,  7 Nov 2019 13:06:35 +0000 (UTC)
 (envelope-from meta@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA7D6ZXp080279;
 Thu, 7 Nov 2019 13:06:35 GMT (envelope-from meta@FreeBSD.org)
Received: (from meta@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA7D6ZoK080276;
 Thu, 7 Nov 2019 13:06:35 GMT (envelope-from meta@FreeBSD.org)
Message-Id: <201911071306.xA7D6ZoK080276@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: meta set sender to
 meta@FreeBSD.org using -f
From: Koichiro Iwao <meta@FreeBSD.org>
Date: Thu, 7 Nov 2019 13:06:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r516970 - in head/devel/ruby-build: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: meta
X-SVN-Commit-Paths: in head/devel/ruby-build: . files
X-SVN-Commit-Revision: 516970
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Nov 2019 13:06:35 -0000

Author: meta
Date: Thu Nov  7 13:06:34 2019
New Revision: 516970
URL: https://svnweb.freebsd.org/changeset/ports/516970

Log:
  devel/ruby-build: Update to 20191030
  
  and use GNU make when building Ruby to avoid Ruby build failure.
  
  PR:		241633
  Submitted by:	Yuichiro NAITO <naito.yuichiro@gmail.com>, myself
  Sponsored by:	HAW International, Inc.

Added:
  head/devel/ruby-build/files/
  head/devel/ruby-build/files/patch-bin_ruby-build   (contents, props changed)
Modified:
  head/devel/ruby-build/Makefile
  head/devel/ruby-build/distinfo

Modified: head/devel/ruby-build/Makefile
==============================================================================
--- head/devel/ruby-build/Makefile	Thu Nov  7 12:53:03 2019	(r516969)
+++ head/devel/ruby-build/Makefile	Thu Nov  7 13:06:34 2019	(r516970)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ruby-build
-PORTVERSION=	20191004 # pend update until bug 241633 solved
+PORTVERSION=	20191030
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel ruby
 

Modified: head/devel/ruby-build/distinfo
==============================================================================
--- head/devel/ruby-build/distinfo	Thu Nov  7 12:53:03 2019	(r516969)
+++ head/devel/ruby-build/distinfo	Thu Nov  7 13:06:34 2019	(r516970)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1570594875
-SHA256 (rbenv-ruby-build-v20191004_GH0.tar.gz) = 6f053957acb0af6d621ebf2b9dacc9c265844b2dc6842a021eb10f0a70094fe8
-SIZE (rbenv-ruby-build-v20191004_GH0.tar.gz) = 63345
+TIMESTAMP = 1573003323
+SHA256 (rbenv-ruby-build-v20191030_GH0.tar.gz) = 6f13124f7bc6e65930606dec25f26305f132dc3596035b09d48576f1eb0ea5c7
+SIZE (rbenv-ruby-build-v20191030_GH0.tar.gz) = 63632

Added: head/devel/ruby-build/files/patch-bin_ruby-build
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ruby-build/files/patch-bin_ruby-build	Thu Nov  7 13:06:34 2019	(r516970)
@@ -0,0 +1,20 @@
+--- bin/ruby-build.orig	2019-10-30 17:11:02 UTC
++++ bin/ruby-build
+@@ -1317,15 +1317,8 @@ fi
+ 
+ if [ -z "$MAKE" ]; then
+   if [ "FreeBSD" = "$(uname -s)" ]; then
+-    if [ "$(echo $1 | sed 's/-.*$//')" = "jruby" ]; then
+-      export MAKE="gmake"
+-    else
+-      if [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then
+-        export MAKE="gmake"
+-      else
+-        export MAKE="make"
+-      fi
+-    fi
++    # FreeBSD bug 241633: fails to build due to race condition
++    export MAKE="gmake"
+   else
+     export MAKE="make"
+   fi