18 files changed, 0 insertions, 332 deletions

diff --git a/lang/ruby/3.2/patches/CVS/Entries b/lang/ruby/3.2/patches/CVS/Entries
deleted file mode 100644
index 90e741d..0000000
--- a/lang/ruby/3.2/patches/CVS/Entries
+++ /dev/null
@@ -1,17 +0,0 @@
-/patch-common_mk/1.1.1.1/Mon Dec 26 03:03:57 2022//
-/patch-compile_c/1.1.1.1/Mon Dec 26 03:03:57 2022//
-/patch-ext_etc_etc_c/1.1.1.1/Mon Dec 26 03:03:57 2022//
-/patch-ext_extmk_rb/1.1.1.1/Mon Dec 26 03:03:57 2022//
-/patch-ext_ripper_depend/1.1.1.1/Mon Dec 26 03:03:57 2022//
-/patch-lib_fileutils_rb/1.1.1.1/Mon Dec 26 03:03:57 2022//
-/patch-lib_mkmf_rb/1.1.1.1/Mon Dec 26 03:03:57 2022//
-/patch-lib_rubygems_commands_install_command_rb/1.1.1.1/Mon Dec 26 03:03:57 2022//
-/patch-lib_rubygems_dependency_installer_rb/1.1.1.1/Mon Dec 26 03:03:57 2022//
-/patch-template_builtin_binary_inc_tmpl/1.1.1.1/Mon Dec 26 03:03:57 2022//
-/patch-thread_pthread_h/1.1.1.1/Mon Dec 26 03:03:57 2022//
-/patch-lib_rubygems_ext_builder_rb/1.2/Sun Feb 12 08:19:31 2023//
-/patch-lib_rubygems_rb/1.1/Sat Feb 11 20:06:58 2023//
-/patch-lib_rubygems_ext_ext_conf_builder_rb/1.2/Sun Apr  2 07:16:05 2023//
-/patch-template_Makefile_in/1.1/Tue Jun 13 05:00:23 2023//
-/patch-configure/1.3/Sun Sep 24 17:19:52 2023//
-D
diff --git a/lang/ruby/3.2/patches/CVS/Repository b/lang/ruby/3.2/patches/CVS/Repository
deleted file mode 100644
index 6c2be2b..0000000
--- a/lang/ruby/3.2/patches/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-ports/lang/ruby/3.2/patches
diff --git a/lang/ruby/3.2/patches/patch-common_mk b/lang/ruby/3.2/patches/patch-common_mk
deleted file mode 100644
index 00be1f5..0000000
--- a/lang/ruby/3.2/patches/patch-common_mk
+++ /dev/null
@@ -1,34 +0,0 @@
-Enable verbose mode when building.
-
-Don't regenerate rdoc documentation during install.
-
-Index: common.mk
---- common.mk.orig
-+++ common.mk
-@@ -7,7 +7,7 @@ dll: $(LIBRUBY_SO)
- .SUFFIXES: .rbinc .rb .inc .h .c .y .i .$(ASMEXT) .$(DTRACE_EXT)
- 
- # V=0 quiet, V=1 verbose.  other values don't work.
--V = 0
-+V = 1
- V0 = $(V:0=)
- Q1 = $(V:1=)
- Q = $(Q1:0=@)
-@@ -328,7 +328,7 @@ ext/configure-ext.mk: $(PREP) all-incs $(MKFILES) $(RB
- configure-ext: $(EXTS_MK)
- 
- build-ext: $(EXTS_MK)
--       $(Q)$(MAKE) -f $(EXTS_MK) $(mflags) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
-+       $(Q)$(MAKE) -f $(EXTS_MK) V=1 $(mflags) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
-            EXTENCS="$(ENCOBJS)" MINIRUBY="$(MINIRUBY)" UPDATE_LIBRARIES=no $(EXTSTATIC)
-        $(Q)$(MAKE) $(EXTS_NOTE)
- 
-@@ -572,7 +572,7 @@ dont-install-man: $(PREP)
- post-no-install-man::
-        @$(NULLCMD)
- 
--install-doc: rdoc pre-install-doc do-install-doc post-install-doc
-+install-doc: pre-install-doc do-install-doc post-install-doc
- pre-install-doc:: install-prereq
- do-install-doc: $(PROGRAM) pre-install-doc
-        $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc $(INSTALL_DOC_OPTS)
diff --git a/lang/ruby/3.2/patches/patch-compile_c b/lang/ruby/3.2/patches/patch-compile_c
deleted file mode 100644
index 2b6833d..0000000
--- a/lang/ruby/3.2/patches/patch-compile_c
+++ /dev/null
@@ -1,17 +0,0 @@
-Disable peephole optimizer on mips64 and sparc64, since it occasionally
-segfaults.
-
-Index: compile.c
---- compile.c.orig
-+++ compile.c
-@@ -2994,6 +2994,10 @@ static int
- iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
- {
-     INSN *const iobj = (INSN *)list;
-+#if defined(__mips64__) || defined(__sparc64__)
-+    return COMPILE_OK;
-+#endif
-+
- 
-   again:
-     optimize_checktype(iseq, iobj);
diff --git a/lang/ruby/3.2/patches/patch-configure b/lang/ruby/3.2/patches/patch-configure
deleted file mode 100644
index f7af0c0..0000000
--- a/lang/ruby/3.2/patches/patch-configure
+++ /dev/null
@@ -1,49 +0,0 @@
-Support arm64 coroutines.
-Don't downgrade arm64 branch protection.
-
-Set correct shared library name.
-
-Override the arch setting to remove OpenBSD version from it,
-so ports don't have to be bumped when OpenBSD version changes.
-
-Index: configure
---- configure.orig
-+++ configure
-@@ -10897,7 +10897,7 @@ esac
-     case "$target_cpu" in #(
-   aarch64) :
- 
--       for opt in -mbranch-protection=pac-ret -msign-return-address=all
-+       for opt in -mbranch-protection=standard -msign-return-address=all
- do :
- 
- 
-@@ -29475,6 +29475,10 @@ esac
- 
-             coroutine_type=x86
-          ;; #(
-+  aarch64-openbsd*) :
-+
-+            coroutine_type=arm64
-+         ;; #(
-   *-openbsd*) :
- 
-             coroutine_type=pthread
-@@ -31684,7 +31688,7 @@ fi
-         ;; #(
-   openbsd*|mirbsd*) :
- 
--       LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
-+       LIBRUBY_SO='lib$(RUBY_SO_NAME).so.'${LIBruby32_VERSION}
-         ;; #(
-   solaris*) :
- 
-@@ -33675,7 +33679,7 @@ then :
- 
- else $as_nop
- 
--        arch="${target_cpu}-${target_os}"
-+        arch="${target_cpu}-openbsd"
- 
- fi
-     printf "%s\n" "#define RUBY_PLATFORM \"$arch\"" >>confdefs.h
diff --git a/lang/ruby/3.2/patches/patch-ext_etc_etc_c b/lang/ruby/3.2/patches/patch-ext_etc_etc_c
deleted file mode 100644
index 0d9265a..0000000
--- a/lang/ruby/3.2/patches/patch-ext_etc_etc_c
+++ /dev/null
@@ -1,23 +0,0 @@
-Use shadow versions of password functions.
-
-Index: ext/etc/etc.c
---- ext/etc/etc.c.orig
-+++ ext/etc/etc.c
-@@ -223,7 +223,7 @@ etc_getpwuid(int argc, VALUE *argv, VALUE obj)
-     else {
-        uid = getuid();
-     }
--    pwd = getpwuid(uid);
-+    pwd = getpwuid_shadow(uid);
-     if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %d", (int)uid);
-     return setup_passwd(pwd);
- #else
-@@ -253,7 +253,7 @@ etc_getpwnam(VALUE obj, VALUE nam)
-     struct passwd *pwd;
-     const char *p = StringValueCStr(nam);
- 
--    pwd = getpwnam(p);
-+    pwd = getpwnam_shadow(p);
-     if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %"PRIsVALUE, nam);
-     return setup_passwd(pwd);
- #else
diff --git a/lang/ruby/3.2/patches/patch-ext_extmk_rb b/lang/ruby/3.2/patches/patch-ext_extmk_rb
deleted file mode 100644
index 40d7877..0000000
--- a/lang/ruby/3.2/patches/patch-ext_extmk_rb
+++ /dev/null
@@ -1,14 +0,0 @@
-Build extensions in verbose mode by default.
-
-Index: ext/extmk.rb
---- ext/extmk.rb.orig
-+++ ext/extmk.rb
-@@ -712,7 +712,7 @@ exts.map! {|d| "#{ext_prefix}/#{d}/."}
- FileUtils.makedirs(File.dirname($command_output))
- begin
-   atomic_write_open($command_output) do |mf|
--    mf.puts "V = 0"
-+    mf.puts "V = 1"
-     mf.puts "V0 = $(V:0=)"
-     mf.puts "Q1 = $(V:1=)"
-     mf.puts "Q = $(Q1:0=@)"
diff --git a/lang/ruby/3.2/patches/patch-ext_ripper_depend b/lang/ruby/3.2/patches/patch-ext_ripper_depend
deleted file mode 100644
index 7d5c477..0000000
--- a/lang/ruby/3.2/patches/patch-ext_ripper_depend
+++ /dev/null
@@ -1,14 +0,0 @@
-Allow overriding CFLAGS for ripper extension.
-
-Index: ext/ripper/depend
---- ext/ripper/depend.orig
-+++ ext/ripper/depend
-@@ -45,6 +45,8 @@ ripper.E: ripper.c
-        $(ECHO) preprocessing ripper.c
-        $(Q) $(CC) -E $(INCFLAGS) $(CPPFLAGS) $< | $(RUBY) $(srcdir)/tools/strip.rb > $@
- 
-+CFLAGS += %%CFLAGS_OVERRIDE%%
-+
- # AUTOGENERATED DEPENDENCIES START
- ripper.o: $(RUBY_EXTCONF_H)
- ripper.o: $(arch_hdrdir)/ruby/config.h
diff --git a/lang/ruby/3.2/patches/patch-lib_fileutils_rb b/lang/ruby/3.2/patches/patch-lib_fileutils_rb
deleted file mode 100644
index aef98f9..0000000
--- a/lang/ruby/3.2/patches/patch-lib_fileutils_rb
+++ /dev/null
@@ -1,16 +0,0 @@
-Make FileUtils.mkdir_p act more like mkdir(1) -p, by not attempting
-to create directories that already exist.  This fixes systrace
-warnings when building ports.
-
-Index: lib/fileutils.rb
---- lib/fileutils.rb.orig
-+++ lib/fileutils.rb
-@@ -381,7 +381,7 @@ module FileUtils
-       end
-       stack.reverse_each do |dir|
-         begin
--          fu_mkdir dir, mode
-+          fu_mkdir dir, mode unless File.directory?(dir)
-         rescue SystemCallError
-           raise unless File.directory?(dir)
-         end
diff --git a/lang/ruby/3.2/patches/patch-lib_mkmf_rb b/lang/ruby/3.2/patches/patch-lib_mkmf_rb
deleted file mode 100644
index 68046ce..0000000
--- a/lang/ruby/3.2/patches/patch-lib_mkmf_rb
+++ /dev/null
@@ -1,14 +0,0 @@
-Ignore linker warnings when compiling native extensions.
-
-Index: lib/mkmf.rb
---- lib/mkmf.rb.orig
-+++ lib/mkmf.rb
-@@ -415,7 +415,7 @@ MESSAGE
-         result = nil
-         Logging.postpone do |log|
-           output = IO.popen(env, command, &:read)
--          result = ($?.success? and File.zero?(log.path))
-+          result = $?.success?
-           output
-         end
-         result
diff --git a/lang/ruby/3.2/patches/patch-lib_rubygems_commands_install_command_rb b/lang/ruby/3.2/patches/patch-lib_rubygems_commands_install_command_rb
deleted file mode 100644
index 1dd38f2..0000000
--- a/lang/ruby/3.2/patches/patch-lib_rubygems_commands_install_command_rb
+++ /dev/null
@@ -1,16 +0,0 @@
-Make gem binaries on ruby 3.2 use a 32 suffix, so you can have both
-other versions of the same gem installed at the same time
-without conflicts.
-
-Index: lib/rubygems/commands/install_command.rb
---- lib/rubygems/commands/install_command.rb.orig
-+++ lib/rubygems/commands/install_command.rb
-@@ -22,7 +22,7 @@ class Gem::Commands::InstallCommand < Gem::Command
- 
-   def initialize
-     defaults = Gem::DependencyInstaller::DEFAULT_OPTIONS.merge({
--      :format_executable => false,
-+      :format_executable => true,
-       :lock => true,
-       :suggest_alternate => true,
-       :version => Gem::Requirement.default,
diff --git a/lang/ruby/3.2/patches/patch-lib_rubygems_dependency_installer_rb b/lang/ruby/3.2/patches/patch-lib_rubygems_dependency_installer_rb
deleted file mode 100644
index d108d6f..0000000
--- a/lang/ruby/3.2/patches/patch-lib_rubygems_dependency_installer_rb
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: lib/rubygems/dependency_installer.rb
---- lib/rubygems/dependency_installer.rb.orig
-+++ lib/rubygems/dependency_installer.rb
-@@ -20,7 +20,7 @@ class Gem::DependencyInstaller
-     :document => %w[ri],
-     :domain => :both, # HACK dup
-     :force => false,
--    :format_executable => false, # HACK dup
-+    :format_executable => true, # HACK dup
-     :ignore_dependencies => false,
-     :prerelease => false,
-     :security_policy => nil, # HACK NoSecurity requires OpenSSL. AlmostNo? Low?
diff --git a/lang/ruby/3.2/patches/patch-lib_rubygems_ext_builder_rb b/lang/ruby/3.2/patches/patch-lib_rubygems_ext_builder_rb
deleted file mode 100644
index 13283f0..0000000
--- a/lang/ruby/3.2/patches/patch-lib_rubygems_ext_builder_rb
+++ /dev/null
@@ -1,21 +0,0 @@
-Ugly hack to make --user-install option work.  Without this, when
-a user uses gem install --user-install, it calls
-/usr/bin/install -o root -g bin, which fails due to permission issues.
-This removes the -o root -g bin, so it can succeed as a regular user.
-
-Index: lib/rubygems/ext/builder.rb
---- lib/rubygems/ext/builder.rb.orig
-+++ lib/rubygems/ext/builder.rb
-@@ -40,6 +40,12 @@ class Gem::Ext::Builder
-       env << "sitelibdir=%s" % sitedir
-     end
- 
-+    unless Process.euid == 0
-+      %w[INSTALL INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM].each do |ins|
-+        env.unshift "#{ins}=#{RbConfig::MAKEFILE_CONFIG[ins].gsub(/-o root -g bin/, '')}"
-+      end
-+    end
-+
-     targets.each do |target|
-       # Pass DESTDIR via command line to override what's in MAKEFLAGS
-       cmd = [
diff --git a/lang/ruby/3.2/patches/patch-lib_rubygems_ext_ext_conf_builder_rb b/lang/ruby/3.2/patches/patch-lib_rubygems_ext_ext_conf_builder_rb
deleted file mode 100644
index 26f7a0c..0000000
--- a/lang/ruby/3.2/patches/patch-lib_rubygems_ext_ext_conf_builder_rb
+++ /dev/null
@@ -1,14 +0,0 @@
-Don't clean extension dir when installing gems.  Doing so breaks packaging
-of some ports.
-
-Index: lib/rubygems/ext/ext_conf_builder.rb
---- lib/rubygems/ext/ext_conf_builder.rb.orig
-+++ lib/rubygems/ext/ext_conf_builder.rb
-@@ -55,7 +55,6 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
-         destent.exist? || FileUtils.mv(ent.path, destent.path)
-       end
- 
--      make dest_path, results, extension_dir, tmp_dest_relative, ["clean"]
-     ensure
-       ENV["DESTDIR"] = destdir
-     end
diff --git a/lang/ruby/3.2/patches/patch-lib_rubygems_rb b/lang/ruby/3.2/patches/patch-lib_rubygems_rb
deleted file mode 100644
index 233c34c..0000000
--- a/lang/ruby/3.2/patches/patch-lib_rubygems_rb
+++ /dev/null
@@ -1,25 +0,0 @@
-Disable the use of `gem update --system`, which is not supported when using
-OpenBSD packages.  Also avoids printing the nagging update message:
-
-  A new release of RubyGems is available: 3.4.1 - 3.4.2!
-  Run `gem update --system 3.4.2` to update your installation.
-
-The ENV usage is to skip this logic during tests, to avoid test failures.
-
-Index: lib/rubygems.rb
---- lib/rubygems.rb.orig
-+++ lib/rubygems.rb
-@@ -1168,6 +1168,13 @@ An Array (#{env.inspect}) was passed in from #{caller[
- 
-     attr_accessor :disable_system_update_message
- 
-+    unless ENV['RUBYGEMS_SYSTEM_UPDATE_MESSAGE'] == 'enable'
-+      Gem.disable_system_update_message = <<EOF
-+Ruby was installed using an OpenBSD package, and using `gem update --system`
-+is not supported.
-+EOF
-+    end
-+
-     ##
-     # Whether RubyGems should enhance builtin `require` to automatically
-     # check whether the path required is present in installed gems, and
diff --git a/lang/ruby/3.2/patches/patch-template_Makefile_in b/lang/ruby/3.2/patches/patch-template_Makefile_in
deleted file mode 100644
index 572d5ba..0000000
--- a/lang/ruby/3.2/patches/patch-template_Makefile_in
+++ /dev/null
@@ -1,16 +0,0 @@
-Allow linking libruby to libc++abi on amd64/aarch64, so other
-software that links to libruby other than ruby itself does
-not need to manually handle arch-dependent linking.
-
-Index: template/Makefile.in
---- template/Makefile.in.orig
-+++ template/Makefile.in
-@@ -339,7 +339,7 @@ verify-static-library: $(LIBRUBY_A)
- $(LIBRUBY_SO):
-                @-[ -n "$(EXTSTATIC)" ] || $(PRE_LIBRUBY_UPDATE)
-                $(ECHO) linking shared-library $@
--               $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(EXTSOLIBS) $(OUTFLAG)$@
-+               $(Q) $(LDSHARED) ${LIBRUBY_DLDFLAGS} $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(EXTSOLIBS) $(OUTFLAG)$@
-                -$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)ruby_static_id_*' \
-                        -L '$(SYMBOL_PREFIX)*_threadptr_*' -L '$(SYMBOL_PREFIX)*_ec_*' $@
-                $(Q) $(POSTLINK)
diff --git a/lang/ruby/3.2/patches/patch-template_builtin_binary_inc_tmpl b/lang/ruby/3.2/patches/patch-template_builtin_binary_inc_tmpl
deleted file mode 100644
index 6c1c8e4..0000000
--- a/lang/ruby/3.2/patches/patch-template_builtin_binary_inc_tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
-Ensure proper alignment of builtin binary arrays to fix crash on mips64.
-compile.c accesses the start of these arrays as struct ibf_header.
-
-Index: template/builtin_binary.inc.tmpl
---- template/builtin_binary.inc.tmpl.orig
-+++ template/builtin_binary.inc.tmpl
-@@ -6,7 +6,7 @@
- %   ary = RubyVM.enum_for(:each_builtin).to_a
- %   ary.each{|feature, iseq|
- 
--static const unsigned char <%= feature %>_bin[] = {
-+static const unsigned char <%= feature %>_bin[] __attribute__((aligned(8))) = {
- %     iseq                   \
- %     . to_binary            \
- %     . each_byte            \
diff --git a/lang/ruby/3.2/patches/patch-thread_pthread_h b/lang/ruby/3.2/patches/patch-thread_pthread_h
deleted file mode 100644
index 7a0a1d4..0000000
--- a/lang/ruby/3.2/patches/patch-thread_pthread_h
+++ /dev/null
@@ -1,14 +0,0 @@
-base-gcc doesn't support __thread
-
-Index: thread_pthread.h
---- thread_pthread.h.orig
-+++ thread_pthread.h
-@@ -93,7 +93,7 @@ struct rb_thread_sched {
- #ifndef RB_THREAD_LOCAL_SPECIFIER_IS_UNSUPPORTED
- # if __STDC_VERSION__ >= 201112
- #   define RB_THREAD_LOCAL_SPECIFIER _Thread_local
--# elif defined(__GNUC__)
-+# elif defined(__clang__)
-   /* note that ICC (linux) and Clang are covered by __GNUC__ */
- #   define RB_THREAD_LOCAL_SPECIFIER __thread
- # endif