pkgsrc-Changes archive

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

CVS commit: pkgsrc/lang/ruby



Module Name:    pkgsrc
Committed By:   taca
Date:           Tue May 27 16:14:47 UTC 2025

Modified Files:
        pkgsrc/lang/ruby: rubyversion.mk

Log Message:
lang/ruby: Remove Ruby 3.1 support


To generate a diff of this commit:
cvs rdiff -u -r1.297 -r1.298 pkgsrc/lang/ruby/rubyversion.mk

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.297 pkgsrc/lang/ruby/rubyversion.mk:1.298
--- pkgsrc/lang/ruby/rubyversion.mk:1.297       Mon May 19 14:39:07 2025
+++ pkgsrc/lang/ruby/rubyversion.mk     Tue May 27 16:14:47 2025
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.297 2025/05/19 14:39:07 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.298 2025/05/27 16:14:47 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -10,7 +10,7 @@
 # RUBY_VERSION_DEFAULT
 #      The preferred Ruby version to use.
 #
-#              Possible values: 31 32 33 34
+#              Possible values: 32 33 34
 #              Default: 32
 #
 # RUBY_BUILD_DOCUMENT
@@ -34,13 +34,13 @@
 # RUBY_VERSIONS_ACCEPTED
 #      The Ruby versions that are acceptable for the package.
 #
-#              Possible values: 31 32 33 34
-#              Default: 32 31 33 34
+#              Possible values: 32 33 34
+#              Default: 32 33 34
 #
 # RUBY_VERSIONS_INCOMPATIBLE
 #      The Ruby versions that are incompatible for the package.
 #
-#              Possible values: 31 32 33 34
+#              Possible values: 32 33 34
 #              Default: empty
 #
 # RUBY_NOVERSION
@@ -68,7 +68,7 @@
 # RUBY_VER
 #      Really selected version of ruby.
 #
-#              Possible values: 31 32 33 34
+#              Possible values: 32 33 34
 #
 #      Use this variable in pkgsrc's Makefile
 #
@@ -77,7 +77,7 @@
 #      use RUBY_PKGPREFIX with Ruby-related packages since you can supply
 #      different binary packages for each version of Ruby.
 #
-#              Possible values: ruby31 ruby32 ruby33 ruby34
+#              Possible values: ruby32 ruby33 ruby34
 #
 # RUBY_ABI_VERSION
 #      Ruby's ABI version.
@@ -106,7 +106,7 @@
 # RUBY_SUFFIX
 #      Extra string for each ruby commands; ruby, irb and so on.
 #
-#              Possible values: 31 32 33 34
+#              Possible values: 32 33 34
 #
 # RUBY_VERSION
 #      Version of Ruby's version.
