 @@ -1,14 +1,14 @@
-# $NetBSD: rubyversion.mk,v 1.252.4.1 2022/11/30 17:19:02 bsiegert Exp $
+# $NetBSD: rubyversion.mk,v 1.252.4.2 2022/11/30 17:25:42 bsiegert Exp $
+#
 # This file determines which Ruby version is used as a dependency for
 # a package.
+#
+#
 # === User-settable variables ===
+#
 # RUBY_VERSION_DEFAULT
 #	The preferred Ruby version to use.
+#
 #		Possible values: 26 27 30 31
 #		Default: 27
 @@ -205,27 +205,27 @@ _RUBYVERSION_MK=	# defined
 .include "../../mk/bsd.prefs.mk"
 .if defined(PKGNAME_REQD)
 .  if !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*)
 _RUBY_VERSION_REQD:=	${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/}
 RUBY_VERSION_REQD?=	${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/}
 .  endif
 .endif
 # current supported Ruby's version
 RUBY26_VERSION=		2.6.10
 RUBY27_VERSION=		2.7.6
-RUBY30_VERSION=		3.0.4
+RUBY30_VERSION=		3.0.5
 RUBY31_VERSION=		3.1.3
 # current API compatible version; used for version of shared library
 RUBY26_API_VERSION=	2.6.0
 RUBY27_API_VERSION=	2.7.0
 RUBY30_API_VERSION=	3.0.0
 RUBY31_API_VERSION=	3.1.0
+#
 RUBY_VERSION_DEFAULT?=	27
 # supported Ruby's version
 RUBY_VERSIONS_SUPPORTED=	26 27 30 31
 @@ -385,27 +385,27 @@ RUBY_ZLIB_VER=			1.1.0
 .elif ${RUBY_VER} == "30"
 RUBY_VERSION=		${RUBY30_VERSION}
 RUBY_ABI_VERSION=	${RUBY_VERSION}
 RUBY_SUFFIX=		${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}
 # bundled gems
 RUBY_RUBYGEMS_VER=		3.2.32
 RUBY_ABBREV_VER=		0.1.0
 RUBY_BASE64_VER=		0.1.0
 RUBY_BENCHMARK_VER=		0.1.1
 RUBY_BIGDECIMAL_VER=		3.0.0
 RUBY_BUNDLER_VER=		2.2.33
-RUBY_CGI_VER=			0.2.1
+RUBY_CGI_VER=			0.2.2
 RUBY_CSV_VER=			3.1.9
 RUBY_DATE_VER=			3.1.3
 RUBY_DBM_VER=			1.1.0
 RUBY_DEBUG_VER=			0.2.1
 RUBY_DELEGATE_VER=		0.2.0
 RUBY_DID_YOU_MEAN_VER=		1.5.0
 RUBY_DIGEST_VER=		3.0.0
 RUBY_DRB_VER=			2.0.5
 RUBY_ENGLISH_VER=		0.7.1
 RUBY_ERB_VER=			2.2.0
 RUBY_ETC_VER=			1.3.0
 RUBY_FCNTL_VER=			1.0.1
 RUBY_FIDDLE_VER=		1.0.8
 @@ -423,27 +423,27 @@ RUBY_LOGGER_VER=		1.4.3
 RUBY_MATRIX_VER=		0.3.1
 RUBY_MINITEST_VER=		5.14.2
 RUBY_MUTEX_M_VER=		0.1.1
 RUBY_NET_FTP_VER=		0.1.2
 RUBY_NET_HTTP_VER=		0.1.1
 RUBY_NET_IMAP_VER=		0.1.1
 RUBY_NET_POP_VER=		0.1.1
 RUBY_NET_PROTOCOL_VER=		0.1.1
 RUBY_NET_SMTP_VER=		0.2.1
 RUBY_NKF_VER=			0.1.0
 RUBY_OBSERVER_VER=		0.1.1
 RUBY_OPEN_URI_VER=		0.1.0
 RUBY_OPEN3_VER=			0.1.1
-RUBY_OPENSSL_VER=		2.2.1
+RUBY_OPENSSL_VER=		2.2.2
 RUBY_OPTPARSE_VER=		0.1.1
 RUBY_OSTRUCT_VER=		0.3.1
 RUBY_PATHNAME_VER=		0.1.0
 RUBY_POWER_ASSERT_VER=		1.2.0
 RUBY_PP_VER=			0.2.1
 RUBY_PRETTYPRINT_VER=		0.1.1
 RUBY_PRIME_VER=			0.1.2
 RUBY_PSTORE_VER=		0.1.1
 RUBY_PSYCH_VER=			3.3.2
 RUBY_RACC_VER=			1.5.2
 RUBY_RAKE_VER=			13.0.3
 RUBY_RBS_VER=			1.4.0
 RUBY_RDOC_VER=			6.3.3

 @@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.10 2022/05/04 16:44:53 taca Exp $
