I would like to update to the default ruby version in ports from 3.1 to
3.2. We usually do this update after ruby-x.y.2 has been released, and
ruby-3.2.2 was released a couple months ago. I think this is a good time
in the release cycle for this change.
The only port that needs a change for this is sysutils/ruby-facter,
which needs a PLIST change so it uses GEM_BIN_SUFFIX instead of hard
coding a value for Ruby 3.1. The other ports just need REVISION bumps.
x11/qt5/qtwebkit needs to stay building with Ruby 3.1, since the build
system relies on the Object#=~ method, which was deprecated in Ruby 2.6
and finally removed in Ruby 3.2.
Tested on amd64 using a bulk of all ports that depend on a ruby port.
OKs?
Thanks,
Jeremy
Index: lang/ruby/ruby.port.mk
===================================================================
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.112
diff -u -p -r1.112 ruby.port.mk
--- lang/ruby/ruby.port.mk 13 Feb 2023 17:33:59 -0000 1.112
+++ lang/ruby/ruby.port.mk 30 May 2023 00:45:35 -0000
@@ -43,9 +43,9 @@ FULLPKGNAME?= ${MODRUBY_PKG_PREFIX}-${P
SUBST_VARS+= GEM_BIN_SUFFIX GEM_MAN_SUFFIX
FLAVOR?=
-# Without a FLAVOR, assume the use of ruby 3.1.
+# Without a FLAVOR, assume the use of ruby 3.2.
. if empty(FLAVOR)
-FLAVOR = ruby31
+FLAVOR = ruby32
. endif
# Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
@@ -65,8 +65,8 @@ ERRORS += "Fatal: Conflicting flavors us
.endif
# The default ruby version to use for non-gem ports. Defaults to ruby
-# 3.1 for consistency with the default ruby31 FLAVOR for gem ports.
-MODRUBY_REV?= 3.1
+# 3.2 for consistency with the default ruby32 FLAVOR for gem ports.
+MODRUBY_REV?= 3.2
# Because the jruby FLAVORs use same binary names but in
# different directories, GEM_MAN_SUFFIX is used for the man pages to avoid
Index: devel/gitsh/Makefile
===================================================================
RCS file: /cvs/ports/devel/gitsh/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- devel/gitsh/Makefile 5 May 2022 15:41:56 -0000 1.16
+++ devel/gitsh/Makefile 30 May 2023 01:09:14 -0000
@@ -1,5 +1,5 @@
VERSION = 0.13
-REVISION = 3
+REVISION = 4
COMMENT = interactive shell for git
Index: devel/ragel/Makefile
===================================================================
RCS file: /cvs/ports/devel/ragel/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- devel/ragel/Makefile 5 May 2022 15:41:56 -0000 1.15
+++ devel/ragel/Makefile 30 May 2023 01:09:22 -0000
@@ -1,7 +1,7 @@
COMMENT = state machine compiler
DISTNAME = ragel-6.9
-REVISION = 6
+REVISION = 7
CATEGORIES = devel
HOMEPAGE = http://www.colm.net/open-source/ragel/
Index: devel/reposurgeon/Makefile
===================================================================
RCS file: /cvs/ports/devel/reposurgeon/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- devel/reposurgeon/Makefile 28 Aug 2022 10:26:39 -0000 1.16
+++ devel/reposurgeon/Makefile 30 May 2023 01:09:25 -0000
@@ -1,7 +1,7 @@
COMMENT= tool for editing version-control repository history
DISTNAME= reposurgeon-4.32
-REVISION= 0
+REVISION= 1
CATEGORIES= devel
Index: devel/swig/Makefile
===================================================================
RCS file: /cvs/ports/devel/swig/Makefile,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile
--- devel/swig/Makefile 2 Nov 2022 16:37:58 -0000 1.80
+++ devel/swig/Makefile 30 May 2023 01:09:45 -0000
@@ -6,6 +6,8 @@ VERSION = 4.1.0
DISTNAME = swig-${VERSION}
CATEGORIES = devel
+REVISION = 0
+
HOMEPAGE = http://www.swig.org/
# BSD
Index: devel/vim-command-t/Makefile
===================================================================
RCS file: /cvs/ports/devel/vim-command-t/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- devel/vim-command-t/Makefile 5 May 2022 15:41:56 -0000 1.14
+++ devel/vim-command-t/Makefile 30 May 2023 01:09:54 -0000
@@ -2,7 +2,7 @@ COMMENT = fast, intuitive file opening
V = 1.11.2
DISTNAME = vim-command-t-${V}
-REVISION = 6
+REVISION = 7
CATEGORIES = devel editors
Index: editors/vim/Makefile
===================================================================
RCS file: /cvs/ports/editors/vim/Makefile,v
retrieving revision 1.241
diff -u -p -r1.241 Makefile
--- editors/vim/Makefile 10 May 2023 09:35:39 -0000 1.241
+++ editors/vim/Makefile 30 May 2023 01:10:28 -0000
@@ -17,6 +17,7 @@ FULLPKGNAME-lang= vim-lang-$V
FULLPKGPATH-lang= ${PKGPATH},-lang
P= vim${V:R:S/.//}
CATEGORIES= editors
+REVISION-main= 0
REVISION-lang= 0
HOMEPAGE= https://www.vim.org/
Index: graphics/inkscape/Makefile
===================================================================
RCS file: /cvs/ports/graphics/inkscape/Makefile,v
retrieving revision 1.103
diff -u -p -r1.103 Makefile
--- graphics/inkscape/Makefile 24 Apr 2023 11:40:45 -0000 1.103
+++ graphics/inkscape/Makefile 30 May 2023 01:21:42 -0000
@@ -2,7 +2,7 @@ COMMENT = SVG vector drawing application
VERSION = 1.2.2
DISTNAME = inkscape-${VERSION}
-REVISION = 0
+REVISION = 1
CATEGORIES = graphics
Index: lang/mruby/Makefile
===================================================================
RCS file: /cvs/ports/lang/mruby/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- lang/mruby/Makefile 28 Feb 2023 15:59:22 -0000 1.23
+++ lang/mruby/Makefile 30 May 2023 01:11:09 -0000
@@ -6,6 +6,8 @@ GH_ACCOUNT = mruby
GH_PROJECT = mruby
GH_TAGNAME = 3.2.0
+REVISION = 0
+
CATEGORIES = lang
HOMEPAGE = https://mruby.org/
Index: mail/mew/Makefile
===================================================================
RCS file: /cvs/ports/mail/mew/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- mail/mew/Makefile 14 Feb 2023 08:23:53 -0000 1.25
+++ mail/mew/Makefile 30 May 2023 01:11:20 -0000
@@ -1,7 +1,7 @@
COMMENT= emacs-based mail client
DISTNAME= mew-6.9
-REVISION= 1
+REVISION= 2
CATEGORIES= mail
HOMEPAGE= http://www.mew.org/
DISTFILES= mew-6.9a.tar.gz
Index: misc/tpp/Makefile
===================================================================
RCS file: /cvs/ports/misc/tpp/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- misc/tpp/Makefile 5 May 2022 15:41:57 -0000 1.25
+++ misc/tpp/Makefile 30 May 2023 01:11:28 -0000
@@ -1,7 +1,7 @@
COMMENT = text-based presentation program
DISTNAME = tpp-1.3.1
-REVISION = 15
+REVISION = 16
CATEGORIES = misc productivity
Index: multimedia/mkvtoolnix/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/Makefile,v
retrieving revision 1.127
diff -u -p -r1.127 Makefile
--- multimedia/mkvtoolnix/Makefile 13 May 2023 11:45:05 -0000 1.127
+++ multimedia/mkvtoolnix/Makefile 30 May 2023 01:11:39 -0000
@@ -1,6 +1,7 @@
COMMENT= create, alter and inspect Matroska files
DISTNAME= mkvtoolnix-76.0
+REVISION= 0
CATEGORIES= multimedia x11
Index: net/munin/Makefile
===================================================================
RCS file: /cvs/ports/net/munin/Makefile,v
retrieving revision 1.117
diff -u -p -r1.117 Makefile
--- net/munin/Makefile 3 Apr 2023 15:52:28 -0000 1.117
+++ net/munin/Makefile 31 May 2023 03:28:56 -0000
@@ -9,6 +9,7 @@ GH_TAGNAME = 2.0.73
PKGNAME-main = munin-node-${GH_TAGNAME}
PKGNAME-server =munin-server-${GH_TAGNAME}
CATEGORIES = net
+REVISION = 0
HOMEPAGE = https://munin-monitoring.org/
Index: net/ocserv/Makefile
===================================================================
RCS file: /cvs/ports/net/ocserv/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- net/ocserv/Makefile 8 Nov 2022 11:16:59 -0000 1.54
+++ net/ocserv/Makefile 30 May 2023 01:12:55 -0000
@@ -2,7 +2,7 @@ COMMENT= server implementing the AnyConn
DISTNAME= ocserv-1.1.6
EXTRACT_SUFX= .tar.xz
-REVISION= 1
+REVISION= 2
CATEGORIES= net
Index: net/weechat/Makefile
===================================================================
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- net/weechat/Makefile 7 Apr 2023 22:53:15 -0000 1.71
+++ net/weechat/Makefile 30 May 2023 01:13:36 -0000
@@ -13,6 +13,8 @@ PKGNAME-python= weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
PKGNAME-tcl= weechat-tcl-${V}
+REVISION-ruby= 0
+
CATEGORIES= net
HOMEPAGE= https://www.weechat.org/
Index: net/whatweb/Makefile
===================================================================
RCS file: /cvs/ports/net/whatweb/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- net/whatweb/Makefile 1 Apr 2023 17:24:45 -0000 1.16
+++ net/whatweb/Makefile 30 May 2023 01:13:56 -0000
@@ -4,6 +4,8 @@ GH_TAGNAME= v0.5.5
GH_PROJECT= WhatWeb
GH_ACCOUNT= urbanadventurer
+REVISION= 0
+
CATEGORIES= net www
HOMEPAGE= http://www.morningstarsecurity.com/research/whatweb
Index: print/texlive/texmf/Makefile
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- print/texlive/texmf/Makefile 24 Nov 2022 20:01:18 -0000 1.66
+++ print/texlive/texmf/Makefile 30 May 2023 01:14:24 -0000
@@ -24,6 +24,8 @@ PKGNAME-docs = texlive_texmf-docs-${V}
PKGNAME-context = texlive_texmf-context-${V}
PKGNAME-buildset = texlive_texmf-buildset-${V}
+REVISION-context = 0
+
NO_BUILD = Yes
NO_TEST = Yes
PKG_ARCH = *
Index: security/arirang/Makefile
===================================================================
RCS file: /cvs/ports/security/arirang/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- security/arirang/Makefile 5 May 2022 15:41:57 -0000 1.44
+++ security/arirang/Makefile 30 May 2023 01:14:34 -0000
@@ -2,7 +2,7 @@ COMMENT = powerful webserver security sc
DISTNAME = arirang-2.03
CATEGORIES = security
-REVISION = 9
+REVISION = 10
FIX_EXTRACT_PERMISSIONS=Yes
MASTER_SITES = http://monkey.org/~pilot/arirang/ \
Index: security/openssl-ruby-tests/Makefile
===================================================================
RCS file: /cvs/ports/security/openssl-ruby-tests/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- security/openssl-ruby-tests/Makefile 19 May 2023 18:57:48 -0000
1.67
+++ security/openssl-ruby-tests/Makefile 30 May 2023 01:14:49 -0000
@@ -3,6 +3,7 @@ COMMENT = sources of the Ruby OpenSSL g
# Follows HEAD
VERSION = 20230519
DISTNAME = openssl-ruby-tests-${VERSION}
+REVISION = 0
GH_ACCOUNT = ruby
GH_PROJECT = openssl
Index: security/wpscan/Makefile
===================================================================
RCS file: /cvs/ports/security/wpscan/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- security/wpscan/Makefile 8 Jun 2022 08:47:42 -0000 1.26
+++ security/wpscan/Makefile 30 May 2023 01:18:32 -0000
@@ -1,6 +1,7 @@
COMMENT = WordPress security scanner
DISTNAME = wpscan-3.8.22
+REVISION = 0
CATEGORIES = security
HOMEPAGE = https://wpscan.org/
Index: sysutils/puppetserver/7/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/puppetserver/7/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- sysutils/puppetserver/7/Makefile 17 Feb 2023 16:41:59 -0000 1.2
+++ sysutils/puppetserver/7/Makefile 30 May 2023 01:15:15 -0000
@@ -2,6 +2,7 @@ COMMENT = Puppet server
VERSION = 7.9.5
DISTNAME = puppetserver-${VERSION}
+REVISION = 0
CATEGORIES = sysutils
Index: sysutils/rset/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/rset/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- sysutils/rset/Makefile 17 Dec 2022 08:48:18 -0000 1.2
+++ sysutils/rset/Makefile 30 May 2023 01:15:25 -0000
@@ -1,6 +1,7 @@
COMMENT = configure systems using any scripting language
DISTNAME = rset-2.5
+REVISION = 0
CATEGORIES = sysutils
Index: sysutils/ruby-facter/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/ruby-facter/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST
--- sysutils/ruby-facter/pkg/PLIST 20 Jan 2023 20:36:58 -0000 1.25
+++ sysutils/ruby-facter/pkg/PLIST 30 May 2023 14:50:32 -0000
@@ -1,4 +1,4 @@
-${GEM_BIN}/facter31
+${GEM_BIN}/facter${GEM_BIN_SUFFIX}
${GEM_LIB}/cache/${DISTNAME}.gem
${GEM_LIB}/gems/${DISTNAME}/
${GEM_LIB}/gems/${DISTNAME}/LICENSE
Index: sysutils/ruby-puppet/6/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/6/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- sysutils/ruby-puppet/6/Makefile 5 Mar 2023 15:13:39 -0000 1.33
+++ sysutils/ruby-puppet/6/Makefile 30 May 2023 20:25:05 -0000
@@ -1,6 +1,7 @@
PORTROACH= limit:^6
VERSION= 6.29.0
+REVISION= 0
RUN_DEPENDS+= converters/ruby-multi_json,${MODRUBY_FLAVOR}>=1.10,<2 \
databases/ruby-hiera3,${MODRUBY_FLAVOR} \
Index: sysutils/ruby-puppet/7/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/7/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- sysutils/ruby-puppet/7/Makefile 24 Feb 2023 21:51:01 -0000 1.3
+++ sysutils/ruby-puppet/7/Makefile 31 May 2023 02:45:16 -0000
@@ -1,7 +1,7 @@
PORTROACH= limit:^7
VERSION= 7.23.0
-REVISION= 0
+REVISION= 1
RUN_DEPENDS+= converters/ruby-multi_json,${MODRUBY_FLAVOR}>=1.10,<2 \
databases/ruby-hiera3,${MODRUBY_FLAVOR}>=3.2.1,<4 \
Index: sysutils/tmuxinator/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/tmuxinator/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- sysutils/tmuxinator/Makefile 5 Aug 2022 16:17:16 -0000 1.24
+++ sysutils/tmuxinator/Makefile 30 May 2023 01:19:34 -0000
@@ -1,6 +1,7 @@
COMMENT = create and manage complex tmux sessions easily
DISTNAME = tmuxinator-3.0.5
+REVISION = 0
CATEGORIES = sysutils
# MIT
Index: textproc/asciidoctor/Makefile
===================================================================
RCS file: /cvs/ports/textproc/asciidoctor/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- textproc/asciidoctor/Makefile 5 May 2022 15:41:57 -0000 1.6
+++ textproc/asciidoctor/Makefile 30 May 2023 01:19:39 -0000
@@ -3,7 +3,7 @@ COMMENT = better AsciiDoc text proc/publ
V = 2.0.17
DISTNAME = asciidoctor-${V}
FULLPKGNAME = ${DISTNAME}
-REVISION = 0
+REVISION = 1
CATEGORIES = textproc
Index: textproc/libmarisa/Makefile
===================================================================
RCS file: /cvs/ports/textproc/libmarisa/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- textproc/libmarisa/Makefile 26 Nov 2022 23:28:15 -0000 1.9
+++ textproc/libmarisa/Makefile 30 May 2023 01:15:35 -0000
@@ -11,7 +11,7 @@ PKGNAME-ruby = ruby-libmarisa-${V}
REVISION-main = 1
REVISION-python = 4
-REVISION-ruby = 0
+REVISION-ruby = 1
GH_ACCOUNT = s-yata
GH_PROJECT = marisa-trie
Index: www/nginx/Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.165
diff -u -p -r1.165 Makefile
--- www/nginx/Makefile 17 Apr 2023 17:36:58 -0000 1.165
+++ www/nginx/Makefile 30 May 2023 01:20:56 -0000
@@ -36,6 +36,8 @@ PKGNAME-passenger= nginx-passenger-${VER
PKGNAME-rtmp= nginx-rtmp-${VERSION}
PKGNAME-securelink= nginx-securelink-${VERSION}
+REVISION-passenger= 0
+
ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
MASTER_SITES= https://nginx.org/download/
Index: www/sass/Makefile
===================================================================
RCS file: /cvs/ports/www/sass/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- www/sass/Makefile 5 May 2022 15:41:58 -0000 1.10
+++ www/sass/Makefile 30 May 2023 01:19:49 -0000
@@ -1,7 +1,7 @@
COMMENT = extension language for CSS
DISTNAME = sass-3.4.22
-REVISION = 6
+REVISION = 7
CATEGORIES = www devel
HOMEPAGE = http://sass-lang.com
Index: www/unit/unit-ruby/Makefile
===================================================================
RCS file: /cvs/ports/www/unit/unit-ruby/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- www/unit/unit-ruby/Makefile 1 Dec 2022 16:06:28 -0000 1.5
+++ www/unit/unit-ruby/Makefile 30 May 2023 01:16:13 -0000
@@ -3,6 +3,8 @@ BROKEN-sparc64= doesn't detect Ruby libr
UNIT_MODNAME= ruby${MODRUBY_REV}
UNIT_SHORTNAME= ruby
+REVISION= 0
+
MODULES+= lang/ruby
# XXX ruby port provide libruby30.so which is picked up in preference to
Index: x11/kde-applications/kross-interpreters/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/kross-interpreters/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- x11/kde-applications/kross-interpreters/Makefile 18 Dec 2022 09:11:05
-0000 1.13
+++ x11/kde-applications/kross-interpreters/Makefile 30 May 2023 01:17:27
-0000
@@ -2,6 +2,7 @@ COMMENT = Kross interpreter plugins for
DISTNAME = kross-interpreters-${VERSION}
PKGNAME = kross-interpreters-kf5-${VERSION}
CATEGORIES = devel
+REVISION = 0
WANTLIB += ${COMPILER_LIBCXX} KF5KrossCore Qt5Core Qt5Gui Qt5Script
WANTLIB += Qt5Widgets Qt5Xml m
Index: x11/qt5/qtwebkit/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- x11/qt5/qtwebkit/Makefile 13 Jul 2022 15:48:59 -0000 1.40
+++ x11/qt5/qtwebkit/Makefile 30 May 2023 14:53:45 -0000
@@ -52,6 +52,7 @@ ALL_TARGET =
MODPY_RUNDEP = No
MODRUBY_RUNDEP = No
+MODRUBY_REV = 3.1
BUILD_DEPENDS = devel/bison \
devel/gperf \
