Index: branches/2017Q1/mail/rubygem-roadie/Makefile =================================================================== --- branches/2017Q1/mail/rubygem-roadie/Makefile (revision 430492) +++ branches/2017Q1/mail/rubygem-roadie/Makefile (revision 430493) @@ -1,21 +1,22 @@ # $FreeBSD$ PORTNAME= roadie PORTVERSION= 3.2.0 +PORTREVISION= 1 CATEGORIES= mail rubygems MASTER_SITES= RG MAINTAINER= ruby@FreeBSD.org COMMENT= Helper for generating HTML mails LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-css_parser>=1.4.5:textproc/rubygem-css_parser \ rubygem-nokogiri>=1.5.0:textproc/rubygem-nokogiri NO_ARCH= yes USE_RUBY= yes USES= gem .include Index: branches/2017Q1/mail/rubygem-roadie/files/patch-gemspec =================================================================== --- branches/2017Q1/mail/rubygem-roadie/files/patch-gemspec (nonexistent) +++ branches/2017Q1/mail/rubygem-roadie/files/patch-gemspec (revision 430493) @@ -0,0 +1,11 @@ +--- roadie.gemspec.orig 2017-01-02 22:36:03.020933000 -0500 ++++ roadie.gemspec 2017-01-02 22:36:14.436284000 -0500 +@@ -24,7 +24,7 @@ + s.specification_version = 4 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then +- s.add_runtime_dependency(%q.freeze, ["< 1.7.0", ">= 1.5.0"]) ++ s.add_runtime_dependency(%q.freeze, [">= 1.5.0"]) + s.add_runtime_dependency(%q.freeze, ["~> 1.4.5"]) + s.add_development_dependency(%q.freeze, ["~> 3.0"]) + s.add_development_dependency(%q.freeze, ["~> 1.0"]) Property changes on: branches/2017Q1/mail/rubygem-roadie/files/patch-gemspec ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q1/www/redmine/Makefile =================================================================== --- branches/2017Q1/www/redmine/Makefile (revision 430492) +++ branches/2017Q1/www/redmine/Makefile (revision 430493) @@ -1,104 +1,104 @@ # Created by: Bernhard Froehlich # $FreeBSD$ PORTNAME= redmine PORTVERSION= 3.2.3 -PORTREVISION= 2 +PORTREVISION= 4 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.5:www/rubygem-rails4 \ rubygem-jquery-rails4>=3.1.4:www/rubygem-jquery-rails4 \ rubygem-coderay>=1.1.0:textproc/rubygem-coderay \ rubygem-builder>=3.0.4:devel/rubygem-builder \ rubygem-request_store>=1.0.5:devel/rubygem-request_store \ rubygem-mime-types>=0:misc/rubygem-mime-types \ rubygem-mimemagic>=0:misc/rubygem-mimemagic \ rubygem-protected_attributes>=0:devel/rubygem-protected_attributes \ rubygem-actionpack-action_caching>=0:devel/rubygem-actionpack-action_caching \ rubygem-actionpack-xml_parser>=0:textproc/rubygem-actionpack-xml_parser \ rubygem-roadie-rails>=0:mail/rubygem-roadie-rails \ 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 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.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 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 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 Index: branches/2017Q1/www/redmine/files/mysql.rb =================================================================== --- branches/2017Q1/www/redmine/files/mysql.rb (revision 430492) +++ branches/2017Q1/www/redmine/files/mysql.rb (revision 430493) @@ -1 +1 @@ -gem "mysql2", "~> 0.3.11" +gem "mysql2", "~> 0.4.5" Index: branches/2017Q1/www/redmine/files/patch-Gemfile =================================================================== --- branches/2017Q1/www/redmine/files/patch-Gemfile (revision 430492) +++ branches/2017Q1/www/redmine/files/patch-Gemfile (revision 430493) @@ -1,96 +1,101 @@ --- 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 -gem "rails", "4.2.5.2" -gem "jquery-rails", "~> 3.1.4" +gem "rails", ">= 4.2.5.2" +gem "jquery-rails" gem "coderay", "~> 1.1.0" gem "builder", ">= 3.0.4" -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-action_caching" @@ -17,7 +17,7 @@ gem "roadie-rails" gem "mimemagic" # Request at least nokogiri 1.6.7.2 because of security advisories -gem "nokogiri", ">= 1.6.7.2" +gem "nokogiri" # 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" + gem "ruby-openid", ">= 2.3.0", :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.3.2" - end -end - 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/ - gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw] + gem "pg", ">= 0.18.1", :platforms => [:mri, :mingw, :x64_mingw] 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 -group :development do - gem "rdoc", ">= 2.4.2" - gem "yard" -end - -group :test do - gem "minitest" - gem "rails-dom-testing" - gem "mocha" - gem "simplecov", "~> 0.9.1", :require => false - # For running UI tests - gem "capybara" - gem "selenium-webdriver" -end - 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 + +Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle| + self.instance_eval(Bundler.read_file(bundle)) +end Index: branches/2017Q1/www/redmine/files/redmine.in =================================================================== --- branches/2017Q1/www/redmine/files/redmine.in (revision 430492) +++ branches/2017Q1/www/redmine/files/redmine.in (revision 430493) @@ -1,37 +1,40 @@ #!/bin/sh # $FreeBSD$ # PROVIDE: redmine # REQUIRE: LOGIN # KEYWORD: shutdown # Add the following line to /etc/rc.conf[.local] to enable redmine # # redmine_enable (bool): Set to "NO" by default. # Set it to "YES" to enable redmine. # redmine_flags (str): Custom additional arguments to be passed # to redmine. # redmine_user (str): User account to run thin with. (default: %%WWWOWN%%) # redmine_group (str): Group to run thin with. (default: %%WWWGRP%%) . /etc/rc.subr name="redmine" rcvar=redmine_enable command=%%RUBY_NAME%% 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"} : ${redmine_user="%%WWWOWN%%"} : ${redmine_group="%%WWWGRP%%"} command_args="-d -D -c %%WWWDIR%% -u ${redmine_user} -g ${redmine_group}" start_cmd="%%PREFIX%%/bin/thin ${command_args} ${redmine_flags} start" run_rc_command "$1" Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 430492) +++ branches/2017Q1 (revision 430493) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r430437,430439-430440