+$NetBSD: distinfo,v 1.10.4.1 2022/11/30 17:25:42 bsiegert Exp $
-BLAKE2s (ruby-3.0.4.tar.xz) = 2487d6f4bd37ef20715935a50d2cc50f9d50589c9223836bfaa6c3ac7de57b4d
+BLAKE2s (ruby-3.0.5.tar.xz) = 21cbe465dddcd8f3fdd19190cab6b513e7a1ae68f6686b0b9f3a95ce86d88bf1
-SHA512 (ruby-3.0.4.tar.xz) = 53bf7dd403b0c68af9691882ad8ed7422c8d1f496627428fb4c3caf0b0313715524b744c5f453aced2d49e16e55f3f45b46b9a77aa3097dbfcae7caa0208194b
+SHA512 (ruby-3.0.5.tar.xz) = 1c69d18210a2156f7696c678a8d54bf05c4dc49a1401c1ecc5760b1c23fb6ac14053873a225564664d6a327cda274ce72f47d112a6ad8d378f978de4e507e9a0
-Size (ruby-3.0.4.tar.xz) = 15830368 bytes
+Size (ruby-3.0.5.tar.xz) = 15880196 bytes
 SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d
-SHA1 (patch-configure) = 8499cad3c1fb1a1b15392ba375f8d4e737fef2e4
+SHA1 (patch-configure) = a6ef87bfefd5f753d0b331c6b5493ef189f69d6a
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-ext_openssl_openssl__missing.h) = 3f8d79736fd14806dfaf76e333eec63ff3ff5890
 SHA1 (patch-ext_openssl_ossl__pkey__rsa.c) = 32054bad7bf31040e6d8828f8786de26dc860518
 SHA1 (patch-include_ruby_internal_static__assert.h) = 2e509d18d294b03b468e4e7bcb99fb6a71089601
 SHA1 (patch-lib_mkmf.rb) = 4a3cd18548dbdf43a13695d4e76f817c0347e335
 SHA1 (patch-lib_rdoc_encoding.rb) = 0e82d2942d9bfcb67dc7c994889d7bc5ec2ae85a
 SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198
 SHA1 (patch-lib_rubygems.rb) = 5208798483129d1391891ca4af46ed11e072737a
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 181bb7554d760182588b0e1b0aafb84c317f41ad
 SHA1 (patch-lib_rubygems_defaults.rb) = 48b71108ec3d2202ac2b31fbcfa4af30db2bc817
 SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3
 SHA1 (patch-lib_rubygems_installer.rb) = 03fcd57d4e7ea03cf2ffc3d219fd489e30361014

 @@ -1,142 +1,155 @@
-$NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $
+$NetBSD: patch-configure,v 1.2.4.1 2022/11/30 17:25:43 bsiegert Exp $
 * Adding Interix support.
 * Ignore doxygen.
 * Ignore VCS.
 * Handle SSP in pkgsrc.
 * Retain _XOPEN_SOURCE, fixes eventmachine.
 * Fix argument for pthread_self() on NetBSD.
---- configure.orig	2022-04-12 11:48:57.000000000 +0000
+--- configure.orig	2022-11-24 11:04:58.000000000 +0000
 +++ configure
-@@ -8381,7 +8381,7 @@ else
+@@ -9270,7 +9270,7 @@ else $as_nop
-     if test x"$target_alias" = x; then :
+ then :
  	case "$target_os" in #(
 -  darwin*) :
 +  nodarwin*) :
- 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
+ 	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
- $as_echo_n "checking for real target cpu... " >&6; }
+ printf %s "checking for real target cpu... " >&6; }
-@@ -10094,6 +10094,7 @@ fi
+@@ -11095,6 +11095,7 @@ fi
  	stack_protector=no
       ;; #(
    *) :
 +	stack_protector=no
       ;;
  esac
-     if test -z "${stack_protector+set}"; then :
+     if test -z "${stack_protector+set}"
-@@ -11794,18 +11795,6 @@ fi
+@@ -12893,18 +12894,6 @@ then :
       CPPFLAGS="$CPPFLAGS ${rb_opt}" ;;
  esac
  	done
 -		    # _XOPEN_SOURCE should not be defined for C++ on Solaris.
 -		    # RUBY_APPEND_OPTIONS(CXXFLAGS)
 -	for rb_opt in -U_XOPEN_SOURCE; do
 -	case " ${CXXFLAGS-} " in #(
 -  *" ${rb_opt} "*) :
 -     ;; #(
 -  '  ') :
 -     CXXFLAGS="${rb_opt}" ;; #(
 -  *) :
 -     CXXFLAGS="$CXXFLAGS ${rb_opt}" ;;
 -esac
 -	done
  fi
