diff --git a/www/redmine/Makefile b/www/redmine/Makefile index 2df4ef349346..2eaa1c7db20c 100644 --- a/www/redmine/Makefile +++ b/www/redmine/Makefile @@ -3,7 +3,7 @@ PORTNAME= redmine PORTVERSION= 3.4.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://www.redmine.org/releases/ @@ -34,10 +34,11 @@ RUN_DEPENDS= rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \ rubygem-rack-openid>=0:www/rubygem-rack-openid \ rubygem-rake>=0:devel/rubygem-rake +USES= cpe +USE_RUBY= yes + NO_ARCH= yes NO_BUILD= yes -USE_RUBY= yes -USES= cpe USERS= ${WWWOWN} GROUPS= ${WWWGRP} diff --git a/www/redmine/files/patch-Gemfile b/www/redmine/files/patch-Gemfile index 1bc45e670ec2..498e0c46d2b0 100644 --- a/www/redmine/files/patch-Gemfile +++ b/www/redmine/files/patch-Gemfile @@ -1,8 +1,10 @@ ---- Gemfile.orig 2018-06-10 06:36:07 UTC -+++ Gemfile -@@ -4,24 +4,24 @@ if Gem::Version.new(Bundler::VERSION) < - abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'." - end +--- Gemfile.orig 2019-04-19 20:09:58.067146000 +0900 ++++ Gemfile 2019-04-19 20:10:30.702127000 +0900 +@@ -1,25 +1,25 @@ + source 'https://rubygems.org' + +-gem "bundler", ">= 1.5.0", "< 2.0.0" ++gem "bundler", ">= 1.5.0" -gem "rails", "4.2.11" +gem "rails", ">= 4.2.11" @@ -32,7 +34,7 @@ gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3" -@@ -33,76 +33,15 @@ gem "rbpdf", "~> 1.19.6" +@@ -32,76 +32,15 @@ # Optional gem for LDAP authentication group :ldap do @@ -111,11 +113,12 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exists?(local_gemfile) eval_gemfile local_gemfile -@@ -112,3 +51,7 @@ end +@@ -110,4 +49,8 @@ + # Load plugins' Gemfiles Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| eval_gemfile file - end ++end + +Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle| + self.instance_eval(Bundler.read_file(bundle)) -+end + end