From owner-svn-ports-all@freebsd.org Sat May 23 08:04:00 2020 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 3F99E2FB6A6; Sat, 23 May 2020 08:04:00 +0000 (UTC) (envelope-from tagattie@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49TbTr0yLgz4WTM; Sat, 23 May 2020 08:04:00 +0000 (UTC) (envelope-from tagattie@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 1C1A0CD09; Sat, 23 May 2020 08:04:00 +0000 (UTC) (envelope-from tagattie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04N83x0H079671; Sat, 23 May 2020 08:03:59 GMT (envelope-from tagattie@FreeBSD.org) Received: (from tagattie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04N83xsN079670; Sat, 23 May 2020 08:03:59 GMT (envelope-from tagattie@FreeBSD.org) Message-Id: <202005230803.04N83xsN079670@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tagattie set sender to tagattie@FreeBSD.org using -f From: Hiroki Tagato Date: Sat, 23 May 2020 08:03:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536272 - head/devel/electron4 X-SVN-Group: ports-head X-SVN-Commit-Author: tagattie X-SVN-Commit-Paths: head/devel/electron4 X-SVN-Commit-Revision: 536272 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.33 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: Sat, 23 May 2020 08:04:00 -0000 Author: tagattie Date: Sat May 23 08:03:59 2020 New Revision: 536272 URL: https://svnweb.freebsd.org/changeset/ports/536272 Log: - Change node and npm dependencies to specify package name [1] - Remove superfluous comments Approved by: mentors (implicit) Suggested by: 0mp (via ports) [1] Modified: head/devel/electron4/Makefile Modified: head/devel/electron4/Makefile ============================================================================== --- head/devel/electron4/Makefile Sat May 23 07:52:46 2020 (r536271) +++ head/devel/electron4/Makefile Sat May 23 08:03:59 2020 (r536272) @@ -23,14 +23,14 @@ COMMENT= Build cross-platform desktop apps with JavaSc LICENSE= MIT LICENSE_FILE= ${WRKSRC}/electron/LICENSE -FETCH_DEPENDS= npm:www/npm-node10 +FETCH_DEPENDS= npm-node10>0:www/npm-node10 PATCH_DEPENDS= git:devel/git BUILD_DEPENDS= ${LOCALBASE}/bin/ar:devel/binutils \ gperf:devel/gperf \ yasm:devel/yasm \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ - node:www/node10 \ - npm:www/npm-node10 + node10>0:www/node10 \ + npm-node10>0:www/npm-node10 LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ @@ -51,7 +51,7 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \ - npm:www/npm-node10 + npm-node10>0:www/npm-node10 USES= bison dos2unix gettext-tools gl gnome jpeg localbase:ldflags \ ninja pkgconfig python:2.7,build,test tar:xz xorg @@ -60,9 +60,6 @@ USE_GITHUB= yes GH_TAGNAME= ${DISTVERSIONPREFIX}${ELECTRON_VER} # See ${WRKSRC}/electron/DEPS for GH_TAGNAME_node GH_TUPLE= electron:node:8bc5d171a0873c0ba49f9433798bc8b67399788c:node - # boto:boto:f7574aa6cc2c819430c1f05e9a1a1a666ef8169b:boto \ - # yaml:pyyaml:3.12:pyyaml \ - # kennethreitz:requests:e4d59bedfd3c7f4f254f4f5d036587bcd8152458:requests # Official chromium version containing "gn" which is known to work CHROMIUM_OFFICIAL_VER= 76.0.3809.132 @@ -200,14 +197,6 @@ post-extract: ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${GH_TAGNAME_node} \ ${WRKSRC}/third_party/${GH_ACCOUNT_node}_${GH_PROJECT_node} - # ${RMDIR} ${WRKSRC}/electron/vendor/${GH_PROJECT_boto} - # ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_boto}-${GH_TAGNAME_boto} \ - # ${WRKSRC}/electron/vendor/${GH_PROJECT_boto} - # ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_pyyaml}-${GH_TAGNAME_pyyaml} \ - # ${WRKSRC}/electron/vendor/${GH_PROJECT_pyyaml} - # ${RMDIR} ${WRKSRC}/electron/vendor/${GH_PROJECT_requests} - # ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_requests}-${GH_TAGNAME_requests} \ - # ${WRKSRC}/electron/vendor/${GH_PROJECT_requests} ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/npm_modules ${WRKSRC}/electron/node_modules @@ -218,10 +207,6 @@ pre-patch: # ${FIND} ${WRKSRC} -type f -name '*~' -print -delete pre-configure: - # cd ${WRKSRC}/electron/vendor/${GH_PROJECT_boto} && \ - # ${PYTHON_CMD} setup.py build - # cd ${WRKSRC}/electron/vendor/${GH_PROJECT_requests} && \ - # ${PYTHON_CMD} setup.py build # We used to remove bundled libraries to be sure that chromium uses # system libraries and not shipped ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ @@ -241,9 +226,6 @@ do-configure: # Setup nodejs dependency ${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node - -# do-build: -# cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -C out/${BUILDTYPE} ${ALL_TARGET} post-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \