 @@ -1,23 +1,23 @@
-$NetBSD: distinfo,v 1.8 2022/11/26 13:02:49 taca Exp $
+$NetBSD: distinfo,v 1.9 2022/12/05 11:47:02 jperkin Exp $
 BLAKE2s (ruby-3.1.3.tar.xz) = ed377b463a7602520d5f2dda4f172f3846b1d817eb9a4bbfd27c8449d983997c
 SHA512 (ruby-3.1.3.tar.xz) = 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69
 Size (ruby-3.1.3.tar.xz) = 15300224 bytes
 SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d
-SHA1 (patch-configure) = 90e976f6a8af9f4962587ba0cb404ff38e704fbd
+SHA1 (patch-configure) = 7bce8e1de07e3ff81cc984faef9ba12518557b7a
 SHA1 (patch-ext_openssl_openssl__missing.h) = 3f8d79736fd14806dfaf76e333eec63ff3ff5890
 SHA1 (patch-include_ruby_internal_static__assert.h) = 7d5c3ae7ff674b9b34639924fcf08237164de9f8
 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) = 060549c43b84f73c77432a72cdcf22941be4eb17
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 66c475a5308deb2ed5096b88cf65549732f87421
 SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 0cd0816e1cd7c84c1dab1e091787c4dc38d28273
 SHA1 (patch-lib_rubygems_installer.rb) = 1c94047a24362b3597dac7ea156982a09cb93234
 SHA1 (patch-lib_rubygems_platform.rb) = ea9d0972fb788799d7d8c07b223ac75cbab23158
 SHA1 (patch-template_Makefile.in) = a4b94293de165e87021b79a0a7f683ba76e168d9
 SHA1 (patch-test_rubygems_test__gem.rb) = 32f7c7d7f8a024c045d78c2bce93944fc3113d04
 SHA1 (patch-thread__pthread.c) = 7c1231933a2d6ce9d56891ab512371841697fbca
 SHA1 (patch-tool_ifchange) = 1814cd41f0b0a93b181799cb117bd1f57068cf33
 SHA1 (patch-tool_runruby.rb) = 5dd8a3bea5e9776f7521f85955dddd2127e4c4d0

 @@ -1,171 +1,184 @@
-$NetBSD: patch-configure,v 1.3 2022/11/26 13:02:49 taca Exp $
+$NetBSD: patch-configure,v 1.4 2022/12/05 11:47:03 jperkin Exp $
 * Avoid bash specific variable substitution.
 * Adding Interix support.
 * Ignore doxygen.
 * Ignore VCS.
 * Handle SSP in pkgsrc.
 * Retain _XOPEN_SOURCE, fixes eventmachine.
 * Fix argument for pthread_self() on NetBSD.
 * Explictly stop display with color.
 --- configure.orig	2022-11-24 10:20:33.000000000 +0000
 +++ configure
 @@ -3942,12 +3942,12 @@ case "$target_cpu-$target_os" in #(
          target_cpu=arm64
          case "$target_vendor" in #(
    unknown) :
 -    target_vendor=apple target=${target/-unknown-/-apple-} ;; #(
 +    target_vendor=apple target=$(echo ${target} | sed -e 's/-unknown-/-apple-/g') ;; #(
    *) :
       ;;
  esac
 -        target="${target/aarch64/arm64}"
 -        target_alias="${target_alias/aarch64/arm64}"
 +        target="$(echo ${target} | sed -e 's/aarch64/arm64/g')"
 +        target_alias="$(echo ${target_alias} | sed -e 's/aarch64/arm64/g')"
       ;; #(
    *) :
       ;;
 @@ -9361,7 +9361,7 @@ else $as_nop
  then :
  	case "$target_os" in #(
 -  darwin*) :
 +  nodarwin*) :
  	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
  printf %s "checking for real target cpu... " >&6; }
 @@ -11355,6 +11355,7 @@ fi
  	stack_protector=no
       ;; #(
    *) :
 +	stack_protector=no
       ;;
  esac
      if test -z "${stack_protector+set}"
 @@ -13198,18 +13199,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
 @@ -13437,6 +13426,10 @@ esac
  			ac_cv_func___builtin_setjmp=no
  		 ;; #(
 +  interix*) :
 +	LIBS="-lm $LIBS"
 +	ac_cv_func_getpgrp_void=yes
 +		 ;; #(
    *) :
       ;;
  esac
 @@ -25518,7 +25511,9 @@ else
  #include <stdlib.h>
  #include <stddef.h>
  #ifndef alloca
 -# ifdef __GNUC__
 +# if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
 +#   include <stdlib.h>
 +# elif defined __GNUC__
  #  define alloca __builtin_alloca
  # elif defined _MSC_VER
  #  include <malloc.h>
 @@ -30542,6 +30537,8 @@ fi
    interix*) :
      	: ${LDSHARED='$(CC) -shared'}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
 +			DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
 +			RPATHFLAG=' -Wl,-R%1$-s'
  			rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
 @@ -30713,7 +30710,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 :
 @@ -31748,8 +31745,10 @@ fi
  	 ;; #(
    freebsd*|dragonfly*) :
 +	RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)'
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
 -	LIBRUBY_SONAME='$(LIBRUBY_SO)'
 +	LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)'
 +	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)'
  	if test "$rb_cv_binary_elf" != "yes"
  then :
-@@ -31872,7 +31871,12 @@ fi
+@@ -31847,9 +31846,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 :
@@ -31872,7 +31872,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'
  	 ;; #(
    cygwin*|msys*|mingw*|mswin*) :
-@@ -32065,7 +32069,7 @@ then :
+@@ -32065,7 +32070,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"
-@@ -33706,7 +33710,7 @@ guard=INCLUDE_RUBY_CONFIG_H
+@@ -33706,7 +33711,7 @@ guard=INCLUDE_RUBY_CONFIG_H
+ (
    if test "x$CONFIGURE_TTY" = xyes
  then :
 -  color=--color
 +  color=--color=never
  else $as_nop
    color=
  fi
-@@ -34930,21 +34934,7 @@ which seems to be undefined.  Please mak
+@@ -34930,21 +34935,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
+     {
 -	if test ${VCS+set}
 -then :
+-
 -	    :
+-
 -elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`
 -then :
+-
 -	    VCS='$(GIT)'
+-
 -else $as_nop
+-
  	    VCS='echo cannot'
+-
 -fi
  	case "$VCS" in #(
    '$(GIT)'|git) :
      VCSUP='$(VCS) pull --rebase $(GITPULLOPTIONS)' ;; #(