I would like to update to the default ruby version in ports from 3.0 to
3.1. We usually do this update after ruby-x.y.2 has been released, and
ruby-3.1.2 was released a couple weeks ago. I think this is a good time
in the release cycle for this change.
Unlike the Ruby 2.7->3.0 change last year, there are no ports that need
patches for this change. Other than the minor change to switch the
default version in ruby.port.mk, this is just REVISION bumps.
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.107
diff -u -p -r1.107 ruby.port.mk
--- lang/ruby/ruby.port.mk 11 Mar 2022 19:29:13 -0000 1.107
+++ lang/ruby/ruby.port.mk 28 Apr 2022 15:46:29 -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.0.
+# Without a FLAVOR, assume the use of ruby 3.1.
. if empty(FLAVOR)
-FLAVOR = ruby30
+FLAVOR = ruby31
. endif
# Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
@@ -64,8 +64,8 @@ ERRORS += "Fatal: Conflicting flavors us
.endif
# The default ruby version to use for non-gem ports. Defaults to ruby
-# 3.0 for consistency with the default ruby30 FLAVOR for gem ports.
-MODRUBY_REV?= 3.0
+# 3.1 for consistency with the default ruby31 FLAVOR for gem ports.
+MODRUBY_REV?= 3.1
# Because the jruby FLAVORs use same binary names but in
# different directories, GEM_MAN_SUFFIX is used for the man pages to avoid
Index: databases/xapian-bindings/Makefile
===================================================================
RCS file: /cvs/ports/databases/xapian-bindings/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- databases/xapian-bindings/Makefile 11 Mar 2022 18:31:49 -0000 1.39
+++ databases/xapian-bindings/Makefile 26 Apr 2022 01:33:32 -0000
@@ -8,6 +8,7 @@ DISTNAME= xapian-bindings-${V}
PKGNAME-main= xapian-bindings-perl-${V}
PKGNAME-python= xapian-bindings-python-${V}
PKGNAME-ruby= ruby${MODRUBY_BINREV}-xapian-${V}
+REVISION-ruby= 0
CATEGORIES= databases textproc
Index: devel/gitsh/Makefile
===================================================================
RCS file: /cvs/ports/devel/gitsh/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- devel/gitsh/Makefile 11 Mar 2022 18:50:06 -0000 1.15
+++ devel/gitsh/Makefile 26 Apr 2022 01:33:44 -0000
@@ -1,5 +1,5 @@
VERSION = 0.13
-REVISION = 2
+REVISION = 3
COMMENT = interactive shell for git
Index: devel/ragel/Makefile
===================================================================
RCS file: /cvs/ports/devel/ragel/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- devel/ragel/Makefile 11 Mar 2022 18:53:08 -0000 1.14
+++ devel/ragel/Makefile 26 Apr 2022 01:33:55 -0000
@@ -1,7 +1,7 @@
COMMENT = state machine compiler
DISTNAME = ragel-6.9
-REVISION = 5
+REVISION = 6
CATEGORIES = devel
HOMEPAGE = http://www.colm.net/open-source/ragel/
Index: devel/swig/Makefile
===================================================================
RCS file: /cvs/ports/devel/swig/Makefile,v
retrieving revision 1.75
diff -u -p -r1.75 Makefile
--- devel/swig/Makefile 11 Mar 2022 18:53:30 -0000 1.75
+++ devel/swig/Makefile 26 Apr 2022 01:34:06 -0000
@@ -2,7 +2,7 @@ COMMENT = simplified wrapper and interfa
SUBST_VARS = VERSION
VERSION = 4.0.2
-REVISION = 0
+REVISION = 1
DISTNAME = swig-${VERSION}
CATEGORIES = devel
Index: devel/vim-command-t/Makefile
===================================================================
RCS file: /cvs/ports/devel/vim-command-t/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- devel/vim-command-t/Makefile 11 Mar 2022 18:53:34 -0000 1.13
+++ devel/vim-command-t/Makefile 26 Apr 2022 01:34:32 -0000
@@ -2,7 +2,7 @@ COMMENT = fast, intuitive file opening
V = 1.11.2
DISTNAME = vim-command-t-${V}
-REVISION = 5
+REVISION = 6
CATEGORIES = devel editors
Index: editors/vim/Makefile
===================================================================
RCS file: /cvs/ports/editors/vim/Makefile,v
retrieving revision 1.228
diff -u -p -r1.228 Makefile
--- editors/vim/Makefile 21 Mar 2022 15:28:53 -0000 1.228
+++ editors/vim/Makefile 26 Apr 2022 01:37:40 -0000
@@ -13,6 +13,7 @@ FULLPKGNAME-lang= vim-lang-$T
FULLPKGPATH-lang= ${PKGPATH},-lang
P= vim${V:R:S/.//}
CATEGORIES= editors
+REVISION= 0
HOMEPAGE= https://www.vim.org/
Index: graphics/inkscape/Makefile
===================================================================
RCS file: /cvs/ports/graphics/inkscape/Makefile,v
retrieving revision 1.95
diff -u -p -r1.95 Makefile
--- graphics/inkscape/Makefile 11 Mar 2022 19:22:33 -0000 1.95
+++ graphics/inkscape/Makefile 26 Apr 2022 02:44:57 -0000
@@ -1,6 +1,7 @@
COMMENT = SVG vector drawing application
DISTNAME = inkscape-1.1.2
+REVISION = 0
CATEGORIES = graphics
Index: lang/mruby/Makefile
===================================================================
RCS file: /cvs/ports/lang/mruby/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- lang/mruby/Makefile 11 Mar 2022 19:29:07 -0000 1.21
+++ lang/mruby/Makefile 26 Apr 2022 01:37:48 -0000
@@ -5,7 +5,7 @@ COMMENT = lightweight, embeddable imple
GH_ACCOUNT = mruby
GH_PROJECT = mruby
GH_TAGNAME = 3.0.0
-REVISION = 0
+REVISION = 1
CATEGORIES = lang
HOMEPAGE = https://mruby.org/
Index: mail/mew/Makefile
===================================================================
RCS file: /cvs/ports/mail/mew/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- mail/mew/Makefile 11 Mar 2022 19:34:41 -0000 1.21
+++ mail/mew/Makefile 26 Apr 2022 01:38:03 -0000
@@ -1,7 +1,7 @@
COMMENT= emacs-based mail client
DISTNAME= mew-6.8
-REVISION= 3
+REVISION= 4
CATEGORIES= mail
HOMEPAGE= http://www.mew.org/
Index: misc/tpp/Makefile
===================================================================
RCS file: /cvs/ports/misc/tpp/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- misc/tpp/Makefile 11 Mar 2022 19:38:22 -0000 1.24
+++ misc/tpp/Makefile 26 Apr 2022 01:38:17 -0000
@@ -1,7 +1,7 @@
COMMENT = text-based presentation program
DISTNAME = tpp-1.3.1
-REVISION = 14
+REVISION = 15
CATEGORIES = misc productivity
Index: net/munin/Makefile
===================================================================
RCS file: /cvs/ports/net/munin/Makefile,v
retrieving revision 1.111
diff -u -p -r1.111 Makefile
--- net/munin/Makefile 12 Mar 2022 17:03:12 -0000 1.111
+++ net/munin/Makefile 28 Apr 2022 15:52:28 -0000
@@ -9,7 +9,8 @@ PKGNAME-main = munin-node-$V
PKGNAME-server =munin-server-$V
CATEGORIES = net
-REVISION-main = 0
+REVISION-main = 1
+REVISION-server = 0
HOMEPAGE = https://munin-monitoring.org/
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=munin/}
Index: multimedia/mkvtoolnix/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/Makefile,v
retrieving revision 1.115
diff -u -p -r1.115 Makefile
--- multimedia/mkvtoolnix/Makefile 11 Mar 2022 19:39:23 -0000 1.115
+++ multimedia/mkvtoolnix/Makefile 26 Apr 2022 01:38:26 -0000
@@ -1,6 +1,7 @@
COMMENT= create, alter and inspect Matroska files
DISTNAME= mkvtoolnix-65.0.0
+REVISION= 0
CATEGORIES= multimedia x11
Index: net/ocserv/Makefile
===================================================================
RCS file: /cvs/ports/net/ocserv/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- net/ocserv/Makefile 21 Mar 2022 04:32:14 -0000 1.52
+++ net/ocserv/Makefile 26 Apr 2022 04:30:56 -0000
@@ -2,6 +2,7 @@ COMMENT= server implementing the AnyConn
DISTNAME= ocserv-1.1.6
EXTRACT_SUFX= .tar.xz
+REVISION= 0
CATEGORIES= net
Index: net/rrdtool/Makefile
===================================================================
RCS file: /cvs/ports/net/rrdtool/Makefile,v
retrieving revision 1.122
diff -u -p -r1.122 Makefile
--- net/rrdtool/Makefile 31 Mar 2022 16:19:21 -0000 1.122
+++ net/rrdtool/Makefile 26 Apr 2022 01:38:58 -0000
@@ -4,7 +4,7 @@ COMMENT-ruby= ruby interface to librrd
VERSION= 1.7.2
REVISION= 1
-REVISION-ruby= 2
+REVISION-ruby= 3
DISTNAME= rrdtool-${VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-update= rrdupdate-${VERSION}
Index: net/weechat/Makefile
===================================================================
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- net/weechat/Makefile 15 Apr 2022 22:07:39 -0000 1.62
+++ net/weechat/Makefile 26 Apr 2022 01:39:30 -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.14
diff -u -p -r1.14 Makefile
--- net/whatweb/Makefile 11 Mar 2022 19:48:11 -0000 1.14
+++ net/whatweb/Makefile 26 Apr 2022 01:40:14 -0000
@@ -4,7 +4,7 @@ GH_TAGNAME = v0.4.9
GH_PROJECT= WhatWeb
GH_ACCOUNT= urbanadventurer
-REVISION = 3
+REVISION = 4
CATEGORIES= net www
Index: print/texlive/texmf/Makefile
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- print/texlive/texmf/Makefile 11 Mar 2022 19:51:09 -0000 1.64
+++ print/texlive/texmf/Makefile 26 Apr 2022 01:41:43 -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.43
diff -u -p -r1.43 Makefile
--- security/arirang/Makefile 11 Mar 2022 19:53:17 -0000 1.43
+++ security/arirang/Makefile 26 Apr 2022 01:41:49 -0000
@@ -2,7 +2,7 @@ COMMENT = powerful webserver security sc
DISTNAME = arirang-2.03
CATEGORIES = security
-REVISION = 8
+REVISION = 9
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.28
diff -u -p -r1.28 Makefile
--- security/openssl-ruby-tests/Makefile 17 Apr 2022 13:37:18 -0000
1.28
+++ security/openssl-ruby-tests/Makefile 26 Apr 2022 01:42:03 -0000
@@ -3,6 +3,7 @@ COMMENT = sources of the Ruby OpenSSL g
# Follows HEAD
VERSION = 20220416
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.24
diff -u -p -r1.24 Makefile
--- security/wpscan/Makefile 11 Mar 2022 19:54:09 -0000 1.24
+++ security/wpscan/Makefile 26 Apr 2022 01:45:32 -0000
@@ -2,6 +2,7 @@ COMMENT = WordPress security scanner
DISTNAME = wpscan-3.8.21
CATEGORIES = security
+REVISION = 0
HOMEPAGE = https://wpscan.org/
MAINTAINER = Sebastian Reitenbach <sebas...@openbsd.org>
Index: sysutils/tmuxinator/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/tmuxinator/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- sysutils/tmuxinator/Makefile 11 Mar 2022 19:58:07 -0000 1.22
+++ sysutils/tmuxinator/Makefile 26 Apr 2022 01:45:37 -0000
@@ -1,7 +1,7 @@
COMMENT = create and manage complex tmux sessions easily
DISTNAME = tmuxinator-1.1.3
-REVISION = 2
+REVISION = 3
FULLPKGNAME = ${DISTNAME}
CATEGORIES = sysutils
Index: textproc/asciidoctor/Makefile
===================================================================
RCS file: /cvs/ports/textproc/asciidoctor/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- textproc/asciidoctor/Makefile 31 Mar 2022 13:41:49 -0000 1.5
+++ textproc/asciidoctor/Makefile 26 Apr 2022 01:45:46 -0000
@@ -3,6 +3,7 @@ COMMENT = better AsciiDoc text proc/publ
V = 2.0.17
DISTNAME = asciidoctor-${V}
FULLPKGNAME = ${DISTNAME}
+REVISION = 0
CATEGORIES = textproc
Index: textproc/libmarisa/Makefile
===================================================================
RCS file: /cvs/ports/textproc/libmarisa/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- textproc/libmarisa/Makefile 11 Mar 2022 20:02:39 -0000 1.4
+++ textproc/libmarisa/Makefile 26 Apr 2022 01:42:38 -0000
@@ -11,6 +11,7 @@ PKGNAME-ruby = ruby-libmarisa-${V}
REVISION-main = 1
REVISION-python = 0
+REVISION-ruby = 0
GH_ACCOUNT = s-yata
GH_PROJECT = marisa-trie
Index: textproc/redland-bindings/Makefile
===================================================================
RCS file: /cvs/ports/textproc/redland-bindings/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- textproc/redland-bindings/Makefile 11 Mar 2022 20:03:26 -0000 1.26
+++ textproc/redland-bindings/Makefile 26 Apr 2022 01:42:56 -0000
@@ -10,6 +10,7 @@ PKGNAME-python= py3-librdf-$V
PKGNAME-ruby= ruby${MODRUBY_BINREV}-librdf-$V
REVISION= 6
REVISION-python= 7
+REVISION-ruby= 7
HOMEPAGE= https://librdf.org/bindings/
Index: www/nginx/Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.161
diff -u -p -r1.161 Makefile
--- www/nginx/Makefile 11 Mar 2022 20:10:10 -0000 1.161
+++ www/nginx/Makefile 26 Apr 2022 02:44:27 -0000
@@ -38,6 +38,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.9
diff -u -p -r1.9 Makefile
--- www/sass/Makefile 11 Mar 2022 20:10:58 -0000 1.9
+++ www/sass/Makefile 26 Apr 2022 01:45:56 -0000
@@ -1,7 +1,7 @@
COMMENT = extension language for CSS
DISTNAME = sass-3.4.22
-REVISION = 5
+REVISION = 6
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.2
diff -u -p -r1.2 Makefile
--- www/unit/unit-ruby/Makefile 11 Mar 2022 20:11:05 -0000 1.2
+++ www/unit/unit-ruby/Makefile 26 Apr 2022 01:43:38 -0000
@@ -1,7 +1,7 @@
UNIT_MODNAME= ruby${MODRUBY_REV}
UNIT_SHORTNAME= ruby
-REVISION= 0
+REVISION= 1
MODULES+= lang/ruby
Index: x11/kde-applications/kross-interpreters/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/kross-interpreters/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- x11/kde-applications/kross-interpreters/Makefile 11 Mar 2022 20:16:26
-0000 1.10
+++ x11/kde-applications/kross-interpreters/Makefile 26 Apr 2022 01:44:50
-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
