 @@ -1,14 +1,14 @@
-# $NetBSD: rubyversion.mk,v 1.228 2021/04/11 12:28:37 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.229 2021/04/11 12:32:03 taca Exp $
+#
 # This file determines which Ruby version is used as a dependency for
 # a package.
+#
+#
 # === User-settable variables ===
+#
 # RUBY_VERSION_DEFAULT
 #	The preferered Ruby version to use.
+#
 #		Possible values: 26 27 30
 #		Default: 26
 @@ -204,27 +204,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.7
-RUBY27_VERSION=		2.7.2
+RUBY27_VERSION=		2.7.3
 RUBY30_VERSION=		3.0.0
 # 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
+#
 RUBY_VERSION_DEFAULT?=	26
 # supported Ruby's version
 RUBY_VERSIONS_SUPPORTED=	26 27 30
 @@ -352,33 +352,33 @@ RUBY_CSV_VERSION=		3.1.2
 RUBY_FILEUTILS_VERSION=		1.4.1
 RUBY_FORWARDABLE_VERSION=	1.3.1
 RUBY_GETOPTLONG_VERSION=	0.1.0
 RUBY_IO_CONSOLE_VERSION=	0.5.6
 RUBY_JSON_VERSION=		2.3.0
 RUBY_LOGGER_VERSION=		1.4.2
 RUBY_MATRIX_VERSION=		0.2.0
 RUBY_MUTEX_M_VERSION=		0.1.0
 RUBY_OPENSSL_VERSION=		2.1.2
 RUBY_OSTRUCT_VERSION=		0.2.0
 RUBY_PRIME_VERSION=		0.1.1
 RUBY_PSYCH_VERSION=		3.1.0
-RUBY_REXML_VERSION=		3.2.3
+RUBY_REXML_VERSION=		3.2.3.1
 RUBY_RSS_VERSION=		0.2.8
 RUBY_SDBM_VERSION=		1.0.0
 RUBY_STRINGIO_VERSION=		0.1.0
 RUBY_STRSCAN_VERSION=		1.0.3
 RUBY_TRACER_VERSION=		0.1.0
-RUBY_WEBRICK_VERSION=		1.6.0
+RUBY_WEBRICK_VERSION=		1.6.1
 RUBY_ZLIB_VERSION=		1.1.0
 RUBY_SUFFIX=	${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}
 .elif ${RUBY_VER} == "30"
 RUBY_VERSION=		${RUBY30_VERSION}
 RUBY_ABI_VERSION=	${RUBY_VERSION}
 RUBY_RDOC_VERSION=	6.3.0
 # bundled gems
 RUBY_MINITEST_VERSION=		5.14.2
 RUBY_POWER_ASSERT_VERSION=	1.2.0

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2020/10/04 03:29:25 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/04/11 12:32:03 taca Exp $
 bin/bundle${RUBY_SUFFIX}
 bin/bundler${RUBY_SUFFIX}
 bin/erb${RUBY_SUFFIX}
 bin/gem${RUBY_SUFFIX}
 bin/irb${RUBY_SUFFIX}
 bin/racc${RUBY_SUFFIX}
 bin/racc2y${RUBY_SUFFIX}
 bin/rake${RUBY_SUFFIX}
 bin/rdoc${RUBY_SUFFIX}
 bin/ri${RUBY_SUFFIX}
 bin/${RUBY_NAME}
 bin/y2racc${RUBY_SUFFIX}
 ${PLIST.win32}bin/rubyw${RUBY_SUFFIX}
 @@ -338,26 +338,34 @@ ${RUBY_LIB}/drb.rb
 ${RUBY_LIB}/drb/acl.rb
 ${RUBY_LIB}/drb/drb.rb
 ${RUBY_LIB}/drb/eq.rb
 ${RUBY_LIB}/drb/extserv.rb
 ${RUBY_LIB}/drb/extservm.rb
 ${RUBY_LIB}/drb/gw.rb
 ${RUBY_LIB}/drb/invokemethod.rb
 ${RUBY_LIB}/drb/observer.rb
 ${RUBY_LIB}/drb/ssl.rb
 ${RUBY_LIB}/drb/timeridconv.rb
 ${RUBY_LIB}/drb/unix.rb
 ${RUBY_LIB}/drb/weakidconv.rb
 ${RUBY_LIB}/erb.rb
 ${RUBY_LIB}/exe/bundle
 ${RUBY_LIB}/exe/bundler
 ${RUBY_LIB}/exe/irb
 ${RUBY_LIB}/exe/racc
 ${RUBY_LIB}/exe/racc2y
 ${RUBY_LIB}/exe/rdoc
 ${RUBY_LIB}/exe/ri
 ${RUBY_LIB}/exe/y2racc
 ${RUBY_LIB}/expect.rb
 ${RUBY_LIB}/fileutils.rb
 ${RUBY_LIB}/find.rb
 ${RUBY_LIB}/forwardable.rb
 ${RUBY_LIB}/forwardable/impl.rb
 ${RUBY_LIB}/forwardable/version.rb
 ${RUBY_LIB}/getoptlong.rb
 ${RUBY_LIB}/getoptlong/version.rb
 ${PLIST.io}${RUBY_LIB}/io/console/size.rb
 ${RUBY_LIB}/ipaddr.rb
 ${RUBY_LIB}/irb.rb
 ${RUBY_LIB}/irb/cmd/chws.rb
 ${RUBY_LIB}/irb/cmd/fork.rb
 @@ -992,26 +1000,28 @@ ${RUBY_LIB}/rubygems/source/installed.rb
 ${RUBY_LIB}/rubygems/source/local.rb
 ${RUBY_LIB}/rubygems/source/lock.rb
 ${RUBY_LIB}/rubygems/source/specific_file.rb
 ${RUBY_LIB}/rubygems/source/vendor.rb
 ${RUBY_LIB}/rubygems/source_list.rb
 ${RUBY_LIB}/rubygems/source_local.rb
 ${RUBY_LIB}/rubygems/source_specific_file.rb
 ${RUBY_LIB}/rubygems/spec_fetcher.rb
 ${RUBY_LIB}/rubygems/specification.rb
 ${RUBY_LIB}/rubygems/specification_policy.rb
 ${RUBY_LIB}/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem
 ${RUBY_LIB}/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem
 ${RUBY_LIB}/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem
 ${RUBY_LIB}/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem
 ${RUBY_LIB}/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
 ${RUBY_LIB}/rubygems/stub_specification.rb
 ${RUBY_LIB}/rubygems/syck_hack.rb
 ${RUBY_LIB}/rubygems/test_case.rb
 ${RUBY_LIB}/rubygems/test_utilities.rb
 ${RUBY_LIB}/rubygems/text.rb
 ${RUBY_LIB}/rubygems/uninstaller.rb
 ${RUBY_LIB}/rubygems/uri_formatter.rb
 ${RUBY_LIB}/rubygems/uri_parser.rb
 ${RUBY_LIB}/rubygems/uri_parsing.rb
 ${RUBY_LIB}/rubygems/user_interaction.rb
 ${RUBY_LIB}/rubygems/util.rb
 ${RUBY_LIB}/rubygems/util/licenses.rb
 ${RUBY_LIB}/rubygems/util/list.rb

 @@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.3 2020/10/04 03:29:25 taca Exp $
