Per our standard Ruby support policy, I am planning to remove Ruby 3.1
from the ports tree, as it will be completely unsupported before the
release of OpenBSD 7.7. Nothing currently depends on it, so
this should cause no problems.
 
Here's the diff for ruby.port.mk. I also have diffs prepared for
ruby-module.5 and quirks.
 
Thanks,
Jeremy

Index: ruby.port.mk
===================================================================
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
diff -u -p -u -p -r1.121 ruby.port.mk
--- ruby.port.mk        20 Jun 2024 22:40:55 -0000      1.121
+++ ruby.port.mk        17 Nov 2024 22:48:11 -0000
@@ -25,7 +25,7 @@ MODRUBY_HANDLE_FLAVORS ?= No
 # If ruby.pork.mk should handle FLAVORs, define a separate FLAVOR
 # for each ruby version.
 .    if !defined(FLAVORS)
-FLAVORS=       ruby31 ruby32 ruby33
+FLAVORS=       ruby32 ruby33
 .    endif
 
 # Instead of adding flavors to the end of the package name, we use
@@ -49,11 +49,10 @@ FLAVOR =            ruby33
 
 # Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
 # on the FLAVOR.
-.    for i in ruby31 ruby32 ruby33
+.    for i in ruby32 ruby33
 .      if ${FLAVOR:M$i}
 MODRUBY_REV = ${i:C/ruby([0-9])/\1./}
-.        if ${FLAVOR:N$i:Mruby31} || \
-            ${FLAVOR:N$i:Mruby32} || \
+.        if ${FLAVOR:N$i:Mruby32} || \
             ${FLAVOR:N$i:Mruby33}
 ERRORS += "Fatal: Conflicting flavors used: ${FLAVOR}"
 .        endif
@@ -154,10 +153,8 @@ EXTRACT_SUFX=      .gem
 
 .  if ${CONFIGURE_STYLE:L:Mext}
 # Use ports-gcc for ruby32 extensions if base does not use clang
-.    if ${FLAVOR:Mruby32} || ${FLAVOR:Mruby33}
 COMPILER ?=    base-clang ports-gcc
 COMPILER_LANGS ?= c
-.    endif
 # Add build complete file to package so rubygems doesn't complain
 # or build extensions at runtime
 GEM_EXTENSIONS_DIR ?= 
${GEM_LIB}/extensions/${MODRUBY_ARCH:S/i386/x86/}/${MODRUBY_REV}/${DISTNAME}

Reply via email to