@@ -213,13 +213,11 @@ RUBY_VERSION_REQD?=       ${PKGNAME_REQD:C/rub
 .endif
 
 # current supported Ruby's version
-RUBY31_VERSION=                3.1.7
 RUBY32_VERSION=                3.2.8
 RUBY33_VERSION=                3.3.8
 RUBY34_VERSION=                3.4.4
 
 # current API compatible version; used for version of shared library
-RUBY31_API_VERSION=    3.1.0
 RUBY32_API_VERSION=    3.2.0
 RUBY33_API_VERSION=    3.3.0
 RUBY34_API_VERSION=    3.4.0
@@ -228,9 +226,9 @@ RUBY34_API_VERSION= 3.4.0
 RUBY_VERSION_DEFAULT?= 32
 
 # supported Ruby's version
-RUBY_VERSIONS_SUPPORTED=       31 32 33 34
+RUBY_VERSIONS_SUPPORTED=       32 33 34
 
-RUBY_VERSIONS_ACCEPTED?=       32 31 33 34
+RUBY_VERSIONS_ACCEPTED?=       32 33 34
 RUBY_VERSIONS_INCOMPATIBLE?=
 
 .if empty(RUBY_VERSIONS_SUPPORTED:M${RUBY_VERSION_DEFAULT})
@@ -269,102 +267,7 @@ RUBY_VER:=        ${RUBY_VER_MAP.${RUBY_VER}:U$
 
 RUBY_SUFFIX?=  ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}${_RUBY_VER_TEENY}
 
-.if ${RUBY_VER} == 31
-RUBY_VERSION=          ${RUBY31_VERSION}
-RUBY_ABI_VERSION=      ${RUBY_VERSION}
-RUBY_SUFFIX=           ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}
-
-# default gems
-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.27
-RUBY_CGI_VER=                  0.3.7
-RUBY_CSV_VER=                  3.2.5
-RUBY_DATE_VER=                 3.2.2
-RUBY_DELEGATE_VER=             0.2.0
-RUBY_DID_YOU_MEAN_VER=         1.6.1
-RUBY_DIGEST_VER=               3.1.0
-RUBY_DRB_VER=                  2.1.0
-RUBY_ENGLISH_VER=              0.7.1
-RUBY_ERB_VER=                  2.2.3
-RUBY_ERROR_HIGHLIGHT_VER=      0.3.0
-RUBY_ETC_VER=                  1.3.0
-RUBY_FCNTL_VER=                        1.0.1
-RUBY_FIDDLE_VER=               1.1.0
-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.11
-RUBY_IO_NONBLOCK_VER=          0.1.0
-RUBY_IO_WAIT_VER=              0.2.1
-RUBY_IPADDR_VER=               1.2.4
-RUBY_IRB_VER=                  1.4.1
-RUBY_JSON_VER=                 2.6.1
-RUBY_LOGGER_VER=               1.5.0
-RUBY_MUTEX_M_VER=              0.1.1
-RUBY_NET_HTTP_VER=             0.3.0.1
-RUBY_NET_PROTOCOL_VER=         0.1.2
-RUBY_NKF_VER=                  0.1.1
-RUBY_OBSERVER_VER=             0.1.1
-RUBY_OPEN3_VER=                        0.1.1
-RUBY_OPENSSL_VER=              3.0.1
-RUBY_OPEN_URI_VER=             0.2.0
-RUBY_OPTPARSE_VER=             0.2.0
-RUBY_OSTRUCT_VER=              0.5.2
-RUBY_PATHNAME_VER=             0.2.0
-RUBY_PP_VER=                   0.3.0
-RUBY_PRETTYPRINT_VER=          0.1.1
-RUBY_PSTORE_VER=               0.1.1
-RUBY_PSYCH_VER=                        4.0.4
-RUBY_RACC_VER=                 1.6.0
-RUBY_RDOC_VER=                 6.4.1.1
-RUBY_READLINE_VER=             0.0.3
-RUBY_READLINE_EXT_VER=         0.1.4
-RUBY_RELINE_VER=               0.3.1
-RUBY_RESOLV_VER=               0.2.1
-RUBY_RESOLV_REPLACE_VER=       0.1.0
-RUBY_RINDA_VER=                        0.1.1
-RUBY_RUBY2_KEYWORDS_VER=       0.0.5
-RUBY_RUBYGEMS_VER=             3.3.26
-RUBY_SECURERANDOM_VER=         0.2.0
-RUBY_SET_VER=                  1.0.2
-RUBY_SHELLWORDS_VER=           0.1.0
-RUBY_SINGLETON_VER=            0.1.1
-RUBY_STRINGIO_VER=             3.0.1.2
-RUBY_STRSCAN_VER=              3.0.1
-RUBY_SYSLOG_VER=               0.1.0
-RUBY_TEMPFILE_VER=             0.1.2
-RUBY_TIME_VER=                 0.2.2
-RUBY_TIMEOUT_VER=              0.2.0
-RUBY_TMPDIR_VER=               0.1.2
-RUBY_TSORT_VER=                        0.1.0
-RUBY_UN_VER=                   0.2.0
-RUBY_URI_VER=                  0.12.4
-RUBY_WEAKREF_VER=              0.1.1
-RUBY_YAML_VER=                 0.2.0
-RUBY_ZLIB_VER=                 2.1.1
-
-# bundled gems
-RUBY_DEBUG_VER=                        1.6.3
-RUBY_MATRIX_VER=               0.4.2
-RUBY_MINITEST_VER=             5.15.0
-RUBY_NET_FTP_VER=              0.1.4
-RUBY_NET_IMAP_VER=             0.2.4
-RUBY_NET_POP_VER=              0.1.1
-RUBY_NET_SMTP_VER=             0.3.1.1
-RUBY_POWER_ASSERT_VER=         2.0.1
-RUBY_PRIME_VER=                        0.1.2
-RUBY_RAKE_VER=                 13.0.6
-RUBY_RBS_VER=                  2.7.0
-RUBY_REXML_VER=                        3.3.9
-RUBY_RSS_VER=                  0.3.1
-RUBY_TEST_UNIT_VER=            3.5.3
-RUBY_TYPEPROF_VER=             0.21.3
-
-.elif ${RUBY_VER} == 32
+.if ${RUBY_VER} == 32
 RUBY_VERSION=          ${RUBY32_VERSION}
 RUBY_ABI_VERSION=      ${RUBY_VERSION}
 RUBY_SUFFIX=           ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}
@@ -671,7 +574,7 @@ MULTI+=     RUBY_VER=${RUBY_VERS:U${RUBY_VER
 #      any specific version of ruby command.  In this case, package's
 #      name begin with "ruby-".
 #      If RUBY_NOVERSION is "No" (default), the package's name begins
-#      with ${RUBY_NAME}; "ruby31", "ruby32" and so on.
+#      with ${RUBY_NAME}; "ruby32", "ruby33" and so on.
 #
 #      It also affects to RUBY_DOC, RUBY_EG...
 #
@@ -711,8 +614,8 @@ RUBY?=                      ${PREFIX}/bin/${RUBY_NAME}
 RAKE?=                 ${PREFIX}/bin/${RAKE_NAME}
 RDOC?=                 ${PREFIX}/bin/rdoc${RUBY_SUFFIX}
 
-# ruby31 helpfully changed the config triple...
-.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) && ${RUBY_VER} >= 31
+# ruby31 and later helpfully changed the config triple...
+.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
 RUBY_ARCH?=    arm64-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI}
 RUBY_EXTARCH?= arm64-${LOWER_OPSYS}${APPEND_ELF}-${LOWER_OPSYS_VERSUFFIX}
 .endif



Home | Main Index | Thread Index | Old Index