Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Jan 2018 03:57:38 +0000 (UTC)
From:      Joseph Mingrone <jrm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r457945 - in head/databases/rubygem-mario-redis-lock: . files
Message-ID:  <201801030357.w033vcjh035602@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jrm
Date: Wed Jan  3 03:57:38 2018
New Revision: 457945
URL: https://svnweb.freebsd.org/changeset/ports/457945

Log:
  databases/rubygem-mario-redis-lock: patch to pull in databases/rubygem-redis
  
  After r457876 and r457886, net-im/mastodon failed to start because of an
  issue with both versions 3 and 4 of the redis gems being pulled in.
  
  /usr/local/lib/ruby/gems/2.4/gems/bundler-1.16.1/lib/bundler/runtime.rb:313:in
  `check_for_activated_spec!': You have already activated redis 4.0.1, but
  your Gemfile requires redis 3.3.5.

Added:
  head/databases/rubygem-mario-redis-lock/files/
  head/databases/rubygem-mario-redis-lock/files/patch-mario-redis-lock.gemspec   (contents, props changed)
Modified:
  head/databases/rubygem-mario-redis-lock/Makefile   (contents, props changed)

Modified: head/databases/rubygem-mario-redis-lock/Makefile
==============================================================================
--- head/databases/rubygem-mario-redis-lock/Makefile	Wed Jan  3 03:51:57 2018	(r457944)
+++ head/databases/rubygem-mario-redis-lock/Makefile	Wed Jan  3 03:57:38 2018	(r457945)
@@ -2,7 +2,7 @@
 
 PORTNAME=	mario-redis-lock
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
@@ -11,10 +11,11 @@ COMMENT=	Ruby distributed lock using Redis, with empha
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-redis3>=3.3.3:databases/rubygem-redis3
+RUN_DEPENDS=	rubygem-redis>=4:databases/rubygem-redis
 
 USES=		gem
 USE_RUBY=	yes
+
 NO_ARCH=	yes
 
 .include <bsd.port.mk>

Added: head/databases/rubygem-mario-redis-lock/files/patch-mario-redis-lock.gemspec
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/rubygem-mario-redis-lock/files/patch-mario-redis-lock.gemspec	Wed Jan  3 03:57:38 2018	(r457945)
@@ -0,0 +1,20 @@
+--- mario-redis-lock.gemspec.orig	2018-01-03 01:55:48 UTC
++++ mario-redis-lock.gemspec
+@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
+     s.specification_version = 4
+ 
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+-      s.add_runtime_dependency(%q<redis>.freeze, [">= 3.0.5", "~> 3"])
++      s.add_runtime_dependency(%q<redis>.freeze, [">= 3.0.5"])
+       s.add_development_dependency(%q<bundler>.freeze, ["~> 1"])
+       s.add_development_dependency(%q<rake>.freeze, ["~> 10"])
+     else
+@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
+       s.add_dependency(%q<rake>.freeze, ["~> 10"])
+     end
+   else
+-    s.add_dependency(%q<redis>.freeze, [">= 3.0.5", "~> 3"])
++    s.add_dependency(%q<redis>.freeze, [">= 3.0.5"])
+     s.add_dependency(%q<bundler>.freeze, ["~> 1"])
+     s.add_dependency(%q<rake>.freeze, ["~> 10"])
+   end



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