aboutsummaryrefslogtreecommitdiffstats
path: root/net-im
diff options
context:
space:
mode:
authorjrm <jrm@FreeBSD.org>2018-03-15 06:57:30 +0800
committerjrm <jrm@FreeBSD.org>2018-03-15 06:57:30 +0800
commitfd6c6badc7f6030a9e610708268b619a5f78e0d6 (patch)
tree4beefbe44a9c32d5628354174620fc51ea6381ab /net-im
parentb8df0db1721ffc80ec78e3e359b44b91a095e4f4 (diff)
downloadfreebsd-ports-gnome-fd6c6badc7f6030a9e610708268b619a5f78e0d6.tar.gz
freebsd-ports-gnome-fd6c6badc7f6030a9e610708268b619a5f78e0d6.tar.zst
freebsd-ports-gnome-fd6c6badc7f6030a9e610708268b619a5f78e0d6.zip
net-im/mastodon: Fix build after r464421
Pointy hat: sunpoet Reported by: Gary Carter <kithop@gmail.com>
Diffstat (limited to 'net-im')
-rw-r--r--net-im/mastodon/Makefile1
-rw-r--r--net-im/mastodon/files/patch-Gemfile11
2 files changed, 11 insertions, 1 deletions
diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile
index 17c2025ed0bd..fd3db0549bd9 100644
--- a/net-im/mastodon/Makefile
+++ b/net-im/mastodon/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mastodon
DISTVERSIONPREFIX= v
DISTVERSION= 2.3.1
+PORTREVISION= 1
CATEGORIES= net-im www
MAINTAINER= ports@FreeBSD.org
diff --git a/net-im/mastodon/files/patch-Gemfile b/net-im/mastodon/files/patch-Gemfile
index c89e3872c0be..cb79ae0162bf 100644
--- a/net-im/mastodon/files/patch-Gemfile
+++ b/net-im/mastodon/files/patch-Gemfile
@@ -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'