git: 91f3ff141cae - main - www/tdiary: Fix runtime error with Ruby 3.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 20 Apr 2025 03:21:40 UTC
The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=91f3ff141cae22200a7263c39f641303f7d545ec commit 91f3ff141cae22200a7263c39f641303f7d545ec Author: Yasuhiro Kimura <yasu@FreeBSD.org> AuthorDate: 2024-12-29 22:17:35 +0000 Commit: Yasuhiro Kimura <yasu@FreeBSD.org> 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'