diff options
| -rw-r--r-- | Mk/bsd.ruby.mk | 4 | ||||
| -rw-r--r-- | lang/ruby25/distinfo | 6 | ||||
| -rw-r--r-- | lang/ruby25/files/patch-tool_rbinstall.rb | 24 | ||||
| -rw-r--r-- | lang/ruby25/pkg-plist | 3 |
4 files changed, 15 insertions, 22 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 0ae2fb6d5e87..2616e906560b 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -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 diff --git a/lang/ruby25/distinfo b/lang/ruby25/distinfo index 41343f3d2999..412fd1477019 100644 --- a/lang/ruby25/distinfo +++ b/lang/ruby25/distinfo @@ -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 diff --git a/lang/ruby25/files/patch-tool_rbinstall.rb b/lang/ruby25/files/patch-tool_rbinstall.rb index c67b453912c1..71c4a24f0b28 100644 --- a/lang/ruby25/files/patch-tool_rbinstall.rb +++ b/lang/ruby25/files/patch-tool_rbinstall.rb @@ -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}" diff --git a/lang/ruby25/pkg-plist b/lang/ruby25/pkg-plist index c865d27ed850..2339170c4587 100644 --- a/lang/ruby25/pkg-plist +++ b/lang/ruby25/pkg-plist @@ -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 |