net-im/mastodon: Add www/npm to RUN_DEPENDS and fix the false postive

RUBY_SUFFIX substitutions in pkg-plist

Reported by:	swills

2 files changed, 89 insertions, 88 deletions

diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile
index 953e839e2ec6..6ffedc792d55 100644
--- a/net-im/mastodon/Makefile
+++ b/net-im/mastodon/Makefile
@@ -12,7 +12,8 @@ LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	ffmpeg>0:multimedia/ffmpeg \
-		libpqtypes>1.5.0:databases/libpqtypes
+		libpqtypes>1.5.0:databases/libpqtypes \
+		npm>=0:www/npm
 
 # Dependencies below match Gemfile layout
 RUN_DEPENDS+=	rubygem-pkg-config>=1.2.0:devel/rubygem-pkg-config
diff --git a/net-im/mastodon/pkg-plist b/net-im/mastodon/pkg-plist
index f8d18b84e88e..dd626959e186 100644
--- a/net-im/mastodon/pkg-plist
+++ b/net-im/mastodon/pkg-plist
@@ -1254,23 +1254,23 @@ etc/periodic/daily/900.mastodon
 %%WWWDIR%%/config/webpack/shared.js
 %%WWWDIR%%/config/webpack/test.js
 %%WWWDIR%%/config/webpack/translationRunner.js
-%%WWWDIR%%/db/migrate/201602%%RUBY_SUFFIX%%162837_add_metadata_to_statuses.rb
-%%WWWDIR%%/db/migrate/201602%%RUBY_SUFFIX%%164502_make_uris_nullable_in_statuses.rb
-%%WWWDIR%%/db/migrate/201602%%RUBY_SUFFIX%%1657%%RUBY_SUFFIX%%_add_url_to_statuses.rb
-%%WWWDIR%%/db/migrate/201602%%RUBY_SUFFIX%%165855_add_url_to_accounts.rb
-%%WWWDIR%%/db/migrate/201602%%RUBY_SUFFIX%%171800_create_favourites.rb
+%%WWWDIR%%/db/migrate/20160223162837_add_metadata_to_statuses.rb
+%%WWWDIR%%/db/migrate/20160223164502_make_uris_nullable_in_statuses.rb
+%%WWWDIR%%/db/migrate/20160223165723_add_url_to_statuses.rb
+%%WWWDIR%%/db/migrate/20160223165855_add_url_to_accounts.rb
+%%WWWDIR%%/db/migrate/20160223171800_create_favourites.rb
 %%WWWDIR%%/db/migrate/20160220174730_create_accounts.rb
 %%WWWDIR%%/db/migrate/20160220211917_create_statuses.rb
 %%WWWDIR%%/db/migrate/20160221003140_create_users.rb
 %%WWWDIR%%/db/migrate/20160221003621_create_follows.rb
 %%WWWDIR%%/db/migrate/20160222122600_create_stream_entries.rb
 %%WWWDIR%%/db/migrate/20160222143943_add_profile_fields_to_accounts.rb
-%%WWWDIR%%/db/migrate/201602242%%RUBY_SUFFIX%%247_create_mentions.rb
-%%WWWDIR%%/db/migrate/20160227%%RUBY_SUFFIX%%0%%RUBY_SUFFIX%%3_add_attachment_avatar_to_accounts.rb
+%%WWWDIR%%/db/migrate/20160224223247_create_mentions.rb
+%%WWWDIR%%/db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb
 %%WWWDIR%%/db/migrate/20160305115639_add_devise_to_users.rb
-%%WWWDIR%%/db/migrate/201603061722%%RUBY_SUFFIX%%_create_doorkeeper_tables.rb
+%%WWWDIR%%/db/migrate/20160306172223_create_doorkeeper_tables.rb
 %%WWWDIR%%/db/migrate/20160312193225_add_attachment_header_to_accounts.rb
