From owner-svn-ports-all@freebsd.org Wed Jan 3 03:57:49 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 3D399EA8C07; Wed, 3 Jan 2018 03:57:49 +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 129C6174E; Wed, 3 Jan 2018 03:57:49 +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 w033vmiO035736; Wed, 3 Jan 2018 03:57:48 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w033vmWr035734; Wed, 3 Jan 2018 03:57:48 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201801030357.w033vmWr035734@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:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457946 - in head/net-im/mastodon: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: in head/net-im/mastodon: . files X-SVN-Commit-Revision: 457946 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:49 -0000 Author: jrm Date: Wed Jan 3 03:57:47 2018 New Revision: 457946 URL: https://svnweb.freebsd.org/changeset/ports/457946 Log: net-im/mastodon: Fix run-time issues by updating dependencies - Depend on textproc/rubygem-twitter-text1 to fix a run-time error after textproc/rubygem-twitter-text was upgraded to a version unsupported by Mastodon. - After r457876, 457885, and r457886, net-im/mastodon failed to start, because of an issue with both versions 3 and 4 of the redis gem 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. Patch, so that only version 4 is pulled in. Modified: head/net-im/mastodon/Makefile (contents, props changed) head/net-im/mastodon/files/patch-Gemfile (contents, props changed) Modified: head/net-im/mastodon/Makefile ============================================================================== --- head/net-im/mastodon/Makefile Wed Jan 3 03:57:38 2018 (r457945) +++ head/net-im/mastodon/Makefile Wed Jan 3 03:57:47 2018 (r457946) @@ -3,7 +3,7 @@ PORTNAME= mastodon DISTVERSIONPREFIX= v DISTVERSION= 2.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im www MAINTAINER= jrm@FreeBSD.org @@ -65,7 +65,7 @@ BR_DEPENDS= ffmpeg>0:multimedia/ffmpeg \ rubygem-rack-timeout>=0.4:www/rubygem-rack-timeout \ rubygem-rails-i18n>=5.0:devel/rubygem-rails-i18n \ rubygem-rails-settings-cached-rails5>=0.6:www/rubygem-rails-settings-cached-rails5 \ - rubygem-redis3>=3.3:databases/rubygem-redis3 \ + rubygem-redis>=4.0:databases/rubygem-redis \ rubygem-mario-redis-lock>=1.2:databases/rubygem-mario-redis-lock \ rubygem-rqrcode>=0.10:www/rubygem-rqrcode \ rubygem-ruby-oembed>=0.12:www/rubygem-ruby-oembed \ @@ -78,7 +78,7 @@ BR_DEPENDS= ffmpeg>0:multimedia/ffmpeg \ rubygem-simple_form-rails5>=3.4:devel/rubygem-simple_form-rails5 \ rubygem-sprockets-rails-rails5>=3.2:devel/rubygem-sprockets-rails-rails5 \ rubygem-strong_migrations>=0.1.9:devel/rubygem-strong_migrations \ - rubygem-twitter-text>=1.14:textproc/rubygem-twitter-text \ + rubygem-twitter-text1>=1.14:textproc/rubygem-twitter-text1 \ rubygem-tzinfo-data>=1.2017:devel/rubygem-tzinfo-data \ rubygem-webpacker-rails5>=3.0:devel/rubygem-webpacker-rails5 \ rubygem-webpush>=0.3.2_1:security/rubygem-webpush \ Modified: head/net-im/mastodon/files/patch-Gemfile ============================================================================== --- head/net-im/mastodon/files/patch-Gemfile Wed Jan 3 03:57:38 2018 (r457945) +++ head/net-im/mastodon/files/patch-Gemfile Wed Jan 3 03:57:47 2018 (r457946) @@ -26,6 +26,15 @@ gem 'idn-ruby', require: 'idn' gem 'kaminari', '~> 1.1' gem 'link_header', '~> 0.0' +@@ -54,7 +53,7 @@ gem 'rack-cors', '~> 0.4', require: 'rac + gem 'rack-timeout', '~> 0.4' + gem 'rails-i18n', '~> 5.0' + gem 'rails-settings-cached', '~> 0.6' +-gem 'redis', '~> 3.3', require: ['redis', 'redis/connection/hiredis'] ++gem 'redis', '>= 3.3', require: ['redis', 'redis/connection/hiredis'] + gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock' + gem 'rqrcode', '~> 0.10' + gem 'ruby-oembed', '~> 0.12', require: 'oembed' @@ -75,45 +74,6 @@ gem 'webpush' gem 'json-ld-preloaded', '~> 2.2.1' gem 'rdf-normalize', '~> 0.3.1'