On Wed, Sep 01, 2021 at 08:32:56PM +0000, Jeremy Evans wrote:
> On 08/25 01:25, Jeremy Evans wrote:
> > I would like to update to the default ruby version in ports from 2.7 to
> > 3.0. We usually do this update after ruby-x.y.2 has been released, and
> > ruby-3.0.2 was released a while back. I think there is still sufficient
> > time in the release cycle for this to be tested before OpenBSD 7.0 is
> > released.
> > Tested on amd64 using a bulk of all ports that depend on a ruby port.
> > OKs?
> Parts of the previous diff have already been committed. Here's a simpler diff
> that is mostly just the default version change, REVISION bumps, and a
> few build fixes.
> Still looking for OKs.
ok kmos
--Kurt
> Thanks,
> Jeremy
>
> Index: lang/ruby/ruby.port.mk
> ===================================================================
> RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
> retrieving revision 1.103
> diff -u -p -r1.103 ruby.port.mk
> --- lang/ruby/ruby.port.mk 28 Dec 2020 16:48:27 -0000 1.103
> +++ lang/ruby/ruby.port.mk 1 Sep 2021 20:22:55 -0000
> @@ -45,9 +45,9 @@ FULLPKGNAME?= ${MODRUBY_PKG_PREFIX}-${P
> SUBST_VARS+= GEM_BIN_SUFFIX GEM_MAN_SUFFIX
>
> FLAVOR?=
> -# Without a FLAVOR, assume the use of ruby 2.7.
> +# Without a FLAVOR, assume the use of ruby 3.0.
> . if empty(FLAVOR)
> -FLAVOR = ruby27
> +FLAVOR = ruby30
> . endif
>
> # Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
> @@ -67,8 +67,8 @@ ERRORS += "Fatal: Conflicting flavors us
> .endif
>
> # The default ruby version to use for non-gem ports. Defaults to ruby
> -# 2.7 for consistency with the default ruby27 FLAVOR for gem ports.
> -MODRUBY_REV?= 2.7
> +# 3.0 for consistency with the default ruby30 FLAVOR for gem ports.
> +MODRUBY_REV?= 3.0
>
> # 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/puppetdb5/Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/puppetdb5/Makefile,v
> retrieving revision 1.28
> diff -u -p -r1.28 Makefile
> --- databases/puppetdb5/Makefile 19 May 2021 01:50:29 -0000 1.28
> +++ databases/puppetdb5/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -9,7 +9,7 @@ PKGNAME-main= ${DISTNAME}
> PKGNAME-plugin= puppetdb-termini-$V
> CATEGORIES= databases
> REVISION-main= 1
> -REVISION-plugin=1
> +REVISION-plugin=2
>
> HOMEPAGE= https://puppet.com/docs/puppetdb/
>
> Index: databases/xapian-bindings/Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/xapian-bindings/Makefile,v
> retrieving revision 1.34
> diff -u -p -r1.34 Makefile
> --- databases/xapian-bindings/Makefile 6 Jul 2021 16:55:32 -0000
> 1.34
> +++ databases/xapian-bindings/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -7,6 +7,7 @@ COMMENT-ruby= ruby bindings for Xapian
> V= 1.4.18
> DISTNAME= xapian-bindings-${V}
> REVISION-python= 1
> +REVISION-ruby = 0
>
> PKGNAME-main= xapian-bindings-perl-${V}
> PKGNAME-python= xapian-bindings-python-${V}
> @@ -50,7 +51,8 @@ SUBST_VARS+= MODRUBY_BINREV
>
> CONFIGURE_STYLE= autoconf
> AUTOCONF_VERSION= 2.69
> -CONFIGURE_ENV= RUBY="${RUBY}" RDOC="${RUBY:S/ruby/rdoc/}"
> +CONFIGURE_ENV= RUBY="${RUBY}" RDOC="${RUBY:S/ruby/rdoc/}" \
> + CXXFLAGS="${CXXFLAGS} -fdeclspec"
> CONFIGURE_ARGS= --with-perl \
> --with-python3 \
> --with-ruby \
> Index: devel/gitsh/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/gitsh/Makefile,v
> retrieving revision 1.13
> diff -u -p -r1.13 Makefile
> --- devel/gitsh/Makefile 17 Nov 2020 03:19:36 -0000 1.13
> +++ devel/gitsh/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -1,7 +1,7 @@
> # $OpenBSD: Makefile,v 1.13 2020/11/17 03:19:36 jeremy Exp $
>
> VERSION = 0.13
> -REVISION = 1
> +REVISION = 2
>
> COMMENT = interactive shell for git
>
> Index: devel/ragel/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/ragel/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- devel/ragel/Makefile 17 Nov 2020 03:19:37 -0000 1.12
> +++ devel/ragel/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -3,7 +3,7 @@
> COMMENT = state machine compiler
>
> DISTNAME = ragel-6.9
> -REVISION = 4
> +REVISION = 5
> 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.73
> diff -u -p -r1.73 Makefile
> --- devel/swig/Makefile 23 Feb 2021 19:39:21 -0000 1.73
> +++ devel/swig/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -4,6 +4,7 @@ COMMENT = simplified wrapper and interfa
>
> SUBST_VARS = VERSION
> VERSION = 4.0.2
> +REVISION = 0
>
> DISTNAME = swig-${VERSION}
> CATEGORIES = devel
> Index: devel/vim-command-t/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/vim-command-t/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- devel/vim-command-t/Makefile 17 Nov 2020 03:19:37 -0000 1.11
> +++ devel/vim-command-t/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -4,7 +4,7 @@ COMMENT = fast, intuitive file opening
>
> V = 1.11.2
> DISTNAME = vim-command-t-${V}
> -REVISION = 4
> +REVISION = 5
>
> CATEGORIES = devel editors
>
> Index: editors/vim/Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/vim/Makefile,v
> retrieving revision 1.215
> diff -u -p -r1.215 Makefile
> --- editors/vim/Makefile 17 Aug 2021 20:41:17 -0000 1.215
> +++ editors/vim/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -5,6 +5,7 @@ COMMENT-lang= vi clone, NLS subpackage
>
> # if updating, regen plists with a gui flavour so -lang isn't messed up
> V= 8.2.3357
> +REVISION= 0
> GH_ACCOUNT= vim
> GH_PROJECT= vim
> GH_TAGNAME= v$V
> Index: graphics/inkscape/Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/inkscape/Makefile,v
> retrieving revision 1.89
> diff -u -p -r1.89 Makefile
> --- graphics/inkscape/Makefile 23 Feb 2021 19:39:25 -0000 1.89
> +++ graphics/inkscape/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -3,6 +3,7 @@
> COMMENT = SVG vector drawing application
>
> DISTNAME = inkscape-1.0.2
> +REVISION = 0
>
> CATEGORIES = graphics
>
> Index: mail/mew/Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/mew/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- mail/mew/Makefile 17 Nov 2020 03:19:37 -0000 1.19
> +++ mail/mew/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -3,7 +3,7 @@
> COMMENT= emacs-based mail client
>
> DISTNAME= mew-6.8
> -REVISION= 2
> +REVISION= 3
> CATEGORIES= mail
> HOMEPAGE= http://www.mew.org/
>
> Index: misc/tpp/Makefile
> ===================================================================
> RCS file: /cvs/ports/misc/tpp/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- misc/tpp/Makefile 17 Nov 2020 03:19:37 -0000 1.22
> +++ misc/tpp/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -3,7 +3,7 @@
> COMMENT = text-based presentation program
>
> DISTNAME = tpp-1.3.1
> -REVISION = 13
> +REVISION = 14
>
> CATEGORIES = misc productivity
>
> Index: net/munin/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/munin/Makefile,v
> retrieving revision 1.105
> diff -u -p -r1.105 Makefile
> --- net/munin/Makefile 10 Jul 2021 18:29:15 -0000 1.105
> +++ net/munin/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -10,8 +10,8 @@ DISTNAME = munin-$V
> PKGNAME-main = munin-node-$V
> PKGNAME-server =munin-server-$V
> CATEGORIES = net
> -REVISION-main = 1
> -REVISION-server = 0
> +REVISION-main = 2
> +REVISION-server = 1
>
> HOMEPAGE = https://munin-monitoring.org/
> MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=munin/}
> Index: net/ocserv/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/ocserv/Makefile,v
> retrieving revision 1.48
> diff -u -p -r1.48 Makefile
> --- net/ocserv/Makefile 5 Mar 2021 10:43:05 -0000 1.48
> +++ net/ocserv/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -5,7 +5,7 @@ COMMENT= server implementing the AnyConn
> DISTNAME= ocserv-1.1.1
> EXTRACT_SUFX= .tar.xz
>
> -REVISION= 3
> +REVISION= 4
>
> CATEGORIES= net
>
> Index: net/rrdtool/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/rrdtool/Makefile,v
> retrieving revision 1.118
> diff -u -p -r1.118 Makefile
> --- net/rrdtool/Makefile 28 Oct 2020 12:12:46 -0000 1.118
> +++ net/rrdtool/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -6,6 +6,7 @@ COMMENT-ruby= ruby interface to librrd
>
> VERSION= 1.7.2
> REVISION= 0
> +REVISION-ruby= 1
> 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.55
> diff -u -p -r1.55 Makefile
> --- net/weechat/Makefile 16 Jun 2021 04:53:26 -0000 1.55
> +++ net/weechat/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -7,6 +7,7 @@ COMMENT-ruby= Ruby bindings for weechat
> COMMENT-tcl= Tcl bindings for weechat
>
> V= 3.2
> +REVISION-ruby= 0
> DISTNAME= weechat-${V}
>
> PKGNAME-main= weechat-${V}
> @@ -80,6 +81,8 @@ CONFIGURE_ARGS+= -DCA_FILE=/etc/ssl/cert
> -DTCL_TCLSH=${MODTCL_BIN} \
> -DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \
> -DMODTCL_LIB=${MODTCL_LIB}
> +
> +CONFIGURE_ENV= CFLAGS="${CFLAGS} -fdeclspec"
>
> pre-configure:
> rm -f ${WRKSRC}/cmake/{FindLua,FindRuby,FindTCL}.cmake
> Index: net/whatweb/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/whatweb/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- net/whatweb/Makefile 17 Nov 2020 03:19:37 -0000 1.12
> +++ net/whatweb/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -6,7 +6,7 @@ GH_TAGNAME = v0.4.9
> GH_PROJECT= WhatWeb
> GH_ACCOUNT= urbanadventurer
>
> -REVISION = 2
> +REVISION = 3
>
> CATEGORIES= net www
>
> Index: security/arirang/Makefile
> ===================================================================
> RCS file: /cvs/ports/security/arirang/Makefile,v
> retrieving revision 1.40
> diff -u -p -r1.40 Makefile
> --- security/arirang/Makefile 17 Nov 2020 03:19:37 -0000 1.40
> +++ security/arirang/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -4,7 +4,7 @@ COMMENT = powerful webserver security sc
>
> DISTNAME = arirang-2.03
> CATEGORIES = security
> -REVISION = 7
> +REVISION = 8
> FIX_EXTRACT_PERMISSIONS=Yes
>
> MASTER_SITES = http://monkey.org/~pilot/arirang/ \
> Index: security/arirang/patches/patch-extconf_rb
> ===================================================================
> RCS file: /cvs/ports/security/arirang/patches/patch-extconf_rb,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-extconf_rb
> --- security/arirang/patches/patch-extconf_rb 28 Aug 2017 00:46:07 -0000
> 1.1
> +++ security/arirang/patches/patch-extconf_rb 1 Sep 2021 20:22:55 -0000
> @@ -1,11 +1,19 @@
> $OpenBSD: patch-extconf_rb,v 1.1 2017/08/28 00:46:07 jeremy Exp $
>
> -Support ruby 2.0+.
> +Support ruby 3.0+.
>
> Index: extconf.rb
> --- extconf.rb.orig
> +++ extconf.rb
> -@@ -23,7 +23,7 @@ makefile += "OBJS= $(SRCS:.c=.o)\n\n"
> +@@ -16,14 +16,14 @@ libruby = CONFIG['RUBY_SO_NAME']
> + makefile = "all: arirang\n"
> + makefile += "exec_prefix = /usr/local\n"
> + makefile += "CC= cc\n"
> +-makefile += "CFLAGS+=-Wall -pedantic\n"
> ++makefile += "CFLAGS+=-Wall -pedantic -fdeclspec\n"
> + makefile += "TARGET= arirang\n"
> + makefile += "SRCS= arirang.c grabhead.c rule.c screen.c report.c
> arissl.c ariruby.c proxy.c debug.c\n"
> + makefile += "OBJS= $(SRCS:.c=.o)\n\n"
>
> makefile += ".c.o:\n"
>
> Index: security/openssl-ruby-tests/Makefile
> ===================================================================
> RCS file: /cvs/ports/security/openssl-ruby-tests/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- security/openssl-ruby-tests/Makefile 19 Jul 2021 16:47:32 -0000
> 1.9
> +++ security/openssl-ruby-tests/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -5,6 +5,7 @@ COMMENT = sources of the Ruby OpenSSL g
> # Follows HEAD
> VERSION = 20210719
> DISTNAME = openssl-ruby-tests-${VERSION}
> +REVISION = 0
>
> GH_ACCOUNT = ruby
> GH_PROJECT = openssl
> Index: sysutils/tmuxinator/Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/tmuxinator/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- sysutils/tmuxinator/Makefile 17 Nov 2020 03:19:38 -0000 1.20
> +++ sysutils/tmuxinator/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -3,7 +3,7 @@
> COMMENT = create and manage complex tmux sessions easily
>
> DISTNAME = tmuxinator-1.1.3
> -REVISION = 1
> +REVISION = 2
> FULLPKGNAME = ${DISTNAME}
> CATEGORIES = sysutils
>
> Index: textproc/asciidoctor/Makefile
> ===================================================================
> RCS file: /cvs/ports/textproc/asciidoctor/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- textproc/asciidoctor/Makefile 17 Nov 2020 03:19:38 -0000 1.2
> +++ textproc/asciidoctor/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -5,7 +5,7 @@ COMMENT = better AsciiDoc text proc/publ
> V = 2.0.10
> DISTNAME = asciidoctor-${V}
> FULLPKGNAME = ${DISTNAME}
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = textproc
>
> Index: textproc/redland-bindings/Makefile
> ===================================================================
> RCS file: /cvs/ports/textproc/redland-bindings/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- textproc/redland-bindings/Makefile 23 Feb 2021 19:39:46 -0000
> 1.22
> +++ textproc/redland-bindings/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -11,6 +11,7 @@ PKGNAME-main= p5-librdf-$V
> PKGNAME-python= py-librdf-$V
> PKGNAME-ruby= ruby${MODRUBY_BINREV}-librdf-$V
> REVISION= 4
> +REVISION-ruby= 5
>
> HOMEPAGE= http://librdf.org/bindings/
>
> @@ -47,7 +48,7 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION_
> CONFIGURE_ARGS+= --with-ruby \
> --with-ruby-linking=so
> MODRUBY_RUNDEP= No
> -CONFIGURE_ENV+= RUBY=${RUBY}
> +CONFIGURE_ENV+= RUBY=${RUBY} CFLAGS="${CFLAGS} -fdeclspec"
> LIB_DEPENDS-ruby= ${LIB_DEPENDS} ${MODRUBY_LIB_DEPENDS}
> RUN_DEPENDS-ruby= ${MODRUBY_RUN_DEPENDS}
> WANTLIB-ruby= ${WANTLIB} ${MODRUBY_WANTLIB}
> Index: www/nginx/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/nginx/Makefile,v
> retrieving revision 1.154
> diff -u -p -r1.154 Makefile
> --- www/nginx/Makefile 28 Aug 2021 08:56:12 -0000 1.154
> +++ www/nginx/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -21,6 +21,8 @@ VERSION= 1.20.1
> DISTNAME= nginx-${VERSION}
> CATEGORIES= www
>
> +REVISION-passenger= 0
> +
> VERSION-rtmp= 1.2.1
>
> PKGNAME-main= ${DISTNAME}
> Index: www/sass/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/sass/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- www/sass/Makefile 17 Nov 2020 03:19:38 -0000 1.7
> +++ www/sass/Makefile 1 Sep 2021 20:22:55 -0000
> @@ -3,7 +3,7 @@
> COMMENT = extension language for CSS
>
> DISTNAME = sass-3.4.22
> -REVISION = 4
> +REVISION = 5
> CATEGORIES = www devel
>
> HOMEPAGE = http://sass-lang.com
> Index: x11/kde-applications/kross-interpreters/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/kde-applications/kross-interpreters/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- x11/kde-applications/kross-interpreters/Makefile 27 Apr 2021 05:27:11
> -0000 1.6
> +++ x11/kde-applications/kross-interpreters/Makefile 1 Sep 2021 20:22:55
> -0000
> @@ -4,6 +4,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/kde-applications/kross-interpreters/patches/patch-ruby_rubyinterpreter_cpp
> ===================================================================
> RCS file:
> x11/kde-applications/kross-interpreters/patches/patch-ruby_rubyinterpreter_cpp
> diff -N
> x11/kde-applications/kross-interpreters/patches/patch-ruby_rubyinterpreter_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++
> x11/kde-applications/kross-interpreters/patches/patch-ruby_rubyinterpreter_cpp
> 1 Sep 2021 20:22:55 -0000
> @@ -0,0 +1,17 @@
> +$OpenBSD$
> +
> +Work on ruby 3.0+.
> +
> +Index: ruby/rubyinterpreter.cpp
> +--- ruby/rubyinterpreter.cpp.orig
> ++++ ruby/rubyinterpreter.cpp
> +@@ -64,9 +64,6 @@ RubyInterpreter::RubyInterpreter(Kross::InterpreterInf
> + {
> + initRuby();
> + }
> +-
> +- const int defaultsafelevel = 4; // per default use the maximum safelevel
> +- rb_set_safe_level( info->optionValue("safelevel",
> defaultsafelevel).toInt() );
> + }
> +
> + RubyInterpreter::~RubyInterpreter()
>
