diff options
| -rw-r--r-- | www/redmine/Makefile | 5 | ||||
| -rw-r--r-- | www/redmine/distinfo | 6 | ||||
| -rw-r--r-- | www/redmine/files/patch-Gemfile | 17 | ||||
| -rw-r--r-- | www/redmine/pkg-plist | 9 |
4 files changed, 18 insertions, 19 deletions
diff --git a/www/redmine/Makefile b/www/redmine/Makefile index 2eaa1c7db20c..62f3ebad3582 100644 --- a/www/redmine/Makefile +++ b/www/redmine/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= redmine -PORTVERSION= 3.4.9 -PORTREVISION= 2 +PORTVERSION= 3.4.11 CATEGORIES= www MASTER_SITES= https://www.redmine.org/releases/ @@ -14,7 +13,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/COPYING RUN_DEPENDS= rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \ - rubygem-rails4>=4.2.11:www/rubygem-rails4 \ + rubygem-rails4>=4.2.11.1:www/rubygem-rails4 \ rubygem-jquery-rails>=3.1.4:www/rubygem-jquery-rails \ rubygem-coderay>=1.1.1:textproc/rubygem-coderay \ rubygem-request_store>=1.0.5:devel/rubygem-request_store \ diff --git a/www/redmine/distinfo b/www/redmine/distinfo index 5318c50ae5b0..05c4737c126f 100644 --- a/www/redmine/distinfo +++ b/www/redmine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550859446 -SHA256 (redmine-3.4.9.tar.gz) = c26f41c165cca182f81e489c45b04763010b43cf7c4edcea9e9205a1a67ffab8 -SIZE (redmine-3.4.9.tar.gz) = 2454011 +TIMESTAMP = 1564158013 +SHA256 (redmine-3.4.11.tar.gz) = 19c09eedbe970fc5a20de96c2f1107a186072a69dc512c501a5638979a3e2891 +SIZE (redmine-3.4.11.tar.gz) = 2454920 diff --git a/www/redmine/files/patch-Gemfile b/www/redmine/files/patch-Gemfile index 498e0c46d2b0..3b46b65b8d85 100644 --- a/www/redmine/files/patch-Gemfile +++ b/www/redmine/files/patch-Gemfile @@ -1,13 +1,13 @@ ---- Gemfile.orig 2019-04-19 20:09:58.067146000 +0900 -+++ Gemfile 2019-04-19 20:10:30.702127000 +0900 +--- Gemfile.orig 2019-06-10 12:52:16 UTC ++++ Gemfile @@ -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" +-gem "rails", "4.2.11.1" ++gem "rails", ">= 4.2.11.1" gem "addressable", "2.4.0" if RUBY_VERSION < "2.0" if RUBY_VERSION < "2.1" gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5") @@ -34,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" -@@ -32,76 +32,15 @@ +@@ -32,76 +32,15 @@ gem "rbpdf", "~> 1.19.6" # Optional gem for LDAP authentication group :ldap do @@ -113,12 +113,11 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exists?(local_gemfile) eval_gemfile local_gemfile -@@ -110,4 +49,8 @@ - # Load plugins' Gemfiles +@@ -111,3 +50,7 @@ end 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 diff --git a/www/redmine/pkg-plist b/www/redmine/pkg-plist index 9b27a8912d2f..f005a3de0dab 100644 --- a/www/redmine/pkg-plist +++ b/www/redmine/pkg-plist @@ -1690,10 +1690,10 @@ %%WWWDIR%%/test/fixtures/changes.yml %%WWWDIR%%/test/fixtures/changesets.yml %%WWWDIR%%/test/fixtures/comments.yml -%%WWWDIR%%/test/fixtures/configuration/default.yml -%%WWWDIR%%/test/fixtures/configuration/empty.yml -%%WWWDIR%%/test/fixtures/configuration/no_default.yml -%%WWWDIR%%/test/fixtures/configuration/overrides.yml +%%WWWDIR%%/test/fixtures/configuration/default.yml.example +%%WWWDIR%%/test/fixtures/configuration/empty.yml.example +%%WWWDIR%%/test/fixtures/configuration/no_default.yml.example +%%WWWDIR%%/test/fixtures/configuration/overrides.yml.example %%WWWDIR%%/test/fixtures/custom_fields.yml %%WWWDIR%%/test/fixtures/custom_fields_projects.yml %%WWWDIR%%/test/fixtures/custom_fields_trackers.yml @@ -1968,6 +1968,7 @@ %%WWWDIR%%/test/integration/sessions_test.rb %%WWWDIR%%/test/integration/sudo_mode_test.rb %%WWWDIR%%/test/integration/users_test.rb +%%WWWDIR%%/test/integration/wiki_test.rb %%WWWDIR%%/test/mocks/open_id_authentication_mock.rb %%WWWDIR%%/test/object_helpers.rb %%WWWDIR%%/test/test_helper.rb |