Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Feb 2024 15:09:17 GMT
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 17844ef38d6c - 2024Q1 - www/redmine50: fix compile problem due to nokogiri update to 1.16.0
Message-ID:  <202402231509.41NF9HSE028100@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by mfechner:

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

commit 17844ef38d6c5b8595fb05ba53131389978530d4
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-01-26 12:47:00 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-02-23 14:21:45 +0000

    www/redmine50: fix compile problem due to nokogiri update to 1.16.0
    
    (cherry picked from commit 2490cad1712cd83bfe8e45373b42451d104bea04)
---
 www/redmine50/Makefile            |  1 +
 www/redmine50/files/patch-Gemfile | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/www/redmine50/Makefile b/www/redmine50/Makefile
index 758accdcc7d7..8c8acef3ceb4 100644
--- a/www/redmine50/Makefile
+++ b/www/redmine50/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	redmine
 PORTVERSION=	5.0.7
+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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402231509.41NF9HSE028100>