git: b0cedac179dd - main - www/redmine4: Update to 4.1.4

[Mikael Urankar]

The branch main has been updated by mikael:

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

commit b0cedac179dd8983439e22c819a1ddcd257a0c01
Author:     Mikael Urankar <mikael at FreeBSD.org>
AuthorDate: 2021-08-17 15:12:09 +0000
Commit:     Mikael Urankar <mikael at FreeBSD.org>
CommitDate: 2021-08-17 15:12:09 +0000

    www/redmine4: Update to 4.1.4
    
     - Update to 4.1.4
     - Remove dependency on mimemagic (PR 257583)
    
    PR:             257583
---
 www/redmine4/Makefile            | 6 +++---
 www/redmine4/distinfo            | 6 +++---
 www/redmine4/files/patch-Gemfile | 7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/www/redmine4/Makefile b/www/redmine4/Makefile
index d284f48fbd51..801a058977f2 100644
--- a/www/redmine4/Makefile
+++ b/www/redmine4/Makefile
@@ -1,8 +1,7 @@
 # Created by: Bernhard Froehlich <decke at bluelife.at>
 
 PORTNAME=	redmine
-PORTVERSION=	4.1.2
-PORTREVISION=	1
+PORTVERSION=	4.1.4
 CATEGORIES=	www
 MASTER_SITES=	https://www.redmine.org/releases/
 PKGNAMESUFFIX=	4
@@ -13,6 +12,8 @@ COMMENT=	Flexible project management web application
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
+PORTSCOUT=	limit:^4\.1\.
+
 RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
 		rubygem-rails52>=5.2.5<5.3:www/rubygem-rails52 \
 		rubygem-rouge312>=3.12.0:textproc/rubygem-rouge312 \
@@ -20,7 +21,6 @@ RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
 		rubygem-mini_mime>=1.0.1:mail/rubygem-mini_mime \
 		rubygem-actionpack-xml_parser-rails52>=0:textproc/rubygem-actionpack-xml_parser-rails52 \
 		rubygem-roadie-rails-rails52>=2.1.0:mail/rubygem-roadie-rails-rails52 \
-		rubygem-mimemagic>=0:misc/rubygem-mimemagic \
 		rubygem-mail>=2.7.1:mail/rubygem-mail \
 		rubygem-csv>=3.1.1:devel/rubygem-csv \
 		rubygem-nokogiri>=1.11.0:textproc/rubygem-nokogiri \
diff --git a/www/redmine4/distinfo b/www/redmine4/distinfo
index c03dd1ad0e0e..ac6f2c0bfbe6 100644
--- a/www/redmine4/distinfo
+++ b/www/redmine4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616999909
-SHA256 (redmine-4.1.2.tar.gz) = 7e22397351c53fe8fe4444c01c4e0640d9cefb17b9ac765b846df27627cd228e
-SIZE (redmine-4.1.2.tar.gz) = 2719030
+TIMESTAMP = 1629104955
+SHA256 (redmine-4.1.4.tar.gz) = beaf6e51bb6a0c7655d73410afdf50c24091ee5f11eda0c9e96f38dfa7a3ab9f
+SIZE (redmine-4.1.4.tar.gz) = 2720709
diff --git a/www/redmine4/files/patch-Gemfile b/www/redmine4/files/patch-Gemfile
index f1dd267183a4..bc935ec1a11a 100644
--- a/www/redmine4/files/patch-Gemfile
+++ b/www/redmine4/files/patch-Gemfile
@@ -1,15 +1,16 @@
 --- Gemfile.orig	2021-04-22 10:46:10 UTC
 +++ Gemfile
-@@ -1,20 +1,20 @@
+@@ -1,21 +1,21 @@
  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.6'
 +gem 'rails', '~> 5.2.5'
  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.12.0"
  gem "request_store", "~> 1.4.1"
 -gem "mini_mime", "~> 1.0.1"
@@ -17,7 +18,7 @@
  gem "actionpack-xml_parser"
 -gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0")
 +gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.2.0")
- gem "mimemagic"
+ gem 'marcel'
  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')