Index: head/net-im/mastodon/Makefile =================================================================== --- head/net-im/mastodon/Makefile (revision 441963) +++ head/net-im/mastodon/Makefile (revision 441964) @@ -1,112 +1,112 @@ # $FreeBSD$ PORTNAME= mastodon DISTVERSIONPREFIX= v -DISTVERSION= 1.4rc5 +DISTVERSION= 1.4.1 CATEGORIES= net-im www MAINTAINER= jrm@FreeBSD.org COMMENT= GNU Social-compatible microblogging server LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE 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-rails50>0:www/rubygem-rails50 \ rubygem-uglifier>0:www/rubygem-uglifier RUN_DEPENDS+= rubygem-hamlit-rails-rails50>0:www/rubygem-hamlit-rails-rails50 \ rubygem-pg>0:databases/rubygem-pg \ rubygem-pghero-rails50>0:databases/rubygem-pghero-rails50 \ rubygem-dotenv-rails-rails50>0:misc/rubygem-dotenv-rails-rails50 \ RUN_DEPENDS+= rubygem-aws-sdk>0:devel/rubygem-aws-sdk \ rubygem-paperclip-rails50>0:devel/rubygem-paperclip-rails50 \ rubygem-paperclip-av-transcoder-rails50>0:multimedia/rubygem-paperclip-av-transcoder-rails50 RUN_DEPENDS+= rubygem-addressable>0:www/rubygem-addressable \ rubygem-cld3>0:textproc/rubygem-cld3 \ rubygem-devise-rails50>0:devel/rubygem-devise-rails50 \ rubygem-devise-two-factor-rails50>0:security/rubygem-devise-two-factor-rails50 \ rubygem-doorkeeper-rails50>0:security/rubygem-doorkeeper-rails50 \ 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-kaminari-rails50>0:www/rubygem-kaminari-rails50 \ 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-rabl-rails50>0:devel/rubygem-rabl-rails50 \ rubygem-rack-attack>0:www/rubygem-rack-attack \ rubygem-rack-cors>0:www/rubygem-rack-cors \ rubygem-rack-timeout>0:www/rubygem-rack-timeout \ rubygem-rails-i18n-rails50>0:devel/rubygem-rails-i18n-rails50 \ rubygem-rails-settings-cached-rails50>0:www/rubygem-rails-settings-cached-rails50 \ rubygem-redis>0:databases/rubygem-redis \ rubygem-rqrcode>0:www/rubygem-rqrcode \ rubygem-ruby-oembed>0:www/rubygem-ruby-oembed \ textproc/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-simple-navigation-rails50>0:devel/rubygem-simple-navigation-rails50 \ rubygem-simple_form-rails50>0:devel/rubygem-simple_form-rails50 \ rubygem-sprockets-rails-rails50>0:devel/rubygem-sprockets-rails-rails50 \ 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-rails50>0:devel/rubygem-webpacker-rails50 RUN_DEPENDS+= rubygem-lograge-rails50>0:www/rubygem-lograge-rails50 \ rubygem-redis-rails-rails50>0:www/rubygem-redis-rails-rails50 USES= gnome pgsql shebangfix USE_GITHUB= yes GH_ACCOUNT= tootsuite USE_GNOME= libxml2 libxslt USE_RC_SUBR= mastodon_stream mastodon_web mastodon_workers USE_RUBY= yes SHEBANG_FILES= bin/* USERS= ${PORTNAME} GROUPS= ${PORTNAME} NO_ARCH= yes NO_BUILD= yes SUB_LIST+= RAKE="${LOCALBASE}/bin/rake" RUBY="${RUBY_NAME}" SUB_FILES= 900.mastodon nginx.conf nginx-include.conf post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ ${WRKSRC}/bin/yarn \ ${WRKSRC}/config/environments/production.rb do-install: ${RM} ${WRKSRC}/Gemfile.lock \ ${WRKSRC}/lib/tasks/auto_annotate_models.rake ${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/periodic/daily \ ${STAGEDIR}${WWWDIR} ${STAGEDIR}/var/log/mastodon ${INSTALL_SCRIPT} ${WRKDIR}/900.mastodon \ ${STAGEDIR}${LOCALBASE}/etc/periodic/daily ${INSTALL_DATA} ${WRKDIR}/nginx.conf \ ${STAGEDIR}${WWWDIR}/nginx.conf.sample ${INSTALL_DATA} ${WRKDIR}/nginx-include.conf \ ${STAGEDIR}${WWWDIR}/nginx-include.conf.sample (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) .include Index: head/net-im/mastodon/distinfo =================================================================== --- head/net-im/mastodon/distinfo (revision 441963) +++ head/net-im/mastodon/distinfo (revision 441964) @@ -1,3 +1,3 @@ -TIMESTAMP = 1495897700 -SHA256 (tootsuite-mastodon-v1.4rc5_GH0.tar.gz) = 5deeb859c5ba2eb774b3160af7094a07ebcefa9198960705e3c9ff4473dfe2a3 -SIZE (tootsuite-mastodon-v1.4rc5_GH0.tar.gz) = 10143723 +TIMESTAMP = 1496009326 +SHA256 (tootsuite-mastodon-v1.4.1_GH0.tar.gz) = f4cef6e56c4eb84e5c20189c003093862341f7a2192e84c478589a4444868ea1 +SIZE (tootsuite-mastodon-v1.4.1_GH0.tar.gz) = 10144469 Index: head/net-im/mastodon/files/mastodon_stream.in =================================================================== --- head/net-im/mastodon/files/mastodon_stream.in (revision 441963) +++ head/net-im/mastodon/files/mastodon_stream.in (revision 441964) @@ -1,34 +1,36 @@ #! /bin/sh # PROVIDE: mastodon_stream # REQUIRE: LOGIN postgresql nginx redis # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable the Mastodon streaming # service. # # mastodon_stream_enable="YES" . /etc/rc.subr name=mastodon_stream rcvar="${name}_enable" +sig_stop="HUP" + load_rc_config "$name" : ${mastodon_stream_enable:="NO"} : ${mastodon_stream_port="4000"} mastodon_stream_chdir="%%WWWDIR%%" mastodon_stream_env="HOME=%%WWWDIR%% \ NODE_ENV=production \ PORT=\"${mastodon_stream_port}\" \ USER=mastodon" mastodon_stream_user="mastodon" command="%%PREFIX%%/bin/node" command_args="%%WWWDIR%%/node_modules/.bin/babel-node ./streaming/index.js \ >> /var/log/mastodon/${name}.log 2>&1 &" run_rc_command "$1" Index: head/net-im/mastodon/files/patch-Gemfile =================================================================== --- head/net-im/mastodon/files/patch-Gemfile (revision 441963) +++ head/net-im/mastodon/files/patch-Gemfile (revision 441964) @@ -1,55 +1,55 @@ ---- Gemfile.orig 2017-05-20 21:11:45 UTC +--- Gemfile.orig 2017-05-28 21:16:17 UTC +++ Gemfile @@ -19,7 +19,6 @@ gem 'paperclip', '~> 5.1' gem 'paperclip-av-transcoder', '~> 0.6' gem 'addressable', '~> 2.5' --gem 'bootsnap' +-gem 'bootsnap', '~> 0.3' gem 'cld3', '~> 3.1' gem 'devise', '~> 4.2' gem 'devise-two-factor', '~> 3.0' @@ -59,44 +58,6 @@ gem 'twitter-text', '~> 1.14' gem 'tzinfo-data', '~> 1.2017' gem 'webpacker', '~> 1.2' -group :development, :test do - gem 'fabrication', '~> 2.16' - gem 'fuubar', '~> 2.2' - gem 'i18n-tasks', '~> 0.9', require: false - gem 'pry-rails', '~> 0.3' - gem 'rspec-rails', '~> 3.6' -end - -group :test do - gem 'capybara', '~> 2.14' - gem 'faker', '~> 1.7' - gem 'microformats2', '~> 3.0' - gem 'rails-controller-testing', '~> 1.0' - gem 'rspec-sidekiq', '~> 3.0' - gem 'simplecov', '~> 0.14', require: false - gem 'webmock', '~> 3.0' - gem 'parallel_tests', '~> 2.14' -end - -group :development do - gem 'active_record_query_trace', '~> 1.5' - gem 'annotate', '~> 2.7' - gem 'better_errors', '~> 2.1' - gem 'binding_of_caller', '~> 0.7' - gem 'bullet', '~> 5.5' - gem 'letter_opener', '~> 1.4' - gem 'letter_opener_web', '~> 1.3' - gem 'rubocop', '~> 0.48', require: false - gem 'brakeman', '~> 3.6', require: false - gem 'bundler-audit', '~> 0.5', require: false - gem 'scss_lint', '~> 0.53', require: false - - gem 'capistrano', '~> 3.8' - gem 'capistrano-rails', '~> 1.2' - gem 'capistrano-rbenv', '~> 2.1' - gem 'capistrano-yarn', '~> 2.0' -end - group :production do gem 'lograge', '~> 0.5' gem 'redis-rails', '~> 5.0' Index: head/net-im/mastodon/pkg-message =================================================================== --- head/net-im/mastodon/pkg-message (revision 441963) +++ head/net-im/mastodon/pkg-message (revision 441964) @@ -1,9 +1,9 @@ ############################################################ -Visit the URL below to get started with Mastodon. +Visit this URL to get started with Mastodon. http://ftfl.ca/blog/2017-05-23-mastodon-freebsd.html -Visit this URL to upgrade. +Visit this URL to upgrade Mastodon. http://ftfl.ca/blog/2017-05-27-mastodon-freebsd-upgrade.html ############################################################