Received: by mail.netbsd.org (Postfix, from userid 605) id ADEA684DA2; Sun, 14 Feb 2021 14:30:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E4E8284D9B for ; Sun, 14 Feb 2021 14:30:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 2ayxaJiOJ85e for ; Sun, 14 Feb 2021 14:30:08 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2143184CED for ; Sun, 14 Feb 2021 14:30:08 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1A2D8FA95; Sun, 14 Feb 2021 14:30:08 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1613313008106460" MIME-Version: 1.0 Date: Sun, 14 Feb 2021 14:30:08 +0000 From: "Takahiro Kambe" Subject: CVS commit: pkgsrc/lang/ruby To: pkgsrc-changes@NetBSD.org Reply-To: taca@netbsd.org X-Mailer: log_accum Message-Id: <20210214143008.1A2D8FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1613313008106460 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: taca Date: Sun Feb 14 14:30:08 UTC 2021 Modified Files: pkgsrc/lang/ruby: rubyversion.mk Log Message: lang/ruby: add support for Ruby 3.0 To generate a diff of this commit: cvs rdiff -u -r1.223 -r1.224 pkgsrc/lang/ruby/rubyversion.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1613313008106460 Content-Disposition: inline Content-Length: 5120 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ruby/rubyversion.mk diff -u pkgsrc/lang/ruby/rubyversion.mk:1.223 pkgsrc/lang/ruby/rubyversion.mk:1.224 --- pkgsrc/lang/ruby/rubyversion.mk:1.223 Sun Oct 4 04:28:35 2020 +++ pkgsrc/lang/ruby/rubyversion.mk Sun Feb 14 14:30:07 2021 @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.223 2020/10/04 04:28:35 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.224 2021/02/14 14:30:07 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -10,7 +10,7 @@ # RUBY_VERSION_DEFAULT # The preferered Ruby version to use. # -# Possible values: 25 26 27 +# Possible values: 25 26 27 30 # Default: 26 # # RUBY_BUILD_DOCUMENT @@ -34,13 +34,13 @@ # RUBY_VERSIONS_ACCEPTED # The Ruby versions that are acceptable for the package. # -# Possible values: 25 26 27 -# Default: 25 26 27 +# Possible values: 25 26 27 30 +# Default: 25 26 27 30 # # RUBY_VERSIONS_INCOMPATIBLE # The Ruby versions that are incompatible for the package. # -# Possible values: 25 26 27 +# Possible values: 25 26 27 30 # Default: empty # # RUBY_NOVERSION @@ -68,7 +68,7 @@ # RUBY_VER # Really selected version of ruby. # -# Possible values: 25 26 27 +# Possible values: 25 26 27 30 # # Use this variable in pkgsrc's Makefile # @@ -106,7 +106,7 @@ # RUBY_SUFFIX # Extra string for each ruby commands; ruby, irb and so on. # -# Possible values: 25 26 27 +# Possible values: 25 26 27 30 # # RUBY_VERSION # Version of Ruby's version. @@ -216,19 +216,22 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/rub RUBY25_VERSION= 2.5.8 RUBY26_VERSION= 2.6.6 RUBY27_VERSION= 2.7.2 +RUBY30_VERSION= 3.0.0 # current API compatible version; used for version of shared library RUBY25_API_VERSION= 2.5.0 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= 25 26 27 +RUBY_VERSIONS_SUPPORTED= 25 26 27 30 -RUBY_VERSIONS_ACCEPTED?= 25 26 27 +RUBY_VERSIONS_ACCEPTED?= 25 26 27 30 RUBY_VERSIONS_INCOMPATIBLE?= .if empty(RUBY_VERSIONS_SUPPORTED:M${RUBY_VERSION_DEFAULT}) @@ -282,6 +285,7 @@ RUBY_TEST_UNIT_VERSION= 3.2.7 RUBY_XML_RPC_VERSION= 0.3.0 RUBY_BIGDECIMAL_VERSION= 1.3.4 +RUBY_FIDDLE_VERSION= 1.0.0 RUBY_JSON_VERSION= 2.1.0 RUBY_IO_CONSOLE_VERSION= 0.4.6 RUBY_OPENSSL_VERSION= 2.1.2 @@ -313,6 +317,7 @@ RUBY_DBM_VERSION= 1.0.0 RUBY_E2MMAP_VERSION= 0.1.0 RUBY_ETC_VERSION= 1.0.1 RUBY_FCNTL_VERSION= 1.0.0 +RUBY_FIDDLE_VERSION= 1.0.0 RUBY_FILEUTILS_VERSION= 1.1.0 RUBY_FORWARDABLE_VERSION= 1.2.0 RUBY_IO_CONSOLE_VERSION= 0.4.7 @@ -394,6 +399,59 @@ 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 +RUBY_RAKE_VERSION= 13.0.3 +RUBY_RBS_VERSION= 1.0.0 +RUBY_REXML_VERSION= 3.2.4 +RUBY_RSS_VERSION= 0.2.9 +RUBY_TEST_UNIT_VERSION= 3.3.7 +RUBY_TYPEPROF_VERSION= 0.11.0 + +# bundled extensions +RUBY_BIGDECIMAL_VERSION= 3.0.0 +RUBY_DATE_VERSION= 3.1.0 +RUBY_DBM_VERSION= 1.1.0 +RUBY_DIGEST_VERSION= 3.0.0 +RUBY_ETC_VERSION= 1.2.0 +RUBY_FCNTL_VERSION= 1.0.0 +RUBY_FIDDLE_VERSION= 1.0.4 +RUBY_IO_CONSOLE_VERSION= 0.5.6 +RUBY_JSON_VERSION= 2.5.1 +RUBY_OPENSSL_VERSION= 2.2.0 +RUBY_PSYCH_VERSION= 3.3.0 +RUBY_RACC_VERSION= 1.5.1 +RUBY_STRINGIO_VERSION= 3.0.0 +RUBY_STRSCAN_VERSION= 3.0.0 +RUBY_ZLIB_VERSION= 1.1.0 + +# bundled libraries +RUBY_BUNDLER_VERSION= 2.2.3 +RUBY_CSV_VERSION= 3.1.9 +RUBY_DID_YOU_MEAN_VERSION= 1.5.0 +RUBY_FILEUTILS_VERSION= 1.5.0 +RUBY_FORWARDABLE_VERSION= 1.3.2 +RUBY_GETOPTLONG_VERSION= 0.1.1 +RUBY_IPADDR_VERSION= 1.2.2 +RUBY_ERB_VERSION= 2.2.0 +RUBY_IRB_VERSION= 1.3.0 +RUBY_LOGGER_VERSION= 1.4.3 +RUBY_MATRIX_VERSION= 0.3.1 +RUBY_MUTEX_M_VERSION= 0.1.1 +RUBY_OSTRUCT_VERSION= 0.3.1 +RUBY_PRIME_VERSION= 0.1.2 +RUBY_TRACER_VERSION= 0.1.1 +RUBY_WEBRICK_VERSION= 1.6.0 + +RUBY_SUFFIX= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR} + .else PKG_FAIL_REASON+= "Unknown Ruby version specified: ${RUBY_VER}." .endif @@ -599,15 +657,19 @@ PLIST_SUBST+= \ ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} \ RUBY_MAJOR_MINOR=${RUBY_MAJOR_MINOR} RUBY_NAME=${RUBY_NAME} \ RUBY_RAKE_VERSION=${RUBY_RAKE_VERSION} \ + RUBY_RBS_VERSION=${RUBY_RBS_VERSION} \ RUBY_RDOC_VERSION=${RUBY_RDOC_VERSION} \ + RUBY_TYPEPROF_VERSION=${RUBY_TYPEPROF_VERSION} \ RUBY_BIGDECIMAL_VERSION=${RUBY_BIGDECIMAL_VERSION} \ RUBY_BUNDLER_VERSION=${RUBY_BUNDLER_VERSION} \ RUBY_CMATH_VERSION=${RUBY_CMATH_VERSION} \ RUBY_CSV_VERSION=${RUBY_CSV_VERSION} \ RUBY_DATE_VERSION=${RUBY_DATE_VERSION} \ RUBY_DBM_VERSION=${RUBY_DBM_VERSION} \ + RUBY_DIGEST_VERSION=${RUBY_DIGEST_VERSION} \ RUBY_E2MMAP_VERSION=${RUBY_E2MMAP_VERSION} \ RUBY_ETC_VERSION=${RUBY_ETC_VERSION} \ + RUBY_ERB_VERSION=${RUBY_ERB_VERSION} \ RUBY_FCNTL_VERSION=${RUBY_FCNTL_VERSION} \ RUBY_FILEUTILS_VERSION=${RUBY_FILEUTILS_VERSION} \ RUBY_FORWARDABLE_VERSION=${RUBY_FORWARDABLE_VERSION} \ --_----------=_1613313008106460--