From nobody Sun Apr 20 03:21:40 2025 X-Original-To: dev-commits-ports-all@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 4ZgDLY0Q2Sz5tspm; Sun, 20 Apr 2025 03:21:41 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZgDLX4Vvbz3DNM; Sun, 20 Apr 2025 03:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745119300; 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=/ORuePTxTWVAlGmnCa3EFIevujSnKoz5Gim+bxm6+2k=; b=RgomX5gXIYil7lL0EL/88n07d/vRJgOg5Fw5GoM0v5B9/Jo/cPBteFONrJVw9BgCa/O+6o fMy8uI282ca5Gx57TpsR0ODgtsrUS2TwQOWOGEEC7GjuBqjU4hI7vSu92NoQO1WI7C06uH KlLhozlGE0Hwpqanm/UMaW3NmnHFvfR6lHaGOr3o6mKvYAXtRvOOlNE9Jhf5FLao8EmESJ XM3BHatX4TYpaPceiNBWSEx0MIx3gqgIb6hZt24h3rdWjsKihmQGt5ZfOwJLqQH4r3oGSF kXQXTvG1hoLdFbZCYY37aDvWyhMFs+AeChXzE0HIs5AQQBolkiocczSo5xSKkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745119300; a=rsa-sha256; cv=none; b=mxLklvORj6/cGwYUPiYNQWujDzxWB/l5Dwjo6TH270DVWfTqPv+HuYfNDlejpF2wEzV9mX WTlNMd3qnNeg2XxD3RERCzOO70KMApuwkdQ4TVlWdA7CLWERVhAeXBjDYZt2coejWE7IGh abLIfB+uafkdRl0PGObAV1PgxliF8rI+jYuSQTMtPww4FD5aDF2LHd/IWnTsAo3RO0OFUL tDzPywId8/0kNxR2UK/ZVfDD1USUHgudeXt8fJGgJeoaJWGvNcqNeSu0h5BFS/RMo/LcOq I1Y0IiHYKFwclJ7BwPDaO5oh2bn7QO0mH7cJHWQF5DSobq51ZCFUlPeP/CuCkA== 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=1745119300; 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=/ORuePTxTWVAlGmnCa3EFIevujSnKoz5Gim+bxm6+2k=; b=pUAx9nqzxXgQROKLMH2DzPAkUgWypAlqbcmhZnhjfqcsCd1ZK1lcnLsddOZqbZYsvqFIuJ fqsd6UX55j32liNUW4hIVELhpIVD+DANrNwiztP5m8EWGUDa39T8+acXxrdv8A8GjenhU0 xRD0f/O986OSMXeTu8zH1p2sndrvq7eRJw1Bag6J4p2PpnPE9S0b94EH6y4vC3xnjofpjf A2b/9xi9clnrVKZQKOgEi1ztcFA2Ozuo5BglRktTo6oChX8FzCrXyy/uP+XYbqRO27Nkz5 nsx2oSvgIHI48UcPx3Zuwh4CcBQTiYunkoObjONm8jUSARX7IVQkFThmXJOK3w== 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 4ZgDLX3Gf4zn1S; Sun, 20 Apr 2025 03:21:40 +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 53K3LemU023932; Sun, 20 Apr 2025 03:21:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53K3Lenx023929; Sun, 20 Apr 2025 03:21:40 GMT (envelope-from git) Date: Sun, 20 Apr 2025 03:21:40 GMT Message-Id: <202504200321.53K3Lenx023929@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 91f3ff141cae - main - www/tdiary: Fix runtime error with Ruby 3.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91f3ff141cae22200a7263c39f641303f7d545ec Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=91f3ff141cae22200a7263c39f641303f7d545ec commit 91f3ff141cae22200a7263c39f641303f7d545ec Author: Yasuhiro Kimura AuthorDate: 2024-12-29 22:17:35 +0000 Commit: Yasuhiro Kimura CommitDate: 2025-04-20 03:20:39 +0000 www/tdiary: Fix runtime error with Ruby 3.4 Our lang/ruby34 port doesn't include base64 gem. So * Add converters/rubygem-base64 to RUN_DEPENDS. * Add "gem 'base64'" to Gemfile. While here, add 'ruby' to USES as tDiary is written in Ruby. --- www/tdiary/Makefile | 7 ++++--- www/tdiary/files/patch-Gemfile | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile index 6671dc9827b4..727ff2002b39 100644 --- a/www/tdiary/Makefile +++ b/www/tdiary/Makefile @@ -1,6 +1,6 @@ PORTNAME= tdiary DISTVERSION= 5.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= www ruby MASTER_SITES= https://github.com/tdiary/tdiary-core/releases/download/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-full-v${PORTVERSION} @@ -12,7 +12,8 @@ WWW= https://www.tdiary.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-bundler>=2.0.2:sysutils/rubygem-bundler \ +RUN_DEPENDS= rubygem-base64>0:converters/rubygem-base64 \ + rubygem-bundler>=2.0.2:sysutils/rubygem-bundler \ rubygem-emot>=0.0.4:textproc/rubygem-emot \ rubygem-fastimage>=2.2.6:graphics/rubygem-fastimage \ rubygem-hikidoc>=0.1.0:textproc/rubygem-hikidoc \ @@ -22,7 +23,7 @@ RUN_DEPENDS= rubygem-bundler>=2.0.2:sysutils/rubygem-bundler \ rubygem-rackup21>=0.2.3:www/rubygem-rackup21 \ rubygem-rake>=13.0.6:devel/rubygem-rake -USES= cpe shebangfix +USES= cpe ruby shebangfix SHEBANG_FILES= bin/tdiary index.fcgi index.rb misc/convert2.rb misc/migrate.rb \ misc/plugin/xmlrpc/xmlrpc.rb update.fcgi update.rb diff --git a/www/tdiary/files/patch-Gemfile b/www/tdiary/files/patch-Gemfile index 684f71f010b1..a360a76e13fb 100644 --- a/www/tdiary/files/patch-Gemfile +++ b/www/tdiary/files/patch-Gemfile @@ -1,6 +1,6 @@ --- Gemfile.orig 2024-02-29 06:16:41 UTC +++ Gemfile -@@ -7,34 +7,3 @@ gem 'rake' +@@ -7,34 +7,4 @@ gem 'rake' gem 'emot' gem 'mail' gem 'rake' @@ -35,3 +35,4 @@ - puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v` - instance_eval File.read(local_gemfile) -end ++gem 'base64'