Date: Tue, 26 May 2015 18:04:00 +0000 (UTC) From: Michael Moll <mmoll@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387501 - in head/www/redmine: . files Message-ID: <201505261804.t4QI40DI091983@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmoll Date: Tue May 26 18:03:59 2015 New Revision: 387501 URL: https://svnweb.freebsd.org/changeset/ports/387501 Log: www/redmine: allow newer net-ldap versions Differential Revision: https://reviews.freebsd.org/D2632 Approved by: mat (mentor) Modified: head/www/redmine/Makefile head/www/redmine/files/extra-patch-thin-Gemfile head/www/redmine/files/patch-Gemfile Modified: head/www/redmine/Makefile ============================================================================== --- head/www/redmine/Makefile Tue May 26 18:01:07 2015 (r387500) +++ head/www/redmine/Makefile Tue May 26 18:03:59 2015 (r387501) @@ -3,7 +3,7 @@ PORTNAME= redmine PORTVERSION= 2.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.redmine.org/releases/ Modified: head/www/redmine/files/extra-patch-thin-Gemfile ============================================================================== --- head/www/redmine/files/extra-patch-thin-Gemfile Tue May 26 18:01:07 2015 (r387500) +++ head/www/redmine/files/extra-patch-thin-Gemfile Tue May 26 18:03:59 2015 (r387501) @@ -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' Modified: head/www/redmine/files/patch-Gemfile ============================================================================== --- head/www/redmine/files/patch-Gemfile Tue May 26 18:01:07 2015 (r387500) +++ head/www/redmine/files/patch-Gemfile Tue May 26 18:03:59 2015 (r387501) @@ -1,6 +1,6 @@ --- Gemfile.orig 2015-05-25 16:10:44 UTC +++ Gemfile -@@ -1,15 +1,15 @@ +@@ -1,24 +1,24 @@ source 'https://rubygems.org' -gem "rails", "3.2.21" @@ -19,7 +19,9 @@ # Optional gem for LDAP authentication group :ldap do -@@ -21,7 +21,7 @@ gem "thin", "~> 1.6.2" +- gem "net-ldap", "~> 0.3.1" ++ gem "net-ldap", ">= 0.3.1" + end # Optional gem for OpenID authentication group :openid do @@ -28,7 +30,7 @@ gem "rack-openid" end -@@ -37,7 +37,7 @@ platforms :mri, :mingw do +@@ -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 @@ -37,7 +39,7 @@ end end -@@ -84,23 +84,6 @@ else +@@ -81,23 +81,6 @@ else warn("Please configure your config/database.yml first") end
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505261804.t4QI40DI091983>