From fb77f6f68700a2440f55a13f76f60c535e3de479 Mon Sep 17 00:00:00 2001
From: Steve Wills <swills@FreeBSD.org>
Date: Sat, 23 Aug 2014 16:05:41 +0000
Subject: [PATCH] www/redmine: update to 2.5.2

PR:		192256
Submitted by:	Mikhail Tsatsenko <m.tsatsenko@gmail.com>
---
 www/redmine/Makefile            |  3 +--
 www/redmine/distinfo            |  4 ++--
 www/redmine/files/patch-Gemfile | 18 +++++++++---------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index 7fb2287db6b6..53526401f8f6 100644
--- a/www/redmine/Makefile
+++ b/www/redmine/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redmine
-PORTVERSION=	2.5.1
-PORTREVISION=	2
+PORTVERSION=	2.5.2
 CATEGORIES=	www
 MASTER_SITES=	http://www.redmine.org/releases/
 
diff --git a/www/redmine/distinfo b/www/redmine/distinfo
index e74fda2a31b0..36e96935b8f8 100644
--- a/www/redmine/distinfo
+++ b/www/redmine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redmine-2.5.1.tar.gz) = 1580396c030c1233e9acffcb97bf43b69fb3c04c6b00accbabf77d2a4a8c93f0
-SIZE (redmine-2.5.1.tar.gz) = 3889516
+SHA256 (redmine-2.5.2.tar.gz) = 60335599d5e23452b5532b7389d4024e5610bc7d746862e8998b37227de71f74
+SIZE (redmine-2.5.2.tar.gz) = 3897300
diff --git a/www/redmine/files/patch-Gemfile b/www/redmine/files/patch-Gemfile
index 57ce248d2a23..4fa68435be8e 100644
--- a/www/redmine/files/patch-Gemfile
+++ b/www/redmine/files/patch-Gemfile
@@ -1,22 +1,22 @@
---- Gemfile.orig	2014-03-29 19:50:17.216630353 +0000
-+++ Gemfile	2014-03-29 19:59:55.539590486 +0000
+--- Gemfile.orig	2014-07-30 01:55:20.626312191 +0400
++++ Gemfile	2014-07-30 01:55:52.188247285 +0400
 @@ -1,11 +1,11 @@
  source 'https://rubygems.org'
  
--gem "rails", "3.2.17"
+-gem "rails", "3.2.19"
 -gem "rake", "~> 10.1.1"
 -gem "jquery-rails", "~> 2.0.2"
-+gem "rails", "~> 3.2.17"
++gem "rails", "~> 3.2"
 +gem "rake", "~> 10.3"
 +gem "jquery-rails", "~> 3.0"
  gem "coderay", "~> 1.1.0"
  gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 -gem "builder", "3.0.0"
-+gem "builder", "~> 3.0.0"
++gem "builder", "~> 3.0"
  gem "mime-types"
  gem "awesome_nested_set", "2.1.6"
  
-@@ -16,7 +16,7 @@
+@@ -19,7 +19,7 @@
  
  # Optional gem for OpenID authentication
  group :openid do
@@ -25,7 +25,7 @@
    gem "rack-openid"
  end
  
-@@ -32,7 +32,7 @@
+@@ -35,7 +35,7 @@
    # Optional Markdown support, not for JRuby
    group :markdown do
      # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped
@@ -34,7 +34,7 @@
    end
  end
  
-@@ -79,20 +79,6 @@
+@@ -82,20 +82,6 @@
    warn("Please configure your config/database.yml first")
  end
  
@@ -45,7 +45,7 @@
 -
 -group :test do
 -  gem "shoulda", "~> 3.3.2"
--  gem "mocha", ">= 0.14", :require => 'mocha/api'
+-  gem "mocha", "~> 1.0.0", :require => 'mocha/api'
 -  if RUBY_VERSION >= '1.9.3'
 -    gem "capybara", "~> 2.1.0"
 -    gem "selenium-webdriver"