Index: www/redmine/Makefile =================================================================== --- www/redmine/Makefile +++ www/redmine/Makefile @@ -3,7 +3,7 @@ PORTNAME= redmine PORTVERSION= 2.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.redmine.org/releases/ @@ -95,7 +95,7 @@ post-install: ${TOUCH} ${STAGEDIR}${WWWDIR}/Gemfile.lock - + if ! [ -r ${STAGEDIR}${WWWDIR}/config/settings.yml ]; then \ ${INSTALL_DATA} ${STAGEDIR}${WWWDIR}/config/settings.yml-dist \ ${STAGEDIR}${WWWDIR}/config/settings.yml; \ Index: www/redmine/files/extra-patch-thin-Gemfile =================================================================== --- www/redmine/files/extra-patch-thin-Gemfile +++ www/redmine/files/extra-patch-thin-Gemfile @@ -1,12 +1,12 @@ --- Gemfile.orig 2015-04-02 19:40:25.929698000 +0000 +++ Gemfile 2015-04-02 19:41:11.539003000 +0000 -@@ -16,6 +16,9 @@ - gem "net-ldap", "~> 0.3.1" +@@ -44,6 +44,9 @@ + gem "activerecord-jdbc-adapter", "~> 1.3.2" end +# Thin webserver +gem "thin", "~> 1.6.2" + - # Optional gem for OpenID authentication - group :openid do - gem "ruby-openid", "~> 2.3.0", :require => "openid" + # Include database gems for the adapters found in the database + # configuration file + require 'erb' Index: www/redmine/files/patch-Gemfile =================================================================== --- www/redmine/files/patch-Gemfile +++ www/redmine/files/patch-Gemfile @@ -1,8 +1,8 @@ ---- Gemfile.orig 2015-02-19 13:15:56.000000000 -0600 -+++ Gemfile 2015-03-15 12:49:50.000000000 -0500 -@@ -1,13 +1,13 @@ +--- Gemfile.orig 2015-03-16 18:59:15 UTC ++++ Gemfile +@@ -1,24 +1,24 @@ source 'https://rubygems.org' - + -gem "rails", "3.2.21" +gem "rails", "~> 3.2" gem "jquery-rails", "~> 3.1.1" @@ -13,20 +13,24 @@ +gem "request_store", "~> 1.1.0" gem "mime-types" gem "rbpdf", "~> 1.18.5" - + -gem "i18n", "~> 0.6.11" +gem "i18n", "~> 0.7.0" - -@@ -18,7 +18,7 @@ - + + # Optional gem for LDAP authentication + group :ldap do +- gem "net-ldap", "~> 0.3.1" ++ gem "net-ldap", ">= 0.3.1" + end + # Optional gem for OpenID authentication group :openid do - gem "ruby-openid", "~> 2.3.0", :require => "openid" + gem "ruby-openid", "~> 2.7", :require => "openid" gem "rack-openid" end - -@@ -35,7 +35,7 @@ + +@@ -34,7 +34,7 @@ platforms :mri, :mingw do # Optional Markdown support, not for JRuby group :markdown do # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped @@ -34,11 +38,11 @@ + gem "redcarpet", "~> 3.0" end end - -@@ -81,23 +81,6 @@ + +@@ -81,23 +81,6 @@ else warn("Please configure your config/database.yml first") end - + -group :development do - gem "rdoc", ">= 2.4.2" - gem "yard"