Skip to content

Commit cea3aae

Browse files
author
jrm
committed
net-im/mastodon: Work around www/node (node version 8) bug [1] on FreeBSD
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. git-svn-id: https://svn.freebsd.org/ports/head@447464 35697150-7ecd-e111-bb59-0022644237b5
1 parent e38f313 commit cea3aae

File tree

3 files changed

+28
-4
lines changed

3 files changed

+28
-4
lines changed

net-im/mastodon/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
PORTNAME= mastodon
44
DISTVERSIONPREFIX= v
55
DISTVERSION= 1.5.0
6-
PORTREVISION= 1
6+
PORTREVISION= 2
77
CATEGORIES= net-im www
88

99
MAINTAINER= jrm@FreeBSD.org
@@ -14,9 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
1414

1515
LIB_DEPENDS= libidn2.so:dns/libidn2
1616
RUN_DEPENDS= ffmpeg>0:multimedia/ffmpeg \
17-
gmake>0:devel/gmake \
18-
libpqtypes>1.5.0:databases/libpqtypes \
19-
npm>=0:www/npm
17+
libpqtypes>1.5.0:databases/libpqtypes
2018

2119
# Dependencies below match Gemfile layout
2220
RUN_DEPENDS+= rubygem-pkg-config>=1.2.0:devel/rubygem-pkg-config
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--- package.json.orig 2017-08-05 12:54:54 UTC
2+
+++ package.json
3+
@@ -7,10 +7,9 @@
4+
"build:production": "cross-env RAILS_ENV=production ./bin/webpack",
5+
"manage:translations": "node ./config/webpack/translationRunner.js",
6+
"start": "node ./streaming/index.js",
7+
- "test": "npm run test:lint && npm run test:mocha",
8+
+ "test": "yarn run test:lint && yarn run test:mocha",
9+
"test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ spec/javascript/ streaming/",
10+
- "test:mocha": "cross-env NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/**/*.test.js",
11+
- "postinstall": "npm rebuild node-sass"
12+
+ "test:mocha": "cross-env NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/**/*.test.js"
13+
},
14+
"repository": {
15+
"type": "git",

net-im/mastodon/files/patch-yarn.lock

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- yarn.lock.orig 2017-08-05 12:54:17 UTC
2+
+++ yarn.lock
3+
@@ -6587,6 +6587,8 @@ uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
4+
uws@^8.14.0:
5+
version "8.14.0"
6+
resolved "https://registry.yarnpkg.com/uws/-/uws-8.14.0.tgz#acc1488d13ecb23fe2f942a7eafb06681fa91431"
7+
+ dependencies:
8+
+ node-gyp "^3.3.1"
9+
10+
validate-npm-package-license@^3.0.1:
11+
version "3.0.1"

0 commit comments

Comments
 (0)