-%%WWWDIR%%/db/migrate/20160314164%%RUBY_SUFFIX%%1_add_owner_to_application.rb
+%%WWWDIR%%/db/migrate/20160314164231_add_owner_to_application.rb
 %%WWWDIR%%/db/migrate/20160316103650_add_missing_indices.rb
 %%WWWDIR%%/db/migrate/20160322193748_add_avatar_remote_url_to_accounts.rb
 %%WWWDIR%%/db/migrate/20160325130944_add_admin_to_users.rb
@@ -1279,15 +1279,15 @@ etc/periodic/daily/900.mastodon
 %%WWWDIR%%/db/migrate/20160919221059_add_subscription_expires_at_to_accounts.rb
 %%WWWDIR%%/db/migrate/20160920003904_remove_verify_token_from_accounts.rb
 %%WWWDIR%%/db/migrate/20160926213048_remove_owner_from_application.rb
-%%WWWDIR%%/db/migrate/2016100314%%RUBY_SUFFIX%%32_add_confirmable_to_users.rb
+%%WWWDIR%%/db/migrate/20161003142332_add_confirmable_to_users.rb
 %%WWWDIR%%/db/migrate/20161003145426_create_blocks.rb
 %%WWWDIR%%/db/migrate/20161006213403_rails_settings_migration.rb
 %%WWWDIR%%/db/migrate/20161009120834_create_domain_blocks.rb
 %%WWWDIR%%/db/migrate/20161027172456_add_silenced_to_accounts.rb
-%%WWWDIR%%/db/migrate/201611%%RUBY_SUFFIX%%093447_add_sensitive_to_statuses.rb
-%%WWWDIR%%/db/migrate/201611041736%%RUBY_SUFFIX%%_create_tags.rb
+%%WWWDIR%%/db/migrate/20161123093447_add_sensitive_to_statuses.rb
+%%WWWDIR%%/db/migrate/20161104173623_create_tags.rb
 %%WWWDIR%%/db/migrate/20161105130633_create_statuses_tags_join_table.rb
-%%WWWDIR%%/db/migrate/2016111616%%RUBY_SUFFIX%%55_add_locale_to_users.rb
+%%WWWDIR%%/db/migrate/20161116162355_add_locale_to_users.rb
 %%WWWDIR%%/db/migrate/20161119211120_create_notifications.rb
 %%WWWDIR%%/db/migrate/20161122163057_remove_unneeded_indexes.rb
 %%WWWDIR%%/db/migrate/20161128103007_create_subscriptions.rb
@@ -1299,8 +1299,8 @@ etc/periodic/daily/900.mastodon
 %%WWWDIR%%/db/migrate/20161221152630_add_hidden_to_stream_entries.rb
 %%WWWDIR%%/db/migrate/20161222201034_add_locked_to_accounts.rb
 %%WWWDIR%%/db/migrate/20161222204147_create_follow_requests.rb
-%%WWWDIR%%/db/migrate/201701%%RUBY_SUFFIX%%162658_add_severity_to_domain_blocks.rb
-%%WWWDIR%%/db/migrate/201701%%RUBY_SUFFIX%%203248_add_reject_media_to_domain_blocks.rb
+%%WWWDIR%%/db/migrate/20170123162658_add_severity_to_domain_blocks.rb
+%%WWWDIR%%/db/migrate/20170123203248_add_reject_media_to_domain_blocks.rb
 %%WWWDIR%%/db/migrate/20170105224407_add_shortcode_to_media_attachments.rb
 %%WWWDIR%%/db/migrate/20170109120109_create_web_settings.rb
 %%WWWDIR%%/db/migrate/20170112154826_migrate_settings.rb
@@ -1325,7 +1325,7 @@ etc/periodic/daily/900.mastodon
 %%WWWDIR%%/db/migrate/20170330021336_add_counter_caches.rb
 %%WWWDIR%%/db/migrate/20170330163835_create_imports.rb
 %%WWWDIR%%/db/migrate/20170330164118_add_attachment_data_to_imports.rb
