git: ebdc74e21479 - main - www/tdiary: Update to 5.4.0

From: Yasuhiro Kimura <yasu_at_FreeBSD.org>
Date: Mon, 08 Sep 2025 07:34:27 UTC
The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ebdc74e2147932c6d436e4d9e417deb9a14cf885

commit ebdc74e2147932c6d436e4d9e417deb9a14cf885
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2025-09-08 06:55:51 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2025-09-08 07:32:14 +0000

    www/tdiary: Update to 5.4.0
    
    ChangeLog:      https://github.com/tdiary/tdiary-core/releases/tag/v5.4.0
---
 www/tdiary/Makefile            | 18 +++++++++---------
 www/tdiary/distinfo            |  6 +++---
 www/tdiary/files/patch-Gemfile | 19 ++++++-------------
 www/tdiary/pkg-plist           |  3 ++-
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index 727ff2002b39..d9cfc64731f8 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	tdiary
-DISTVERSION=	5.3.0
-PORTREVISION=	2
+DISTVERSION=	5.4.0
 CATEGORIES?=	www ruby
 MASTER_SITES=	https://github.com/tdiary/tdiary-core/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-full-v${PORTVERSION}
@@ -12,16 +11,17 @@ WWW=		https://www.tdiary.org/
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-base64>0:converters/rubygem-base64 \
+RUN_DEPENDS=	rubygem-base64>=0.3.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-fastimage>=2.4.0:graphics/rubygem-fastimage \
 		rubygem-hikidoc>=0.1.0:textproc/rubygem-hikidoc \
-		rubygem-mail>=2.7.1:mail/rubygem-mail \
-		rubygem-net-smtp>=0.3.1:mail/rubygem-net-smtp \
-		rubygem-rack>=3.0.1,3:www/rubygem-rack \
-		rubygem-rackup21>=0.2.3:www/rubygem-rackup21 \
-		rubygem-rake>=13.0.6:devel/rubygem-rake
+		rubygem-mail>=2.8.1:mail/rubygem-mail \
+		rubygem-net-smtp>=0.5.1:mail/rubygem-net-smtp \
+		rubygem-rack-session>=2.1.1:www/rubygem-rack-session \
+		rubygem-rack>=3.1.16,3:www/rubygem-rack \
+		rubygem-rackup>=2.2.1:www/rubygem-rackup \
+		rubygem-rake>=13.3.0:devel/rubygem-rake
 
 USES=		cpe ruby shebangfix
 
diff --git a/www/tdiary/distinfo b/www/tdiary/distinfo
index d17ecdc0a40c..4153ab9d0518 100644
--- a/www/tdiary/distinfo
+++ b/www/tdiary/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709192402
-SHA256 (tdiary-full-v5.3.0.tar.gz) = a487ac5ed24c83a126d17eeca5a2b511155045f4bac491fa72f70629f56b4518
-SIZE (tdiary-full-v5.3.0.tar.gz) = 9423063
+TIMESTAMP = 1757313889
+SHA256 (tdiary-full-v5.4.0.tar.gz) = 995bf82611c8b2402a079179e602ca150ce595ca550ec9ea765914d89315b611
+SIZE (tdiary-full-v5.4.0.tar.gz) = 9136172
diff --git a/www/tdiary/files/patch-Gemfile b/www/tdiary/files/patch-Gemfile
index a360a76e13fb..c284435d649b 100644
--- a/www/tdiary/files/patch-Gemfile
+++ b/www/tdiary/files/patch-Gemfile
@@ -1,10 +1,9 @@
---- Gemfile.orig	2024-02-29 06:16:41 UTC
+--- Gemfile.orig	2025-06-13 08:42:45 UTC
 +++ Gemfile
-@@ -7,34 +7,4 @@ gem 'rake'
- gem 'emot'
+@@ -9,28 +9,6 @@ gem 'rake'
  gem 'mail'
  gem 'rake'
--
+ 
 -group :development do
 -  gem 'pit', require: false
 -  gem 'racksh', require: false
@@ -21,18 +20,12 @@
 -    gem 'launchy'
 -    gem 'sequel'
 -    gem 'sqlite3'
--    gem 'jasmine', '< 3'
 -    gem 'simplecov', require: false
--    gem 'coveralls', '~> 0.8', require: false
 -    gem "rexml"
 -    gem "webrick"
 -  end
 -end
 -
--# https://github.com/redmine/redmine/blob/master/Gemfile#L89
--local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
--if File.exist?(local_gemfile)
--  puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
--  instance_eval File.read(local_gemfile)
--end
-+gem 'base64'
+ # https://github.com/redmine/redmine/blob/master/Gemfile#L89
+ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+ if File.exist?(local_gemfile)
diff --git a/www/tdiary/pkg-plist b/www/tdiary/pkg-plist
index efebf46116e5..b45eccf94752 100644
--- a/www/tdiary/pkg-plist
+++ b/www/tdiary/pkg-plist
@@ -27,6 +27,7 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/js/preview.js
 %%WWWDIR%%/lib/aws/pa_api.rb
 %%WWWDIR%%/lib/aws/sig_v4.rb
+%%WWWDIR%%/lib/rack/server.rb
 %%WWWDIR%%/lib/tdiary.rb
 %%WWWDIR%%/lib/tdiary/admin.rb
 %%WWWDIR%%/lib/tdiary/application.rb
@@ -95,7 +96,6 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/lib/tdiary/tasks/db.rake
 %%WWWDIR%%/lib/tdiary/tasks/doc.rake
 %%WWWDIR%%/lib/tdiary/tasks/heroku.rake
-%%WWWDIR%%/lib/tdiary/tasks/jasmine.rake
 %%WWWDIR%%/lib/tdiary/tasks/mongodb.rake
 %%WWWDIR%%/lib/tdiary/tasks/rdoc.rake
 %%WWWDIR%%/lib/tdiary/tasks/release.rake
@@ -246,6 +246,7 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/misc/plugin/xmlrpc/README
 %%WWWDIR%%/misc/plugin/xmlrpc/xmlrpc.rb
 %%WWWDIR%%/misc/templates/Gemfile.local.erb
+%%WWWDIR%%/package-lock.json
 %%WWWDIR%%/package.json
 %%WWWDIR%%/tdiary.conf.beginner
 %%WWWDIR%%/tdiary.conf.sample