Download raw body.
Switch default ruby version in ports from 3.3 to 3.4
I would like to update the default ruby version in ports from 3.3 to
3.4. 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. The
exception is www/unit/unit-ruby, which fails to build due to a -Werror
issue. This removes -Werror from the generated Makefile using a
post-configure sed program to fix that.
Tested on amd64 using a bulk of all ports that depend on a ruby port.
OKs?
Thanks,
Jeremy
Index: devel/gitsh/Makefile
===================================================================
RCS file: /cvs/ports/devel/gitsh/Makefile,v
diff -u -p -u -p -r1.21 Makefile
--- devel/gitsh/Makefile 28 Jan 2025 14:38:28 -0000 1.21
+++ devel/gitsh/Makefile 25 Jun 2025 00:26:18 -0000
@@ -1,5 +1,5 @@
VERSION = 0.13
-REVISION = 6
+REVISION = 7
COMMENT = interactive shell for git
Index: devel/ragel/Makefile
===================================================================
RCS file: /cvs/ports/devel/ragel/Makefile,v
diff -u -p -u -p -r1.19 Makefile
--- devel/ragel/Makefile 17 Oct 2024 10:50:32 -0000 1.19
+++ devel/ragel/Makefile 25 Jun 2025 00:26:31 -0000
@@ -2,6 +2,7 @@ COMMENT = state machine compiler
DISTNAME = ragel-6.10
CATEGORIES = devel
+REVISION = 0
HOMEPAGE = https://www.colm.net/open-source/ragel/
Index: devel/reposurgeon/Makefile
===================================================================
RCS file: /cvs/ports/devel/reposurgeon/Makefile,v
diff -u -p -u -p -r1.19 Makefile
--- devel/reposurgeon/Makefile 20 Jun 2024 22:41:25 -0000 1.19
+++ devel/reposurgeon/Makefile 25 Jun 2025 00:26:35 -0000
@@ -1,7 +1,7 @@
COMMENT= tool for editing version-control repository history
DISTNAME= reposurgeon-4.32
-REVISION= 2
+REVISION= 3
CATEGORIES= devel
Index: editors/vim/Makefile
===================================================================
RCS file: /cvs/ports/editors/vim/Makefile,v
diff -u -p -u -p -r1.286 Makefile
--- editors/vim/Makefile 24 Jun 2025 23:40:51 -0000 1.286
+++ editors/vim/Makefile 25 Jun 2025 00:33:37 -0000
@@ -2,7 +2,7 @@ COMMENT= vi clone with many additional f
# careful with PLISTs if updating; normally use a gui flavour, not no_x11
V= 9.1.1478
-REVISION= 0
+REVISION= 1
DIST_TUPLE= \
github vim vim v$V . \
Index: graphics/inkscape/Makefile
===================================================================
RCS file: /cvs/ports/graphics/inkscape/Makefile,v
diff -u -p -u -p -r1.122 Makefile
--- graphics/inkscape/Makefile 22 May 2025 08:36:05 -0000 1.122
+++ graphics/inkscape/Makefile 25 Jun 2025 19:44:02 -0000
@@ -2,6 +2,7 @@ COMMENT = SVG vector drawing application
VERSION = 1.4.2
DISTNAME = inkscape-${VERSION}
+REVISION = 0
CATEGORIES = graphics
Index: lang/mruby/Makefile
===================================================================
RCS file: /cvs/ports/lang/mruby/Makefile,v
diff -u -p -u -p -r1.27 Makefile
--- lang/mruby/Makefile 20 Feb 2025 05:15:09 -0000 1.27
+++ lang/mruby/Makefile 25 Jun 2025 00:27:25 -0000
@@ -6,7 +6,7 @@ GH_ACCOUNT = mruby
GH_PROJECT = mruby
GH_TAGNAME = 3.3.0
-REVISION = 1
+REVISION = 2
CATEGORIES = lang
HOMEPAGE = https://mruby.org/
Index: lang/ruby/ruby.port.mk
===================================================================
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
diff -u -p -u -p -r1.123 ruby.port.mk
--- lang/ruby/ruby.port.mk 10 Jan 2025 03:38:07 -0000 1.123
+++ lang/ruby/ruby.port.mk 24 Jun 2025 22:19:00 -0000
@@ -42,9 +42,9 @@ FULLPKGNAME?= ${MODRUBY_PKG_PREFIX}-${P
SUBST_VARS+= GEM_BIN_SUFFIX GEM_MAN_SUFFIX
FLAVOR?=
-# Without a FLAVOR, assume the use of ruby 3.3.
+# Without a FLAVOR, assume the use of ruby 3.4.
. if empty(FLAVOR)
-FLAVOR = ruby33
+FLAVOR = ruby34
. endif
# Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
@@ -63,8 +63,8 @@ ERRORS += "Fatal: Conflicting flavors us
.endif
# The default ruby version to use for non-gem ports. Defaults to ruby
-# 3.3 for consistency with the default ruby33 FLAVOR for gem ports.
-MODRUBY_REV?= 3.3
+# 3.4 for consistency with the default ruby33 FLAVOR for gem ports.
+MODRUBY_REV?= 3.4
# Use the FLAVOR as the prefix for the package, to avoid conflicts.
MODRUBY_PKG_PREFIX = ${MODRUBY_FLAVOR}
Index: mail/mew/Makefile
===================================================================
RCS file: /cvs/ports/mail/mew/Makefile,v
diff -u -p -u -p -r1.28 Makefile
--- mail/mew/Makefile 20 Jun 2024 22:41:25 -0000 1.28
+++ mail/mew/Makefile 25 Jun 2025 00:27:35 -0000
@@ -1,7 +1,7 @@
COMMENT= emacs-based mail client
DISTNAME= mew-6.9
-REVISION= 3
+REVISION= 4
CATEGORIES= mail
HOMEPAGE= http://www.mew.org/
DISTFILES= mew-6.9a.tar.gz
Index: multimedia/mkvtoolnix/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/Makefile,v
diff -u -p -u -p -r1.141 Makefile
--- multimedia/mkvtoolnix/Makefile 5 Nov 2024 18:38:31 -0000 1.141
+++ multimedia/mkvtoolnix/Makefile 25 Jun 2025 00:27:49 -0000
@@ -3,6 +3,7 @@ BROKEN= fail to configure: fatal error:
COMMENT= create, alter and inspect Matroska files
DISTNAME= mkvtoolnix-88.0
+REVISION= 0
CATEGORIES= multimedia x11
Index: net/ocserv/Makefile
===================================================================
RCS file: /cvs/ports/net/ocserv/Makefile,v
diff -u -p -u -p -r1.60 Makefile
--- net/ocserv/Makefile 24 Nov 2024 11:50:43 -0000 1.60
+++ net/ocserv/Makefile 25 Jun 2025 00:28:26 -0000
@@ -2,6 +2,7 @@ COMMENT= server implementing the AnyConn
DISTNAME= ocserv-1.3.0
EXTRACT_SUFX= .tar.xz
+REVISION= 0
CATEGORIES= net
Index: net/weechat/Makefile
===================================================================
RCS file: /cvs/ports/net/weechat/Makefile,v
diff -u -p -u -p -r1.102 Makefile
--- net/weechat/Makefile 22 May 2025 07:28:35 -0000 1.102
+++ net/weechat/Makefile 25 Jun 2025 00:28:48 -0000
@@ -12,6 +12,7 @@ PKGNAME-lua= weechat-lua-${V}
PKGNAME-python= weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
PKGNAME-tcl= weechat-tcl-${V}
+REVISION-ruby= 0
CATEGORIES= net
Index: net/whatweb/Makefile
===================================================================
RCS file: /cvs/ports/net/whatweb/Makefile,v
diff -u -p -u -p -r1.18 Makefile
--- net/whatweb/Makefile 20 Jun 2024 22:41:25 -0000 1.18
+++ net/whatweb/Makefile 25 Jun 2025 00:28:55 -0000
@@ -4,7 +4,7 @@ GH_TAGNAME= v0.5.5
GH_PROJECT= WhatWeb
GH_ACCOUNT= urbanadventurer
-REVISION= 1
+REVISION= 2
CATEGORIES= net www
Index: security/arirang/Makefile
===================================================================
RCS file: /cvs/ports/security/arirang/Makefile,v
diff -u -p -u -p -r1.48 Makefile
--- security/arirang/Makefile 20 Jun 2024 22:41:25 -0000 1.48
+++ security/arirang/Makefile 25 Jun 2025 00:29:00 -0000
@@ -2,7 +2,7 @@ COMMENT = powerful webserver security sc
DISTNAME = arirang-2.03
CATEGORIES = security
-REVISION = 11
+REVISION = 12
FIX_EXTRACT_PERMISSIONS=Yes
SITES = http://monkey.org/~pilot/arirang/ \
Index: security/openssl-ruby-tests/Makefile
===================================================================
RCS file: /cvs/ports/security/openssl-ruby-tests/Makefile,v
diff -u -p -u -p -r1.131 Makefile
--- security/openssl-ruby-tests/Makefile 23 Jun 2025 08:25:21 -0000 1.131
+++ security/openssl-ruby-tests/Makefile 26 Jun 2025 18:54:18 -0000
@@ -3,6 +3,7 @@ COMMENT = sources of the Ruby OpenSSL g
# Follows HEAD
VERSION = 20250620
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
diff -u -p -u -p -r1.32 Makefile
--- security/wpscan/Makefile 22 Mar 2025 19:02:23 -0000 1.32
+++ security/wpscan/Makefile 25 Jun 2025 00:31:55 -0000
@@ -2,6 +2,7 @@ COMMENT = WordPress security scanner
DISTNAME = wpscan-3.8.28
CATEGORIES = security
+REVISION = 0
HOMEPAGE = https://wpscan.org/
MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
Index: sysutils/puppetserver/7/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/puppetserver/7/Makefile,v
diff -u -p -u -p -r1.10 Makefile
--- sysutils/puppetserver/7/Makefile 20 Jun 2024 22:41:25 -0000 1.10
+++ sysutils/puppetserver/7/Makefile 25 Jun 2025 00:29:23 -0000
@@ -4,7 +4,7 @@ COMMENT = Puppet server
VERSION = 7.17.0
DISTNAME = puppetserver-${VERSION}
-REVISION = 0
+REVISION = 1
CATEGORIES = sysutils
Index: sysutils/puppetserver/8/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/puppetserver/8/Makefile,v
diff -u -p -u -p -r1.6 Makefile
--- sysutils/puppetserver/8/Makefile 21 Jan 2025 10:38:00 -0000 1.6
+++ sysutils/puppetserver/8/Makefile 25 Jun 2025 00:29:28 -0000
@@ -2,6 +2,7 @@ COMMENT = Puppet server
VERSION = 8.7.0
DISTNAME = puppetserver-${VERSION}
+REVISION = 0
CATEGORIES = sysutils
Index: sysutils/rset/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/rset/Makefile,v
diff -u -p -u -p -r1.11 Makefile
--- sysutils/rset/Makefile 11 May 2025 14:01:35 -0000 1.11
+++ sysutils/rset/Makefile 25 Jun 2025 00:29:44 -0000
@@ -1,6 +1,7 @@
COMMENT = configure systems using any scripting language
DISTNAME = rset-3.2
+REVISION = 0
CATEGORIES = sysutils
Index: sysutils/ruby-puppet/7/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/7/Makefile,v
diff -u -p -u -p -r1.12 Makefile
--- sysutils/ruby-puppet/7/Makefile 20 Jun 2024 22:41:25 -0000 1.12
+++ sysutils/ruby-puppet/7/Makefile 25 Jun 2025 00:34:13 -0000
@@ -1,7 +1,7 @@
PORTROACH= limit:^7
VERSION= 7.30.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/ruby-puppet/8/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/8/Makefile,v
diff -u -p -u -p -r1.5 Makefile
--- sysutils/ruby-puppet/8/Makefile 21 Jan 2025 10:40:03 -0000 1.5
+++ sysutils/ruby-puppet/8/Makefile 25 Jun 2025 00:34:18 -0000
@@ -1,6 +1,7 @@
PORTROACH= limit:^8
VERSION= 8.10.0
+REVISION= 0
RUN_DEPENDS+= converters/ruby-multi_json,${MODRUBY_FLAVOR}>=1.13,<2 \
devel/ruby-concurrent-ruby,${MODRUBY_FLAVOR}>=1,<2 \
Index: sysutils/tmuxinator/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/tmuxinator/Makefile,v
diff -u -p -u -p -r1.26 Makefile
--- sysutils/tmuxinator/Makefile 20 Jun 2024 22:41:25 -0000 1.26
+++ sysutils/tmuxinator/Makefile 25 Jun 2025 00:32:39 -0000
@@ -1,7 +1,7 @@
COMMENT = create and manage complex tmux sessions easily
DISTNAME = tmuxinator-3.0.5
-REVISION = 1
+REVISION = 2
CATEGORIES = sysutils
# MIT
Index: sysutils/trash-d/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/trash-d/Makefile,v
diff -u -p -u -p -r1.6 Makefile
--- sysutils/trash-d/Makefile 29 Oct 2024 16:32:19 -0000 1.6
+++ sysutils/trash-d/Makefile 25 Jun 2025 00:30:03 -0000
@@ -7,6 +7,7 @@ CATEGORIES = sysutils
GH_ACCOUNT = rushsteve1
GH_PROJECT = trash-d
GH_TAGNAME = 19
+REVISION = 0
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
Index: textproc/asciidoctor/Makefile
===================================================================
RCS file: /cvs/ports/textproc/asciidoctor/Makefile,v
diff -u -p -u -p -r1.10 Makefile
--- textproc/asciidoctor/Makefile 20 Jun 2024 22:41:25 -0000 1.10
+++ textproc/asciidoctor/Makefile 25 Jun 2025 00:32:46 -0000
@@ -3,7 +3,7 @@ COMMENT = better AsciiDoc text proc/publ
V = 2.0.20
DISTNAME = asciidoctor-${V}
FULLPKGNAME = ${DISTNAME}
-REVISION = 0
+REVISION = 1
CATEGORIES = textproc
Index: textproc/libmarisa/Makefile
===================================================================
RCS file: /cvs/ports/textproc/libmarisa/Makefile,v
diff -u -p -u -p -r1.15 Makefile
--- textproc/libmarisa/Makefile 29 May 2025 06:00:18 -0000 1.15
+++ textproc/libmarisa/Makefile 25 Jun 2025 00:30:10 -0000
@@ -13,7 +13,7 @@ PKGNAME-ruby = ruby-libmarisa-${V}
REVISION-main = 2
REVISION-python = 6
-REVISION-ruby = 3
+REVISION-ruby = 4
REVISION-perl = 0
GH_ACCOUNT = s-yata
Index: textproc/redland-bindings/Makefile
===================================================================
RCS file: /cvs/ports/textproc/redland-bindings/Makefile,v
diff -u -p -u -p -r1.32 Makefile
--- textproc/redland-bindings/Makefile 16 Dec 2024 18:29:02 -0000 1.32
+++ textproc/redland-bindings/Makefile 25 Jun 2025 00:30:21 -0000
@@ -7,7 +7,7 @@ DISTNAME= redland-bindings-$V
PKGNAME-main= p5-librdf-$V
PKGNAME-ruby= ruby${MODRUBY_BINREV}-librdf-$V
REVISION= 7
-REVISION-ruby= 8
+REVISION-ruby= 9
HOMEPAGE= https://librdf.org/bindings/
Index: www/nginx/Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile,v
diff -u -p -u -p -r1.191 Makefile
--- www/nginx/Makefile 19 May 2025 12:26:26 -0000 1.191
+++ www/nginx/Makefile 25 Jun 2025 19:43:33 -0000
@@ -22,6 +22,7 @@ COMMENT-xslt= nginx XSLT filter module
VERSION= 1.28.0
REVISION= 1
+REVISION-passenger= 2
DISTNAME= nginx-${VERSION}
CATEGORIES= www
Index: www/sass/Makefile
===================================================================
RCS file: /cvs/ports/www/sass/Makefile,v
diff -u -p -u -p -r1.12 Makefile
--- www/sass/Makefile 20 Jun 2024 22:41:25 -0000 1.12
+++ www/sass/Makefile 25 Jun 2025 00:32:51 -0000
@@ -1,7 +1,7 @@
COMMENT = extension language for CSS
DISTNAME = sass-3.4.22
-REVISION = 8
+REVISION = 9
CATEGORIES = www devel
HOMEPAGE = http://sass-lang.com
Index: www/unit/unit-ruby/Makefile
===================================================================
RCS file: /cvs/ports/www/unit/unit-ruby/Makefile,v
diff -u -p -u -p -r1.12 Makefile
--- www/unit/unit-ruby/Makefile 21 Apr 2025 22:44:20 -0000 1.12
+++ www/unit/unit-ruby/Makefile 25 Jun 2025 19:41:43 -0000
@@ -2,10 +2,11 @@ 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
+# XXX ruby port provide librubyXX.so which is picked up in preference to
# the versioned library. Keep the "Extra" WANTLIB.
WANTLIB= ${MODRUBY_WANTLIB}
CONFIGURE_ENV+= RUBY=${RUBY}
@@ -16,6 +17,7 @@ SUBST_VARS= MODRUBY_REV
post-configure:
cd ${WRKSRC} && ./configure ruby --ruby=${MODRUBY_FLAVOR} \
--module=ruby${MODRUBY_REV}
+ /usr/bin/sed -i -e 's/-Werror //' ${WRKSRC}/build/Makefile
# needed for ruby 3 on llvm
CFLAGS-base_clang+= -fdeclspec
Index: www/webkitgtk4/Makefile
===================================================================
RCS file: /cvs/ports/www/webkitgtk4/Makefile,v
diff -u -p -u -p -r1.236 Makefile
--- www/webkitgtk4/Makefile 29 May 2025 11:37:12 -0000 1.236
+++ www/webkitgtk4/Makefile 25 Jun 2025 00:30:59 -0000
@@ -14,6 +14,7 @@ V = 2.48.3
DISTNAME = webkitgtk-${V}
PKGNAME = webkitgtk${API:S/.//}-${V}
FULLPKGNAME = ${PKGNAME}
+REVISION = 0
EXTRACT_SUFX = .tar.xz
SUBST_VARS = API
Index: x11/autocutsel/Makefile
===================================================================
RCS file: /cvs/ports/x11/autocutsel/Makefile,v
diff -u -p -u -p -r1.19 Makefile
--- x11/autocutsel/Makefile 27 Sep 2023 20:37:02 -0000 1.19
+++ x11/autocutsel/Makefile 25 Jun 2025 00:31:15 -0000
@@ -2,6 +2,7 @@ COMMENT= keep X clipboard and cutbuffer
V= 0.10.1
DISTNAME= autocutsel-$V
+REVISION= 0
CATEGORIES= x11
Index: x11/mruby-zest/Makefile
===================================================================
RCS file: /cvs/ports/x11/mruby-zest/Makefile,v
diff -u -p -u -p -r1.6 Makefile
--- x11/mruby-zest/Makefile 3 Apr 2025 22:30:10 -0000 1.6
+++ x11/mruby-zest/Makefile 25 Jun 2025 00:31:36 -0000
@@ -7,7 +7,7 @@ PKGNAME= mruby-zest-20210207
GH_ACCOUNT= mruby-zest
GH_PROJECT= mruby-zest-build
GH_COMMIT= f1eeda675f6bbda1d2f9f1454ec0d84e0632e603
-REVISION = 0
+REVISION = 1
CATEGORIES= x11
Index: x11/qt5/qtwebkit/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
diff -u -p -u -p -r1.50 Makefile
--- x11/qt5/qtwebkit/Makefile 24 Jan 2025 09:20:59 -0000 1.50
+++ x11/qt5/qtwebkit/Makefile 25 Jun 2025 00:31:43 -0000
@@ -14,7 +14,7 @@ PKGNAME = qtwebkit-${VERSION}
PKGSPEC = qtwebkit->=${VERSION}v0
EPOCH = 0
-REVISION = 15
+REVISION = 16
SHARED_LIBS += Qt5WebKit 3.1 # 5.9
SHARED_LIBS += Qt5WebKitWidgets 3.1 # 5.9
Switch default ruby version in ports from 3.3 to 3.4