Index | Thread | Search

From:
Jeremy Evans <jeremy@openbsd.org>
Subject:
Switch default ruby version in ports from 3.2 to 3.3
To:
OpenBSD ports <ports@openbsd.org>
Date:
Thu, 13 Jun 2024 16:58:20 +0000

Download raw body.

Thread
I would like to update to the default ruby version in ports from 3.2 to
3.3.  We usually do this update after ruby-x.y.2 has been released, and
ruby-3.3.2 was released a couple weeks ago, and I plan on committing
ruby 3.3.3 tomorrow. I think this is a good time in the release cycle
for this change.

Other than ruby.port.mk, the only changes needed are REVISION bumps.

Tested on amd64 using a bulk of all ports that depend on a ruby port.
OKs?

Thanks,
Jeremy

Index: databases/xapian-bindings/Makefile
===================================================================
RCS file: /cvs/ports/databases/xapian-bindings/Makefile,v
diff -u -p -u -p -r1.52 Makefile
--- databases/xapian-bindings/Makefile	6 May 2024 12:22:36 -0000	1.52
+++ databases/xapian-bindings/Makefile	12 Jun 2024 20:24:35 -0000
@@ -10,7 +10,7 @@ PKGNAME-python=	xapian-bindings-python-$
 PKGNAME-ruby=	ruby${MODRUBY_BINREV}-xapian-${V}
 REVISION-main=	0
 REVISION-python=0
-REVISION-ruby=	0
+REVISION-ruby=	1
 
 CATEGORIES=	databases textproc
 
Index: devel/gitsh/Makefile
===================================================================
RCS file: /cvs/ports/devel/gitsh/Makefile,v
diff -u -p -u -p -r1.19 Makefile
--- devel/gitsh/Makefile	21 Sep 2023 09:49:54 -0000	1.19
+++ devel/gitsh/Makefile	12 Jun 2024 20:24:42 -0000
@@ -1,5 +1,5 @@
 VERSION =		0.13
-REVISION =		4
+REVISION =		5
 
 COMMENT =		interactive shell for git
 
Index: devel/ragel/Makefile
===================================================================
RCS file: /cvs/ports/devel/ragel/Makefile,v
diff -u -p -u -p -r1.17 Makefile
--- devel/ragel/Makefile	21 Sep 2023 09:50:04 -0000	1.17
+++ devel/ragel/Makefile	12 Jun 2024 20:24:47 -0000
@@ -1,7 +1,7 @@
 COMMENT =		state machine compiler
 
 DISTNAME =		ragel-6.9
-REVISION =		7
+REVISION =		8
 CATEGORIES =		devel
 
 HOMEPAGE =		http://www.colm.net/open-source/ragel/
Index: devel/reposurgeon/Makefile
===================================================================
RCS file: /cvs/ports/devel/reposurgeon/Makefile,v
diff -u -p -u -p -r1.18 Makefile
--- devel/reposurgeon/Makefile	21 Sep 2023 09:50:04 -0000	1.18
+++ devel/reposurgeon/Makefile	12 Jun 2024 20:24:53 -0000
@@ -1,7 +1,7 @@
 COMMENT=	tool for editing version-control repository history
 
 DISTNAME=	reposurgeon-4.32
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	devel
 
Index: devel/vim-command-t/Makefile
===================================================================
RCS file: /cvs/ports/devel/vim-command-t/Makefile,v
diff -u -p -u -p -r1.17 Makefile
--- devel/vim-command-t/Makefile	21 Sep 2023 09:50:07 -0000	1.17
+++ devel/vim-command-t/Makefile	12 Jun 2024 20:24:57 -0000
@@ -2,7 +2,7 @@ COMMENT =		fast, intuitive file opening 
 
 V =			1.11.2
 DISTNAME =		vim-command-t-${V}
-REVISION =		8
+REVISION =		9
 
 CATEGORIES =		devel editors
 
