git: f7611eaeeda5 - main - www/redmine42: Update to 4.2.6

The branch main has been updated by mikael:

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

commit f7611eaeeda5267ebd0c8d91800269b426509607
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2022-05-23 16:23:45 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2022-06-17 07:44:24 +0000

    www/redmine42: Update to 4.2.6
    
    Changes: https://www.redmine.org/projects/redmine/wiki/Changelog_4_2
---
 www/redmine42/Makefile            |  2 +-
 www/redmine42/distinfo            |  6 +++---
 www/redmine42/files/patch-Gemfile | 18 ++++++++++++------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/www/redmine42/Makefile b/www/redmine42/Makefile
index fb51a62ba155..c96f3ca83dea 100644
--- a/www/redmine42/Makefile
+++ b/www/redmine42/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	redmine
-PORTVERSION=	4.2.5
+PORTVERSION=	4.2.6
 CATEGORIES=	www
 MASTER_SITES=	https://www.redmine.org/releases/
 PKGNAMESUFFIX=	42
diff --git a/www/redmine42/distinfo b/www/redmine42/distinfo
index 6019499b39d0..657069017c0e 100644
--- a/www/redmine42/distinfo
+++ b/www/redmine42/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648644277
-SHA256 (redmine-4.2.5.tar.gz) = d97084b0eaad7266056814a0c0aec2737f4d23b8f67ce90c01a79b2eb5605984
-SIZE (redmine-4.2.5.tar.gz) = 3041844
+TIMESTAMP = 1653323003
+SHA256 (redmine-4.2.6.tar.gz) = 022cb2eee0f8823fd27e2e93373086a29b4bb11215ee6dc7012b5ef2a3bada4c
+SIZE (redmine-4.2.6.tar.gz) = 3041632
diff --git a/www/redmine42/files/patch-Gemfile b/www/redmine42/files/patch-Gemfile
index 240786e5e319..e0087d80e57e 100644
--- a/www/redmine42/files/patch-Gemfile
+++ b/www/redmine42/files/patch-Gemfile
@@ -1,11 +1,11 @@
 --- Gemfile.orig	2021-04-30 11:34:49 UTC
 +++ Gemfile
-@@ -3,19 +3,19 @@ gem 'bundler', '>= 1.12.0'
+@@ -3,17 +3,17 @@ gem 'bundler', '>= 1.12.0'
  ruby '>= 2.4.0', '< 2.8.0'
  gem 'bundler', '>= 1.12.0'
  
--gem 'rails', '5.2.6.3'
-+gem 'rails', '~> 5.2.6'
+-gem 'rails', '5.2.8'
++gem 'rails', '>=5.2.8'
  gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
  gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0')
 -gem 'rouge', '~> 3.26.0'
@@ -19,13 +19,19 @@
  gem "mail", "~> 2.7.1"
 -gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1')
 +gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.2.0')
- gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1')
+ gem 'nokogiri', (if Gem.ruby_version < Gem::Version.new('2.5.0')
+                    '~> 1.10.10'
+                  elsif Gem.ruby_version < Gem::Version.new('2.6.0')
+@@ -21,7 +21,7 @@ gem 'nokogiri', (if Gem.ruby_version < Gem::Version.ne
+                  else
+                    '~> 1.13.6'
+                  end)
 -gem 'i18n', '~> 1.8.2'
 +gem 'i18n', '>= 1.8.2'
  gem "rbpdf", "~> 1.20.0"
  gem 'addressable'
  gem 'rubyzip', '~> 2.3.0'
-@@ -38,68 +38,6 @@ end
+@@ -44,68 +44,6 @@ end
    gem "rack-openid"
  end
  
@@ -94,7 +100,7 @@
  local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
  if File.exists?(local_gemfile)
    eval_gemfile local_gemfile
-@@ -108,4 +46,8 @@ Dir.glob File.expand_path("../plugins/*/{Gemfile,Plugi
+@@ -114,4 +52,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