Index: head/www/redmine/Makefile
===================================================================
--- head/www/redmine/Makefile	(revision 397332)
+++ head/www/redmine/Makefile	(revision 397333)
@@ -1,93 +1,93 @@
 # Created by: Bernhard Froehlich <decke@bluelife.at>
 # $FreeBSD$
 
 PORTNAME=	redmine
 PORTVERSION=	2.6.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://www.redmine.org/releases/
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Flexible project management web application
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	rubygem-builder>=3.0.0:${PORTSDIR}/devel/rubygem-builder \
 		rubygem-bundler>=0:${PORTSDIR}/sysutils/rubygem-bundler \
 		rubygem-coderay>=1.0.9:${PORTSDIR}/textproc/rubygem-coderay \
 		rubygem-fastercsv>=1.5.0:${PORTSDIR}/devel/rubygem-fastercsv \
 		rubygem-i18n>=0.7.0:${PORTSDIR}/devel/rubygem-i18n \
 		rubygem-net-ldap>=0.3.1:${PORTSDIR}/net/rubygem-net-ldap \
 		rubygem-rack-openid>=0:${PORTSDIR}/www/rubygem-rack-openid \
 		rubygem-rails>=3.2.16:${PORTSDIR}/www/rubygem-rails \
 		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake \
 		rubygem-rbpdf>=0:${PORTSDIR}/print/rubygem-rbpdf \
 		rubygem-redcarpet>=3.0:${PORTSDIR}/textproc/rubygem-redcarpet \
 		rubygem-request_store>=1.1.0:${PORTSDIR}/devel/rubygem-request_store \
 		rubygem-rubytree>=0:${PORTSDIR}/devel/rubygem-rubytree
 
 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 MYSQL2 POSTGRESQL RMAGIC WWWSERVER
 OPTIONS_DEFAULT=MYSQL2 RMAGIC WWWSERVER THIN
 OPTIONS_SINGLE=	WWWSERVER
 OPTIONS_SINGLE_WWWSERVER=	THIN PASSENGER
 POSTGRESQL_DESC=Enable PostgreSQL support
 RMAGIC_DESC=	Enable Gantt charts support
 THIN_DESC=	Use Thin WEB server
 PASSENGER_DESC=	Use Apache/Nginx WEB server
 MYSQL2_DESC=	MySQL database support (via mysql2 rubygem)
 NO_OPTIONS_SORT=yes
 
 MYSQL_RUN_DEPENDS=	rubygem-mysql>=2.8.1:${PORTSDIR}/databases/rubygem-mysql
 MYSQL2_RUN_DEPENDS=	rubygem-mysql2>=0:${PORTSDIR}/databases/rubygem-mysql2
 POSTGRESQL_RUN_DEPENDS=	rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg
 RMAGIC_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Gemfile
 RMAGIC_RUN_DEPENDS=	rubygem-rmagick>=2.0.0:${PORTSDIR}/graphics/rubygem-rmagick
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MWWWSERVER}
 .if ${PORT_OPTIONS:MTHIN}
 RUN_DEPENDS+=	thin:${PORTSDIR}/www/rubygem-thin
 USE_RC_SUBR=	redmine
 SUB_LIST+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-thin-Gemfile
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
 RUN_DEPENDS+=	passenger-config:${PORTSDIR}/www/rubygem-passenger
 .endif
 .endif
 
 post-extract:
 	@${RM} ${WRKSRC}/.hgignore ${WRKSRC}/.travis.yml
 	@${MV} ${WRKSRC}/config/settings.yml ${WRKSRC}/config/settings.yml-dist
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.bak' -o -name '*.orig' -delete
 
 pre-install:
 	${MKDIR} ${WRKSRC}/public/plugin_assets
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/pids
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 
 post-install:
 	${TOUCH} ${STAGEDIR}${WWWDIR}/Gemfile.lock
 	if ! [ -r ${STAGEDIR}${WWWDIR}/config/settings.yml ]; then		\
 		${INSTALL_DATA} ${STAGEDIR}${WWWDIR}/config/settings.yml-dist	\
 			${STAGEDIR}${WWWDIR}/config/settings.yml;		\
 	fi
 
 .include <bsd.port.mk>
Index: head/www/redmine/files/patch-Gemfile
===================================================================
--- head/www/redmine/files/patch-Gemfile	(revision 397332)
+++ head/www/redmine/files/patch-Gemfile	(revision 397333)
@@ -1,65 +1,65 @@
 --- Gemfile.orig	2015-05-25 16:10:44 UTC
 +++ Gemfile
 @@ -1,24 +1,24 @@
  source 'https://rubygems.org'
  
 -gem "rails", "3.2.21"
 +gem "rails", "~> 3.2"
  gem "jquery-rails", "~> 3.1.1"
  gem "coderay", "~> 1.1.0"
  gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
  gem "builder", ">= 3.0.4"
 -gem "request_store", "1.0.5"
-+gem "request_store", "~> 1.1.0"
++gem "request_store", ">= 1.0.5"
  gem "mime-types"
  gem "rbpdf", "~> 1.18.5"
  
 -gem "i18n", "~> 0.6.11"
 +gem "i18n", "~> 0.7.0"
  
  # Optional gem for LDAP authentication
  group :ldap do
 -  gem "net-ldap", "~> 0.3.1"
 +  gem "net-ldap", ">= 0.3.1"
  end
  
  # Optional gem for OpenID authentication
  group :openid do
 -  gem "ruby-openid", "~> 2.3.0", :require => "openid"
 +  gem "ruby-openid", "~> 2.7", :require => "openid"
    gem "rack-openid"
  end
  
 @@ -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
 -    gem "redcarpet", "~> 2.3.0"
 +    gem "redcarpet", "~> 3.0"
    end
  end
  
 @@ -81,23 +81,6 @@ else
    warn("Please configure your config/database.yml first")
  end
  
 -group :development do
 -  gem "rdoc", ">= 2.4.2"
 -  gem "yard"
 -end
 -
 -group :test do
 -  gem "shoulda", "~> 3.3.2"
 -  gem "shoulda-matchers", "1.4.1"
 -  gem "mocha", "~> 1.0.0", :require => 'mocha/api'
 -  if RUBY_VERSION >= '1.9.3'
 -    gem "capybara"
 -    gem "selenium-webdriver"
 -    # building ffi 1.9.7 fails in Ubuntu: https://github.com/ffi/ffi/issues/414
 -    gem "ffi", "1.9.6"
 -  end
 -end
 -
  local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
  if File.exists?(local_gemfile)
    puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`