net-im/mastodon: Update to version 1.5.1

Upstream changes: https://github.com/tootsuite/mastodon/releases/tag/v1.5.1

3 files changed, 70 insertions, 70 deletions

diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile
index db6c85de9a0a..e3e4bd34ab38 100644
--- a/net-im/mastodon/Makefile
+++ b/net-im/mastodon/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	mastodon
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5.0
-PORTREVISION=	2
+DISTVERSION=	1.5.1
 CATEGORIES=	net-im www
 
 MAINTAINER=	jrm@FreeBSD.org
@@ -17,71 +16,71 @@ RUN_DEPENDS=	ffmpeg>0:multimedia/ffmpeg \
 		libpqtypes>1.5.0:databases/libpqtypes
 
 # Dependencies below match Gemfile layout
-RUN_DEPENDS+=	rubygem-pkg-config>=1.2.0:devel/rubygem-pkg-config
-
-RUN_DEPENDS+=	rubygem-puma>0:www/rubygem-puma \
-		rubygem-rails5>0:www/rubygem-rails5 \
-		rubygem-uglifier>0:www/rubygem-uglifier
-
-RUN_DEPENDS+=	rubygem-hamlit-rails-rails5>0:www/rubygem-hamlit-rails-rails5 \
-		rubygem-pg>0:databases/rubygem-pg \
-		rubygem-pghero-rails5>0:databases/rubygem-pghero-rails5 \
-		rubygem-dotenv-rails-rails5>0:misc/rubygem-dotenv-rails-rails5
-
-RUN_DEPENDS+=	rubygem-aws-sdk>0:devel/rubygem-aws-sdk \
-		rubygem-paperclip-rails5>0:devel/rubygem-paperclip-rails5 \
-		rubygem-paperclip-av-transcoder>0:multimedia/rubygem-paperclip-av-transcoder
-
-RUN_DEPENDS+=	rubygem-active_model_serializers>0:databases/rubygem-active_model_serializers \
-		rubygem-addressable>0:www/rubygem-addressable \
-		rubygem-browser>0:www/rubygem-browser \
-		rubygem-charlock_holmes>0:textproc/rubygem-charlock_holmes \
-		rubygem-cld3>0:textproc/rubygem-cld3 \
-		rubygem-devise-rails5>0:devel/rubygem-devise-rails5 \
-		rubygem-devise-two-factor-rails5>0:security/rubygem-devise-two-factor-rails5 \
-		rubygem-doorkeeper-rails5>0:security/rubygem-doorkeeper-rails5 \
-		rubygem-fast_blank>0:devel/rubygem-fast_blank \
-		rubygem-goldfinger>0:www/rubygem-goldfinger \
-		rubygem-hiredis>0:databases/rubygem-hiredis \
-		rubygem-redis-namespace>0:databases/rubygem-redis-namespace \
-		rubygem-htmlentities>0:textproc/rubygem-htmlentities \
-		rubygem-http>0:www/rubygem-http \
-		rubygem-http_accept_language>0:devel/rubygem-http_accept_language \
-		rubygem-httplog>0:sysutils/rubygem-httplog \
-		rubygem-idn-ruby>0:dns/rubygem-idn-ruby \
-		rubygem-kaminari-rails5>0:www/rubygem-kaminari-rails5 \
-		rubygem-link_header>0:www/rubygem-link_header \
-		rubygem-nokogiri>0:textproc/rubygem-nokogiri \
-		rubygem-oj>0:devel/rubygem-oj \
-		rubygem-ostatus2>0:www/rubygem-ostatus2 \
-		rubygem-ox>0:textproc/rubygem-ox \
-		rubygem-pundit>0:security/rubygem-pundit \
-		rubygem-rabl>0:devel/rubygem-rabl \
-		rubygem-rack-attack>0:www/rubygem-rack-attack \
-		rubygem-rack-cors0>0:www/rubygem-rack-cors0 \
-		rubygem-rack-timeout>0:www/rubygem-rack-timeout \
-		rubygem-rails-i18n>0:devel/rubygem-rails-i18n \
-		rubygem-rails-settings-cached-rails5>0:www/rubygem-rails-settings-cached-rails5 \
-		rubygem-redis>0:databases/rubygem-redis \
-		rubygem-mario-redis-lock>0:databases/rubygem-mario-redis-lock \
-		rubygem-rqrcode>0:www/rubygem-rqrcode \
-		rubygem-ruby-oembed>0:www/rubygem-ruby-oembed \
-		rubygem-sanitize>0:textproc/rubygem-sanitize \
-		rubygem-sidekiq>0:devel/rubygem-sidekiq \
-		rubygem-sidekiq-scheduler>0:devel/rubygem-sidekiq-scheduler \
-		rubygem-sidekiq-unique-jobs>0:devel/rubygem-sidekiq-unique-jobs \
-		rubygem-sidekiq-bulk-rails5>0:devel/rubygem-sidekiq-bulk-rails5 \
-		rubygem-simple-navigation>0:devel/rubygem-simple-navigation \
-		rubygem-simple_form-rails5>0:devel/rubygem-simple_form-rails5 \
-		rubygem-sprockets-rails-rails5>0:devel/rubygem-sprockets-rails-rails5 \
-		rubygem-statsd-instrument>0:devel/rubygem-statsd-instrument \
-		rubygem-twitter-text>0:textproc/rubygem-twitter-text \
-		rubygem-tzinfo-data>0:devel/rubygem-tzinfo-data \
-		rubygem-webpacker-rails5>0:devel/rubygem-webpacker-rails5 \
-		rubygem-webpush>0:security/rubygem-webpush
-
-RUN_DEPENDS+=	rubygem-lograge-rails5>0:www/rubygem-lograge-rails5 \
-		rubygem-redis-rails-rails5>0:www/rubygem-redis-rails-rails5
+RUN_DEPENDS+=	rubygem-pkg-config>=1.2.3:devel/rubygem-pkg-config
+
+RUN_DEPENDS+=	rubygem-puma>=3.9.1:www/rubygem-puma \
+		rubygem-rails5>=5.1.3:www/rubygem-rails5 \
+		rubygem-uglifier>=3.2.0:www/rubygem-uglifier
+
+RUN_DEPENDS+=	rubygem-hamlit-rails-rails5>=0.2.0:www/rubygem-hamlit-rails-rails5 \
+		rubygem-pg>=0.21.0:databases/rubygem-pg \
+		rubygem-pghero-rails5>=1.7.0:databases/rubygem-pghero-rails5 \
+		rubygem-dotenv-rails-rails5>=2.2.1:misc/rubygem-dotenv-rails-rails5
+
+RUN_DEPENDS+=	rubygem-aws-sdk>=2.10.17:devel/rubygem-aws-sdk \
+		rubygem-paperclip-rails5>=5.1.0:devel/rubygem-paperclip-rails5 \
+		rubygem-paperclip-av-transcoder>=0.6.4:multimedia/rubygem-paperclip-av-transcoder
+
+RUN_DEPENDS+=	rubygem-active_model_serializers>=0.10.6:databases/rubygem-active_model_serializers \
+		rubygem-addressable>=2.5.1_1:www/rubygem-addressable \
+		rubygem-browser>=2.4.0:www/rubygem-browser \
+		rubygem-charlock_holmes>=0.7.3_5:textproc/rubygem-charlock_holmes \
+		rubygem-cld3>=3.1.3_1:textproc/rubygem-cld3 \
+		rubygem-devise-rails5>=4.3.0:devel/rubygem-devise-rails5 \
+		rubygem-devise-two-factor-rails5>=3.0.0:security/rubygem-devise-two-factor-rails5 \
+		rubygem-doorkeeper-rails5>=4.2.6:security/rubygem-doorkeeper-rails5 \
+		rubygem-fast_blank>=1.0.0:devel/rubygem-fast_blank \
+		rubygem-goldfinger>=2.0.1:www/rubygem-goldfinger \
+		rubygem-hiredis>=0.6.1:databases/rubygem-hiredis \
+		rubygem-redis-namespace>=1.5.3:databases/rubygem-redis-namespace \
+		rubygem-htmlentities>=4.3.4:textproc/rubygem-htmlentities \
+		rubygem-http>=2.2.2:www/rubygem-http \
+		rubygem-http_accept_language>=2.1.1:devel/rubygem-http_accept_language \
+		rubygem-httplog>=0.99.7:sysutils/rubygem-httplog \
+		rubygem-idn-ruby>=0.1.0:dns/rubygem-idn-ruby \
+		rubygem-kaminari-rails5>=1.0.1:www/rubygem-kaminari-rails5 \
+		rubygem-link_header>=0.0.8:www/rubygem-link_header \
+		rubygem-nokogiri>=1.8.0_1:textproc/rubygem-nokogiri \
+		rubygem-oj>=3.3.4:devel/rubygem-oj \
+		rubygem-ostatus2>=2.0.1:www/rubygem-ostatus2 \
+		rubygem-ox>=2.5.0:textproc/rubygem-ox \
+		rubygem-pundit>=1.1.0:security/rubygem-pundit \
+		rubygem-rabl>=0.13.1_1:devel/rubygem-rabl \
+		rubygem-rack-attack>=5.0.1:www/rubygem-rack-attack \
+		rubygem-rack-cors0>=0.4.1:www/rubygem-rack-cors0 \
+		rubygem-rack-timeout>=0.4.2:www/rubygem-rack-timeout \
+		rubygem-rails-i18n>=5.0.4:devel/rubygem-rails-i18n \
+		rubygem-rails-settings-cached-rails5>=0.6.6:www/rubygem-rails-settings-cached-rails5 \
+		rubygem-redis>=3.3.3:databases/rubygem-redis \
+		rubygem-mario-redis-lock>=1.2.0:databases/rubygem-mario-redis-lock \
+		rubygem-rqrcode>=0.10.1:www/rubygem-rqrcode \
+		rubygem-ruby-oembed>=0.12.0:www/rubygem-ruby-oembed \
+		rubygem-sanitize>=4.5.0:textproc/rubygem-sanitize \
+		rubygem-sidekiq>=5.0.4:devel/rubygem-sidekiq \
+		rubygem-sidekiq-scheduler>=2.1.8:devel/rubygem-sidekiq-scheduler \
+		rubygem-sidekiq-unique-jobs>=5.0.9:devel/rubygem-sidekiq-unique-jobs \
+		rubygem-sidekiq-bulk-rails5>=0.1.1:devel/rubygem-sidekiq-bulk-rails5 \
+		rubygem-simple-navigation>=4.0.5_1:devel/rubygem-simple-navigation \
+		rubygem-simple_form-rails5>=3.5.0:devel/rubygem-simple_form-rails5 \
+		rubygem-sprockets-rails-rails5>=3.2.0:devel/rubygem-sprockets-rails-rails5 \
+		rubygem-statsd-instrument>=2.1.4:devel/rubygem-statsd-instrument \
+		rubygem-twitter-text>=1.14.7:textproc/rubygem-twitter-text \
+		rubygem-tzinfo-data>=1.2017.2:devel/rubygem-tzinfo-data \
+		rubygem-webpacker-rails5>=2.0:devel/rubygem-webpacker-rails5 \
+		rubygem-webpush>=0.3.2_1:security/rubygem-webpush
+
+RUN_DEPENDS+=	rubygem-lograge-rails5>=0.6.0:www/rubygem-lograge-rails5 \
+		rubygem-redis-rails-rails5>=5.0.2:www/rubygem-redis-rails-rails5
 
 USES=		gnome pgsql python:2 shebangfix
 USE_GITHUB=	yes
