Index: head/www/redmine/Makefile
===================================================================
--- head/www/redmine/Makefile	(revision 460212)
+++ head/www/redmine/Makefile	(revision 460213)
@@ -1,115 +1,116 @@
 # Created by: Bernhard Froehlich <decke@bluelife.at>
 # $FreeBSD$
 
 PORTNAME=	redmine
 PORTVERSION=	3.4.4
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.redmine.org/releases/
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Flexible project management web application
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
 RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
 		rubygem-rails4>=4.2.8:www/rubygem-rails4 \
 		rubygem-jquery-rails>=4.3.0:www/rubygem-jquery-rails \
 		rubygem-coderay>=1.1.1:textproc/rubygem-coderay \
 		rubygem-request_store>=1.0.5:devel/rubygem-request_store \
 		rubygem-mime-types>=0:misc/rubygem-mime-types \
 		rubygem-protected_attributes>=0:devel/rubygem-protected_attributes \
 		rubygem-actionpack-xml_parser1>=0:textproc/rubygem-actionpack-xml_parser1 \
 		rubygem-roadie-rails>=1.2.0:mail/rubygem-roadie-rails \
 		rubygem-roadie>=3.2.1:mail/rubygem-roadie \
 		rubygem-mimemagic>=0:misc/rubygem-mimemagic \
 		rubygem-mail>=2.6.4:mail/rubygem-mail \
 		rubygem-nokogiri>=1.8.1:textproc/rubygem-nokogiri \
 		rubygem-i18n>=0.8.5:devel/rubygem-i18n \
 		rubygem-ffi>=1.9.14:devel/rubygem-ffi \
 		rubygem-rails-html-sanitizer>=1.0.3:textproc/rubygem-rails-html-sanitizer \
 		rubygem-rbpdf>=1.19.2:print/rubygem-rbpdf \
 		rubygem-net-ldap>=0.12.0:net/rubygem-net-ldap \
 		rubygem-ruby-openid>=2.3.0:net/rubygem-ruby-openid \
 		rubygem-rack-openid>=0:www/rubygem-rack-openid \
 		rubygem-rake>=0:devel/rubygem-rake
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 USE_RUBY=	yes
 USES=		cpe
 
 USERS=		${WWWOWN}
 GROUPS=		${WWWGRP}
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 SUB_LIST=	RUBY_NAME=${RUBY_NAME}
 
 OPTIONS_DEFINE=	MYSQL POSTGRESQL LDAP MARKDOWN RMAGIC
 OPTIONS_DEFAULT=MYSQL MARKDOWN RMAGIC THIN
 OPTIONS_SINGLE=	WWWSERVER
 OPTIONS_SINGLE_WWWSERVER=	THIN PASSENGER
 OPTIONS_SUB=	yes
 POSTGRESQL_DESC=Enable PostgreSQL support
 LDAP_DESC=	Enable LDAP Authentification
 MARKDOWN_DESC=	Enable Markdown support
 RMAGIC_DESC=	Enable Gantt charts support
 THIN_DESC=	Use Thin WEB server
 PASSENGER_DESC=	Use Apache/Nginx WEB server
 MYSQL_DESC=	MySQL database support (via mysql2 rubygem)
 NO_OPTIONS_SORT=	yes
 
 MYSQL_RUN_DEPENDS=	rubygem-mysql2>=0.4.6: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.4.0:textproc/rubygem-redcarpet
 RMAGIC_RUN_DEPENDS=	rubygem-rmagick>=2.14.0:graphics/rubygem-rmagick
 THIN_RUN_DEPENDS=	rubygem-thin>=1.6.2:www/rubygem-thin
 THIN_SUB_LIST=		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 THIN_VARS=		USE_RC_SUBR=redmine
 
 post-extract:
 	@${RM} ${WRKSRC}/.hgignore ${WRKSRC}/.travis.yml
 	@${MV} ${WRKSRC}/config/settings.yml ${WRKSRC}/config/settings.yml.sample
 	@${MV} ${WRKSRC}/config/database.yml.example ${WRKSRC}/config/database.yml.sample
 	@${TOUCH} ${WRKSRC}/log/development.log
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 pre-install:
 	${MKDIR} ${WRKSRC}/public/plugin_assets
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/pids
 	${MKDIR} ${STAGEDIR}${WWWDIR}/bundler.d
 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/pdf
 	${TOUCH} ${STAGEDIR}${WWWDIR}/tmp/pdf/empty
 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/test
 	${TOUCH} ${STAGEDIR}${WWWDIR}/tmp/test/empty
 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/thumbnails
 	${TOUCH} ${STAGEDIR}${WWWDIR}/tmp/thumbnails/empty
 	${MKDIR} ${STAGEDIR}${WWWDIR}/log
 	${TOUCH} ${STAGEDIR}${WWWDIR}/log/development.log
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 	${TOUCH} ${STAGEDIR}${WWWDIR}/Gemfile.lock
 
 do-install-MYSQL-on:
 	${CP} ${FILESDIR}/mysql.rb ${STAGEDIR}${WWWDIR}/bundler.d
 
 do-install-POSTGRESQL-on:
 	${CP} ${FILESDIR}/pg.rb ${STAGEDIR}${WWWDIR}/bundler.d
 
 do-install-LDAP-on:
 	${CP} ${FILESDIR}/ldap.rb ${STAGEDIR}${WWWDIR}/bundler.d
 
 do-install-MARKDOWN-on:
 	${CP} ${FILESDIR}/markdown.rb ${STAGEDIR}${WWWDIR}/bundler.d
 
 do-install-RMAGIC-on:
 	${CP} ${FILESDIR}/rmagic.rb ${STAGEDIR}${WWWDIR}/bundler.d
 
 do-install-THIN-on:
 	${CP} ${FILESDIR}/thin.rb ${STAGEDIR}${WWWDIR}/bundler.d
 
 .include <bsd.port.mk>