-%%WWWDIR%%/db/migrate/201704%%RUBY_SUFFIX%%005413_add_allowed_languages_to_user.rb
+%%WWWDIR%%/db/migrate/20170423005413_add_allowed_languages_to_user.rb
 %%WWWDIR%%/db/migrate/20170403172249_add_action_taken_by_account_id_to_reports.rb
 %%WWWDIR%%/db/migrate/20170405112956_add_index_on_mentions_status_id.rb
 %%WWWDIR%%/db/migrate/20170406215816_add_notifications_and_favourites_indices.rb
@@ -1337,11 +1337,11 @@ etc/periodic/daily/900.mastodon
 %%WWWDIR%%/db/migrate/20170424112722_add_status_id_index_to_statuses_tags.rb
 %%WWWDIR%%/db/migrate/20170425131920_add_media_attachment_meta.rb
 %%WWWDIR%%/db/migrate/20170425202925_add_oembed_to_preview_cards.rb
-%%WWWDIR%%/db/migrate/20170506%%RUBY_SUFFIX%%5850_create_conversations.rb
+%%WWWDIR%%/db/migrate/20170506235850_create_conversations.rb
 %%WWWDIR%%/db/migrate/20170507000211_add_conversation_id_to_statuses.rb
 %%WWWDIR%%/db/migrate/20170507141759_optimize_index_subscriptions.rb
-%%WWWDIR%%/db/migrate/20170508%%RUBY_SUFFIX%%0434_create_conversation_mutes.rb
-%%WWWDIR%%/db/migrate/2017051607%%RUBY_SUFFIX%%09_add_index_accounts_on_uri.rb
+%%WWWDIR%%/db/migrate/20170508230434_create_conversation_mutes.rb
+%%WWWDIR%%/db/migrate/20170516072309_add_index_accounts_on_uri.rb
 %%WWWDIR%%/db/migrate/20170520145338_change_language_filter_to_opt_out.rb
 %%WWWDIR%%/db/schema.rb
 %%WWWDIR%%/db/seeds.rb
