diff options
| author | swills <swills@FreeBSD.org> | 2014-03-31 05:48:25 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2014-03-31 05:48:25 +0800 |
| commit | 66fd25a74b14cd848f23656d947f1c24cf4c7ca9 (patch) | |
| tree | eb7a781ea8c1e71dc2d17283d519e53077dddde1 /www/redmine | |
| parent | c491b9cc04c0075111c6a1454b90e3afaf4ae829 (diff) | |
| download | freebsd-ports-gnome-66fd25a74b14cd848f23656d947f1c24cf4c7ca9.tar.gz freebsd-ports-gnome-66fd25a74b14cd848f23656d947f1c24cf4c7ca9.tar.zst freebsd-ports-gnome-66fd25a74b14cd848f23656d947f1c24cf4c7ca9.zip | |
- Fix patch with rmagick options disabled
Reported by: Cyril Kalinchikov <cyr.k@me.com>
Pointyhat to: swills
Diffstat (limited to 'www/redmine')
| -rw-r--r-- | www/redmine/Makefile | 1 | ||||
| -rw-r--r-- | www/redmine/files/extra-patch-Gemfile | 18 |
2 files changed, 9 insertions, 10 deletions
diff --git a/www/redmine/Makefile b/www/redmine/Makefile index 27ffd5850b1d..eedc304c6e56 100644 --- a/www/redmine/Makefile +++ b/www/redmine/Makefile @@ -3,6 +3,7 @@ PORTNAME= redmine PORTVERSION= 2.5.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.redmine.org/releases/ diff --git a/www/redmine/files/extra-patch-Gemfile b/www/redmine/files/extra-patch-Gemfile index 1f3ded2ccd18..1acc6721dc51 100644 --- a/www/redmine/files/extra-patch-Gemfile +++ b/www/redmine/files/extra-patch-Gemfile @@ -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 |