Index: head/www/redmine/Makefile =================================================================== --- head/www/redmine/Makefile (revision 409249) +++ head/www/redmine/Makefile (revision 409250) @@ -1,88 +1,88 @@ # Created by: Bernhard Froehlich # $FreeBSD$ PORTNAME= redmine PORTVERSION= 2.6.9 -PORTREVISION= 1 +PORTREVISION= 2 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-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-i18n>=0.7.0:${PORTSDIR}/devel/rubygem-i18n \ rubygem-jquery-rails>=3.1.4:${PORTSDIR}/www/rubygem-jquery-rails \ rubygem-mime-types>=0:${PORTSDIR}/misc/rubygem-mime-types \ rubygem-net-ldap>=0.3.1:${PORTSDIR}/net/rubygem-net-ldap \ rubygem-rack-openid>=0:${PORTSDIR}/www/rubygem-rack-openid \ rubygem-ruby-openid>=2.3.0:${PORTSDIR}/net/rubygem-ruby-openid \ rubygem-rails>=3.2.22:${PORTSDIR}/www/rubygem-rails \ rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake \ rubygem-rbpdf>=0:${PORTSDIR}/print/rubygem-rbpdf \ rubygem-redcarpet>=3.3.2:${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 OPTIONS_DEFAULT=MYSQL2 RMAGIC THIN OPTIONS_SINGLE= WWWSERVER OPTIONS_SINGLE_WWWSERVER= THIN PASSENGER OPTIONS_SUB= yes 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 PASSENGER_RUN_DEPENDS= passenger-config:${PORTSDIR}/www/rubygem-passenger POSTGRESQL_RUN_DEPENDS= rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg RMAGIC_RUN_DEPENDS= rubygem-rmagick>=2.13.4:${PORTSDIR}/graphics/rubygem-rmagick THIN_RUN_DEPENDS= thin:${PORTSDIR}/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 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 ${MKDIR} ${STAGEDIR}${WWWDIR}/bundler.d cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} do-install-RMAGIC-on: ${CP} ${FILESDIR}/rmagic.rb ${STAGEDIR}${WWWDIR}/bundler.d do-install-THIN-on: ${CP} ${FILESDIR}/thin.rb ${STAGEDIR}${WWWDIR}/bundler.d post-install: ${TOUCH} ${STAGEDIR}${WWWDIR}/Gemfile.lock .include Index: head/www/redmine/files/patch-Gemfile =================================================================== --- head/www/redmine/files/patch-Gemfile (revision 409249) +++ head/www/redmine/files/patch-Gemfile (revision 409250) @@ -1,78 +1,87 @@ ---- Gemfile.orig 2015-12-09 23:40:39 UTC +--- Gemfile.orig 2015-12-05 08:47:22 UTC +++ Gemfile @@ -1,37 +1,29 @@ source 'https://rubygems.org' -gem "rails", "3.2.22" +gem "rails", "~> 3.2" gem "rack-cache", "1.2" if RUBY_VERSION < "1.9.3" gem "jquery-rails", "~> 3.1.4" 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.0.5" gem "mime-types" -gem "rbpdf", "~> 1.18.7" +gem "rbpdf", ">= 1.18.7" -gem "i18n", "~> 0.6.11" +gem "i18n", ">= 0.6.11" # 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.3.0", :require => "openid" gem "rack-openid" end platforms :mri, :mingw do - # Optional gem for exporting the gantt to a PNG file, not supported with jruby - group :rmagick do - # RMagick 2 supports ruby 1.9 - # RMagick 1 would be fine for ruby 1.8 but Bundler does not support - # different requirements for the same gem on different platforms - gem "rmagick", (RUBY_VERSION < "1.9" ? "2.13.3" : "~> 2.13.4") - end - # Optional Markdown support, not for JRuby group :markdown do gem "redcarpet", (RUBY_VERSION < "1.9" ? "~> 2.3.0" : "~> 3.3.2") +@@ -62,7 +54,7 @@ if File.exist?(database_file) + gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw] + gem "activerecord-jdbcmysql-adapter", :platforms => :jruby + when /postgresql/ +- gem "pg", "~> 0.17.1", :platforms => [:mri, :mingw] ++ gem "pg", "~> 0.18.4", :platforms => [:mri, :mingw] + gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby + when /sqlite3/ + gem "sqlite3", :platforms => [:mri, :mingw] @@ -82,23 +74,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 "minitest" - gem "test-unit", "~> 3.0" - 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" - 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` @@ -111,3 +86,7 @@ Dir.glob File.expand_path("../plugins/*/ #TODO: switch to "eval_gemfile file" when bundler >= 1.2.0 will be required (rails 4) instance_eval File.read(file), file end + +Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle| + self.instance_eval(Bundler.read_file(bundle)) +end