@@ -1389,46 +1389,46 @@ etc/periodic/daily/900.mastodon
 %%WWWDIR%%/public/apple-touch-icon.png
 %%WWWDIR%%/public/avatars/original/missing.png
 %%WWWDIR%%/public/browserconfig.xml
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%1a.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%1a.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%1b.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%1b.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%28.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%28.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%cf.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%cf.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%e9.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%e9.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%ea.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%ea.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%eb.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%eb.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%ec.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%ec.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%ed.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%ed.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%ee.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%ee.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%ef.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%ef.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%f0.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%f0.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%f1.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%f1.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%f2.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%f2.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%f3.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%f3.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%f8.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%f8.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%f9.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%f9.svg
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%fa.png
-%%WWWDIR%%/public/emoji/%%RUBY_SUFFIX%%fa.svg
-%%WWWDIR%%/public/emoji/00%%RUBY_SUFFIX%%-20e3.png
-%%WWWDIR%%/public/emoji/00%%RUBY_SUFFIX%%-20e3.svg
-%%WWWDIR%%/public/emoji/00%%RUBY_SUFFIX%%.png
-%%WWWDIR%%/public/emoji/00%%RUBY_SUFFIX%%.svg
+%%WWWDIR%%/public/emoji/231a.png
+%%WWWDIR%%/public/emoji/231a.svg
+%%WWWDIR%%/public/emoji/231b.png
+%%WWWDIR%%/public/emoji/231b.svg
+%%WWWDIR%%/public/emoji/2328.png
+%%WWWDIR%%/public/emoji/2328.svg
+%%WWWDIR%%/public/emoji/23cf.png
+%%WWWDIR%%/public/emoji/23cf.svg
+%%WWWDIR%%/public/emoji/23e9.png
+%%WWWDIR%%/public/emoji/23e9.svg
+%%WWWDIR%%/public/emoji/23ea.png
+%%WWWDIR%%/public/emoji/23ea.svg
+%%WWWDIR%%/public/emoji/23eb.png
+%%WWWDIR%%/public/emoji/23eb.svg
+%%WWWDIR%%/public/emoji/23ec.png
+%%WWWDIR%%/public/emoji/23ec.svg
+%%WWWDIR%%/public/emoji/23ed.png
+%%WWWDIR%%/public/emoji/23ed.svg
+%%WWWDIR%%/public/emoji/23ee.png
+%%WWWDIR%%/public/emoji/23ee.svg
+%%WWWDIR%%/public/emoji/23ef.png
+%%WWWDIR%%/public/emoji/23ef.svg
+%%WWWDIR%%/public/emoji/23f0.png
+%%WWWDIR%%/public/emoji/23f0.svg
+%%WWWDIR%%/public/emoji/23f1.png
+%%WWWDIR%%/public/emoji/23f1.svg
+%%WWWDIR%%/public/emoji/23f2.png
+%%WWWDIR%%/public/emoji/23f2.svg
+%%WWWDIR%%/public/emoji/23f3.png
+%%WWWDIR%%/public/emoji/23f3.svg
+%%WWWDIR%%/public/emoji/23f8.png
+%%WWWDIR%%/public/emoji/23f8.svg
+%%WWWDIR%%/public/emoji/23f9.png
+%%WWWDIR%%/public/emoji/23f9.svg
+%%WWWDIR%%/public/emoji/23fa.png
+%%WWWDIR%%/public/emoji/23fa.svg
+%%WWWDIR%%/public/emoji/0023-20e3.png
+%%WWWDIR%%/public/emoji/0023-20e3.svg
+%%WWWDIR%%/public/emoji/0023.png
+%%WWWDIR%%/public/emoji/0023.svg
 %%WWWDIR%%/public/emoji/002a-20e3.png
 %%WWWDIR%%/public/emoji/002a-20e3.svg
 %%WWWDIR%%/public/emoji/002a.png
@@ -1477,24 +1477,24 @@ etc/periodic/daily/900.mastodon
 %%WWWDIR%%/public/emoji/00a9.svg
 %%WWWDIR%%/public/emoji/00ae.png
 %%WWWDIR%%/public/emoji/00ae.svg
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%2.png
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%2.svg
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%3.png
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%3.svg
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%4.png
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%4.svg
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%5.png
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%5.svg
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%6.png
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%6.svg
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%7.png
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%7.svg
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%8.png
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%8.svg
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%9.png
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%9.svg
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%a.png
-%%WWWDIR%%/public/emoji/1f%%RUBY_SUFFIX%%a.svg
+%%WWWDIR%%/public/emoji/1f232.png
+%%WWWDIR%%/public/emoji/1f232.svg
+%%WWWDIR%%/public/emoji/1f233.png
+%%WWWDIR%%/public/emoji/1f233.svg
+%%WWWDIR%%/public/emoji/1f234.png
+%%WWWDIR%%/public/emoji/1f234.svg
+%%WWWDIR%%/public/emoji/1f235.png
+%%WWWDIR%%/public/emoji/1f235.svg
+%%WWWDIR%%/public/emoji/1f236.png
+%%WWWDIR%%/public/emoji/1f236.svg
+%%WWWDIR%%/public/emoji/1f237.png
+%%WWWDIR%%/public/emoji/1f237.svg
+%%WWWDIR%%/public/emoji/1f238.png
+%%WWWDIR%%/public/emoji/1f238.svg
+%%WWWDIR%%/public/emoji/1f239.png
+%%WWWDIR%%/public/emoji/1f239.svg
+%%WWWDIR%%/public/emoji/1f23a.png
+%%WWWDIR%%/public/emoji/1f23a.svg
 %%WWWDIR%%/public/emoji/1f004.png
 %%WWWDIR%%/public/emoji/1f004.svg
 %%WWWDIR%%/public/emoji/1f0cf.png
