From: Jeremy Evans Subject: Switch default ruby version in ports from 3.4 to 4.0 To: OpenBSD ports Date: Mon, 15 Jun 2026 23:58:19 -0700 I would like to update the default ruby version in ports from 3.4 to 4.0. I think this is a good time in the release cycle for this change. Other than ruby.port.mk, most changes needed are REVISION bumps. Exceptions: * databases/xapian-bindings: Needs PLIST changes due to rdoc changes in ruby 4.0 (no bump as package prefix changes to ruby40) * sysutils/ruby-pdk: gem metadata needs a patch change to build Ruby 4.0 version. * textproc/redland-bindings: Drop REVISION-ruby, as the package prefix changes, this doesn't need a REVISION bump. During this process, I saw we have textproc/libmarisa that uses a ruby- prefix. That seems like a bug. We should switch to a ruby${MODRUBY_BINREV}- prefix. We used to warn for ruby- prefixes, but that was removed in a quirks change a while back. Tested on amd64 using a bulk of all ports that depend on a ruby port. This has fewer bumps than previous upgrades. I decided not to bump ports where MODRUBY_RUNDEP=No, unless SUBST_VARS indicated something ruby related. These tended to be ports using ruby during build or test, where the change in Ruby version shouldn't affect the package. OKs? Thanks, Jeremy Index: databases/ruby-hiera-eyaml/Makefile =================================================================== RCS file: /cvs/ports/databases/ruby-hiera-eyaml/Makefile,v diff -u -p -u -p -r1.24 Makefile --- databases/ruby-hiera-eyaml/Makefile 22 May 2026 06:26:16 -0000 1.24 +++ databases/ruby-hiera-eyaml/Makefile 14 Jun 2026 16:41:28 -0000 @@ -1,5 +1,6 @@ COMMENT = Hiera backend for decrypting encrypted yaml properties +REVISION = 0 DISTNAME = hiera-eyaml-5.0.1 CATEGORIES = databases Index: databases/ruby-hiera-eyaml-gpg/Makefile =================================================================== RCS file: /cvs/ports/databases/ruby-hiera-eyaml-gpg/Makefile,v diff -u -p -u -p -r1.6 Makefile --- databases/ruby-hiera-eyaml-gpg/Makefile 9 Feb 2026 08:09:46 -0000 1.6 +++ databases/ruby-hiera-eyaml-gpg/Makefile 14 Jun 2026 16:41:20 -0000 @@ -1,6 +1,6 @@ COMMENT = gpg encryptor for the hiera eyaml backend -REVISION = 0 +REVISION = 1 DISTNAME = hiera-eyaml-gpg-0.7.4 CATEGORIES = databases Index: databases/ruby-hiera-file/Makefile =================================================================== RCS file: /cvs/ports/databases/ruby-hiera-file/Makefile,v diff -u -p -u -p -r1.12 Makefile --- databases/ruby-hiera-file/Makefile 9 Feb 2026 08:09:46 -0000 1.12 +++ databases/ruby-hiera-file/Makefile 14 Jun 2026 16:41:33 -0000 @@ -1,6 +1,6 @@ COMMENT = data backend for Hiera to return whole files -REVISION = 3 +REVISION = 4 DISTNAME = hiera-file-1.1.1 CATEGORIES = databases Index: databases/ruby-hiera3/Makefile =================================================================== RCS file: /cvs/ports/databases/ruby-hiera3/Makefile,v diff -u -p -u -p -r1.32 Makefile --- databases/ruby-hiera3/Makefile 9 Feb 2026 08:09:46 -0000 1.32 +++ databases/ruby-hiera3/Makefile 14 Jun 2026 16:41:43 -0000 @@ -1,6 +1,6 @@ COMMENT= simple pluggable hierarchical database -REVISION = 0 +REVISION = 1 V= 3.12.0 DISTNAME= hiera-${V} PKGNAME= hiera3-${V} Index: databases/xapian-bindings/pkg/PLIST-ruby =================================================================== RCS file: /cvs/ports/databases/xapian-bindings/pkg/PLIST-ruby,v diff -u -p -u -p -r1.7 PLIST-ruby --- databases/xapian-bindings/pkg/PLIST-ruby 11 Mar 2022 18:31:49 -0000 1.7 +++ databases/xapian-bindings/pkg/PLIST-ruby 15 Jun 2026 07:02:27 -0000 @@ -9,71 +9,14 @@ share/doc/xapian-bindings/ruby${MODRUBY_ share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/examples/simplesearch.rb share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/index.html share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/ -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/ -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Database.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Document.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/ESet.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Enquire.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/ExpandTerm.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/LatLongCoord.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/LatLongCoords.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/MSet.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Match.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/MultiValueKeyMaker/ -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/MultiValueKeyMaker.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/MultiValueKeyMaker/KeySpec.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Posting.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Query.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/QueryParser.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Term.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Value.html -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/ValueCountMatchSpy.html share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/created.rid share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/css/ -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/css/fonts.css share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/css/rdoc.css -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/fonts/ -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/fonts/Lato-Light.ttf -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/fonts/Lato-LightItalic.ttf -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/fonts/Lato-Regular.ttf -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/fonts/Lato-RegularItalic.ttf -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/fonts/SourceCodePro-Bold.ttf -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/fonts/SourceCodePro-Regular.ttf -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/ -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/add.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/arrow_up.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/brick.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/brick_link.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/bug.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/bullet_black.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/bullet_toggle_minus.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/bullet_toggle_plus.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/date.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/delete.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/find.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/loadingAnimation.gif -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/macFFBgHack.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/package.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/page_green.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/page_white_text.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/page_white_width.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/plugin.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/ruby.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/tag_blue.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/tag_green.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/transparent.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/wrench.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/wrench_orange.png -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/zoom.png share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/index.html share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/ -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/darkfish.js -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/navigation.js -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/navigation.js.gz -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/search.js -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/search_index.js -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/search_index.js.gz -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/searcher.js -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/searcher.js.gz -share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/table_of_contents.html +share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/aliki.js +share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/c_highlighter.js +share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/search_controller.js +share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/search_navigation.js +share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/search_ranker.js +share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/theme-toggle.js Index: devel/gitsh/Makefile =================================================================== RCS file: /cvs/ports/devel/gitsh/Makefile,v diff -u -p -u -p -r1.22 Makefile --- devel/gitsh/Makefile 28 Jun 2025 00:36:32 -0000 1.22 +++ devel/gitsh/Makefile 16 Jun 2026 06:33:43 -0000 @@ -1,5 +1,5 @@ VERSION = 0.13 -REVISION = 7 +REVISION = 8 COMMENT = interactive shell for git @@ -14,7 +14,7 @@ MAINTAINER = Mike Burns " -+ - - ">=" +@@ -57,9 +57,6 @@ dependencies: + - - ">=" - !ruby/object:Gem::Version -- version: '0.8' -+ version: '0.9' -+ - - "<" -+ - !ruby/object:Gem::Version -+ version: '2' - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: -- - - "~>" -+ - - ">=" - - !ruby/object:Gem::Version -- version: '0.8' -+ version: '0.9' -+ - - "<" -+ - !ruby/object:Gem::Version -+ version: '2' - - !ruby/object:Gem::Dependency - name: bundler - requirement: !ruby/object:Gem::Requirement -@@ -96,7 +102,7 @@ dependencies: - name: hitimes - requirement: !ruby/object:Gem::Requirement - requirements: -- - - '=' -+ - - '>=' - - !ruby/object:Gem::Version - version: 2.0.0 - type: :runtime -@@ -152,7 +158,7 @@ dependencies: - name: json-schema - requirement: !ruby/object:Gem::Requirement - requirements: -- - - "~>" -+ - - ">=" - - !ruby/object:Gem::Version - version: '5.0' - type: :runtime -@@ -168,7 +174,7 @@ dependencies: - requirements: - - - "~>" - - !ruby/object:Gem::Version -- version: '1.0' -+ version: '2.0' - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement -@@ -208,7 +214,7 @@ dependencies: - name: pathspec - requirement: !ruby/object:Gem::Requirement - requirements: -- - - "~>" -+ - - ">=" - - !ruby/object:Gem::Version - version: '1.1' - type: :runtime -@@ -224,7 +230,7 @@ dependencies: - requirements: - - - "~>" - - !ruby/object:Gem::Version -- version: '5.0' -+ version: '6.0' + version: 2.1.0 +- - - "<" +- - !ruby/object:Gem::Version +- version: 3.0.0 type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement Index: sysutils/ruby-puppet-lint/Makefile =================================================================== RCS file: /cvs/ports/sysutils/ruby-puppet-lint/Makefile,v diff -u -p -u -p -r1.41 Makefile --- sysutils/ruby-puppet-lint/Makefile 9 Feb 2026 08:09:46 -0000 1.41 +++ sysutils/ruby-puppet-lint/Makefile 14 Jun 2026 16:42:00 -0000 @@ -1,6 +1,6 @@ COMMENT= ensure your Puppet manifests conform with the style guide -REVISION = 0 +REVISION = 1 DISTNAME= puppet-lint-5.1.1 CATEGORIES= sysutils Index: sysutils/ruby-r10k/Makefile =================================================================== RCS file: /cvs/ports/sysutils/ruby-r10k/Makefile,v diff -u -p -u -p -r1.49 Makefile --- sysutils/ruby-r10k/Makefile 22 May 2026 11:50:56 -0000 1.49 +++ sysutils/ruby-r10k/Makefile 14 Jun 2026 16:42:08 -0000 @@ -1,5 +1,6 @@ COMMENT = Puppet module management +REVISION = 0 DISTNAME = r10k-5.0.3 CATEGORIES = sysutils HOMEPAGE = https://github.com/puppetlabs/r10k Index: sysutils/tmuxinator/Makefile =================================================================== RCS file: /cvs/ports/sysutils/tmuxinator/Makefile,v diff -u -p -u -p -r1.27 Makefile --- sysutils/tmuxinator/Makefile 28 Jun 2025 00:36:32 -0000 1.27 +++ sysutils/tmuxinator/Makefile 14 Jun 2026 16:42:18 -0000 @@ -1,7 +1,7 @@ COMMENT = create and manage complex tmux sessions easily DISTNAME = tmuxinator-3.0.5 -REVISION = 2 +REVISION = 3 CATEGORIES = sysutils # MIT Index: textproc/asciidoctor/Makefile =================================================================== RCS file: /cvs/ports/textproc/asciidoctor/Makefile,v diff -u -p -u -p -r1.13 Makefile --- textproc/asciidoctor/Makefile 18 Mar 2026 12:08:40 -0000 1.13 +++ textproc/asciidoctor/Makefile 14 Jun 2026 16:43:04 -0000 @@ -3,6 +3,7 @@ COMMENT = better AsciiDoc text proc/publ V = 2.0.26 DISTNAME = asciidoctor-${V} FULLPKGNAME = ${DISTNAME} +REVISION = 0 CATEGORIES = textproc Index: textproc/libmarisa/Makefile =================================================================== RCS file: /cvs/ports/textproc/libmarisa/Makefile,v diff -u -p -u -p -r1.22 Makefile --- textproc/libmarisa/Makefile 23 Mar 2026 06:22:51 -0000 1.22 +++ textproc/libmarisa/Makefile 14 Jun 2026 16:39:58 -0000 @@ -13,7 +13,7 @@ PKGNAME-ruby = ruby-libmarisa-${V} REVISION-main = 4 REVISION-python = 8 -REVISION-ruby = 6 +REVISION-ruby = 7 REVISION-perl = 2 GH_ACCOUNT = s-yata Index: www/sass/Makefile =================================================================== RCS file: /cvs/ports/www/sass/Makefile,v diff -u -p -u -p -r1.13 Makefile --- www/sass/Makefile 28 Jun 2025 00:36:32 -0000 1.13 +++ www/sass/Makefile 14 Jun 2026 16:43:10 -0000 @@ -1,7 +1,7 @@ COMMENT = extension language for CSS DISTNAME = sass-3.4.22 -REVISION = 9 +REVISION = 10 CATEGORIES = www devel HOMEPAGE = http://sass-lang.com Index: www/webkitgtk4/Makefile =================================================================== RCS file: /cvs/ports/www/webkitgtk4/Makefile,v diff -u -p -u -p -r1.259 Makefile --- www/webkitgtk4/Makefile 2 Jun 2026 09:09:28 -0000 1.259 +++ www/webkitgtk4/Makefile 16 Jun 2026 06:42:00 -0000 @@ -16,7 +16,7 @@ DISTNAME = webkitgtk-${V} PKGNAME = webkitgtk${API:S/.//}-${V} FULLPKGNAME = ${PKGNAME} -REVISION = 0 +REVISION = 1 EXTRACT_SUFX = .tar.xz SUBST_VARS = API