From owner-svn-ports-all@freebsd.org Wed Jan 3 03:57:39 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E0844EA8BCF; Wed, 3 Jan 2018 03:57:39 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BA46F1704; Wed, 3 Jan 2018 03:57:39 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w033vcNH035605; Wed, 3 Jan 2018 03:57:38 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w033vcjh035602; Wed, 3 Jan 2018 03:57:38 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201801030357.w033vcjh035602@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Wed, 3 Jan 2018 03:57:38 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: in head/databases/rubygem-mario-redis-lock: . files X-SVN-Commit-Revision: 457945 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jan 2018 03:57:40 -0000 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 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.freeze, [">= 3.0.5", "~> 3"]) ++ s.add_runtime_dependency(%q.freeze, [">= 3.0.5"]) + s.add_development_dependency(%q.freeze, ["~> 1"]) + s.add_development_dependency(%q.freeze, ["~> 10"]) + else +@@ -31,7 +31,7 @@ Gem::Specification.new do |s| + s.add_dependency(%q.freeze, ["~> 10"]) + end + else +- s.add_dependency(%q.freeze, [">= 3.0.5", "~> 3"]) ++ s.add_dependency(%q.freeze, [">= 3.0.5"]) + s.add_dependency(%q.freeze, ["~> 1"]) + s.add_dependency(%q.freeze, ["~> 10"]) + end