Skip to content

Commit

Permalink
net-im/mastodon: Work around www/node (node version 8) bug [1] on Fre…
Browse files Browse the repository at this point in the history
…eBSD

11.1 that prevents building node modules with gyp [2].

[1] nodejs/node#14076
[2] Users still have to install www/yarn and devel/rubygem-execjs with
non-default NODE6 option.
  • Loading branch information
Jehops committed Aug 6, 2017
1 parent c425573 commit 034f668
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 4 deletions.
6 changes: 2 additions & 4 deletions net-im/mastodon/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
PORTNAME= mastodon
DISTVERSIONPREFIX= v
DISTVERSION= 1.5.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net-im www

MAINTAINER= [email protected]
Expand All @@ -14,9 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE

LIB_DEPENDS= libidn2.so:dns/libidn2
RUN_DEPENDS= ffmpeg>0:multimedia/ffmpeg \
gmake>0:devel/gmake \
libpqtypes>1.5.0:databases/libpqtypes \
npm>=0:www/npm
libpqtypes>1.5.0:databases/libpqtypes

# Dependencies below match Gemfile layout
RUN_DEPENDS+= rubygem-pkg-config>=1.2.0:devel/rubygem-pkg-config
Expand Down
15 changes: 15 additions & 0 deletions net-im/mastodon/files/patch-package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--- package.json.orig 2017-08-05 12:54:54 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",
11 changes: 11 additions & 0 deletions net-im/mastodon/files/patch-yarn.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- yarn.lock.orig 2017-08-05 12:54:17 UTC
+++ yarn.lock
@@ -6587,6 +6587,8 @@ uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
uws@^8.14.0:
version "8.14.0"
resolved "https://registry.yarnpkg.com/uws/-/uws-8.14.0.tgz#acc1488d13ecb23fe2f942a7eafb06681fa91431"
+ dependencies:
+ node-gyp "^3.3.1"

validate-npm-package-license@^3.0.1:
version "3.0.1"

0 comments on commit 034f668

Please sign in to comment.