pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/lang



Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Feb 20 15:59:09 UTC 2022

Modified Files:
        pkgsrc/lang/ruby: rubyversion.mk
        pkgsrc/lang/ruby31-base: Makefile PLIST distinfo
        pkgsrc/lang/ruby31-base/patches: patch-lib_rubygems_platform.rb

Log Message:
lang/ruby31-base: update to 3.1.1

>From release announce:

Ruby 3.1.1 Released
Posted by naruse on 18 Feb 2022

Ruby 3.1.1 has been released.

This is the first TEENY version release of the stable 3.1 series.

See the commit logs <https://github.com/ruby/ruby/compare/v3_1_0...v3_1_1> for details.


To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 pkgsrc/lang/ruby/rubyversion.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ruby31-base/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ruby31-base/PLIST \
    pkgsrc/lang/ruby31-base/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/ruby31-base/patches/patch-lib_rubygems_platform.rb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby/rubyversion.mk
diff -u pkgsrc/lang/ruby/rubyversion.mk:1.242 pkgsrc/lang/ruby/rubyversion.mk:1.243
--- pkgsrc/lang/ruby/rubyversion.mk:1.242       Sun Jan 16 13:56:43 2022
+++ pkgsrc/lang/ruby/rubyversion.mk     Sun Feb 20 15:59:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.242 2022/01/16 13:56:43 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.243 2022/02/20 15:59:09 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -216,7 +216,7 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/rub
 RUBY26_VERSION=                2.6.9
 RUBY27_VERSION=                2.7.5
 RUBY30_VERSION=                3.0.3
-RUBY31_VERSION=                3.1.0
+RUBY31_VERSION=                3.1.1
 
 # current API compatible version; used for version of shared library
 RUBY26_API_VERSION=    2.6.0
@@ -486,7 +486,7 @@ RUBY_ABBREV_VER=            0.1.0
 RUBY_BASE64_VER=               0.1.1
 RUBY_BENCHMARK_VER=            0.2.0
 RUBY_BIGDECIMAL_VER=           3.1.1
-RUBY_BUNDLER_VER=              2.3.3
+RUBY_BUNDLER_VER=              2.3.7
 RUBY_CGI_VER=                  0.3.1
 RUBY_CSV_VER=                  3.2.2
 RUBY_DATE_VER=                 3.2.2
@@ -505,10 +505,10 @@ RUBY_FILEUTILS_VER=               1.6.0
 RUBY_FIND_VER=                 0.1.1
 RUBY_FORWARDABLE_VER=          1.3.2
 RUBY_GETOPTLONG_VER=           0.1.1
-RUBY_IO_CONSOLE_VER=           0.5.10
+RUBY_IO_CONSOLE_VER=           0.5.11
 RUBY_IO_NONBLOCK_VER=          0.1.0
 RUBY_IO_WAIT_VER=              0.2.1
-RUBY_IPADDR_VER=               1.2.3
+RUBY_IPADDR_VER=               1.2.4
 RUBY_IRB_VER=                  1.4.1
 RUBY_JSON_VER=                 2.6.1
 RUBY_LOGGER_VER=               1.5.0
@@ -517,7 +517,7 @@ RUBY_MINITEST_VER=          5.15.0
 RUBY_MUTEX_M_VER=              0.1.1
 RUBY_NET_FTP_VER=              0.1.3
 RUBY_NET_HTTP_VER=             0.2.0
-RUBY_NET_IMAP_VER=             0.2.2
+RUBY_NET_IMAP_VER=             0.2.3
 RUBY_NET_POP_VER=              0.1.1
 RUBY_NET_PROTOCOL_VER=         0.1.2
 RUBY_NET_SMTP_VER=             0.3.1
@@ -537,7 +537,7 @@ RUBY_PSTORE_VER=            0.1.1
 RUBY_PSYCH_VER=                        4.0.3
 RUBY_RACC_VER=                 1.6.0
 RUBY_RAKE_VER=                 13.0.6
-RUBY_RBS_VER=                  2.0.0
+RUBY_RBS_VER=                  2.1.0
 RUBY_RDOC_VER=                 6.4.0
 RUBY_READLINE_VER=             0.0.3
 RUBY_RELINE_VER=               0.3.0
@@ -561,7 +561,7 @@ RUBY_TIMEOUT_VER=           0.2.0
 RUBY_TMPDIR_VER=               0.1.2
 RUBY_TRACER_VER=               0.1.1
 RUBY_TSORT_VER=                        0.1.0
-RUBY_TYPEPROF_VER=             0.21.1
+RUBY_TYPEPROF_VER=             0.21.2
 RUBY_UN_VER=                   0.2.0
 RUBY_URI_VER=                  0.11.0
 RUBY_WEAKREF_VER=              0.1.1

