git: 097770c474d4 - main - Mk/bsd.default-versions.mk: Change default version of Ruby

From: Yasuhiro Kimura <yasu_at_FreeBSD.org>
Date: Wed, 15 Mar 2023 07:10:11 UTC
The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=097770c474d4bb7b24cec37dc87439c1ed4344c7

commit 097770c474d4bb7b24cec37dc87439c1ed4344c7
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2022-12-26 23:24:41 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2023-03-15 07:07:12 +0000

    Mk/bsd.default-versions.mk: Change default version of Ruby
    
    * Change default version of Ruby from 3.0 to 3.1.
    * Bump PORTREVISION of lang/ruby3[01]. They need to be rebuilt as only
      default ruby package includes ${PREFIX}/bin/ruby and
      ${PREFIX}/man/man1/ruby.1.gz symlinks.
    * Add entry about change of default Ruby version to UPDATING.
    
    PR:             268586
    Exp-run by:     antoine
    Approved by:    meta (ruby, maintainer)
---
 Mk/Uses/ruby.mk            |  4 ++--
 Mk/bsd.default-versions.mk |  2 +-
 UPDATING                   | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk
index 22a8255ff0bf..5a86dc836a7c 100644
--- a/Mk/Uses/ruby.mk
+++ b/Mk/Uses/ruby.mk
@@ -156,13 +156,13 @@ RUBY_PORTREVISION=	0
 # Ruby 3.0
 #
 RUBY_DISTVERSION=	3.0.5
-RUBY_PORTREVISION=	0
+RUBY_PORTREVISION=	1
 .      elif ${RUBY_VER} == 3.1
 #
 # Ruby 3.1
 #
 RUBY_DISTVERSION=	3.1.3
-RUBY_PORTREVISION=	1
+RUBY_PORTREVISION=	2
 
 .      elif ${RUBY_VER} == 3.2
 #
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 0b0d0d37d296..6211f51bf5bb 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -123,7 +123,7 @@ PYTHON2_DEFAULT?=	2.7
 # Possible values: 3.7, 3.8, 3.9, 3.10, 3.11
 PYTHON3_DEFAULT?=	3.9
 # Possible values: 2.7, 3.0, 3.1, 3.2
-RUBY_DEFAULT?=		3.0
+RUBY_DEFAULT?=		3.1
 # Possible values: rust, rust-nightly
 RUST_DEFAULT?=		rust
 # Possible values: 4.13, 4.16
diff --git a/UPDATING b/UPDATING
index 9da7fb0406b6..b5bf7c2e3810 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,30 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20230315:
+  AFFECTS: users of lang/ruby30
+  AUTHOR: yasu@FreeBSD.org
+
+  The default ruby version has been updated from 3.0 to 3.1.
+
+  If you compile your own ports you may keep 3.0 as the default version by
+  adding the following lines to your /etc/make.conf file:
+
+  #
+  # Keep ruby 3.0 as default version
+  #
+  DEFAULT_VERSIONS+=ruby=3.0
+
+  If you wish to update to the new default version, you need to first stop any
+  software that uses ruby. Then, you will need to follow these steps, depending
+  upon how you manage your system.
+
+  If you use pkg, simply upgrade:
+  # pkg upgrade
+
+  If you do not use pkg, please check entry 20190420.
+  The description there should also work for this version.
+
 20230314:
   AFFECTS: users of security/openssl-devel
   AUTHOR: brnrd@FreeBSD.org