- Update to 2.3.2

- Remove unnecessary dependencies
- Correct dependencies (mysql, rmagick)

3 files changed, 26 insertions, 26 deletions

diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index c6af3b1d21ca..78780d0760ab 100644
--- a/www/redmine/Makefile
+++ b/www/redmine/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redmine
-PORTVERSION=	2.3.1
-PORTREVISION=	2
+PORTVERSION=	2.3.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -11,23 +10,16 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A flexible project management web application
 
-RUN_DEPENDS=	rackup:${PORTSDIR}/www/rubygem-rack \
-		rubygem-rubytree>=0:${PORTSDIR}/devel/rubygem-rubytree \
+RUN_DEPENDS=	rubygem-rubytree>=0:${PORTSDIR}/devel/rubygem-rubytree \
 		rubygem-i18n>=0.4.2:${PORTSDIR}/devel/rubygem-i18n \
 		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake \
 		rubygem-bundler>=0:${PORTSDIR}/sysutils/rubygem-bundler \
-		rubygem-rmagick>=2.0.0:${PORTSDIR}/graphics/rubygem-rmagick \
 		rubygem-rails>=3.2.13:${PORTSDIR}/www/rubygem-rails \
-		rubygem-capybara>=2.0.0:${PORTSDIR}/devel/rubygem-capybara \
 		rubygem-rack-openid>=0:${PORTSDIR}/www/rubygem-rack-openid \
-		rubygem-coderay>=1.0.6:${PORTSDIR}/textproc/rubygem-coderay \
+		rubygem-coderay>=1.0.9:${PORTSDIR}/textproc/rubygem-coderay \
 		rubygem-fastercsv>=1.5.0:${PORTSDIR}/devel/rubygem-fastercsv \
 		rubygem-builder>=3.0.0:${PORTSDIR}/devel/rubygem-builder \
-		rubygem-net-ldap>=0.3.1:${PORTSDIR}/net/rubygem-net-ldap \
-		rubygem-mysql>=2.8.1:${PORTSDIR}/databases/rubygem-mysql \
-		rubygem-yard>=0:${PORTSDIR}/textproc/rubygem-yard \
-		rubygem-shoulda>=2.11.3:${PORTSDIR}/devel/rubygem-shoulda \
-		rubygem-mocha>=0.9.12:${PORTSDIR}/devel/rubygem-mocha
+		rubygem-net-ldap>=0.3.1:${PORTSDIR}/net/rubygem-net-ldap
 
 USE_RUBY=	yes
 USE_RUBY_FEATURES=	iconv
@@ -48,7 +40,7 @@ NO_OPTIONS_SORT=yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/mysql.so:${PORTSDIR}/databases/ruby-mysql
+RUN_DEPENDS+=	rubygem-mysql>=2.8.1:${PORTSDIR}/databases/rubygem-mysql
 .endif
 
 .if ${PORT_OPTIONS:MPOSTGRESQL}
@@ -56,7 +48,7 @@ RUN_DEPENDS+=	rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg
 .endif
 
 .if ${PORT_OPTIONS:MRMAGIC}
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/RMagick2.so:${PORTSDIR}/graphics/ruby-rmagick
+RUN_DEPENDS+=	rubygem-rmagick>=2.0.0:${PORTSDIR}/graphics/rubygem-rmagick
 .endif
 
 .if ${PORT_OPTIONS:MWWWSERVER}
diff --git a/www/redmine/distinfo b/www/redmine/distinfo
index 1e7a884d64dd..b9c38be803a8 100644
--- a/www/redmine/distinfo
+++ b/www/redmine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redmine-2.3.1.tar.gz) = e5f5b97361eea13203b81cae2aad9a74be59945fc60fc01860c23bdea0a4179f
-SIZE (redmine-2.3.1.tar.gz) = 3798773
+SHA256 (redmine-2.3.2.tar.gz) = dc3f86f2ac591c6d0886d183b68604aa80fc90d412bdeab0c3a57c9cd7b43384
+SIZE (redmine-2.3.2.tar.gz) = 3801029
diff --git a/www/redmine/files/patch-Gemfile b/www/redmine/files/patch-Gemfile
index 0aef44f5c660..c7f310509d57 100644
--- a/www/redmine/files/patch-Gemfile
+++ b/www/redmine/files/patch-Gemfile
@@ -1,5 +1,5 @@
---- Gemfile.orig	2013-06-01 13:45:53.232402408 +0000
-+++ Gemfile	2013-06-01 13:45:56.413919051 +0000
+--- Gemfile.orig	2013-07-14 16:51:09.000000000 +0000
++++ Gemfile	2013-07-21 12:56:04.025404096 +0000
 @@ -1,11 +1,11 @@
  source 'https://rubygems.org'
  
@@ -7,7 +7,7 @@
 -gem "jquery-rails", "~> 2.0.2"
 +gem "jquery-rails", "~> 3.0"
  gem "i18n", "~> 0.6.0"
- gem "coderay", "~> 1.0.6"
+ gem "coderay", "~> 1.0.9"
  gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 -gem "builder", "3.0.0"
 +gem "builder", "~> 3.0.0"
@@ -32,14 +32,22 @@
          gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
        when /postgresql/
          gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw]
-@@ -77,8 +77,8 @@
+@@ -71,18 +71,6 @@
+   warn("Please configure your config/database.yml first")
  end
  
- group :test do
+-group :development do
+-  gem "rdoc", ">= 2.4.2"
+-  gem "yard"
+-end
+-
+-group :test do
 -  gem "shoulda", "~> 3.3.2"
 -  gem "mocha", "~> 0.13.3"
-+  gem "shoulda", "~> 2.11"
-+  gem "mocha", "~> 0.9"
-   gem 'capybara', '~> 2.0.0'
- end
- 
+-  gem 'capybara', '~> 2.0.0'
+-  gem 'nokogiri', '< 1.6.0'
+-end
+-
+ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+ if File.exists?(local_gemfile)
+   puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`