From owner-svn-ports-all@freebsd.org Mon Jan 29 04:21:18 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EDBCDED3BDF; Mon, 29 Jan 2018 04:21:17 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9FF337DF78; Mon, 29 Jan 2018 04:21:17 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9AF4623308; Mon, 29 Jan 2018 04:21:17 +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 w0T4LHXb055093; Mon, 29 Jan 2018 04:21:17 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0T4LHQ1055092; Mon, 29 Jan 2018 04:21:17 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201801290421.w0T4LHQ1055092@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Mon, 29 Jan 2018 04:21:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460240 - head/net-im/mastodon X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: head/net-im/mastodon X-SVN-Commit-Revision: 460240 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: Mon, 29 Jan 2018 04:21:18 -0000 Author: jrm Date: Mon Jan 29 04:21:17 2018 New Revision: 460240 URL: https://svnweb.freebsd.org/changeset/ports/460240 Log: net-im/mastodon: depend on devel/rubygem-fog-core1 Without this change, two conflicting versions of the fog-core gem will be pulled in, version 1 (devel/rubygem-fog-core1) and version 2 (devel/rubygem-fog-core). Modified: head/net-im/mastodon/Makefile (contents, props changed) Modified: head/net-im/mastodon/Makefile ============================================================================== --- head/net-im/mastodon/Makefile Mon Jan 29 04:03:50 2018 (r460239) +++ head/net-im/mastodon/Makefile Mon Jan 29 04:21:17 2018 (r460240) @@ -3,7 +3,7 @@ PORTNAME= mastodon DISTVERSIONPREFIX= v DISTVERSION= 2.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im www MAINTAINER= jrm@FreeBSD.org @@ -28,7 +28,7 @@ BR_DEPENDS= ffmpeg>0:multimedia/ffmpeg \ rubygem-pghero-rails5>=2.0.0:databases/rubygem-pghero-rails5 \ rubygem-dotenv-rails-rails5>=2.2:misc/rubygem-dotenv-rails-rails5 \ rubygem-aws-sdk>=2.10:devel/rubygem-aws-sdk \ - rubygem-fog-core>=1.45:devel/rubygem-fog-core \ + rubygem-fog-core1>=1.45:devel/rubygem-fog-core1 \ rubygem-fog-local>=0.4:net/rubygem-fog-local \ rubygem-fog-openstack>=0.1:net/rubygem-fog-openstack \ rubygem-paperclip-rails5>=5.1.0:devel/rubygem-paperclip-rails5 \