From owner-svn-ports-all@freebsd.org Tue Mar 16 21:08:21 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A620256DD10; Tue, 16 Mar 2021 21:08:21 +0000 (UTC) (envelope-from otis@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0Qqn4J5Hz3QMp; Tue, 16 Mar 2021 21:08:21 +0000 (UTC) (envelope-from otis@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8277C2A65E; Tue, 16 Mar 2021 21:08:21 +0000 (UTC) (envelope-from otis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12GL8LY3060041; Tue, 16 Mar 2021 21:08:21 GMT (envelope-from otis@FreeBSD.org) Received: (from otis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12GL8L51060039; Tue, 16 Mar 2021 21:08:21 GMT (envelope-from otis@FreeBSD.org) Message-Id: <202103162108.12GL8L51060039@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: otis set sender to otis@FreeBSD.org using -f From: Juraj Lutter Date: Tue, 16 Mar 2021 21:08:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568613 - head/devel/node-gyp X-SVN-Group: ports-head X-SVN-Commit-Author: otis X-SVN-Commit-Paths: head/devel/node-gyp X-SVN-Commit-Revision: 568613 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2021 21:08:21 -0000 Author: otis Date: Tue Mar 16 21:08:20 2021 New Revision: 568613 URL: https://svnweb.freebsd.org/changeset/ports/568613 Log: devel/node-gyp: Adjust runtime dependency - Make www/npm also a runtime dependency - Link in proper node_modules path Reported by: osa Reviewed by: osa Approved by: osa Differential Revision: https://reviews.freebsd.org/D29287 Modified: head/devel/node-gyp/Makefile head/devel/node-gyp/pkg-plist Modified: head/devel/node-gyp/Makefile ============================================================================== --- head/devel/node-gyp/Makefile Tue Mar 16 21:01:19 2021 (r568612) +++ head/devel/node-gyp/Makefile Tue Mar 16 21:08:20 2021 (r568613) @@ -3,6 +3,7 @@ PORTNAME= gyp DISTVERSIONPREFIX= v DISTVERSION= 7.1.2 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= node- @@ -12,6 +13,7 @@ COMMENT= Cross-platform command-line tool written in N LICENSE= MIT BUILD_DEPENDS= ${LOCALBASE}/bin/npm:www/npm +RUN_DEPENDS= ${LOCALBASE}/bin/npm:www/npm USE_GITHUB= yes GH_ACCOUNT= nodejs @@ -27,5 +29,7 @@ do-install: "! ( -name \.* -or -path *\/\.github\/* -or -name test -or -path *\/test\/* )") ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/node-gyp/bin/node-gyp.js \ ${STAGEDIR}${PREFIX}/bin/node-gyp + ${LN} -s ${LOCALBASE}/lib/node_modules/npm/node_modules \ + ${STAGEDIR}${PREFIX}/lib/node_modules/node-gyp/node_modules .include Modified: head/devel/node-gyp/pkg-plist ============================================================================== --- head/devel/node-gyp/pkg-plist Tue Mar 16 21:01:19 2021 (r568612) +++ head/devel/node-gyp/pkg-plist Tue Mar 16 21:08:20 2021 (r568613) @@ -93,3 +93,4 @@ lib/node_modules/node-gyp/macOS_Catalina_acid_test.sh lib/node_modules/node-gyp/package.json lib/node_modules/node-gyp/src/win_delay_load_hook.cc lib/node_modules/node-gyp/update-gyp.py +lib/node_modules/node-gyp/node_modules