Index: editors/vim/Makefile
===================================================================
RCS file: /cvs/ports/editors/vim/Makefile,v
diff -u -p -u -p -r1.263 Makefile
--- editors/vim/Makefile	1 Jun 2024 10:03:47 -0000	1.263
+++ editors/vim/Makefile	12 Jun 2024 20:25:30 -0000
@@ -15,6 +15,8 @@ FULLPKGPATH-lang= ${PKGPATH},-lang
 P=		vim${V:R:S/.//}
 CATEGORIES=	editors
 
+REVISION=	0
+
 HOMEPAGE=	https://www.vim.org/
 
 MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
Index: graphics/inkscape/Makefile
===================================================================
RCS file: /cvs/ports/graphics/inkscape/Makefile,v
diff -u -p -u -p -r1.112 Makefile
--- graphics/inkscape/Makefile	29 May 2024 12:06:31 -0000	1.112
+++ graphics/inkscape/Makefile	12 Jun 2024 23:47:40 -0000
@@ -2,7 +2,7 @@ COMMENT =	SVG vector drawing application
 
 VERSION =	1.3.2
 DISTNAME =	inkscape-${VERSION}
-REVISION =	2
+REVISION =	3
 
 CATEGORIES =	graphics
 
Index: lang/mruby/Makefile
===================================================================
RCS file: /cvs/ports/lang/mruby/Makefile,v
diff -u -p -u -p -r1.25 Makefile
--- lang/mruby/Makefile	15 Apr 2024 15:10:07 -0000	1.25
+++ lang/mruby/Makefile	12 Jun 2024 20:25:44 -0000
@@ -6,6 +6,8 @@ GH_ACCOUNT =		mruby
 GH_PROJECT =		mruby
 GH_TAGNAME =		3.3.0
 
+REVISION =		0
+
 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.120 ruby.port.mk
--- lang/ruby/ruby.port.mk	18 Feb 2024 05:03:49 -0000	1.120
+++ lang/ruby/ruby.port.mk	12 Jun 2024 19:39:36 -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.2.
+# Without a FLAVOR, assume the use of ruby 3.3.
 .    if empty(FLAVOR)
-FLAVOR =		ruby32
+FLAVOR =		ruby33
 .    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.2 for consistency with the default ruby32 FLAVOR for gem ports.
-MODRUBY_REV?=		3.2
+# 3.3 for consistency with the default ruby33 FLAVOR for gem ports.
+MODRUBY_REV?=		3.3
 
 # 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.27 Makefile
--- mail/mew/Makefile	26 Sep 2023 12:28:12 -0000	1.27
+++ mail/mew/Makefile	12 Jun 2024 20:25:56 -0000
@@ -1,7 +1,7 @@
 COMMENT=	emacs-based mail client
 
 DISTNAME=	mew-6.9
-REVISION=	2
+REVISION=	3
 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.134 Makefile
--- multimedia/mkvtoolnix/Makefile	4 Dec 2023 06:53:00 -0000	1.134
+++ multimedia/mkvtoolnix/Makefile	12 Jun 2024 20:26:04 -0000
@@ -1,6 +1,7 @@
 COMMENT=	create, alter and inspect Matroska files
 
 DISTNAME=	mkvtoolnix-81.0
+REVISION=	0
 
 CATEGORIES=	multimedia x11
 
Index: net/ocserv/Makefile
===================================================================
RCS file: /cvs/ports/net/ocserv/Makefile,v
diff -u -p -u -p -r1.57 Makefile
--- net/ocserv/Makefile	18 Mar 2024 04:15:45 -0000	1.57
+++ net/ocserv/Makefile	12 Jun 2024 23:21:15 -0000
@@ -2,6 +2,7 @@ COMMENT=	server implementing the AnyConn
 
 DISTNAME=	ocserv-1.2.4
 EXTRACT_SUFX=	.tar.xz
+REVISION=	0
 
 CATEGORIES=	net
 
Index: net/rrdtool/Makefile
===================================================================
RCS file: /cvs/ports/net/rrdtool/Makefile,v
diff -u -p -u -p -r1.132 Makefile
--- net/rrdtool/Makefile	19 Sep 2023 22:02:34 -0000	1.132
+++ net/rrdtool/Makefile	12 Jun 2024 20:26:55 -0000
@@ -4,6 +4,7 @@ COMMENT-ruby=	ruby interface to librrd
 
 V=		1.8.0
 REVISION=	1
+REVISION-ruby=	2
 DISTNAME=	rrdtool-$V
 PKGNAME-main=	${DISTNAME}
 PKGNAME-update=	rrdupdate-$V
Index: net/weechat/Makefile
===================================================================
RCS file: /cvs/ports/net/weechat/Makefile,v
diff -u -p -u -p -r1.85 Makefile
--- net/weechat/Makefile	10 Jun 2024 05:40:33 -0000	1.85
+++ net/weechat/Makefile	12 Jun 2024 20:27:09 -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
diff -u -p -u -p -r1.17 Makefile
--- net/whatweb/Makefile	31 May 2023 15:21:52 -0000	1.17
+++ net/whatweb/Makefile	12 Jun 2024 20:27:13 -0000
@@ -4,7 +4,7 @@ GH_TAGNAME=		v0.5.5
 GH_PROJECT=		WhatWeb
 GH_ACCOUNT=		urbanadventurer
 
-REVISION=		0
+REVISION=		1
 
 CATEGORIES=		net www
 
Index: security/arirang/Makefile
===================================================================
RCS file: /cvs/ports/security/arirang/Makefile,v
diff -u -p -u -p -r1.47 Makefile
--- security/arirang/Makefile	27 Sep 2023 16:34:30 -0000	1.47
+++ security/arirang/Makefile	12 Jun 2024 20:27:17 -0000
@@ -2,7 +2,7 @@ COMMENT =	powerful webserver security sc
 
 DISTNAME =	arirang-2.03
 CATEGORIES =	security
-REVISION =	10
+REVISION =	11
 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.98 Makefile
--- security/openssl-ruby-tests/Makefile	11 Jun 2024 16:34:20 -0000	1.98
+++ security/openssl-ruby-tests/Makefile	12 Jun 2024 20:27:27 -0000
@@ -3,6 +3,7 @@ COMMENT =		sources of the Ruby OpenSSL g
 # Follows HEAD
 VERSION =		20240611
 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.29 Makefile
--- security/wpscan/Makefile	22 Oct 2023 14:20:24 -0000	1.29
+++ security/wpscan/Makefile	12 Jun 2024 20:30:51 -0000
@@ -2,6 +2,7 @@ COMMENT =	WordPress security scanner
 
 DISTNAME =	wpscan-3.8.25
 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.9 Makefile
--- sysutils/puppetserver/7/Makefile	20 Apr 2024 20:23:05 -0000	1.9
+++ sysutils/puppetserver/7/Makefile	12 Jun 2024 20:27:51 -0000
@@ -4,7 +4,7 @@ COMMENT =		Puppet server
 
 VERSION =		7.17.0
 DISTNAME =		puppetserver-${VERSION}
-
+REVISION =		0
 
 CATEGORIES =		sysutils
 
Index: sysutils/puppetserver/8/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/puppetserver/8/Makefile,v
diff -u -p -u -p -r1.4 Makefile
--- sysutils/puppetserver/8/Makefile	20 Apr 2024 18:51:03 -0000	1.4
+++ sysutils/puppetserver/8/Makefile	12 Jun 2024 20:28:04 -0000
@@ -2,6 +2,7 @@ COMMENT =		Puppet server
 
 VERSION =		8.6.0
 DISTNAME =		puppetserver-${VERSION}
+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.11 Makefile
--- sysutils/ruby-puppet/7/Makefile	21 Apr 2024 18:33:23 -0000	1.11
+++ sysutils/ruby-puppet/7/Makefile	12 Jun 2024 20:32:40 -0000
@@ -1,6 +1,7 @@
 PORTROACH=		limit:^7
 
 VERSION=		7.30.0
+REVISION=		0
 
 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.3 Makefile
--- sysutils/ruby-puppet/8/Makefile	20 Apr 2024 20:41:33 -0000	1.3
+++ sysutils/ruby-puppet/8/Makefile	12 Jun 2024 20:32:48 -0000
@@ -1,6 +1,7 @@
 PORTROACH=		limit:^7
 
 VERSION=		8.6.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.25 Makefile
--- sysutils/tmuxinator/Makefile	31 May 2023 15:21:53 -0000	1.25
+++ sysutils/tmuxinator/Makefile	12 Jun 2024 20:32:57 -0000
@@ -1,7 +1,7 @@
 COMMENT =		create and manage complex tmux sessions easily
 
 DISTNAME =		tmuxinator-3.0.5
-REVISION =		0
+REVISION =		1
 CATEGORIES =		sysutils
 
 # MIT
Index: textproc/asciidoctor/Makefile
===================================================================
RCS file: /cvs/ports/textproc/asciidoctor/Makefile,v
diff -u -p -u -p -r1.9 Makefile
--- textproc/asciidoctor/Makefile	16 Aug 2023 11:34:11 -0000	1.9
+++ textproc/asciidoctor/Makefile	12 Jun 2024 20:33:07 -0000
@@ -3,6 +3,7 @@ COMMENT =	better AsciiDoc text proc/publ
 V =		2.0.20
 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.11 Makefile
--- textproc/libmarisa/Makefile	6 May 2024 12:24:08 -0000	1.11
+++ textproc/libmarisa/Makefile	12 Jun 2024 20:28:31 -0000
@@ -11,7 +11,7 @@ PKGNAME-ruby =		ruby-libmarisa-${V}
 
 REVISION-main =		2
 REVISION-python =	5
-REVISION-ruby =		2
+REVISION-ruby =		3
 REVISION-perl =		0
 
 GH_ACCOUNT =	s-yata
Index: www/nginx/Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile,v
diff -u -p -u -p -r1.180 Makefile
--- www/nginx/Makefile	3 Jun 2024 07:19:08 -0000	1.180
+++ www/nginx/Makefile	12 Jun 2024 23:47:12 -0000
@@ -22,6 +22,7 @@ VERSION=	1.26.1
 DISTNAME=	nginx-${VERSION}
 CATEGORIES=	www
 REVISION-main=	0
+REVISION-passenger=	0
 
 VERSION-njs=	0.8.2
 VERSION-rtmp=	1.2.1
Index: www/sass/Makefile
===================================================================
RCS file: /cvs/ports/www/sass/Makefile,v
diff -u -p -u -p -r1.11 Makefile
--- www/sass/Makefile	31 May 2023 15:21:53 -0000	1.11
+++ www/sass/Makefile	12 Jun 2024 20:33:14 -0000
@@ -1,7 +1,7 @@
 COMMENT =		extension language for CSS
 
 DISTNAME =		sass-3.4.22
-REVISION =		7
+REVISION =		8
 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.7 Makefile
--- www/unit/unit-ruby/Makefile	5 Sep 2023 11:31:17 -0000	1.7
+++ www/unit/unit-ruby/Makefile	12 Jun 2024 20:29:39 -0000
@@ -2,6 +2,7 @@ BROKEN-sparc64=	doesn't detect Ruby libr
 
 UNIT_MODNAME=	ruby${MODRUBY_REV}
 UNIT_SHORTNAME=	ruby
+REVISION=	0
 
 MODULES+=	lang/ruby
 
Index: x11/kde-applications/kross-interpreters/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/kross-interpreters/Makefile,v
diff -u -p -u -p -r1.16 Makefile
--- x11/kde-applications/kross-interpreters/Makefile	20 May 2024 06:39:03 -0000	1.16
+++ x11/kde-applications/kross-interpreters/Makefile	12 Jun 2024 20:30:33 -0000
@@ -3,6 +3,8 @@ DISTNAME =	kross-interpreters-${VERSION}
 PKGNAME =	kross-interpreters-kf5-${VERSION}
 CATEGORIES =	devel
 
+REVISION =	0
+
 WANTLIB += ${COMPILER_LIBCXX} KF5KrossCore Qt5Core Qt5Gui Qt5Script
 WANTLIB += Qt5Widgets Qt5Xml m