Date: Tue, 3 Jan 2017 18:25:45 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r430493 - in branches/2017Q1: mail/rubygem-roadie mail/rubygem-roadie/files www/redmine www/redmine/files Message-ID: <201701031825.v03IPjx8028528@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue Jan 3 18:25:44 2017 New Revision: 430493 URL: https://svnweb.freebsd.org/changeset/ports/430493 Log: MFH multiple fixes to get redmine working MFH: r430437 r430439 r430440 mail/rubygem-roadie: fix with newer nokogiri www/redmine: fix with newer gems Fix with newer ldap and mysql. PR: 213127 www/redmine: fix startup when using thing PR: 213051 Submitted by: Matthias Fechner <idefix@fechner.net> Added: branches/2017Q1/mail/rubygem-roadie/files/ - copied from r430437, head/mail/rubygem-roadie/files/ Modified: branches/2017Q1/mail/rubygem-roadie/Makefile branches/2017Q1/www/redmine/Makefile branches/2017Q1/www/redmine/files/mysql.rb branches/2017Q1/www/redmine/files/patch-Gemfile branches/2017Q1/www/redmine/files/redmine.in Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/mail/rubygem-roadie/Makefile ============================================================================== --- branches/2017Q1/mail/rubygem-roadie/Makefile Tue Jan 3 18:23:21 2017 (r430492) +++ branches/2017Q1/mail/rubygem-roadie/Makefile Tue Jan 3 18:25:44 2017 (r430493) @@ -2,6 +2,7 @@ PORTNAME= roadie PORTVERSION= 3.2.0 +PORTREVISION= 1 CATEGORIES= mail rubygems MASTER_SITES= RG Modified: branches/2017Q1/www/redmine/Makefile ============================================================================== --- branches/2017Q1/www/redmine/Makefile Tue Jan 3 18:23:21 2017 (r430492) +++ branches/2017Q1/www/redmine/Makefile Tue Jan 3 18:25:44 2017 (r430493) @@ -3,7 +3,7 @@ PORTNAME= redmine PORTVERSION= 3.2.3 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://www.redmine.org/releases/ @@ -28,7 +28,8 @@ 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-rack-openid>=0:www/rubygem-rack-openid \ + rubygem-net-ldap>=0.12.0:net/rubygem-net-ldap NO_ARCH= yes NO_BUILD= yes @@ -54,12 +55,11 @@ PASSENGER_DESC= Use Apache/Nginx WEB ser MYSQL_DESC= MySQL database support (via mysql2 rubygem) NO_OPTIONS_SORT= yes -MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.3.11:databases/rubygem-mysql2 +MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.4.5:databases/rubygem-mysql2 PASSENGER_RUN_DEPENDS= passenger-config:www/rubygem-passenger 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.14.0:graphics/rubygem-rmagick -LDAP_RUN_DEPENDS= rubygem-net-ldap>=0.12.0:net/rubygem-net-ldap THIN_RUN_DEPENDS= rubygem-thin>=1.6.2:www/rubygem-thin THIN_SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} THIN_VARS= USE_RC_SUBR=redmine Modified: branches/2017Q1/www/redmine/files/mysql.rb ============================================================================== --- branches/2017Q1/www/redmine/files/mysql.rb Tue Jan 3 18:23:21 2017 (r430492) +++ branches/2017Q1/www/redmine/files/mysql.rb Tue Jan 3 18:25:44 2017 (r430493) @@ -1 +1 @@ -gem "mysql2", "~> 0.3.11" +gem "mysql2", "~> 0.4.5" Modified: branches/2017Q1/www/redmine/files/patch-Gemfile ============================================================================== --- branches/2017Q1/www/redmine/files/patch-Gemfile Tue Jan 3 18:23:21 2017 (r430492) +++ branches/2017Q1/www/redmine/files/patch-Gemfile Tue Jan 3 18:25:44 2017 (r430493) @@ -24,15 +24,14 @@ # Request at least rails-html-sanitizer 1.0.3 because of security advisories gem "rails-html-sanitizer", ">= 1.0.3" -@@ -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" +@@ -28,27 +28,15 @@ 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" --end -- ++ gem "net-ldap", "~> 0.15.0" + end + # Optional gem for OpenID authentication group :openid do - gem "ruby-openid", "~> 2.3.0", :require => "openid" @@ -55,7 +54,13 @@ 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' -@@ -72,7 +55,7 @@ if File.exist?(database_file) +@@ -67,12 +55,12 @@ if File.exist?(database_file) + adapters.each do |adapter| + case adapter + when 'mysql2' +- gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw, :x64_mingw] ++ gem "mysql2", "~> 0.4.5", :platforms => [:mri, :mingw, :x64_mingw] + gem "activerecord-jdbcmysql-adapter", :platforms => :jruby when 'mysql' gem "activerecord-jdbcmysql-adapter", :platforms => :jruby when /postgresql/ @@ -64,7 +69,7 @@ gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby when /sqlite3/ gem "sqlite3", :platforms => [:mri, :mingw, :x64_mingw] -@@ -92,21 +75,6 @@ else +@@ -92,21 +80,6 @@ else warn("Please configure your config/database.yml first") end @@ -86,7 +91,7 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exists?(local_gemfile) eval_gemfile local_gemfile -@@ -116,3 +84,7 @@ end +@@ -116,3 +89,7 @@ end Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| eval_gemfile file end Modified: branches/2017Q1/www/redmine/files/redmine.in ============================================================================== --- branches/2017Q1/www/redmine/files/redmine.in Tue Jan 3 18:23:21 2017 (r430492) +++ branches/2017Q1/www/redmine/files/redmine.in Tue Jan 3 18:25:44 2017 (r430493) @@ -25,6 +25,9 @@ pidfile="%%WWWDIR%%/tmp/pids/thin.pid" load_rc_config $name +# add /usr/local/bin to path +export PATH=$PATH:%%PREFIX%%/bin + # set defaults : ${redmine_enable="NO"} : ${redmine_flags="-a 0.0.0.0 -p 3000 -e production"}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701031825.v03IPjx8028528>