www/redmine: allow newer net-ldap versions

Differential Revision:	https://reviews.freebsd.org/D2632
Approved by:	mat (mentor)

3 files changed, 12 insertions, 10 deletions

diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index 1ff59fbb1e7f..3764e248b348 100644
--- a/www/redmine/Makefile
+++ b/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/
 
diff --git a/www/redmine/files/extra-patch-thin-Gemfile b/www/redmine/files/extra-patch-thin-Gemfile
index 5cf5b20b1588..486b355864e3 100644
--- a/www/redmine/files/extra-patch-thin-Gemfile
+++ b/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'
diff --git a/www/redmine/files/patch-Gemfile b/www/redmine/files/patch-Gemfile
index f7b91a7026fb..85a4b9832d3c 100644
--- a/www/redmine/files/patch-Gemfile
+++ b/www/redmine/files/patch-Gemfile
@@ -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