Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Aug 2017 14:31:06 +0000 (UTC)
From:      Joseph Mingrone <jrm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r447464 - in head/net-im/mastodon: . files
Message-ID:  <201708061431.v76EV6QU047572@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jrm
Date: Sun Aug  6 14:31:06 2017
New Revision: 447464
URL: https://svnweb.freebsd.org/changeset/ports/447464

Log:
  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] https://github.com/nodejs/node/issues/14076
  [2] Users still have to install www/yarn and devel/rubygem-execjs with
  non-default NODE6 option.

Added:
  head/net-im/mastodon/files/patch-package.json   (contents, props changed)
  head/net-im/mastodon/files/patch-yarn.lock   (contents, props changed)
Modified:
  head/net-im/mastodon/Makefile

Modified: head/net-im/mastodon/Makefile
==============================================================================
--- head/net-im/mastodon/Makefile	Sun Aug  6 14:01:28 2017	(r447463)
+++ head/net-im/mastodon/Makefile	Sun Aug  6 14:31:06 2017	(r447464)
@@ -3,7 +3,7 @@
 PORTNAME=	mastodon
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im www
 
 MAINTAINER=	jrm@FreeBSD.org
@@ -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

Added: head/net-im/mastodon/files/patch-package.json
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/mastodon/files/patch-package.json	Sun Aug  6 14:31:06 2017	(r447464)
@@ -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",

Added: head/net-im/mastodon/files/patch-yarn.lock
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/mastodon/files/patch-yarn.lock	Sun Aug  6 14:31:06 2017	(r447464)
@@ -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"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708061431.v76EV6QU047572>