Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Oct 2016 11:23:44 +0000 (UTC)
From:      Torsten Zuehlsdorff <tz@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r423958 - in head/www/redmine: . files
Message-ID:  <201610141123.u9EBNie6058276@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tz
Date: Fri Oct 14 11:23:44 2016
New Revision: 423958
URL: https://svnweb.freebsd.org/changeset/ports/423958

Log:
  www/redmine: Unbreak after update of databases/rubygem-pg
  
  Approved by: pi (mentor)

Modified:
  head/www/redmine/Makefile
  head/www/redmine/files/patch-Gemfile
  head/www/redmine/files/pg.rb

Modified: head/www/redmine/Makefile
==============================================================================
--- head/www/redmine/Makefile	Fri Oct 14 11:13:25 2016	(r423957)
+++ head/www/redmine/Makefile	Fri Oct 14 11:23:44 2016	(r423958)
@@ -3,7 +3,7 @@
 
 PORTNAME=	redmine
 PORTVERSION=	3.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.redmine.org/releases/
 

Modified: head/www/redmine/files/patch-Gemfile
==============================================================================
--- head/www/redmine/files/patch-Gemfile	Fri Oct 14 11:13:25 2016	(r423957)
+++ head/www/redmine/files/patch-Gemfile	Fri Oct 14 11:23:44 2016	(r423958)
@@ -55,6 +55,15 @@
  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)
+       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
    warn("Please configure your config/database.yml first")
  end

Modified: head/www/redmine/files/pg.rb
==============================================================================
--- head/www/redmine/files/pg.rb	Fri Oct 14 11:13:25 2016	(r423957)
+++ head/www/redmine/files/pg.rb	Fri Oct 14 11:23:44 2016	(r423958)
@@ -1 +1 @@
-gem "pg", "~> 0.18.1"
+gem "pg", ">= 0.18.1"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610141123.u9EBNie6058276>