diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2018-01-03 03:57:38 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2018-01-03 03:57:38 +0000 |
| commit | df1ad146adc54719663963eb2baebb83a289f3b3 (patch) | |
| tree | 18ffca4b7fb66e9efb9592fbc81e798c94f98f53 /databases/rubygem-mario-redis-lock | |
| parent | 7529d42b64253fca83351d0c58f9b36555bb5c8c (diff) | |
| download | ports-df1ad146adc54719663963eb2baebb83a289f3b3.tar.gz ports-df1ad146adc54719663963eb2baebb83a289f3b3.zip | |
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.
Notes
Notes:
svn path=/head/; revision=457945
Diffstat (limited to 'databases/rubygem-mario-redis-lock')
| -rw-r--r-- | databases/rubygem-mario-redis-lock/Makefile | 5 | ||||
| -rw-r--r-- | databases/rubygem-mario-redis-lock/files/patch-mario-redis-lock.gemspec | 20 |
2 files changed, 23 insertions, 2 deletions
diff --git a/databases/rubygem-mario-redis-lock/Makefile b/databases/rubygem-mario-redis-lock/Makefile index f10eb62b1264..fde650c90868 100644 --- a/databases/rubygem-mario-redis-lock/Makefile +++ b/databases/rubygem-mario-redis-lock/Makefile @@ -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 emphasis in transparency 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> diff --git a/databases/rubygem-mario-redis-lock/files/patch-mario-redis-lock.gemspec b/databases/rubygem-mario-redis-lock/files/patch-mario-redis-lock.gemspec new file mode 100644 index 000000000000..298cad7c5bb9 --- /dev/null +++ b/databases/rubygem-mario-redis-lock/files/patch-mario-redis-lock.gemspec @@ -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 |