+$NetBSD: distinfo,v 1.4 2021/04/11 12:32:03 taca Exp $
-SHA1 (ruby-2.7.2.tar.xz) = 82a1fe683460caa8edb6199707f2905634e5ffcc
+SHA1 (ruby-2.7.3.tar.xz) = ce3d5203d5ab734df01e602c05f68f25249dc3e0
-RMD160 (ruby-2.7.2.tar.xz) = fa7fc107e0c2085bf997d7e4ec78ae5636c6bfe2
+RMD160 (ruby-2.7.3.tar.xz) = f02628d9137618e6d0833b450cd8e78a06579c31
-SHA512 (ruby-2.7.2.tar.xz) = 7972278b096aa768c7adf2befd26003e18781a29ca317640317d30d93d6e963ded197724c8e2f1dfe1e838c5647176d414a74732a62e931fb50d6f2e0f777349
+SHA512 (ruby-2.7.3.tar.xz) = b755d418b3bab2f9f6a8893afd13869269f17065643dde78b9e85ae3538a6d0617893db6e9c3908e00a40c7577a5c912a7c822d8f245cdcfb857be76dfb66c1e
-Size (ruby-2.7.2.tar.xz) = 12037052 bytes
+Size (ruby-2.7.3.tar.xz) = 12073568 bytes
-SHA1 (patch-configure) = fd465910fe2cb6d6b1530e1071062591e84a9fd9
+SHA1 (patch-configure) = 5ee800f6824b18efd06e56a659235ea784819f2e
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 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) = b38f58a852e920bed77a4be281d3703d26515ad0
+SHA1 (patch-lib_rubygems.rb) = 6f5ff6ca504c38ec3a521027dc4df8fa9d6683c3
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 181bb7554d760182588b0e1b0aafb84c317f41ad
 SHA1 (patch-lib_rubygems_defaults.rb) = 79cc5bb308d5ad4ee88f4fbcbb6f40663c05c05d
 SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3
 SHA1 (patch-lib_rubygems_installer.rb) = bce2fe5bcc88ba15352c1e3017bdf97e19d0cbfa
 SHA1 (patch-lib_rubygems_platform.rb) = 8608f9e29728101789a990d73b4a6780054dd278
 SHA1 (patch-test_rubygems_test__gem.rb) = e624da5b9c49f9409160a7b0fdd2efad17986cab
 SHA1 (patch-thread__pthread.c) = ce3dfbc7e953cdd04522bcc8e443b60e541845ce

 @@ -1,131 +1,116 @@
-$NetBSD: patch-configure,v 1.1 2020/03/15 15:26:22 taca Exp $
+$NetBSD: patch-configure,v 1.2 2021/04/11 12:32:03 taca Exp $
 * Adding Interix support.
 * Ignore doxygen.
 * Ignore VCS.
 * Handle SSP in pkgsrc.
 * Put -std= in CFLAGS not CPPFLAGS.
 * Fix argument for pthread_self() on NetBSD.
