svn commit: r544659 - in head: devel/electron7 editors/vscode

[Koichiro Iwao]

Author: meta
Date: Tue Aug 11 02:18:32 2020
New Revision: 544659
URL: https://svnweb.freebsd.org/changeset/ports/544659

Log:
  editors/vscode: Resolve dependency confliction on node10 and 12
  
  vscode has direct build dependency on npm-node10. And also has build dependency
  on devel/electron7. devel/electron7 depends on npm-node12. As a result,
  editors/vscode has dependency on both npm-node10 and npm-node12 however they
  conflicts each other. This confliction of dependency prevent this port building.
  
  PR:		248071
  Submitted by:	meta (myself)
  Approved by:	maintainer timeout

Modified:
  head/devel/electron7/Makefile
  head/editors/vscode/Makefile

Modified: head/devel/electron7/Makefile
==============================================================================
--- head/devel/electron7/Makefile	Tue Aug 11 01:31:11 2020	(r544658)
+++ head/devel/electron7/Makefile	Tue Aug 11 02:18:32 2020	(r544659)
@@ -23,15 +23,15 @@ COMMENT=	Build cross-platform desktop apps with JavaSc
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/electron/LICENSE
 
-FETCH_DEPENDS=	yarn-node12>0:www/yarn-node12
-EXTRACT_DEPENDS=	yarn-node12>0:www/yarn-node12
+FETCH_DEPENDS=	yarn-node${NODE_VER_MAJOR}>0:www/yarn-node${NODE_VER_MAJOR}
+EXTRACT_DEPENDS=	yarn-node${NODE_VER_MAJOR}>0:www/yarn-node${NODE_VER_MAJOR}
 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 \
-		node12>0:www/node12 \
-		npm-node12>0:www/npm-node12
+		node${NODE_VER_MAJOR}>0:www/node${NODE_VER_MAJOR} \
+		npm-node${NODE_VER_MAJOR}>0:www/npm-node${NODE_VER_MAJOR}
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libatspi.so:accessibility/at-spi2-core \
 		libsnappy.so:archivers/snappy \
@@ -55,7 +55,7 @@ LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 TEST_DEPENDS=	git:devel/git \
 		${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \
-		npm-node12>0:www/npm-node12
+		npm-node${NODE_VER_MAJOR}>0:www/npm-node${NODE_VER_MAJOR}
 
 USES=		bison dos2unix gettext-tools gl gnome jpeg localbase:ldflags \
 		ninja pkgconfig python:2.7,build,test tar:xz xorg
@@ -75,6 +75,7 @@ CHROMIUM_NODE_MODULES_HASH=	ab7f28fee456b5af5fbd3fcb5b
 CHROMIUM_TEST_FONTS_HASH=	a22de844e32a3f720d219e3911c3da3478039f89
 # See ${WRKSRC}/electron/DEPS for NODE_VER
 NODE_VER=	12.8.1
+NODE_VER_MAJOR=	${NODE_VER:C/\..*$//}
 # See ${WRKSRC}/electron/DEPS for NAN_VER
 NAN_VER=	2ee313aaca52e2b478965ac50eb5082520380d1b
 

Modified: head/editors/vscode/Makefile
==============================================================================
--- head/editors/vscode/Makefile	Tue Aug 11 01:31:11 2020	(r544658)
+++ head/editors/vscode/Makefile	Tue Aug 11 02:18:32 2020	(r544659)
@@ -21,8 +21,8 @@ ONLY_FOR_ARCHS=	amd64
 BUILD_DEPENDS=	zip:archivers/zip \
 		electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		rg:textproc/ripgrep \
-		npm-node10>0:www/npm-node10 \
-		yarn-node10>0:www/yarn-node10
+		npm-node${NODE_VER_MAJOR}>0:www/npm-node${NODE_VER_MAJOR} \
+		yarn-node${NODE_VER_MAJOR}>0:www/yarn-node${NODE_VER_MAJOR}
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libatspi.so:accessibility/at-spi2-core \
 		libsnappy.so:archivers/snappy \
@@ -74,6 +74,7 @@ USE_LDCONFIG=	${DATADIR}
 
 # See ${WRKSRC}/remote/.yarnrc for NODE_VER
 NODE_VER=	12.4.0
+NODE_VER_MAJOR=	${NODE_VER:C/\..*$//}
 
 SHEBANG_REGEX=	./(extensions|resources|scripts|src)/.*\.sh$$
 PATHFIX_FILES=	src/vs/workbench/contrib/debug/node/terminals.ts