git: 2df6dd52d5b6 - main - www/redmine4: Fix build after recent rubygem-rails52 update

[Mikael Urankar]

The branch main has been updated by mikael:

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

commit 2df6dd52d5b652b15de6c4b40337a67b07834f36
Author:     Mikael Urankar <mikael at FreeBSD.org>
AuthorDate: 2021-04-23 06:49:52 +0000
Commit:     Mikael Urankar <mikael at FreeBSD.org>
CommitDate: 2021-04-23 06:50:52 +0000

    www/redmine4: Fix build after recent rubygem-rails52 update
---
 www/redmine4/Makefile            |  2 +-
 www/redmine4/files/patch-Gemfile | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/www/redmine4/Makefile b/www/redmine4/Makefile
index 6435386f0bf9..e9ac23b854af 100644
--- a/www/redmine4/Makefile
+++ b/www/redmine4/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
 RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
-		rubygem-rails52>=5.2.4.5<5.2.5:www/rubygem-rails52 \
+		rubygem-rails52>=5.2.4.5:www/rubygem-rails52 \
 		rubygem-rouge312>=3.12.0:textproc/rubygem-rouge312 \
 		rubygem-request_store14>=1.0.5:devel/rubygem-request_store14 \
 		rubygem-mini_mime>=1.0.1:mail/rubygem-mini_mime \
diff --git a/www/redmine4/files/patch-Gemfile b/www/redmine4/files/patch-Gemfile
index c77fbe9d24e4..b96e9e726725 100644
--- a/www/redmine4/files/patch-Gemfile
+++ b/www/redmine4/files/patch-Gemfile
@@ -1,13 +1,17 @@
---- Gemfile.orig	2021-03-21 09:40:24.000000000 +0100
-+++ Gemfile	2021-03-29 08:41:04.325888000 +0200
-@@ -1,6 +1,6 @@
+--- Gemfile.orig	2021-04-22 10:46:10 UTC
++++ Gemfile
+@@ -1,9 +1,9 @@
  source 'https://rubygems.org'
  
 -ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0'
 +ruby '>= 2.3.0', '< 2.8.0' if Bundler::VERSION >= '1.12.0'
  gem "bundler", ">= 1.5.0"
  
- gem 'rails', '5.2.4.5'
+-gem 'rails', '5.2.4.5'
++gem 'rails', '5.2.5'
+ gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
+ gem "rouge", "~> 3.12.0"
+ gem "request_store", "~> 1.4.1"
 @@ -14,7 +14,7 @@ gem "mimemagic"
  gem "mail", "~> 2.7.1"
  gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1')