Date: Wed, 18 Feb 2026 06:16:28 +0000 From: Xin LI <delphij@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 47e451bc2b74 - main - www/redmine60: Update mini_magick to v5, set daemon title flags Message-ID: <6995593c.3abfb.3bc686fa@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=47e451bc2b74768d874e70ad92ae2df16163cd6a commit 47e451bc2b74768d874e70ad92ae2df16163cd6a Author: Xin LI <delphij@FreeBSD.org> AuthorDate: 2026-02-18 06:16:19 +0000 Commit: Xin LI <delphij@FreeBSD.org> CommitDate: 2026-02-18 06:16:19 +0000 www/redmine60: Update mini_magick to v5, set daemon title flags - Switch RMAGIC dependency from rubygem-mini_magick4 to rubygem-mini_magick >= 5.0.1 - Update files/mini_magick.rb minimum version to 5.0.1 - Refresh patch-Gemfile: replace upstream version-pinned DB adapter logic with bundler.d-based loading; update mini_magick group to ~> 5.0.1 - Add -T/-t flags to daemon invocation for proper process title tagging PR: ports/293251 --- www/redmine60/Makefile | 4 +- www/redmine60/files/commonmark.rb | 3 +- www/redmine60/files/mini_magick.rb | 2 +- www/redmine60/files/patch-Gemfile | 108 +++++++++++++++++++++++++++++-------- www/redmine60/files/redmine.in | 2 +- 5 files changed, 91 insertions(+), 28 deletions(-) diff --git a/www/redmine60/Makefile b/www/redmine60/Makefile index f6c90fb30ac6..62fa2b7bf2c8 100644 --- a/www/redmine60/Makefile +++ b/www/redmine60/Makefile @@ -1,6 +1,6 @@ PORTNAME= redmine PORTVERSION= 6.0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://www.redmine.org/releases/ PKGNAMESUFFIX= 60 @@ -86,7 +86,7 @@ PUMA_RUN_DEPENDS= rubygem-puma>=6.5.0:www/rubygem-puma \ rubygem-rb-kqueue>=0.2:devel/rubygem-rb-kqueue PUMA_SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} PUMA_VARS= USE_RC_SUBR=redmine -RMAGIC_RUN_DEPENDS= rubygem-mini_magick4>=4.11.0:graphics/rubygem-mini_magick4 +RMAGIC_RUN_DEPENDS= rubygem-mini_magick>=5.0.1:graphics/rubygem-mini_magick SQLITE_RUN_DEPENDS= rubygem-sqlite3>=1.7.0:databases/rubygem-sqlite3 .include <bsd.port.options.mk> diff --git a/www/redmine60/files/commonmark.rb b/www/redmine60/files/commonmark.rb index 45c9b6df5d0a..a42837199fc0 100644 --- a/www/redmine60/files/commonmark.rb +++ b/www/redmine60/files/commonmark.rb @@ -1,2 +1,3 @@ gem "commonmarker", ">= 0.23.8" -gem "deckar01-task_list", ">=2.3.2" +gem 'deckar01-task_list', ">= 2.3.2" + diff --git a/www/redmine60/files/mini_magick.rb b/www/redmine60/files/mini_magick.rb index 5e3d7b1cacd6..f3d604deae41 100644 --- a/www/redmine60/files/mini_magick.rb +++ b/www/redmine60/files/mini_magick.rb @@ -1 +1 @@ -gem "mini_magick", ">= 4.12.0" +gem "mini_magick", ">= 5.0.1" diff --git a/www/redmine60/files/patch-Gemfile b/www/redmine60/files/patch-Gemfile index 1235b3201d52..e230d7d9be70 100644 --- a/www/redmine60/files/patch-Gemfile +++ b/www/redmine60/files/patch-Gemfile @@ -38,7 +38,7 @@ # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] -@@ -31,23 +31,23 @@ gem 'rqrcode' +@@ -31,94 +31,14 @@ gem 'rqrcode' gem 'rqrcode' # HTML pipeline and sanitization @@ -53,33 +53,95 @@ + gem 'net-ldap', '>= 0.19' end - # Optional gem for exporting the gantt to a PNG file - group :minimagick do +-# Optional gem for exporting the gantt to a PNG file +-group :minimagick do - gem 'mini_magick', '~> 5.0.1' -+ gem 'mini_magick', '~> 4.13.0' - end - - # Optional CommonMark support, not for JRuby - group :common_mark do - gem "commonmarker", '~> 0.23.8' +-end +- +-# Optional CommonMark support, not for JRuby +-group :common_mark do +- gem "commonmarker", '~> 0.23.8' - gem 'deckar01-task_list', '2.3.2' -+ gem 'deckar01-task_list', '2.3.4' - end - - # Include database gems for the adapters found in the database -@@ -110,11 +110,10 @@ group :test do - gem "capybara", ">= 3.39" - gem 'selenium-webdriver', '>= 4.11.0' - # RuboCop +-end +- +-# Include database gems for the adapters found in the database +-# configuration file +-database_file = File.join(File.dirname(__FILE__), "config/database.yml") +-if File.exist?(database_file) +- database_config = File.read(database_file) +- +- # Requiring libraries in a Gemfile may cause Bundler warnings or +- # unexpected behavior, especially if multiple gem versions are available. +- # So, process database.yml through ERB only if it contains ERB syntax +- # in the adapter setting. See https://www.redmine.org/issues/41749. +- if database_config.match?(/^ *adapter: *<%=/) +- require 'erb' +- database_config = ERB.new(database_config).result +- end +- +- adapters = database_config.scan(/^ *adapter: *(.*)/).flatten.uniq +- if adapters.any? +- adapters.each do |adapter| +- case adapter.strip +- when /mysql2/ +- gem 'mysql2', '~> 0.5.0' +- gem "with_advisory_lock" +- when /postgresql/ +- gem 'pg', '~> 1.5.3' +- when /sqlite3/ +- gem 'sqlite3', '~> 1.7.0' +- when /sqlserver/ +- gem 'tiny_tds', '~> 2.1.2' +- gem 'activerecord-sqlserver-adapter', '~> 7.2.0' +- else +- warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems") +- end +- end +- else +- warn("No adapter found in config/database.yml, please configure it first") +- end +-else +- warn("Please configure your config/database.yml first") +-end +- +-group :development, :test do +- gem 'debug' +-end +- +-group :development do +- gem 'listen', '~> 3.3' +- gem 'yard', require: false +- gem 'svg_sprite', require: false +-end +- +-group :test do +- gem "rails-dom-testing", '>= 2.3.0' +- gem 'mocha', '>= 2.0.1' +- gem 'simplecov', '~> 0.22.0', :require => false +- gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] +- # For running system tests +- gem 'puma' +- gem "capybara", ">= 3.39" +- gem 'selenium-webdriver', '>= 4.11.0' +- # RuboCop - gem 'rubocop', '~> 1.68.0', require: false - gem 'rubocop-ast', '~> 1.40.0', require: false - gem 'rubocop-performance', '~> 1.22.0', require: false - gem 'rubocop-rails', '~> 2.27.0', require: false - gem 'bundle-audit', require: false -+ gem 'rubocop', '>= 1.68.0', require: false -+ gem 'rubocop-ast', '>= 1.40.0', require: false -+ gem 'rubocop-performance', '>= 1.22.0', require: false -+ gem 'rubocop-rails', '>= 2.27.0', require: false - # `bin/rails test` fails at startup with minitest >= 6.0 - gem 'minitest', '< 6.0' +- # `bin/rails test` fails at startup with minitest >= 6.0 +- gem 'minitest', '< 6.0' +-end +- + local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") + if File.exist?(local_gemfile) + eval_gemfile local_gemfile +@@ -127,4 +47,8 @@ Dir.glob File.expand_path("../plugins/*/{Gemfile,Plugi + # Load plugins' Gemfiles + Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| + eval_gemfile file ++end ++ ++Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle|0 ++ self.instance_eval(Bundler.read_file(bundle)) end diff --git a/www/redmine60/files/redmine.in b/www/redmine60/files/redmine.in index 9c9ed9636db7..d1c7e0bbd0a7 100644 --- a/www/redmine60/files/redmine.in +++ b/www/redmine60/files/redmine.in @@ -32,7 +32,7 @@ export PATH=$PATH:%%PREFIX%%/bin : ${redmine_group="%%WWWGRP%%"} command=/usr/sbin/daemon -command_args="-c -f -P ${pidfile} -S \ +command_args="-c -f -P ${pidfile} -T ${name} -t ${name} -S \ %%PREFIX%%/bin/puma --dir %%WWWDIR%% --no-config ${redmine_args}" run_rc_command "$1"home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6995593c.3abfb.3bc686fa>