svn commit: r422934 - in head/www/redmine: . files
Steve Wills
swills at FreeBSD.org
Thu Sep 29 15:26:18 UTC 2016
Author: swills
Date: Thu Sep 29 15:26:16 2016
New Revision: 422934
URL: https://svnweb.freebsd.org/changeset/ports/422934
Log:
www/redmine: fix ldap option
PR: 21308
Reported by: xmj
Modified:
head/www/redmine/Makefile
head/www/redmine/files/patch-Gemfile
Modified: head/www/redmine/Makefile
==============================================================================
--- head/www/redmine/Makefile Thu Sep 29 15:04:31 2016 (r422933)
+++ head/www/redmine/Makefile Thu Sep 29 15:26:16 2016 (r422934)
@@ -3,6 +3,7 @@
PORTNAME= redmine
PORTVERSION= 3.2.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.redmine.org/releases/
@@ -27,8 +28,7 @@ RUN_DEPENDS= rubygem-bundler>=1.5.0:sysu
rubygem-rbpdf>=1.19.0:print/rubygem-rbpdf \
rubygem-rake>=0:devel/rubygem-rake \
rubygem-ruby-openid>=2.3.0:net/rubygem-ruby-openid \
- rubygem-rack-openid>=0:www/rubygem-rack-openid \
- rubygem-net-ldap>=0.3.1:net/rubygem-net-ldap
+ rubygem-rack-openid>=0:www/rubygem-rack-openid
NO_ARCH= yes
NO_BUILD= yes
@@ -59,6 +59,7 @@ PASSENGER_RUN_DEPENDS= passenger-config:
POSTGRESQL_RUN_DEPENDS= rubygem-pg>=0.18.1:databases/rubygem-pg
MARKDOWN_RUN_DEPENDS= rubygem-redcarpet>=3.3.2:textproc/rubygem-redcarpet
RMAGIC_RUN_DEPENDS= rubygem-rmagick>=2.13.4:graphics/rubygem-rmagick
+LDAP_RUN_DEPENDS= rubygem-net-ldap>=0.3.1:net/rubygem-net-ldap
THIN_RUN_DEPENDS= thin:www/rubygem-thin
THIN_SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
THIN_VARS= USE_RC_SUBR=redmine
Modified: head/www/redmine/files/patch-Gemfile
==============================================================================
--- head/www/redmine/files/patch-Gemfile Thu Sep 29 15:04:31 2016 (r422933)
+++ head/www/redmine/files/patch-Gemfile Thu Sep 29 15:26:16 2016 (r422934)
@@ -1,6 +1,6 @@
---- Gemfile.orig 2016-05-05 18:39:09.000000000 +0000
-+++ Gemfile 2016-06-06 19:49:50.462089000 +0000
-@@ -4,11 +4,11 @@
+--- Gemfile.orig 2016-06-05 07:30:30 UTC
++++ Gemfile
+@@ -4,11 +4,11 @@ if Gem::Version.new(Bundler::VERSION) <
abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
end
@@ -15,7 +15,7 @@
gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
gem "protected_attributes"
gem "actionpack-action_caching"
-@@ -17,7 +17,7 @@
+@@ -17,7 +17,7 @@ gem "roadie-rails"
gem "mimemagic"
# Request at least nokogiri 1.6.7.2 because of security advisories
@@ -24,14 +24,15 @@
# Request at least rails-html-sanitizer 1.0.3 because of security advisories
gem "rails-html-sanitizer", ">= 1.0.3"
-@@ -28,27 +28,15 @@
+@@ -26,29 +26,12 @@ gem "rails-html-sanitizer", ">= 1.0.3"
+ gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby]
+ gem "rbpdf", "~> 1.19.0"
- # Optional gem for LDAP authentication
- group :ldap do
+-# Optional gem for LDAP authentication
+-group :ldap do
- gem "net-ldap", "~> 0.12.0"
-+ gem "net-ldap"
- end
-
+-end
+-
# Optional gem for OpenID authentication
group :openid do
- gem "ruby-openid", "~> 2.3.0", :require => "openid"
@@ -54,7 +55,7 @@
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'
-@@ -92,21 +80,6 @@
+@@ -92,21 +75,6 @@ else
warn("Please configure your config/database.yml first")
end
@@ -76,7 +77,7 @@
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
if File.exists?(local_gemfile)
eval_gemfile local_gemfile
-@@ -116,3 +89,7 @@
+@@ -116,3 +84,7 @@ end
Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file|
eval_gemfile file
end
More information about the svn-ports-all
mailing list