Index: head/www/redmine/files/patch-Gemfile
===================================================================
--- head/www/redmine/files/patch-Gemfile	(revision 460212)
+++ head/www/redmine/files/patch-Gemfile	(revision 460213)
@@ -1,94 +1,95 @@
 --- Gemfile.orig	2018-01-08 19:38:18 UTC
 +++ Gemfile
 @@ -4,24 +4,24 @@ 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
  
 -gem "rails", "4.2.8"
 +gem "rails", ">= 4.2.8"
  gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
  if RUBY_VERSION < "2.1"
    gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
  end
 -gem "jquery-rails", "~> 3.1.4"
 +gem "jquery-rails", ">= 3.1.4"
  gem "coderay", "~> 1.1.1"
 -gem "request_store", "1.0.5"
 +gem "request_store", ">= 1.0.5"
  gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
  gem "protected_attributes"
  gem "actionpack-xml_parser"
 -gem "roadie-rails", "~> 1.1.1"
 +gem "roadie-rails", "~> 1.1", ">= 1.1.1"
  gem "roadie", "~> 3.2.1"
  gem "mimemagic"
- gem "mail", "~> 2.6.4"
+-gem "mail", "~> 2.6.4"
++gem "mail", ">= 2.6.4"
  
  gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.1" : "~> 1.6.8")
 -gem "i18n", "~> 0.7.0"
 +gem "i18n", "~> 0.7"
  gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
  
  # Request at least rails-html-sanitizer 1.0.3 because of security advisories
 @@ -33,27 +33,15 @@ gem "rbpdf", "~> 1.19.3"
  
  # Optional gem for LDAP authentication
  group :ldap do
 -  gem "net-ldap", "~> 0.12.0"
 +  gem "net-ldap", "~> 0.12"
  end
  
  # Optional gem for OpenID authentication
  group :openid do
 -  gem "ruby-openid", "~> 2.3.0", :require => "openid"
 +  gem "ruby-openid", "~> 2.3", :require => "openid"
    gem "rack-openid"
  end
  
 -platforms :mri, :mingw, :x64_mingw do
 -  # Optional gem for exporting the gantt to a PNG file, not supported with jruby
 -  group :rmagick do
 -    gem "rmagick", ">= 2.14.0"
 -  end
 -
 -  # Optional Markdown support, not for JRuby
 -  group :markdown do
 -    gem "redcarpet", "~> 3.4.0"
 -  end
 -end
 -
  # Include database gems for the adapters found in the database
  # configuration file
  require 'erb'
 @@ -86,23 +74,6 @@ else
    warn("Please configure your config/database.yml first")
  end
  
 -group :development do
 -  gem "rdoc", "~> 4.3"
 -  gem "yard"
 -end
 -
 -group :test do
 -  gem "minitest"
 -  gem "rails-dom-testing"
 -  gem "mocha"
 -  gem "simplecov", "~> 0.9.1", :require => false
 -  # TODO: remove this after upgrading to Rails 5
 -  gem "test_after_commit", "~> 0.4.2"
 -  # For running UI tests
 -  gem "capybara"
 -  gem "selenium-webdriver", "~> 2.53.4"
 -end
 -
  local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
  if File.exists?(local_gemfile)
    eval_gemfile local_gemfile
 @@ -112,3 +83,7 @@ end
  Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file|
    eval_gemfile file
  end
 +
 +Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle|
 +  self.instance_eval(Bundler.read_file(bundle))
 +end