git: 3e65c2daf2af - main - */*: Adjust USES and USE_ELECTRON after electron.mk split (ed6a84c1c979)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 27 Jun 2026 08:39:46 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3e65c2daf2af34c776e9d08b955a515f0f59431c
commit 3e65c2daf2af34c776e9d08b955a515f0f59431c
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2026-06-27 08:38:06 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2026-06-27 08:38:06 +0000
*/*: Adjust USES and USE_ELECTRON after electron.mk split (ed6a84c1c979)
---
deskutils/joplin-desktop/Makefile | 6 +++---
devel/electron37/Makefile | 9 ++++-----
devel/electron38/Makefile | 9 ++++-----
devel/electron39/Makefile | 9 ++++-----
devel/electron40/Makefile | 9 ++++-----
devel/electron41/Makefile | 9 ++++-----
devel/electron42/Makefile | 9 ++++-----
editors/vscode/Makefile | 3 +--
editors/vscode/Makefile.reh | 7 +++----
net-im/deltachat-desktop/Makefile | 4 ++--
net-im/teams/Makefile | 4 ++--
security/bitwarden-cli/Makefile | 5 ++---
x11/waveterm/Makefile | 4 ++--
13 files changed, 39 insertions(+), 48 deletions(-)
diff --git a/deskutils/joplin-desktop/Makefile b/deskutils/joplin-desktop/Makefile
index 1821869dc9cc..dc2a64d5f3be 100644
--- a/deskutils/joplin-desktop/Makefile
+++ b/deskutils/joplin-desktop/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= libvips.so:graphics/vips \
libsecret-1.so:security/libsecret
USES= cargo cpe electron:40 gmake localbase:ldflags nodejs:24,build \
- python:build
+ npm:yarn4 python:build
CPE_VENDOR= joplinapp
USE_GITHUB= yes
@@ -47,7 +47,7 @@ CARGO_TEST= no
BINARY_ALIAS= python3=${PYTHON_CMD}
SUB_FILES= ${PORTNAME}${PKGNAMESUFFIX}
-TARGET_ORDER_OVERRIDE= 750:electron-install-node-modules
+TARGET_ORDER_OVERRIDE= 750:npm-install-node-modules
BUILD_WRKSRC= ${WRKSRC}/packages/app-desktop
TEST_WRKSRC= ${WRKSRC}/packages/app-desktop
@@ -56,7 +56,7 @@ PORTDOCS= README.md SECURITY.md
OPTIONS_DEFINE= DOCS
-USE_ELECTRON= npm:yarn4 appbuilder prefetch extract build:builder
+USE_ELECTRON= appbuilder build:builder
DEFAULT_PLUGINS_NODE_MODULES_FILE= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-default-plugins-node-modules${EXTRACT_SUFX}
APP_CLIPPER_NODE_MODULES_FILE= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-app-clipper-node-modules${EXTRACT_SUFX}
diff --git a/devel/electron37/Makefile b/devel/electron37/Makefile
index 70d54fb98a54..a49e4b2e63c1 100644
--- a/devel/electron37/Makefile
+++ b/devel/electron37/Makefile
@@ -71,10 +71,10 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils
TEST_DEPENDS= git:devel/git \
${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR}
-USES= bison compiler:c++17-lang cpe display:test electron:env \
- gettext-tools gl gmake gnome iconv:wchar_t jpeg \
- localbase:ldflags ninja nodejs:22,build pkgconfig \
- python:build,test qt:5 shebangfix tar:xz xorg
+USES= bison compiler:c++17-lang cpe display:test gettext-tools gl \
+ gmake gnome iconv:wchar_t jpeg localbase:ldflags ninja \
+ nodejs:22,build npm:yarn4 pkgconfig python:build,test qt:5 \
+ shebangfix tar:xz xorg
CPE_VENDOR= electronjs
USE_GITHUB= yes
@@ -89,7 +89,6 @@ USE_GNOME= atk cairo gdkpixbuf gtk30 libxml2 libxslt pango
USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
xrender xscrnsaver xtst
USE_QT= buildtools:build core:build widgets:build
-USE_ELECTRON= npm:yarn4 prefetch extract
NPM_EXTRACT_WRKSRC= ${WRKSRC:H}/${PORTNAME}-${ELECTRON_VER}
SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
diff --git a/devel/electron38/Makefile b/devel/electron38/Makefile
index 15674e370aa5..18848af2074a 100644
--- a/devel/electron38/Makefile
+++ b/devel/electron38/Makefile
@@ -73,10 +73,10 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils
TEST_DEPENDS= git:devel/git \
${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR}
-USES= bison compiler:c++17-lang cpe display:test electron:env \
- gettext-tools gl gmake gnome iconv:wchar_t jpeg \
- localbase:ldflags ninja nodejs:22,build pkgconfig \
- python:build,test qt:5 shebangfix tar:xz xorg
+USES= bison compiler:c++17-lang cpe display:test gettext-tools gl \
+ gmake gnome iconv:wchar_t jpeg localbase:ldflags ninja \
+ nodejs:22,build npm:yarn4 pkgconfig python:build,test qt:5 \
+ shebangfix tar:xz xorg
CPE_VENDOR= electronjs
USE_GITHUB= yes
@@ -91,7 +91,6 @@ USE_GNOME= atk cairo gdkpixbuf gtk30 libxml2 libxslt pango
USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
xrender xscrnsaver xtst
USE_QT= buildtools:build core:build widgets:build
-USE_ELECTRON= npm:yarn4 prefetch extract
NPM_EXTRACT_WRKSRC= ${WRKSRC:H}/${PORTNAME}-${ELECTRON_VER}
SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
diff --git a/devel/electron39/Makefile b/devel/electron39/Makefile
index 2f389c7ce081..1c67f51171a9 100644
--- a/devel/electron39/Makefile
+++ b/devel/electron39/Makefile
@@ -72,10 +72,10 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils
TEST_DEPENDS= git:devel/git \
${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR}
-USES= bison compiler:c++17-lang cpe display:test electron:env \
- gettext-tools gl gmake gnome iconv:wchar_t jpeg \
- localbase:ldflags ninja nodejs:22,build pkgconfig \
- python:build,test qt:5 shebangfix tar:xz xorg
+USES= bison compiler:c++17-lang cpe display:test gettext-tools gl \
+ gmake gnome iconv:wchar_t jpeg localbase:ldflags ninja \
+ nodejs:22,build npm:yarn4 pkgconfig python:build,test qt:5 \
+ shebangfix tar:xz xorg
CPE_VENDOR= electronjs
USE_GITHUB= yes
@@ -90,7 +90,6 @@ USE_GNOME= atk cairo gdkpixbuf gtk30 libxml2 libxslt pango
USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
xrender xscrnsaver xtst
USE_QT= buildtools:build core:build widgets:build
-USE_ELECTRON= npm:yarn4 prefetch extract
NPM_EXTRACT_WRKSRC= ${WRKSRC:H}/${PORTNAME}-${ELECTRON_VER}
SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
diff --git a/devel/electron40/Makefile b/devel/electron40/Makefile
index 40559c3b1fe8..a7ca3f3bd230 100644
--- a/devel/electron40/Makefile
+++ b/devel/electron40/Makefile
@@ -69,10 +69,10 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils
TEST_DEPENDS= git:devel/git \
${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR}
-USES= bison compiler:c++17-lang cpe display:test electron:env \
- gettext-tools gl gmake gnome iconv:wchar_t jpeg \
- localbase:ldflags ninja nodejs:24,build pkgconfig \
- python:build,test qt:5 shebangfix tar:xz xorg
+USES= bison compiler:c++17-lang cpe display:test gettext-tools gl \
+ gmake gnome iconv:wchar_t jpeg localbase:ldflags ninja \
+ nodejs:24,build npm:yarn4 pkgconfig python:build,test qt:5 \
+ shebangfix tar:xz xorg
CPE_VENDOR= electronjs
USE_GITHUB= yes
@@ -88,7 +88,6 @@ USE_GNOME= atk cairo gdkpixbuf gtk30 libxml2 libxslt pango
USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
xrender xscrnsaver xtst
USE_QT= buildtools:build core:build widgets:build
-USE_ELECTRON= npm:yarn4 prefetch extract
NPM_EXTRACT_WRKSRC= ${WRKSRC:H}/${PORTNAME}-${ELECTRON_VER}
SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
diff --git a/devel/electron41/Makefile b/devel/electron41/Makefile
index 379b2dfba43c..5cff354ee739 100644
--- a/devel/electron41/Makefile
+++ b/devel/electron41/Makefile
@@ -68,10 +68,10 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils
TEST_DEPENDS= git:devel/git \
${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR}
-USES= bison cargo compiler:c++17-lang cpe display:test electron:env \
- gettext-tools gl gmake gnome iconv:wchar_t jpeg \
- localbase:ldflags ninja nodejs:24,build pkgconfig \
- python:build,test qt:5 shebangfix tar:xz xorg
+USES= bison cargo compiler:c++17-lang cpe display:test gettext-tools \
+ gl gmake gnome iconv:wchar_t jpeg localbase:ldflags ninja \
+ nodejs:24,build npm:yarn4 pkgconfig python:build,test qt:5 \
+ shebangfix tar:xz xorg
CPE_VENDOR= electronjs
USE_GITHUB= nodefault
@@ -89,7 +89,6 @@ USE_GNOME= atk cairo gdkpixbuf gtk30 libxml2 libxslt pango
USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
xrender xscrnsaver xtst
USE_QT= buildtools:build core:build widgets:build
-USE_ELECTRON= npm:yarn4 prefetch extract
NPM_EXTRACT_WRKSRC= ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}
SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
diff --git a/devel/electron42/Makefile b/devel/electron42/Makefile
index 36633de6f307..8dafb555f81d 100644
--- a/devel/electron42/Makefile
+++ b/devel/electron42/Makefile
@@ -69,10 +69,10 @@ TEST_DEPENDS= git:devel/git \
${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \
sentry-cli:devel/sentry-cli
-USES= bison cargo compiler:c++17-lang cpe display:test electron:env \
- gettext-tools gl gmake gnome iconv:wchar_t jpeg \
- localbase:ldflags ninja nodejs:24,build pkgconfig \
- python:build,test qt:5 shebangfix tar:xz xorg
+USES= bison cargo compiler:c++17-lang cpe display:test gettext-tools \
+ gl gmake gnome iconv:wchar_t jpeg localbase:ldflags ninja \
+ nodejs:24,build npm:yarn4 pkgconfig python:build,test qt:5 \
+ shebangfix tar:xz xorg
CPE_VENDOR= electronjs
USE_GITHUB= nodefault
@@ -90,7 +90,6 @@ USE_GNOME= atk cairo gdkpixbuf gtk30 libxml2 libxslt pango
USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
xrender xscrnsaver xtst
USE_QT= buildtools:build core:build widgets:build
-USE_ELECTRON= npm:yarn4 prefetch extract
NPM_EXTRACT_WRKSRC= ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}
SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index ed90269f7dce..5811cb75e70c 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -61,7 +61,7 @@ TEST_DEPENDS= bash:shells/bash
USES= cargo desktop-file-utils display:test electron:42,build,test \
gl gmake gnome gssapi:mit iconv:wchar_t jpeg localbase:ldflags \
- nodejs:24,build pkgconfig python:build shebangfix xorg
+ nodejs:24,build npm:npm pkgconfig python:build shebangfix xorg
USE_GITHUB= yes
GH_ACCOUNT= microsoft
@@ -89,7 +89,6 @@ USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \
xrandr xrender xscrnsaver xtst
USE_GL= gbm gl glesv2
USE_GNOME= atk cairo pango gdkpixbuf gtk30 libxml2 libxslt
-USE_ELECTRON= npm:npm
SHEBANG_REGEX= ./(extensions|node_modules|resources|scripts|src)/.*(\.(pl|py|sh)|makeBlacker|makeFF)$$
PATHFIX_FILES= src/vs/workbench/contrib/debug/node/terminals.ts
diff --git a/editors/vscode/Makefile.reh b/editors/vscode/Makefile.reh
index f2f5b5b98383..93d61a38f756 100644
--- a/editors/vscode/Makefile.reh
+++ b/editors/vscode/Makefile.reh
@@ -33,8 +33,8 @@ LIB_DEPENDS= libbrotlidec.so:archivers/brotli \
libsqlite3.so:databases/sqlite3 \
libsecret-1.so:security/libsecret
-USES= cargo electron:env gssapi:mit localbase:ldflags \
- nodejs:24,build pkgconfig python:build shebangfix
+USES= cargo gssapi:mit localbase:ldflags nodejs:24,build npm:npm \
+ pkgconfig python:build shebangfix
USE_GITHUB= yes
GH_ACCOUNT= microsoft
@@ -57,7 +57,6 @@ CARGO_TEST= no
CFLAGS+= -Wno-error=implicit-function-declaration
USE_CXXSTD= c++20
-USE_ELECTRON= npm:npm
SHEBANG_REGEX= ./(extensions|node_modules|resources|scripts|src)/.*(\.(pl|py|sh)|makeBlacker|makeFF)$$
PATHFIX_FILES= src/vs/workbench/contrib/debug/node/terminals.ts
@@ -70,7 +69,7 @@ BINARY_ALIAS= python=${PYTHON_CMD}
.include "Makefile.version"
.include <bsd.port.pre.mk>
-NODEJS_ARCH= ${ELECTRON_ARCH}
+NODEJS_ARCH= ${ARCH:S/aarch64/arm64/:S/amd64/x64/:S/i386/ia32/}
NODEJS_DIR= ${PORTSDIR}/www/node${NODEJS_VERSION}
.include "${NODEJS_DIR}/Makefile.version"
diff --git a/net-im/deltachat-desktop/Makefile b/net-im/deltachat-desktop/Makefile
index 69a8b6ede48e..33da9bbb8d00 100644
--- a/net-im/deltachat-desktop/Makefile
+++ b/net-im/deltachat-desktop/Makefile
@@ -13,9 +13,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# Important to keep the RPC server core in sync with the Desktop release
RUN_DEPENDS= deltachat-rpc-server>=2.52<2.53:net/deltachat-rpc-server
-USES= electron:42,build,run desktop-file-utils nodejs:22,build pkgconfig
+USES= electron:42,build,run desktop-file-utils nodejs:22,build \
+ npm:pnpm pkgconfig
-USE_ELECTRON= npm:pnpm prefetch extract
NPM_VER= 10.33.2
# Possible to support more arches, but need their binary
diff --git a/net-im/teams/Makefile b/net-im/teams/Makefile
index 9b97ca228518..95f553f416bf 100644
--- a/net-im/teams/Makefile
+++ b/net-im/teams/Makefile
@@ -12,7 +12,7 @@ LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE.md
USES= desktop-file-utils electron:41 localbase:ldflags \
- nodejs:24,build python:build
+ nodejs:24,build npm:npm python:build
USE_GITHUB= yes
GH_ACCOUNT= IsmaelMartinez
@@ -25,7 +25,7 @@ PORTDOCS= CONTRIBUTING.md HISTORY.md README.md SECURITY.md
OPTIONS_DEFINE= DOCS
-USE_ELECTRON= npm:npm appbuilder:devel prefetch extract rebuild build:builder
+USE_ELECTRON= appbuilder:devel rebuild build:builder
do-install:
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/security/bitwarden-cli/Makefile b/security/bitwarden-cli/Makefile
index baae48e2f1a1..ebb34dcdfdd3 100644
--- a/security/bitwarden-cli/Makefile
+++ b/security/bitwarden-cli/Makefile
@@ -30,8 +30,8 @@ LIB_DEPENDS= libbrotlidec.so:archivers/brotli \
RUN_DEPENDS= xdg-open:devel/xdg-utils \
ca_root_nss>0:security/ca_root_nss
-USES= electron:env gmake localbase:ldflags nodejs:22,build \
- pkgconfig python:build sqlite ssl
+USES= gmake localbase:ldflags nodejs:22,build npm:npm pkgconfig \
+ python:build sqlite ssl
USE_GITHUB= yes
GH_ACCOUNT= bitwarden
@@ -52,7 +52,6 @@ PORTDOCS= CONTRIBUTING.md README.md SECURITY.md
OPTIONS_DEFINE= DOCS
-USE_ELECTRON= npm:npm prefetch extract
PKG_NODE_VER= 22.15.1
PKG_FETCH_VER= 3.5
PKG_NODE_CONFIGURE_ARGS=--openssl-use-def-ca-store \
diff --git a/x11/waveterm/Makefile b/x11/waveterm/Makefile
index e377d44616fa..e8bb72b7b4ea 100644
--- a/x11/waveterm/Makefile
+++ b/x11/waveterm/Makefile
@@ -27,7 +27,7 @@ BUILD_DEPENDS= task:devel/task
LIB_DEPENDS= libvips.so:graphics/vips
USES= cargo electron:41 gmake go:1.25+,modules,no_targets \
- nodejs:24,build python:build
+ nodejs:24,build npm:npm python:build
USE_GITHUB= yes
GH_ACCOUNT= wavetermdev
@@ -52,7 +52,7 @@ PORTDOCS= CONTRIBUTING.md README.md SECURITY.md
OPTIONS_DEFINE= DOCS
-USE_ELECTRON= npm:npm appbuilder:devel prefetch extract rebuild build:builder
+USE_ELECTRON= appbuilder:devel rebuild build:builder
ELECTRON_MAKE_FLAGS+= -c electron-builder.config.cjs