Date: Wed, 13 Sep 2017 15:45:29 +0000 (UTC) From: Luca Pizzamiglio <pizzamig@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449801 - head/www/yarn Message-ID: <201709131545.v8DFjT62090069@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pizzamig Date: Wed Sep 13 15:45:29 2017 New Revision: 449801 URL: https://svnweb.freebsd.org/changeset/ports/449801 Log: www/yarn: Updating to version 1.0.1 Adding an option to avoid the installation of the yarn script, that collides with a hadoop2 utility Approved by: olivier (mentor) Differential Revision: https://reviews.freebsd.org/D12332 Modified: head/www/yarn/Makefile head/www/yarn/distinfo head/www/yarn/pkg-plist Modified: head/www/yarn/Makefile ============================================================================== --- head/www/yarn/Makefile Wed Sep 13 15:18:16 2017 (r449800) +++ head/www/yarn/Makefile Wed Sep 13 15:45:29 2017 (r449801) @@ -2,7 +2,7 @@ PORTNAME= yarn DISTVERSIONPREFIX= v -DISTVERSION= 0.27.5 +DISTVERSION= 1.0.1 CATEGORIES= www MASTER_SITES= https://yarnpkg.com/downloads/${PORTVERSION}/ @@ -12,33 +12,44 @@ COMMENT= Package manager for node, alternative to npm LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -WRKSRC= ${WRKDIR}/dist - +OPTIONS_DEFINE= HADOOPCOMPAT OPTIONS_SINGLE= BACKEND OPTIONS_SINGLE_BACKEND= NODE4 NODE6 NODE OPTIONS_DEFAULT= NODE +HADOOPCOMPAT_DESC= hadoop2 compatibility, the yarn script is excluded NODE_DESC= Use www/node as backend NODE6_DESC= Use www/node6 as backend NODE4_DESC= Use www/node4 as backend +OPTIONS_SUB= yes + NODE_RUN_DEPENDS= node>=0.8.0:www/node NODE6_RUN_DEPENDS= node6>=0.8.0:www/node6 NODE4_RUN_DEPENDS= node4>=0.8.0:www/node4 -CONFLICTS_INSTALL= hadoop-2* +HADOOPCOMPAT_CONFLICTS_OFF= hadoop2* NO_ARCH= yes NO_BUILD= yes post-patch: @${RM} ${WRKSRC}/bin/*.cmd - @${REINPLACE_CMD} -i '' -e 's|"installationMethod": "tar"|"installationMethod": "pkg"|g' \ + @${REINPLACE_CMD} -i '' \ + -e 's|"installationMethod": "tar"|"installationMethod": "pkg"|g' \ ${WRKSRC}/package.json + @${REINPLACE_CMD} -i '' -e 's%Linux)%Linux|FreeBSD)%g' \ + ${WRKSRC}/bin/yarn do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn (cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/node_modules/yarn) - ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarn.js ${STAGEDIR}${PREFIX}/bin/yarn - ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarnpkg ${STAGEDIR}${PREFIX}/bin/yarnpkg + ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarn.js \ + ${STAGEDIR}${PREFIX}/bin/yarn.js + ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarnpkg \ + ${STAGEDIR}${PREFIX}/bin/yarnpkg + +do-install-HADOOPCOMPAT-off: + ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarn \ + ${STAGEDIR}${PREFIX}/bin/yarn .include <bsd.port.mk> Modified: head/www/yarn/distinfo ============================================================================== --- head/www/yarn/distinfo Wed Sep 13 15:18:16 2017 (r449800) +++ head/www/yarn/distinfo Wed Sep 13 15:45:29 2017 (r449801) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498864541 -SHA256 (yarn-v0.27.5.tar.gz) = f0f3510246ee74eb660ea06930dcded7b684eac2593aa979a7add84b72517968 -SIZE (yarn-v0.27.5.tar.gz) = 816114 +TIMESTAMP = 1505124517 +SHA256 (yarn-v1.0.1.tar.gz) = 6b00b5e0a7074a512d39d2d91ba6262dde911d452617939ca4be4a700dd77cf1 +SIZE (yarn-v1.0.1.tar.gz) = 843398 Modified: head/www/yarn/pkg-plist ============================================================================== --- head/www/yarn/pkg-plist Wed Sep 13 15:18:16 2017 (r449800) +++ head/www/yarn/pkg-plist Wed Sep 13 15:45:29 2017 (r449801) @@ -1,9 +1,11 @@ -bin/yarn +%%NO_HADOOPCOMPAT%%bin/yarn +bin/yarn.js bin/yarnpkg +lib/node_modules/yarn/README.md lib/node_modules/yarn/LICENSE @(,,755) lib/node_modules/yarn/bin/yarn @(,,755) lib/node_modules/yarn/bin/yarn.js @(,,755) lib/node_modules/yarn/bin/yarnpkg lib/node_modules/yarn/lib/v8-compile-cache.js -@(,,755) lib/node_modules/yarn/lib/yarn-cli.js +@(,,755) lib/node_modules/yarn/lib/cli.js lib/node_modules/yarn/package.json
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709131545.v8DFjT62090069>