---- configure.orig	2019-12-17 15:08:45.000000000 +0000
+--- configure.orig	2021-04-05 12:39:40.000000000 +0000
 +++ configure
 @@ -6469,7 +6469,7 @@ else
      if test x"$target_alias" = x; then :
  	case "$target_os" in #(
 -  darwin*) :
 +  nodarwin*) :
  	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
  $as_echo_n "checking for real target cpu... " >&6; }
-@@ -8831,6 +8831,7 @@ fi
+@@ -8839,6 +8839,7 @@ fi
  	stack_protector=no
       ;; #(
    *) :
 +	stack_protector=no
       ;;
  esac
      if test -z "${stack_protector+set}"; then :
-@@ -10695,6 +10696,10 @@ esac
+@@ -10703,6 +10704,10 @@ esac
  			ac_cv_func___builtin_setjmp=no
  		 ;; #(
 +  interix*) :
 +	LIBS="-lm $LIBS"
 +	ac_cv_func_getpgrp_void=yes
 +		 ;; #(
    *) :
       ;;
  esac
-@@ -22269,6 +22274,8 @@ else
+@@ -22277,6 +22282,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
 +# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
 +#   include <stdlib.h>
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -26817,11 +26824,11 @@ if ${rb_cv_func_pthread_setname_np_argum
+@@ -27482,7 +27489,9 @@ fi
  else
    rb_cv_func_pthread_setname_np_arguments=
  	    # Linux,AIX,  (pthread_self(), name)
 -	    # NetBSD (pthread_self(), name, \"%s\")
 +	    # NetBSD (pthread_self(), \"%s\", name)
  	    # Darwin (name)
  	    for mac in \
  		"(pthread_self(), name)" \
 -		"(pthread_self(), name, \"%s\")" \
 +		"(pthread_self(), \"%s\", name)" \
  		"(name)" \
  		; do
  		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27415,7 +27422,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*) :
-@@ -28676,7 +28685,7 @@ fi
+@@ -28743,7 +28752,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 :
-@@ -28755,9 +28764,10 @@ esac
+@@ -28822,9 +28831,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 :
  	    libprefix="@executable_path/../${libdir_basename}"
-@@ -28778,7 +28788,12 @@ fi
+@@ -28845,7 +28855,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*) :
-@@ -28960,7 +28975,7 @@ if test "$enable_rpath" = yes; then :
+@@ -29027,7 +29042,7 @@ if test "$enable_rpath" = yes; 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"
-@@ -31684,19 +31699,7 @@ which seems to be undefined.  Please mak
+@@ -31751,19 +31766,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
+-

 @@ -1,44 +1,44 @@
-$NetBSD: patch-lib_rubygems.rb,v 1.1 2020/03/15 15:26:22 taca Exp $
+$NetBSD: patch-lib_rubygems.rb,v 1.2 2021/04/11 12:32:03 taca Exp $
 * Add install_root option for pkgsrc's rubygems support.
---- lib/rubygems.rb.orig	2018-12-23 00:20:49.000000000 +0000
+--- lib/rubygems.rb.orig	2021-04-05 12:39:38.000000000 +0000
 +++ lib/rubygems.rb
-@@ -317,10 +317,16 @@ module Gem
+@@ -311,10 +311,16 @@ module Gem
    ##
    # The path where gem executables are to be installed.
 -  def self.bindir(install_dir=Gem.dir)
 -    return File.join install_dir, 'bin' unless
 -      install_dir.to_s == Gem.default_dir.to_s
 -    Gem.default_bindir
 +  def self.bindir(install_dir=Gem.dir, install_root=nil)
 +    if install_dir.to_s == Gem.default_dir.to_s
 +      install_dir = Gem.default_bindir
 +    else
 +      install_dir = File.join install_dir, 'bin'
 +    end
 +    unless install_root.nil? or install_root.empty?
 +      install_dir = File.join install_root, install_dir
 +    end
 +    install_dir
    end
    ##
-@@ -661,7 +667,7 @@ An Array (#{env.inspect}) was passed in
+@@ -657,7 +663,7 @@ An Array (#{env.inspect}) was passed in
        return i if path.instance_variable_defined?(:@gem_prelude_index)
      end
 -    index = $LOAD_PATH.index RbConfig::CONFIG['sitelibdir']
 +    index = $LOAD_PATH.index RbConfig::CONFIG['vendordir']
-     index
+     index || 0
    end
-@@ -835,6 +841,7 @@ An Array (#{env.inspect}) was passed in
+@@ -849,6 +855,7 @@ An Array (#{env.inspect}) was passed in
      prefix = File.dirname RUBYGEMS_DIR
      if prefix != File.expand_path(RbConfig::CONFIG['sitelibdir']) and
 +       prefix != File.expand_path(RbConfig::CONFIG['vendordir']) and
         prefix != File.expand_path(RbConfig::CONFIG['libdir']) and
         'lib' == File.basename(RUBYGEMS_DIR)
        prefix