Index: head/www/yarn/Makefile =================================================================== --- head/www/yarn/Makefile (revision 531698) +++ head/www/yarn/Makefile (revision 531699) @@ -1,57 +1,58 @@ # $FreeBSD$ PORTNAME= yarn DISTVERSIONPREFIX= v DISTVERSION= 1.22.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://yarnpkg.com/downloads/${PORTVERSION}/ MAINTAINER= pizzamig@FreeBSD.org COMMENT= Package manager for node, alternative to npm LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS_INSTALL?= yarn-node12 yarn-node10 yarn-node8 OPTIONS_DEFINE= HADOOPCOMPAT OPTIONS_SINGLE= BACKEND OPTIONS_SINGLE_BACKEND= NODE10 NODE12 NODE OPTIONS_DEFAULT= NODE HADOOPCOMPAT_DESC= hadoop2 compatibility, the yarn script is excluded NODE_DESC= Use www/node as backend NODE12_DESC= Use www/node12 as backend NODE10_DESC= Use www/node10 as backend OPTIONS_SUB= yes NODE_RUN_DEPENDS= node>=0.8.0:www/node NODE12_RUN_DEPENDS= node12>=12.0.0:www/node12 NODE10_RUN_DEPENDS= node10>=10.0.0:www/node10 HADOOPCOMPAT_CONFLICTS_INSTALL_OFF= hadoop2* NO_ARCH= yes NO_BUILD= yes post-patch: @${RM} ${WRKSRC}/bin/*.cmd @${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.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 Index: head/www/yarn/files/patch-lib_cli.js =================================================================== --- head/www/yarn/files/patch-lib_cli.js (nonexistent) +++ head/www/yarn/files/patch-lib_cli.js (revision 531699) @@ -0,0 +1,80 @@ +--- lib/cli.js.orig 2020-03-09 15:51:47 UTC ++++ lib/cli.js +@@ -56939,10 +56939,10 @@ function getRcConfigForFolder(cwd) { + } + + function loadRcFile(fileText, filePath) { +- var _parse = (0, (_lockfile || _load_lockfile()).parse)(fileText, filePath), ++ var _parse = (0, (_lockfile || _load_lockfile()).parse)(fileText, 'yarnrc'), + values = _parse.object; + +- if (filePath.match(/\.yml$/) && typeof values.yarnPath === 'string') { ++ if (filePath.match(/\.yml$/)) { + values = { 'yarn-path': values.yarnPath }; + } + +@@ -64532,27 +64532,16 @@ function parse(str, fileLoc) { + var parser = new Parser(str, fileLoc); + parser.next(); + +- if (!fileLoc.endsWith(`.yml`)) { ++ try { ++ return parser.parse(); ++ } catch (error1) { + try { +- return parser.parse(); +- } catch (error1) { +- try { +- return safeLoad(str, { +- schema: FAILSAFE_SCHEMA +- }); +- } catch (error2) { +- throw error1; +- } ++ return safeLoad(str, { ++ schema: FAILSAFE_SCHEMA ++ }); ++ } catch (error2) { ++ throw error1; + } +- } else { +- var result = safeLoad(str, { +- schema: FAILSAFE_SCHEMA +- }); +- if (typeof result === 'object') { +- return result; +- } else { +- return {}; +- } + } + } + +@@ -90319,7 +90308,7 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _lo + var rcPath = `${config.lockfileFolder}/.yarnrc.yml`; + reporter.log(`Updating ${chalk.magenta(rcPath)}...`); + +- yield (_fs || _load_fs()).writeFilePreservingEol(rcPath, `yarnPath: ${(0, (_stringify || _load_stringify()).default)(targetPath)}\n`); ++ yield (_fs || _load_fs()).writeFilePreservingEol(rcPath, `yarnPath: ${(0, (_stringify || _load_stringify()).default)(yarnPath)}\n`); + } else { + var _rcPath = `${config.lockfileFolder}/.yarnrc`; + reporter.log(`Updating ${chalk.magenta(_rcPath)}...`); +@@ -101330,11 +101319,7 @@ function parseRcPaths(paths, parser) { + try { + return parser((0, (_fs || _load_fs()).readFileSync)(path).toString(), path); + } catch (error) { +- if (error.code === 'ENOENT' || error.code === 'EISDIR') { +- return {}; +- } else { +- throw error; +- } ++ return {}; + } + }))); + } +@@ -153406,4 +153391,4 @@ module.exports = require("dns"); + module.exports = require("domain"); + + /***/ }) +-/******/ ]); +\ No newline at end of file ++/******/ ]); Property changes on: head/www/yarn/files/patch-lib_cli.js ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property