From owner-svn-ports-all@freebsd.org Fri Mar 15 21:42:08 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 00510152FBD5; Fri, 15 Mar 2019 21:42:08 +0000 (UTC) (envelope-from sunpoet@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 DAA0C847D5; Fri, 15 Mar 2019 21:41:58 +0000 (UTC) (envelope-from sunpoet@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 EF60918371; Fri, 15 Mar 2019 21:41:57 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2FLfva5098129; Fri, 15 Mar 2019 21:41:57 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2FLfvpu098126; Fri, 15 Mar 2019 21:41:57 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201903152141.x2FLfvpu098126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 15 Mar 2019 21:41:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495828 - in head: Mk lang/ruby25 lang/ruby25/files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head: Mk lang/ruby25 lang/ruby25/files X-SVN-Commit-Revision: 495828 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DAA0C847D5 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2019 21:42:08 -0000 Author: sunpoet Date: Fri Mar 15 21:41:56 2019 New Revision: 495828 URL: https://svnweb.freebsd.org/changeset/ports/495828 Log: Update to 2.5.5 Changes: https://www.ruby-lang.org/en/news/2019/03/15/ruby-2-5-5-released/ https://www.ruby-lang.org/en/news/2019/03/13/ruby-2-5-4-released/ Modified: head/Mk/bsd.ruby.mk head/lang/ruby25/distinfo head/lang/ruby25/files/patch-tool_rbinstall.rb head/lang/ruby25/pkg-plist Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Fri Mar 15 21:41:51 2019 (r495827) +++ head/Mk/bsd.ruby.mk Fri Mar 15 21:41:56 2019 (r495828) @@ -174,8 +174,8 @@ RUBY24= "" # PLIST_SUB helpers # # Ruby 2.5 # -RUBY_RELVERSION= 2.5.3 -RUBY_PORTREVISION= 1 +RUBY_RELVERSION= 2.5.5 +RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY25= "" # PLIST_SUB helpers Modified: head/lang/ruby25/distinfo ============================================================================== --- head/lang/ruby25/distinfo Fri Mar 15 21:41:51 2019 (r495827) +++ head/lang/ruby25/distinfo Fri Mar 15 21:41:56 2019 (r495828) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540022791 -SHA256 (ruby/ruby-2.5.3.tar.xz) = 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -SIZE (ruby/ruby-2.5.3.tar.xz) = 11453336 +TIMESTAMP = 1552671237 +SHA256 (ruby/ruby-2.5.5.tar.xz) = 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d +SIZE (ruby/ruby-2.5.5.tar.xz) = 11459832 Modified: head/lang/ruby25/files/patch-tool_rbinstall.rb ============================================================================== --- head/lang/ruby25/files/patch-tool_rbinstall.rb Fri Mar 15 21:41:51 2019 (r495827) +++ head/lang/ruby25/files/patch-tool_rbinstall.rb Fri Mar 15 21:41:56 2019 (r495828) @@ -1,4 +1,4 @@ ---- tool/rbinstall.rb.orig 2017-10-30 05:45:20 UTC +--- tool/rbinstall.rb.orig 2019-02-05 12:15:47 UTC +++ tool/rbinstall.rb @@ -325,6 +325,7 @@ bindir = CONFIG["bindir", true] libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true] @@ -17,7 +17,7 @@ install pc, pkgconfigdir, :mode => $data_mode end end -@@ -699,136 +700,6 @@ end +@@ -762,130 +763,6 @@ end # :startdoc: @@ -25,17 +25,7 @@ - install_default_gem('lib', srcdir) -end -install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do -- install_default_gem('ext', srcdir) do |path| -- # assume that gemspec and extconf.rb are placed in the same directory -- success = false -- begin -- IO.foreach(File.dirname(path[(srcdir.size+1)..-1]) + "/Makefile") do |l| -- break success = true if /^TARGET\s*=/ =~ l -- end -- rescue Errno::ENOENT -- end -- success -- end +- install_default_gem('ext', srcdir) -end - -def load_gemspec(file) @@ -62,8 +52,12 @@ - makedirs(default_spec_dir) - - gems = Dir.glob("#{srcdir}/#{dir}/**/*.gemspec").map {|src| -- next if block_given? and !yield(src) -- load_gemspec(src) +- spec = load_gemspec(src) +- file_collector = RbInstall::Specs::FileCollector.new(src) +- files = file_collector.collect +- next if files.empty? +- spec.files = files +- spec - } - gems.compact.sort_by(&:name).each do |gemspec| - full_name = "#{gemspec.name}-#{gemspec.version}" Modified: head/lang/ruby25/pkg-plist ============================================================================== --- head/lang/ruby25/pkg-plist Fri Mar 15 21:41:51 2019 (r495827) +++ head/lang/ruby25/pkg-plist Fri Mar 15 21:41:56 2019 (r495828) @@ -6907,7 +6907,6 @@ man/man1/%%RUBY_NAME%%.1.gz %%RDOC%%%%RUBY_RIDIR%%/Gem/BundlerVersionFinder/lockfile_contents-c.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BundlerVersionFinder/lockfile_version-c.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/BundlerVersionFinder/missing_version_message-c.ri -%%RDOC%%%%RUBY_RIDIR%%/Gem/BundlerVersionFinder/without_filtering-c.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Command/add_common_option-c.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Command/add_extra_args-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Command/add_option-i.ri @@ -7388,7 +7387,7 @@ man/man1/%%RUBY_NAME%%.1.gz %%RDOC%%%%RUBY_RIDIR%%/Gem/Installer/spec-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Installer/spec_file-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Installer/unpack-i.ri -%%RDOC%%%%RUBY_RIDIR%%/Gem/Installer/verify_spec_name-i.ri +%%RDOC%%%%RUBY_RIDIR%%/Gem/Installer/verify_spec-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Installer/windows_stub_script-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Installer/wrappers-i.ri %%RDOC%%%%RUBY_RIDIR%%/Gem/Installer/write_build_info_file-i.ri