From owner-svn-ports-all@freebsd.org Wed Mar 14 22:57:31 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 1835FF500C3; Wed, 14 Mar 2018 22:57:31 +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 B81417BA17; Wed, 14 Mar 2018 22:57:30 +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 AEF266170; Wed, 14 Mar 2018 22:57:30 +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 w2EMvUKR035105; Wed, 14 Mar 2018 22:57:30 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2EMvUbK035103; Wed, 14 Mar 2018 22:57:30 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201803142257.w2EMvUbK035103@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Wed, 14 Mar 2018 22:57:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464537 - 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: 464537 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, 14 Mar 2018 22:57:31 -0000 Author: jrm Date: Wed Mar 14 22:57:30 2018 New Revision: 464537 URL: https://svnweb.freebsd.org/changeset/ports/464537 Log: net-im/mastodon: Fix build after r464421 Pointy hat: sunpoet Reported by: Gary Carter 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 Mar 14 22:50:27 2018 (r464536) +++ head/net-im/mastodon/Makefile Wed Mar 14 22:57:30 2018 (r464537) @@ -3,6 +3,7 @@ PORTNAME= mastodon DISTVERSIONPREFIX= v DISTVERSION= 2.3.1 +PORTREVISION= 1 CATEGORIES= net-im www MAINTAINER= ports@FreeBSD.org Modified: head/net-im/mastodon/files/patch-Gemfile ============================================================================== --- head/net-im/mastodon/files/patch-Gemfile Wed Mar 14 22:50:27 2018 (r464536) +++ head/net-im/mastodon/files/patch-Gemfile Wed Mar 14 22:57:30 2018 (r464537) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2018-03-09 12:11:43 UTC +--- Gemfile.orig 2018-03-13 15:16:51 UTC +++ Gemfile @@ -9,15 +9,15 @@ gem 'puma', '~> 3.10' gem 'rails', '~> 5.1.4' @@ -20,6 +20,15 @@ gem 'paperclip-av-transcoder', '~> 0.6' gem 'streamio-ffmpeg', '~> 3.0' +@@ -32,7 +32,7 @@ gem 'cld3', '~> 3.2.0' + gem 'devise', '~> 4.4' + gem 'devise-two-factor', '~> 3.0' + +-gem 'devise_pam_authenticatable2', '~> 8.0', install_if: -> { ENV['PAM_ENABLED'] == 'true' } ++gem 'devise_pam_authenticatable2', '>= 8.0', install_if: -> { ENV['PAM_ENABLED'] == 'true' } + gem 'net-ldap', '~> 0.10' + gem 'omniauth-cas', '~> 1.1' + gem 'omniauth-saml', '~> 1.10' @@ -47,7 +47,7 @@ gem 'redis-namespace', '~> 1.5' gem 'htmlentities', '~> 4.3' gem 'http', '~> 3.0'