diff --git a/net-im/mastodon/distinfo b/net-im/mastodon/distinfo
index 3577645e945d..e7d03c549693 100644
--- a/net-im/mastodon/distinfo
+++ b/net-im/mastodon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501596174
-SHA256 (tootsuite-mastodon-v1.5.0_GH0.tar.gz) = bead519f6a0fb2d45f7e83c5fa50c0340ff61b8d4c51154c6d92e490d558192a
-SIZE (tootsuite-mastodon-v1.5.0_GH0.tar.gz) = 9993509
+TIMESTAMP = 1502067757
+SHA256 (tootsuite-mastodon-v1.5.1_GH0.tar.gz) = 1caa5eaf1c5095203f52c7eb4b3f13fff31569dbf0b9f2af0320995b2ac9677b
+SIZE (tootsuite-mastodon-v1.5.1_GH0.tar.gz) = 9990113
diff --git a/net-im/mastodon/pkg-plist b/net-im/mastodon/pkg-plist
index 397685690eac..8e8af957bcc7 100644
--- a/net-im/mastodon/pkg-plist
+++ b/net-im/mastodon/pkg-plist
@@ -922,6 +922,7 @@
 %%WWWDIR%%/app/views/layouts/embedded.html.haml
 %%WWWDIR%%/app/views/layouts/error.html.haml
 %%WWWDIR%%/app/views/layouts/mailer.text.erb
+%%WWWDIR%%/app/views/layouts/modal.html.haml
 %%WWWDIR%%/app/views/layouts/public.html.haml
 %%WWWDIR%%/app/views/manifests/show.json.rabl
 %%WWWDIR%%/app/views/notification_mailer/_status.text.erb