git: 2490cad1712c - main - www/redmine50: fix compile problem due to nokogiri update to 1.16.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 18 Feb 2024 05:16:17 UTC
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=2490cad1712cd83bfe8e45373b42451d104bea04 commit 2490cad1712cd83bfe8e45373b42451d104bea04 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2024-01-26 12:47:00 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2024-02-18 04:53:31 +0000 www/redmine50: fix compile problem due to nokogiri update to 1.16.0 --- www/redmine50/Makefile | 2 +- www/redmine50/files/patch-Gemfile | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/www/redmine50/Makefile b/www/redmine50/Makefile index a3ff0538a666..c52cc1f7046e 100644 --- a/www/redmine50/Makefile +++ b/www/redmine50/Makefile @@ -1,6 +1,6 @@ PORTNAME= redmine PORTVERSION= 5.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://www.redmine.org/releases/ PKGNAMESUFFIX= 50 diff --git a/www/redmine50/files/patch-Gemfile b/www/redmine50/files/patch-Gemfile index 31b94952299b..ff93cfc7b6ba 100644 --- a/www/redmine50/files/patch-Gemfile +++ b/www/redmine50/files/patch-Gemfile @@ -1,6 +1,6 @@ ---- Gemfile.orig 2023-03-05 21:35:36 UTC +--- Gemfile.orig 2023-11-27 20:30:01 UTC +++ Gemfile -@@ -3,30 +3,30 @@ gem 'bundler', '>= 1.12.0' +@@ -3,30 +3,30 @@ source 'https://rubygems.org' ruby '>= 2.5.0', '< 3.2.0' gem 'bundler', '>= 1.12.0' @@ -23,7 +23,8 @@ - '~> 1.13.10' + '>= 1.13.9' else - '~> 1.15.2' +- '~> 1.15.2' ++ '~> 1.15' end) gem "rexml", require: false if Gem.ruby_version >= Gem::Version.new('3.0') -gem 'i18n', '~> 1.10.0' @@ -39,7 +40,7 @@ gem 'net-pop', '~> 0.1.1' # Rails 6.1.6.1 does not work with Pysch 3.0.2, which is installed by default with Ruby 2.5. See https://github.com/rails/rails/issues/45590 gem 'psych', '>= 3.1.0' if Gem.ruby_version < Gem::Version.new('2.6.0') -@@ -40,85 +40,10 @@ group :ldap do +@@ -40,85 +40,10 @@ gem 'rqrcode' # Optional gem for LDAP authentication group :ldap do @@ -126,7 +127,7 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exist?(local_gemfile) eval_gemfile local_gemfile -@@ -127,4 +52,8 @@ Dir.glob File.expand_path("../plugins/*/{Gemfile,Plugi +@@ -127,4 +52,8 @@ end # Load plugins' Gemfiles Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| eval_gemfile file