From nobody Wed Jul 10 05:02:29 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WJm1x5jjhz5Q8Ks; Wed, 10 Jul 2024 05:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WJm1x3nCjz4W0q; Wed, 10 Jul 2024 05:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720587749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y8bezOKy1vc5w1BshBl2FpiZIwY/hencMTTvqafLdZQ=; b=oyCfwZlfMtKa3vnu6A0x4tLFTic6aYElJ8yABYNfAuDbBTZyEEV5AXWtuIVLnMOvirV5PH vjCcalr6WMBtRSh86IZThhuURup2vpW3ATcOK5gJFaM2sV1T6ecgzrcFBxfCMgMQrU2g7B WJu2RLpmaL2F38W5KneGaZV2Y1+/hwNyLb9ffWGFgr35asO/uBh93FQYMyqfhJRN539ZqO p8RW4/6QmyuiGM3z7vhHCwDMa1Gzh1HhAIhHACYWMphUVC8aOkS3VY1UBY4l3Ht37aVxQM 3ggYLB0JB2O9DNloAjPlnteJp6SZMae3pTQV4A83tKG5dUBW+mHKIfvU2N8fzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720587749; a=rsa-sha256; cv=none; b=dmMX+Ut5VBO/wv+zStfTGQh5f78MBU6JrO2AeEN1h3y8GEXS9eFeYKtskiNwJwfJhIpd4u QT1Q2CSfN59Z+nIkc4p/EZhKKvRCMNCjBapuXlTbzolvhc5xKZ/IepUtTZlz5mEpCsmUdT xtpRd42UzWcVAuF7cKKiWgiodPrknCUIxk7dP5gaGNZqcPvcwetXXmZFgjhXvMxjpJC4T7 fPT3qFYUTok5FGVphJDoThHwdfh0M9rAK/KvKFPYYkiaO+ByZjTAPDDI4hjF5AB05WTb/F kbUoz6YIKhFq7jD9MPq8Uscl9bhFXjVodMnGnbPKYKfXCCkf1PiDNrZAjVDvyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720587749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y8bezOKy1vc5w1BshBl2FpiZIwY/hencMTTvqafLdZQ=; b=GTvZoIbMC+MOgAXWn/dd9Kdilg0Q93/FpB9shHoPG5ULK2fm1waIb7GHHPQIBnvkEwEVgQ 7SeRue35B6U1MVhDnmpfkcUBDdPBo8cjr4uW0ijzyhCpcqvTW7dTWg6LokbDfxAtPpeglH Z5BXXGCBk/aXUICDAm+8g6dFtZGWrJsxb5mFUr/NMPfmap5Ry6jOfXoqV7RVzKzaaqXyjU 6gAR9dgVoZm8FGbIKUqLEIDTM//RJrDea4x69Pd9H51fIozl6fwAtwdMc3F/fRMgM018vT FeUYL6cJv4CiQh6+CSy+/OoGrDlKxv0Y0MzUP1kTwTDrR6IV7dX2KindTr0L9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WJm1x2vF2z14P3; Wed, 10 Jul 2024 05:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46A52Tr7043857; Wed, 10 Jul 2024 05:02:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46A52T6X043854; Wed, 10 Jul 2024 05:02:29 GMT (envelope-from git) Date: Wed, 10 Jul 2024 05:02:29 GMT Message-Id: <202407100502.46A52T6X043854@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 2047cad56393 - main - lang/ruby33: Update to 3.3.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2047cad563933a282463f713e47d58ccc09fb645 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=2047cad563933a282463f713e47d58ccc09fb645 commit 2047cad563933a282463f713e47d58ccc09fb645 Author: Po-Chuan Hsieh AuthorDate: 2024-07-10 04:58:57 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-07-10 04:59:40 +0000 lang/ruby33: Update to 3.3.4 Changes: https://github.com/ruby/ruby/releases https://github.com/ruby/ruby/blob/master/NEWS.md https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ --- Mk/Uses/ruby.mk | 2 +- lang/ruby33/Makefile | 3 +-- lang/ruby33/distinfo | 6 +++--- lang/ruby33/files/patch-tool_rbinstall.rb | 24 +++++++++++++++--------- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk index 032f8ff2fbda..f4e3ce92d388 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -162,7 +162,7 @@ RUBY_PORTREVISION= 0 # # Ruby 3.3 # -RUBY_DISTVERSION= 3.3.3 +RUBY_DISTVERSION= 3.3.4 RUBY_PORTREVISION= 0 # When adding a version, please keep the comment in diff --git a/lang/ruby33/Makefile b/lang/ruby33/Makefile index c861bdf7f083..0fd86ed469b7 100644 --- a/lang/ruby33/Makefile +++ b/lang/ruby33/Makefile @@ -1,6 +1,5 @@ PORTNAME= ruby -DISTVERSION= ${RUBY_DISTVERSION} -PORTREVISION= ${RUBY_PORTREVISION} +PORTVERSION= ${RUBY_DISTVERSION} PORTEPOCH= ${RUBY_PORTEPOCH} CATEGORIES= lang ruby MASTER_SITES= RUBY/${MASTER_SITE_SUBDIR_RUBY} diff --git a/lang/ruby33/distinfo b/lang/ruby33/distinfo index 1c9241239dfc..035beec17d76 100644 --- a/lang/ruby33/distinfo +++ b/lang/ruby33/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1718163101 -SHA256 (ruby/ruby-3.3.3.tar.xz) = 83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e -SIZE (ruby/ruby-3.3.3.tar.xz) = 16361160 +TIMESTAMP = 1720536562 +SHA256 (ruby/ruby-3.3.4.tar.xz) = 1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad +SIZE (ruby/ruby-3.3.4.tar.xz) = 16366580 diff --git a/lang/ruby33/files/patch-tool_rbinstall.rb b/lang/ruby33/files/patch-tool_rbinstall.rb index bc9ed5129c9a..2c414079bb59 100644 --- a/lang/ruby33/files/patch-tool_rbinstall.rb +++ b/lang/ruby33/files/patch-tool_rbinstall.rb @@ -1,6 +1,6 @@ ---- tool/rbinstall.rb.orig 2024-05-30 00:23:11 UTC +--- tool/rbinstall.rb.orig 2024-07-08 23:28:22 UTC +++ tool/rbinstall.rb -@@ -970,169 +970,6 @@ end +@@ -970,175 +970,6 @@ end # :startdoc: @@ -121,16 +121,22 @@ - File.foreach("#{srcdir}/gems/bundled_gems") do |name| - next if /^\s*(?:#|$)/ =~ name - next unless /^(\S+)\s+(\S+).*/ =~ name +- gem = $1 - gem_name = "#$1-#$2" -- # Try to find the gemspec file for C ext gems -- # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec -- # This gemspec keep the original dependencies -- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec" +- # Try to find the original gemspec file +- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem}.gemspec" - unless File.exist?(path) -- path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec" +- # Try to find the gemspec file for C ext gems +- # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec +- # This gemspec keep the original dependencies +- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec" - unless File.exist?(path) -- skipped[gem_name] = "gemspec not found" -- next +- # Try to find the gemspec file for gems that hasn't own gemspec +- path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec" +- unless File.exist?(path) +- skipped[gem_name] = "gemspec not found" +- next +- end - end - end - spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}")