aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-im/mastodon/Makefile7
-rw-r--r--net-im/mastodon/files/patch-package.json15
2 files changed, 5 insertions, 17 deletions
diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile
index 40dc3c619dc3..e87291b75ef5 100644
--- a/net-im/mastodon/Makefile
+++ b/net-im/mastodon/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mastodon
DISTVERSIONPREFIX= v
DISTVERSION= 1.5.0
+PORTREVISION= 1
CATEGORIES= net-im www
MAINTAINER= jrm@FreeBSD.org
@@ -13,7 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libidn2.so:dns/libidn2
RUN_DEPENDS= ffmpeg>0:multimedia/ffmpeg \
- libpqtypes>1.5.0:databases/libpqtypes
+ gmake>0:devel/gmake \
+ 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
@@ -82,7 +85,7 @@ RUN_DEPENDS+= rubygem-active_model_serializers>0:databases/rubygem-active_model_
RUN_DEPENDS+= rubygem-lograge-rails5>0:www/rubygem-lograge-rails5 \
rubygem-redis-rails-rails5>0:www/rubygem-redis-rails-rails5
-USES= gnome pgsql shebangfix
+USES= gnome pgsql python:2 shebangfix
USE_GITHUB= yes
GH_ACCOUNT= tootsuite
USE_GNOME= libxml2 libxslt
diff --git a/net-im/mastodon/files/patch-package.json b/net-im/mastodon/files/patch-package.json
deleted file mode 100644
index 229b5435f758..000000000000
--- a/net-im/mastodon/files/patch-package.json
+++ /dev/null
@@ -1,15 +0,0 @@
---- package.json.orig 2017-07-31 15:09:11 UTC
-+++ package.json
-@@ -7,10 +7,9 @@
- "build:production": "cross-env RAILS_ENV=production ./bin/webpack",
- "manage:translations": "node ./config/webpack/translationRunner.js",
- "start": "node ./streaming/index.js",
-- "test": "npm run test:lint && npm run test:mocha",
-+ "test": "yarn run test:lint && yarn run test:mocha",
- "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ spec/javascript/ streaming/",
-- "test:mocha": "cross-env NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/**/*.test.js",
-- "postinstall": "npm rebuild node-sass"
-+ "test:mocha": "cross-env NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/**/*.test.js"
- },
- "repository": {
- "type": "git",