Date: Mon, 1 Jul 2019 07:02:26 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r505545 - in branches/2019Q2/www/npm: . files Message-ID: <201907010702.x6172QLh058013@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Mon Jul 1 07:02:26 2019 New Revision: 505545 URL: https://svnweb.freebsd.org/changeset/ports/505545 Log: MFH: r502940 r503843 www/npm: Fix the python executable name PR: 238204 Reported by: run failure Approved by: portmgr (blanket: ports/framework (python) compliance) Compile and install .pyc files for node-gyp - Bump PORTREVISION for package change PR: 238243 Submitted by: Hiroki Tagato <tagattie@yandex.com> Approved by: ports-secteam (blanket(s): run/packaging fix, ports (python) compliance) Added: branches/2019Q2/www/npm/files/patch-lib_node__modules_npm_node__modules_node-gyp_lib_configure.js - copied unchanged from r502940, head/www/npm/files/patch-lib_node__modules_npm_node__modules_node-gyp_lib_configure.js Modified: branches/2019Q2/www/npm/Makefile branches/2019Q2/www/npm/pkg-plist Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/www/npm/Makefile ============================================================================== --- branches/2019Q2/www/npm/Makefile Mon Jul 1 06:56:29 2019 (r505544) +++ branches/2019Q2/www/npm/Makefile Mon Jul 1 07:02:26 2019 (r505545) @@ -3,6 +3,7 @@ PORTNAME= npm PORTVERSION= 6.9.0 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= LOCAL/sunpoet @@ -55,5 +56,10 @@ post-patch: do-install: cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/ + +post-install: + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -d ${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp -f \ + ${STAGEDIR}${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp .include <bsd.port.post.mk> Copied: branches/2019Q2/www/npm/files/patch-lib_node__modules_npm_node__modules_node-gyp_lib_configure.js (from r502940, head/www/npm/files/patch-lib_node__modules_npm_node__modules_node-gyp_lib_configure.js) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q2/www/npm/files/patch-lib_node__modules_npm_node__modules_node-gyp_lib_configure.js Mon Jul 1 07:02:26 2019 (r505545, copy of r502940, head/www/npm/files/patch-lib_node__modules_npm_node__modules_node-gyp_lib_configure.js) @@ -0,0 +1,11 @@ +--- lib/node_modules/npm/node_modules/node-gyp/lib/configure.js.orig 2019-05-29 07:53:16 UTC ++++ lib/node_modules/npm/node_modules/node-gyp/lib/configure.js +@@ -29,7 +29,7 @@ exports.usage = 'Generates ' + (win ? 'MSVC project fi + + function configure (gyp, argv, callback) { + +- var python = gyp.opts.python || process.env.PYTHON || 'python2' ++ var python = gyp.opts.python || process.env.PYTHON || 'python2.7' + , buildDir = path.resolve('build') + , configNames = [ 'config.gypi', 'common.gypi' ] + , configs = [] Modified: branches/2019Q2/www/npm/pkg-plist ============================================================================== --- branches/2019Q2/www/npm/pkg-plist Mon Jul 1 06:56:29 2019 (r505544) +++ branches/2019Q2/www/npm/pkg-plist Mon Jul 1 07:02:26 2019 (r505545) @@ -2441,46 +2441,87 @@ lib/node_modules/npm/node_modules/node-gyp/gyp/gyp lib/node_modules/npm/node_modules/node-gyp/gyp/gyp.bat lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSNew.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSNew.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSProject.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSProject.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSToolFile.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSToolFile.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSUserFile.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSUserFile.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSUtil.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSUtil.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSVersion.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSVersion.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/common.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/common.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/common_test.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/common_test.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/easy_xml.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/easy_xml.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/easy_xml_test.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/easy_xml_test.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/__init__.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/__init__.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/analyzer.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/analyzer.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/android.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/android.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/cmake.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/cmake.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/dump_dependency_json.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/dump_dependency_json.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/eclipse.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/eclipse.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/gypd.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/gypd.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/gypsh.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/gypsh.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs_test.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs_test.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja_test.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja_test.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode_test.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode_test.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/input.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/input_test.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/input_test.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/msvs_emulation.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/msvs_emulation.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/ninja_syntax.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/ninja_syntax.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/ordered_dict.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/ordered_dict.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/simple_copy.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/simple_copy.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_ninja.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_ninja.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcodeproj_file.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcodeproj_file.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xml_fix.py +lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xml_fix.pyc lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples.bat lib/node_modules/npm/node_modules/node-gyp/gyp/setup.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907010702.x6172QLh058013>