@@ -2661,8 +2661,8 @@ etc/periodic/daily/900.mastodon
 %%WWWDIR%%/public/emoji/1f3fe.svg
 %%WWWDIR%%/public/emoji/1f3ff.png
 %%WWWDIR%%/public/emoji/1f3ff.svg
-%%WWWDIR%%/public/emoji/1f4%%RUBY_SUFFIX%%.png
-%%WWWDIR%%/public/emoji/1f4%%RUBY_SUFFIX%%.svg
+%%WWWDIR%%/public/emoji/1f423.png
+%%WWWDIR%%/public/emoji/1f423.svg
 %%WWWDIR%%/public/emoji/1f400.png
 %%WWWDIR%%/public/emoji/1f400.svg
 %%WWWDIR%%/public/emoji/1f401.png
@@ -3559,8 +3559,8 @@ etc/periodic/daily/900.mastodon
 %%WWWDIR%%/public/emoji/1f4fd.svg
 %%WWWDIR%%/public/emoji/1f4ff.png
 %%WWWDIR%%/public/emoji/1f4ff.svg
-%%WWWDIR%%/public/emoji/1f5%%RUBY_SUFFIX%%.png
-%%WWWDIR%%/public/emoji/1f5%%RUBY_SUFFIX%%.svg
+%%WWWDIR%%/public/emoji/1f523.png
+%%WWWDIR%%/public/emoji/1f523.svg
 %%WWWDIR%%/public/emoji/1f500.png
 %%WWWDIR%%/public/emoji/1f500.svg
 %%WWWDIR%%/public/emoji/1f501.png
@@ -3881,8 +3881,8 @@ etc/periodic/daily/900.mastodon
 %%WWWDIR%%/public/emoji/1f5fe.svg
 %%WWWDIR%%/public/emoji/1f5ff.png
 %%WWWDIR%%/public/emoji/1f5ff.svg
-%%WWWDIR%%/public/emoji/1f6%%RUBY_SUFFIX%%.png
-%%WWWDIR%%/public/emoji/1f6%%RUBY_SUFFIX%%.svg
+%%WWWDIR%%/public/emoji/1f623.png
+%%WWWDIR%%/public/emoji/1f623.svg
 %%WWWDIR%%/public/emoji/1f600.png
 %%WWWDIR%%/public/emoji/1f600.svg
 %%WWWDIR%%/public/emoji/1f601.png
@@ -4355,8 +4355,8 @@ etc/periodic/daily/900.mastodon
 %%WWWDIR%%/public/emoji/1f6f5.svg
 %%WWWDIR%%/public/emoji/1f6f6.png
 %%WWWDIR%%/public/emoji/1f6f6.svg
-%%WWWDIR%%/public/emoji/1f9%%RUBY_SUFFIX%%.png
-%%WWWDIR%%/public/emoji/1f9%%RUBY_SUFFIX%%.svg
+%%WWWDIR%%/public/emoji/1f923.png
+%%WWWDIR%%/public/emoji/1f923.svg
 %%WWWDIR%%/public/emoji/1f910.png
 %%WWWDIR%%/public/emoji/1f910.svg
 %%WWWDIR%%/public/emoji/1f911.png
@@ -4747,8 +4747,8 @@ etc/periodic/daily/900.mastodon
 %%WWWDIR%%/public/emoji/25fd.svg
 %%WWWDIR%%/public/emoji/25fe.png
 %%WWWDIR%%/public/emoji/25fe.svg
-%%WWWDIR%%/public/emoji/26%%RUBY_SUFFIX%%.png
-%%WWWDIR%%/public/emoji/26%%RUBY_SUFFIX%%.svg
+%%WWWDIR%%/public/emoji/2623.png
+%%WWWDIR%%/public/emoji/2623.svg
 %%WWWDIR%%/public/emoji/2600.png
 %%WWWDIR%%/public/emoji/2600.svg
 %%WWWDIR%%/public/emoji/2601.png