Index: pkgsrc/lang/ruby31-base/Makefile
diff -u pkgsrc/lang/ruby31-base/Makefile:1.2 pkgsrc/lang/ruby31-base/Makefile:1.3
--- pkgsrc/lang/ruby31-base/Makefile:1.2        Tue Jan 18 08:26:38 2022
+++ pkgsrc/lang/ruby31-base/Makefile    Sun Feb 20 15:59:09 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2022/01/18 08:26:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/02/20 15:59:09 taca Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 

Index: pkgsrc/lang/ruby31-base/PLIST
diff -u pkgsrc/lang/ruby31-base/PLIST:1.1 pkgsrc/lang/ruby31-base/PLIST:1.2
--- pkgsrc/lang/ruby31-base/PLIST:1.1   Sun Jan 16 13:57:10 2022
+++ pkgsrc/lang/ruby31-base/PLIST       Sun Feb 20 15:59:09 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2022/01/16 13:57:10 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/02/20 15:59:09 taca Exp $
 bin/bundle${RUBY_SUFFIX}
 bin/bundler${RUBY_SUFFIX}
 bin/erb${RUBY_SUFFIX}
@@ -356,7 +356,6 @@ ${RUBY_LIB}/bundler/plugin/installer/git
 ${RUBY_LIB}/bundler/plugin/installer/rubygems.rb
 ${RUBY_LIB}/bundler/plugin/source_list.rb
 ${RUBY_LIB}/bundler/process_lock.rb
-${RUBY_LIB}/bundler/psyched_yaml.rb
 ${RUBY_LIB}/bundler/remote_specification.rb
 ${RUBY_LIB}/bundler/resolver.rb
 ${RUBY_LIB}/bundler/resolver/spec_group.rb
