svn commit: r349685 - in head/www/redmine: . files

[Steve Wills]

Author: swills
Date: Sun Mar 30 21:48:25 2014
New Revision: 349685
URL: http://svnweb.freebsd.org/changeset/ports/349685
QAT: https://qat.redports.org/buildarchive/r349685/

Log:
  - Fix patch with rmagick options disabled
  
  Reported by:	Cyril Kalinchikov <cyr.k at me.com>
  Pointyhat to:	swills

Modified:
  head/www/redmine/Makefile
  head/www/redmine/files/extra-patch-Gemfile

Modified: head/www/redmine/Makefile
==============================================================================
--- head/www/redmine/Makefile	Sun Mar 30 21:44:34 2014	(r349684)
+++ head/www/redmine/Makefile	Sun Mar 30 21:48:25 2014	(r349685)
@@ -3,6 +3,7 @@
 
 PORTNAME=	redmine
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.redmine.org/releases/
 

Modified: head/www/redmine/files/extra-patch-Gemfile
==============================================================================
--- head/www/redmine/files/extra-patch-Gemfile	Sun Mar 30 21:44:34 2014	(r349684)
+++ head/www/redmine/files/extra-patch-Gemfile	Sun Mar 30 21:48:25 2014	(r349685)
@@ -1,19 +1,17 @@
---- ./Gemfile.orig	2013-07-30 12:49:03.000000000 -0400
-+++ ./Gemfile	2013-07-30 12:49:13.000000000 -0400
-@@ -18,16 +18,6 @@
-   gem "rack-openid"
+--- Gemfile.orig	2014-03-30 21:39:22.047223369 +0000
++++ Gemfile	2014-03-30 21:39:43.309222769 +0000
+@@ -21,14 +21,6 @@
  end
  
--# Optional gem for exporting the gantt to a PNG file, not supported with jruby
--platforms :mri, :mingw do
+ platforms :mri, :mingw do
+-  # Optional gem for exporting the gantt to a PNG file, not supported with jruby
 -  group :rmagick do
 -    # RMagick 2 supports ruby 1.9
 -    # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
 -    # different requirements for the same gem on different platforms
 -    gem "rmagick", ">= 2.0.0"
 -  end
--end
 -
- platforms :jruby do
-   # jruby-openssl is bundled with JRuby 1.7.0
-   gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
+   # Optional Markdown support, not for JRuby
+   group :markdown do
+     # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped