diff options
| -rw-r--r-- | Mk/bsd.ruby.mk | 2 | ||||
| -rw-r--r-- | lang/ruby27/distinfo | 6 | ||||
| -rw-r--r-- | lang/ruby27/files/patch-include_ruby_ruby.h | 29 | ||||
| -rw-r--r-- | lang/ruby27/pkg-plist | 8 |
4 files changed, 4 insertions, 41 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 44038cf8d387..43b92b03edb2 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -142,7 +142,7 @@ RUBY26= "" # PLIST_SUB helpers # # Ruby 2.7 # -RUBY_VERSION= 2.7.4 +RUBY_VERSION= 2.7.5 RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY27= "" # PLIST_SUB helpers diff --git a/lang/ruby27/distinfo b/lang/ruby27/distinfo index ff4f31053662..26e8984cba32 100644 --- a/lang/ruby27/distinfo +++ b/lang/ruby27/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625854090 -SHA256 (ruby/ruby-2.7.4.tar.xz) = 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 -SIZE (ruby/ruby-2.7.4.tar.xz) = 12067588 +TIMESTAMP = 1637774590 +SHA256 (ruby/ruby-2.7.5.tar.xz) = d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 +SIZE (ruby/ruby-2.7.5.tar.xz) = 12072980 diff --git a/lang/ruby27/files/patch-include_ruby_ruby.h b/lang/ruby27/files/patch-include_ruby_ruby.h deleted file mode 100644 index 1cbe0ed4a699..000000000000 --- a/lang/ruby27/files/patch-include_ruby_ruby.h +++ /dev/null @@ -1,29 +0,0 @@ ---- include/ruby/ruby.h.orig 2021-04-05 12:39:38 UTC -+++ include/ruby/ruby.h -@@ -1828,12 +1828,14 @@ VALUE rb_sym2str(VALUE); - VALUE rb_to_symbol(VALUE name); - VALUE rb_check_symbol(volatile VALUE *namep); - --#define RUBY_CONST_ID_CACHE(result, str) \ -- { \ -+#define RUBY_CONST_ID_CACHE_NB(result, str) \ - static ID rb_intern_id_cache; \ - if (!rb_intern_id_cache) \ - rb_intern_id_cache = rb_intern2((str), (long)strlen(str)); \ -- result rb_intern_id_cache; \ -+ result rb_intern_id_cache; -+#define RUBY_CONST_ID_CACHE(result, str) \ -+ { \ -+ RUBY_CONST_ID_CACHE_NB(result, str) \ - } - #define RUBY_CONST_ID(var, str) \ - do RUBY_CONST_ID_CACHE((var) =, (str)) while (0) -@@ -1844,7 +1846,7 @@ VALUE rb_check_symbol(volatile VALUE *namep); - * since gcc-2.7.2.3 at least. */ - #define rb_intern(str) \ - (__builtin_constant_p(str) ? \ -- __extension__ (RUBY_CONST_ID_CACHE((ID), (str))) : \ -+ __extension__ ({RUBY_CONST_ID_CACHE_NB((ID), (str))}) : \ - rb_intern(str)) - #define rb_intern_const(str) \ - (__builtin_constant_p(str) ? \ diff --git a/lang/ruby27/pkg-plist b/lang/ruby27/pkg-plist index 7e05dfd62ef9..3534fcd91712 100644 --- a/lang/ruby27/pkg-plist +++ b/lang/ruby27/pkg-plist @@ -204,14 +204,6 @@ lib/libruby%%RUBY_SHLIBVER%%.so.%%RUBY_SHLIBVER%% %%RUBY_LIBDIR%%/drb/unix.rb %%RUBY_LIBDIR%%/drb/weakidconv.rb %%RUBY_LIBDIR%%/erb.rb -%%RUBY_LIBDIR%%/exe/bundle -%%RUBY_LIBDIR%%/exe/bundler -%%RUBY_LIBDIR%%/exe/irb -%%RUBY_LIBDIR%%/exe/racc -%%RUBY_LIBDIR%%/exe/racc2y -%%RUBY_LIBDIR%%/exe/rdoc -%%RUBY_LIBDIR%%/exe/ri -%%RUBY_LIBDIR%%/exe/y2racc %%RUBY_LIBDIR%%/expect.rb %%RUBY_LIBDIR%%/fiddle.rb %%RUBY_LIBDIR%%/fiddle/closure.rb |