@@ -1416,8 +1415,6 @@ ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMA
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/LICENSE.txt
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/README.md
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/Rakefile
-${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/bin/console
-${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/bin/setup
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap.rb
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/authenticators.rb
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/authenticators/cram_md5.rb
@@ -1426,6 +1423,7 @@ ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMA
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/authenticators/plain.rb
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/command_data.rb
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/data_encoding.rb
+${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/errors.rb
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/flags.rb
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/response_data.rb
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/response_parser.rb
@@ -1554,6 +1552,7 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/cor
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/hash.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/integer.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/io.rbs
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/io/buffer.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/io/wait.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/kernel.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/marshal.rbs
@@ -1572,6 +1571,7 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/cor
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/range.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rational.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/rb_config.rbs
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/refinement.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/regexp.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/ruby_vm.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/core/signal.rbs
@@ -1616,6 +1616,11 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/goodcheck.yml
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs.rb
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/ancestor_graph.rb
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/annotate.rb
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/annotate/annotations.rb
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/annotate/formatter.rb
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/annotate/rdoc_annotator.rb
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/annotate/rdoc_source.rb
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/ast/annotation.rb
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/ast/comment.rb
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/ast/declarations.rb
@@ -1645,7 +1650,6 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/environment_walker.rb
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/errors.rb
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/factory.rb
-${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/location.rb
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/location_aux.rb
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/locator.rb
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/method_type.rb
@@ -1692,6 +1696,10 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sch
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/schema/types.json
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/ancestor_builder.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/ancestor_graph.rbs
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/annotate/annotations.rbs
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/annotate/formatter.rbs
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/annotate/rdoc_annotater.rbs
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/annotate/rdoc_source.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/annotation.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/buffer.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/builtin_names.rbs
@@ -1699,9 +1707,9 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/cli.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/collection.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/collection/cleaner.rbs
-${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/collection/collections.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/collection/config.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/collection/installer.rbs
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/collection/sources.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/comment.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/constant.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/constant_table.rbs
@@ -1736,6 +1744,7 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/version.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/sig/writer.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/abbrev/0/abbrev.rbs
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/abbrev/0/array.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/base64/0/base64.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/benchmark/0/benchmark.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/bigdecimal-math/0/big_math.rbs
@@ -1767,6 +1776,7 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/std
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/mutex_m/0/mutex_m.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/net-http/0/manifest.yaml
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/net-http/0/net-http.rbs
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/nkf/0/nkf.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/objspace/0/objspace.rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/openssl/0/manifest.yaml
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/stdlib/openssl/0/openssl.rbs
Index: pkgsrc/lang/ruby31-base/distinfo
diff -u pkgsrc/lang/ruby31-base/distinfo:1.1 pkgsrc/lang/ruby31-base/distinfo:1.2
--- pkgsrc/lang/ruby31-base/distinfo:1.1        Sun Jan 16 13:57:10 2022
+++ pkgsrc/lang/ruby31-base/distinfo    Sun Feb 20 15:59:09 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2022/01/16 13:57:10 taca Exp $
+$NetBSD: distinfo,v 1.2 2022/02/20 15:59:09 taca Exp $
 
-BLAKE2s (ruby-3.1.0.tar.xz) = 3f7e1efe8ad9964d3141ec31c7ea0cd1a6d91791ca925c852c34afc260126b41
-SHA512 (ruby-3.1.0.tar.xz) = a2bb6b5e62d5fa06dd9c30cf84ddcb2c27cb87fbaaffd2309a44391a6b110e1dde6b7b0d8c659b56387ee3c9b4264003f3532d5a374123a7c187ebba9293f320
-Size (ruby-3.1.0.tar.xz) = 14709096 bytes
+BLAKE2s (ruby-3.1.1.tar.xz) = c2785175bbc542c3049a9ccbb8e394ab1548e92ecaa366479bca13eb937b7c5d
+SHA512 (ruby-3.1.1.tar.xz) = 8877fa9a458964a59a11529cd10b3d25b5f6238cd4678b6dcea0bd4b750499cf8ff39d8824053b4ab26c5cd0cfb604a57807ce61580175857fcf00b2cff3e55f
+Size (ruby-3.1.1.tar.xz) = 15103808 bytes
 SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d
 SHA1 (patch-configure) = c8a09d995d9d09c1142f22cf59f04fa61b528a2a
 SHA1 (patch-ext_openssl_openssl__missing.h) = 3f8d79736fd14806dfaf76e333eec63ff3ff5890
@@ -14,7 +14,7 @@ SHA1 (patch-lib_rubygems_commands_setup_
 SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3
 SHA1 (patch-lib_rubygems_installer.rb) = 03fcd57d4e7ea03cf2ffc3d219fd489e30361014
-SHA1 (patch-lib_rubygems_platform.rb) = dc4c1073ffe331c06c477ee4b281db7aeb76fa92
+SHA1 (patch-lib_rubygems_platform.rb) = 7ef0d86c2d84b942db726d293a319d7ea54e56c8
 SHA1 (patch-test_rubygems_test__gem.rb) = e624da5b9c49f9409160a7b0fdd2efad17986cab
 SHA1 (patch-thread__pthread.c) = 7c1231933a2d6ce9d56891ab512371841697fbca
 SHA1 (patch-tool_ifchange) = 1814cd41f0b0a93b181799cb117bd1f57068cf33

Index: pkgsrc/lang/ruby31-base/patches/patch-lib_rubygems_platform.rb
diff -u pkgsrc/lang/ruby31-base/patches/patch-lib_rubygems_platform.rb:1.1 pkgsrc/lang/ruby31-base/patches/patch-lib_rubygems_platform.rb:1.2
--- pkgsrc/lang/ruby31-base/patches/patch-lib_rubygems_platform.rb:1.1  Sun Jan 16 13:57:10 2022
+++ pkgsrc/lang/ruby31-base/patches/patch-lib_rubygems_platform.rb      Sun Feb 20 15:59:09 2022
@@ -1,29 +1,29 @@
-$NetBSD: patch-lib_rubygems_platform.rb,v 1.1 2022/01/16 13:57:10 taca Exp $
+$NetBSD: patch-lib_rubygems_platform.rb,v 1.2 2022/02/20 15:59:09 taca Exp $
 
 * Don't replace "i486" to "x86".
 * Allow simple "netbsd" as Gem::Platform.
 
---- lib/rubygems/platform.rb.orig      2020-12-08 09:02:31.000000000 +0000
+--- lib/rubygems/platform.rb.orig      2022-02-18 09:42:25.000000000 +0000
 +++ lib/rubygems/platform.rb
-@@ -71,12 +71,7 @@ class Gem::Platform
+@@ -75,12 +75,7 @@ class Gem::Platform
          arch.last << "-#{extra}"
        end
  
 -      cpu = arch.shift
 -
 -      @cpu = case cpu
--             when /i\d86/ then 'x86'
--             else cpu
--             end
+-      when /i\d86/ then 'x86'
+-      else cpu
+-      end
 +      @cpu = arch.shift
  
        if arch.length == 2 and arch.last =~ /^\d+(\.\d+)?$/ # for command-line
          @os, @version = arch
-@@ -105,6 +100,7 @@ class Gem::Platform
-                         @cpu = 'x86' if @cpu.nil? and os =~ /32$/
-                         [os, version]
-                       when /netbsdelf/ then             [ 'netbsdelf', nil ]
-+                      when /netbsd/ then                [ 'netbsd',    nil ]
-                       when /openbsd(\d+\.\d+)?/ then    [ 'openbsd',   $1  ]
-                       when /bitrig(\d+\.\d+)?/ then     [ 'bitrig',    $1  ]
-                       when /solaris(\d+\.\d+)?/ then    [ 'solaris',   $1  ]
+@@ -110,6 +105,7 @@ class Gem::Platform
+         @cpu = 'x86' if @cpu.nil? and os =~ /32$/
+         [os, version]
+       when /netbsdelf/ then             [ 'netbsdelf', nil ]
++      when /netbsd/ then                [ 'netbsd',    nil ]
+       when /openbsd(\d+\.\d+)?/ then    [ 'openbsd',   $1  ]
+       when /bitrig(\d+\.\d+)?/ then     [ 'bitrig',    $1  ]
+       when /solaris(\d+\.\d+)?/ then    [ 'solaris',   $1  ]



Home | Main Index | Thread Index | Old Index