This updates to Ruby 3.2.1, released yesterday. Release announcement at
https://www.ruby-lang.org/en/news/2023/02/08/ruby-3-2-1-released/
Ports-wise, this has a few changes:
* Change how gem update --system nag message is removed, which also
prevents gem update --system from working (nobody using the OpenBSD
package should use it).
* Reorder environment variables when building C extensions to avoid
a couple of test failures.
* Use TEST_TARGET instead of overriding do_test.
I plan to commit in a couple days unless I hear objections.
Thanks,
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ruby/3.2/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 8 Jan 2023 02:44:58 -0000 1.2
+++ Makefile 9 Feb 2023 16:19:35 -0000
@@ -1,9 +1,8 @@
-VERSION = 3.2.0
+VERSION = 3.2.1
DISTNAME = ruby-${VERSION}
SHARED_LIBS = ruby32 0.0
NEXTVER = 3.3
PKGSPEC-main ?= ruby->=3.2.0,<${NEXTVER}
-REVISION-main = 0
PSEUDO_FLAVORS= no_ri_docs bootstrap
# Do not build the RI docs on slow arches
@@ -37,6 +36,9 @@ SUBST_VARS += GEM_EXTENSIONS_DIR
WANTLIB-main += curses yaml-0
+TEST_ENV = RUBYGEMS_SYSTEM_UPDATE_MESSAGE=enable
+TEST_TARGET = check TESTOPTS="-v -q"
+
post-extract:
${POST_EXTRACT}
@@ -48,8 +50,5 @@ pre-install:
post-install:
${FIX_RBCONFIG}
-
-do-test:
- cd ${WRKSRC} && make check
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/ruby/3.2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 26 Dec 2022 03:03:57 -0000 1.1.1.1
+++ distinfo 8 Feb 2023 17:03:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (ruby-3.2.0.tar.gz) = 2qp44TYLJ4P5je7OtnetkA86NsD/puK2sZCQvnerwnI=
-SIZE (ruby-3.2.0.tar.gz) = 20440715
+SHA256 (ruby-3.2.1.tar.gz) = E9Z5AWYO4yF9vZ3VYFk0a9QhLOZKacMG71LfZJNfjb0=
+SIZE (ruby-3.2.1.tar.gz) = 20448976
Index: patches/patch-lib_rubygems_ext_builder_rb
===================================================================
RCS file: /cvs/ports/lang/ruby/3.2/patches/patch-lib_rubygems_ext_builder_rb,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-lib_rubygems_ext_builder_rb
--- patches/patch-lib_rubygems_ext_builder_rb 26 Dec 2022 03:03:57 -0000
1.1.1.1
+++ patches/patch-lib_rubygems_ext_builder_rb 9 Feb 2023 01:03:49 -0000
@@ -12,7 +12,7 @@ Index: lib/rubygems/ext/builder.rb
+ unless Process.euid == 0
+ %w[INSTALL INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM].each do |ins|
-+ env << "#{ins}=#{RbConfig::MAKEFILE_CONFIG[ins].gsub(/-o root -g
bin/, '')}"
++ env.unshift "#{ins}=#{RbConfig::MAKEFILE_CONFIG[ins].gsub(/-o root -g
bin/, '')}"
+ end
+ end
+
Index: patches/patch-lib_rubygems_rb
===================================================================
RCS file: patches/patch-lib_rubygems_rb
diff -N patches/patch-lib_rubygems_rb
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_rubygems_rb 8 Feb 2023 18:52:05 -0000
@@ -0,0 +1,25 @@
+Disable the use of `gem update --system`, which is not supported when using
+OpenBSD packages. Also avoids printing the nagging update message:
+
+ A new release of RubyGems is available: 3.4.1 - 3.4.2!
+ Run `gem update --system 3.4.2` to update your installation.
+
+The ENV usage is to skip this logic during tests, to avoid test failures.
+
+Index: lib/rubygems.rb
+--- lib/rubygems.rb.orig
++++ lib/rubygems.rb
+@@ -1168,6 +1168,13 @@ An Array (#{env.inspect}) was passed in from #{caller[
+
+ attr_accessor :disable_system_update_message
+
++ unless ENV['RUBYGEMS_SYSTEM_UPDATE_MESSAGE'] == 'enable'
++ Gem.disable_system_update_message = <<EOF
++Ruby was installed using an OpenBSD package, and using `gem update --system`
++is not supported.
++EOF
++ end
++
+ ##
+ # Whether RubyGems should enhance builtin `require` to automatically
+ # check whether the path required is present in installed gems, and
Index: patches/patch-lib_rubygems_update_suggestion_rb
===================================================================
RCS file: patches/patch-lib_rubygems_update_suggestion_rb
diff -N patches/patch-lib_rubygems_update_suggestion_rb
--- patches/patch-lib_rubygems_update_suggestion_rb 8 Jan 2023 02:44:58
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-Avoid printing of nagging update message:
-
- A new release of RubyGems is available: 3.4.1 - 3.4.2!
- Run `gem update --system 3.4.2` to update your installation.
-
-When using the OpenBSD port, important updates to rubygems will
-be distributed via normal updates to the related ruby ports.
-
-return false while true is used instead of plain return false to
-avoid the statement not reached verbose mode warning.
-
-Index: lib/rubygems/update_suggestion.rb
---- lib/rubygems/update_suggestion.rb.orig
-+++ lib/rubygems/update_suggestion.rb
-@@ -31,6 +31,7 @@ Run `gem update --system #{Gem.latest_rubygems_version
- # Determines if current environment is eglible for update suggestion.
-
- def eglible_for_update?
-+ return false while true
- # explicit opt-out
- return false if Gem.configuration[:prevent_update_suggestion]
- return false if ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"]
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/ruby/3.2/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-main
--- pkg/PLIST-main 26 Dec 2022 03:03:58 -0000 1.1.1.1
+++ pkg/PLIST-main 8 Feb 2023 17:30:10 -0000
@@ -221,7 +221,7 @@ include/ruby-${REV}/ruby/util.h
include/ruby-${REV}/ruby/version.h
include/ruby-${REV}/ruby/vm.h
include/ruby-${REV}/${SUB}/
-include/ruby-${REV}/${SUB}/rb_mjit_min_header-3.2.0.h
+include/ruby-${REV}/${SUB}/rb_mjit_min_header-3.2.1.h
include/ruby-${REV}/${SUB}/ruby/
include/ruby-${REV}/${SUB}/ruby/config.h
@so lib/libruby32.so
@@ -809,8 +809,6 @@ lib/ruby/${REV}/logger/log_device.rb
lib/ruby/${REV}/logger/period.rb
lib/ruby/${REV}/logger/severity.rb
lib/ruby/${REV}/logger/version.rb
-lib/ruby/${REV}/mjit/
-lib/ruby/${REV}/mjit/instruction.rb
lib/ruby/${REV}/mkmf.rb
lib/ruby/${REV}/monitor.rb
lib/ruby/${REV}/mutex_m.rb
@@ -1591,10 +1589,10 @@ lib/ruby/gems/${REV}/gems/abbrev-0.1.1/
lib/ruby/gems/${REV}/gems/base64-0.1.1/
lib/ruby/gems/${REV}/gems/benchmark-0.2.1/
lib/ruby/gems/${REV}/gems/bigdecimal-3.1.3/
-lib/ruby/gems/${REV}/gems/bundler-2.4.1/
-lib/ruby/gems/${REV}/gems/bundler-2.4.1/libexec/
-lib/ruby/gems/${REV}/gems/bundler-2.4.1/libexec/bundle
-lib/ruby/gems/${REV}/gems/bundler-2.4.1/libexec/bundler
+lib/ruby/gems/${REV}/gems/bundler-2.4.6/
+lib/ruby/gems/${REV}/gems/bundler-2.4.6/libexec/
+lib/ruby/gems/${REV}/gems/bundler-2.4.6/libexec/bundle
+lib/ruby/gems/${REV}/gems/bundler-2.4.6/libexec/bundler
lib/ruby/gems/${REV}/gems/cgi-0.3.6/
lib/ruby/gems/${REV}/gems/csv-3.2.6/
lib/ruby/gems/${REV}/gems/date-3.3.3/
@@ -2734,7 +2732,7 @@ lib/ruby/gems/${REV}/specifications/defa
lib/ruby/gems/${REV}/specifications/default/base64-0.1.1.gemspec
lib/ruby/gems/${REV}/specifications/default/benchmark-0.2.1.gemspec
lib/ruby/gems/${REV}/specifications/default/bigdecimal-3.1.3.gemspec
-lib/ruby/gems/${REV}/specifications/default/bundler-2.4.1.gemspec
+lib/ruby/gems/${REV}/specifications/default/bundler-2.4.6.gemspec
lib/ruby/gems/${REV}/specifications/default/cgi-0.3.6.gemspec
lib/ruby/gems/${REV}/specifications/default/csv-3.2.6.gemspec
lib/ruby/gems/${REV}/specifications/default/date-3.3.3.gemspec
Index: pkg/PLIST-ri_docs
===================================================================
RCS file: /cvs/ports/lang/ruby/3.2/pkg/PLIST-ri_docs,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-ri_docs
--- pkg/PLIST-ri_docs 26 Dec 2022 03:03:59 -0000 1.1.1.1
+++ pkg/PLIST-ri_docs 8 Feb 2023 17:30:49 -0000
@@ -2670,6 +2670,7 @@ share/ri/${REV}/system/Gem/CommandManage
share/ri/${REV}/system/Gem/CommandManager/find_command_possibilities-i.ri
share/ri/${REV}/system/Gem/CommandManager/instance-c.ri
share/ri/${REV}/system/Gem/CommandManager/instance-i.ri
+share/ri/${REV}/system/Gem/CommandManager/invoke_command-i.ri
share/ri/${REV}/system/Gem/CommandManager/load_and_instantiate-i.ri
share/ri/${REV}/system/Gem/CommandManager/new-c.ri
share/ri/${REV}/system/Gem/CommandManager/process_args-i.ri
@@ -3071,17 +3072,15 @@ share/ri/${REV}/system/Gem/Ext/CargoBuil
share/ri/${REV}/system/Gem/Ext/CargoBuilder/LinkFlagConverter/cdesc-LinkFlagConverter.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/LinkFlagConverter/convert-c.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/build-i.ri
-share/ri/${REV}/system/Gem/Ext/CargoBuilder/build_crate-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/build_env-i.ri
+share/ri/${REV}/system/Gem/Ext/CargoBuilder/cargo-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/cargo_command-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/cargo_crate_name-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/cargo_dylib_path-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/cargo_rustc_args-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/cdesc-CargoBuilder.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/darwin_target%3f-i.ri
-share/ri/${REV}/system/Gem/Ext/CargoBuilder/final_extension_path-i.ri
-share/ri/${REV}/system/Gem/Ext/CargoBuilder/finalize_directory-i.ri
-share/ri/${REV}/system/Gem/Ext/CargoBuilder/get_relative_path-i.ri
+share/ri/${REV}/system/Gem/Ext/CargoBuilder/extension_nesting-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/ldflag_to_link_modifier-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/libruby_args-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/linker_args-i.ri
@@ -3092,10 +3091,10 @@ share/ri/${REV}/system/Gem/Ext/CargoBuil
share/ri/${REV}/system/Gem/Ext/CargoBuilder/msvc_target%3f-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/mswin_link_args-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/new-c.ri
+share/ri/${REV}/system/Gem/Ext/CargoBuilder/normalize_path-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/platform_specific_rustc_args-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/profile-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/rb_config_env-i.ri
-share/ri/${REV}/system/Gem/Ext/CargoBuilder/rename_cdylib_for_ruby_compatibility-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/ruby_static%3f-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/runner-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/rustc_dynamic_linker_flags-i.ri
@@ -3103,7 +3102,6 @@ share/ri/${REV}/system/Gem/Ext/CargoBuil
share/ri/${REV}/system/Gem/Ext/CargoBuilder/so_ext-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/spec-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/split_flags-i.ri
-share/ri/${REV}/system/Gem/Ext/CargoBuilder/validate_cargo_build%21-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/win_target%3f-i.ri
share/ri/${REV}/system/Gem/Ext/CargoBuilder/write_deffile-i.ri
share/ri/${REV}/system/Gem/Ext/CmakeBuilder/
@@ -4722,6 +4720,7 @@ share/ri/${REV}/system/Gem/default_speci
share/ri/${REV}/system/Gem/deflate-c.ri
share/ri/${REV}/system/Gem/dir-c.ri
share/ri/${REV}/system/Gem/disable_system_update_message-c.ri
+share/ri/${REV}/system/Gem/discover_gems_on_require-c.ri
share/ri/${REV}/system/Gem/done_installing-c.ri
share/ri/${REV}/system/Gem/done_installing_hooks-c.ri
share/ri/${REV}/system/Gem/ensure_default_gem_subdirectories-c.ri
@@ -5930,7 +5929,6 @@ share/ri/${REV}/system/Kernel/fork-i.ri
share/ri/${REV}/system/Kernel/format-i.ri
share/ri/${REV}/system/Kernel/frozen%3f-i.ri
share/ri/${REV}/system/Kernel/gem-i.ri
-share/ri/${REV}/system/Kernel/gem_original_require-i.ri
share/ri/${REV}/system/Kernel/gets-i.ri
share/ri/${REV}/system/Kernel/global_variables-i.ri
share/ri/${REV}/system/Kernel/gsub-i.ri