-@@ -11970,6 +11959,10 @@ esac
+@@ -13060,6 +13049,10 @@ esac
  			ac_cv_func___builtin_setjmp=no
  		 ;; #(
 +  interix*) :
 +	LIBS="-lm $LIBS"
 +	ac_cv_func_getpgrp_void=yes
 +		 ;; #(
    *) :
       ;;
  esac
-@@ -23324,6 +23317,8 @@ else
+@@ -24715,7 +24708,9 @@ else
- # ifdef _MSC_VER
+ #include <stdlib.h>
- #  include <malloc.h>
+ #include <stddef.h>
- #  define alloca _alloca
+ #ifndef alloca
-+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+-# ifdef __GNUC__
 +# if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
 +#   include <stdlib.h>
- # else
++# elif defined __GNUC__
- #  ifdef HAVE_ALLOCA_H
+ #  define alloca __builtin_alloca
- #   include <alloca.h>
+ # elif defined _MSC_VER
-@@ -28622,7 +28617,9 @@ fi
+ #  include <malloc.h>
@@ -29662,7 +29657,9 @@ fi
    interix*) :
      	: ${LDSHARED='$(CC) -shared'}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
 +			DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
  			LIBPATHFLAG=" -L%1\$-s"
 +			RPATHFLAG=' -Wl,-R%1$-s'
  			rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
-@@ -29890,7 +29887,7 @@ fi
+@@ -29833,7 +29830,7 @@ fi
        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $flag is accepted for bundle" >&5
  printf %s "checking whether $flag is accepted for bundle... " >&6; }
        : > conftest.c
 -      if ${LDSHARED/'$(CC)'/$CC} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err &&
 +      if $(echo ${LDSHARED} | sed -e "s/'$(CC)'/$CC/g") -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err &&
            test ! -s conftest.err
  then :
@@ -30991,7 +30988,7 @@ fi
  	 ;; #(
    freebsd*|dragonfly*) :
 -	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
 +	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)$(TEENY)'
  	LIBRUBY_SONAME='$(LIBRUBY_SO)'
- 	if test "$rb_cv_binary_elf" != "yes" ; then :
+ 	if test "$rb_cv_binary_elf" != "yes"
  then :
-@@ -29969,9 +29966,10 @@ esac
+@@ -31072,9 +31069,10 @@ esac
  	 ;; #(
    darwin*) :
 +	RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)'
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)'
 -	LIBRUBY_SONAME='$(LIBRUBY_SO)'
 -	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)'
 +	LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)'
 +	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)'
- 	if test "$load_relative" = yes; then :
+ 	if test "$load_relative" = yes
  then :
- 	    libprefix="@executable_path/../${libdir_basename}"
+@@ -31097,7 +31095,12 @@ fi
@@ -29992,7 +29990,12 @@ fi
  	 ;; #(
    interix*) :
 -	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
 +	SOLIBS='$(LIBS)'
 +	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
 +	# link explicitly to 0x48000000
 +	LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
 +	LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)'
 +	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
  	 ;; #(
    mingw*|cygwin*|mswin*) :
-@@ -30174,7 +30177,7 @@ if test "$enable_rpath" = yes; then :
+@@ -31290,7 +31293,7 @@ then :
  esac
      rpathflag=`IFS="$PATH_SEPARATOR"
          echo x "$rpathflag" |
 -        sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g"
 +        sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g"
+     `
      LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -32906,19 +32909,7 @@ which seems to be undefined.  Please mak
+@@ -34101,21 +34104,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
+     {
--	if test ${VCS+set}; then :
+-	if test ${VCS+set}
 -then :
+-
 -	    :
+-
--elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then :
+-elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`
 -then :
+-
 -	    VCS='$(GIT)'
+-
--else
+-else $as_nop
+-
  	    VCS='echo cannot'
+-
 -fi
  	case "$VCS" in #(
    '$(GIT)'|git) :
      VCSUP='$(VCS) pull --rebase $(GITPULLOPTIONS)' ;; #(

 @@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.71 2022/09/10 13:19:28 taca Exp $
+# $NetBSD: Makefile,v 1.71.2.1 2022/11/30 17:25:42 bsiegert Exp $
 DISTNAME=	# empty
 PKGNAME=	ruby-${RUBY_VERSION}
 PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	https://www.ruby-lang.org/en/
 COMMENT=	Wrapper package for Ruby programming language
 CONFLICTS=	pkg_alternatives-[0-9]*
 NO_CONFIGURE=	yes
 NO_BUILD=	yes

 @@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2022/07/18 12:47:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2022/11/30 17:25:42 bsiegert Exp $
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
 PKGREVISION=	2
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	${RUBY_HOMEPAGE}
 COMMENT=	Ruby ${RUBY_VERSION} release minimum base package
 CONFLICTS+=	${RUBY_PKGPREFIX}-fiddle-[0-9]*
 RUBY_VERSIONS_ACCEPTED=	30
 MAKE_JOBS_SAFE=		no
 USE_GCC_RUNTIME=	yes