From nobody Wed Sep 04 04:44:50 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wz8zk34Ydz5V5TJ; Wed, 04 Sep 2024 04:44:50 +0000 (UTC) (envelope-from git@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wz8zk2CBNz4vTg; Wed, 4 Sep 2024 04:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725425090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ifZA5eWBRg5MM6XlN7oFv/cqehBACwUg6RqHOlpYmfA=; b=WjxrYOS8cgS+vV/BfoizKRVLR6D9SXeA+2xODKk3It9ljQTMePHA5/phqoVFdz27uHacb/ CbuEOsL20yRyDAlGkjDQmlF0YOSlrBUUE6tMOQr4BRPRZBlJTfMaaTGZrt7kyRic5tCyWI DoOF+r+aNIhw6voTMuCgB2n4qHwslhFnDp3bTrf2H2SMJ4YHuxJZe/BEgDnY7W/I68n6qj cnB1CSX1oBs4pDAuEnDhdCigmodLuFoAFr2pYTyM3+pzLuGggfej+FsDlv/RU/cw5dEeNF ReXnHd2pW88V+lCA5TFjClU/LaupU12Igo7i63xad0GM7LaOsBvgMn0FIgk63Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725425090; a=rsa-sha256; cv=none; b=tj1A12atDil+LxPJw2IPXylMDep9pKvf10EQKMyKWODeBUL0JauiPDcUOxhHE63u4gfpdf TneTv5wI7V/i/DO1gSwuuEG/5lZMYou02079tX3U5OwZ2+7iyO/04M49xcrsmH8OvGayxY 0OaKWGzMnDeTKpSnPHI4HO4gj4pTQsno/fCm7MmVQ5UNfJIkNyxbV7hUM/A8Bmk9Y185e3 RtOMzoG9oc4QPv+DjJqL7TRCcC9dNyiOGtJtLvQLkv1ticQhjbtzCd5VsmD0kc2ywAqY8j nDULJtZeVMXJtwlAEaY+eZkKcIZvkaTyWCkDRGSNAi6ss8oJ43AAn2TERdDP8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725425090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ifZA5eWBRg5MM6XlN7oFv/cqehBACwUg6RqHOlpYmfA=; b=Q5lADb+ydZEVadzCQmrbpSkuVtHn+igcoOK3iPlX/aj/qH2NPOEBWHhLNCKT/UoEIXZhPb YfOthI6ku14HD1n+Ru2DmG/PyHbZoVxDrXBleZB9+FhcZFXJQDUnO9C8OS9/+aarllssxG BkFUZ1S8p/agaqnnZ8bsFzkz+NXDNp5aNCc7cIhVigMkITgD/O5BeEYyFY3ot004HIJ2mG MzYJZ4VRRgbVt4GrrNibAylz0Tx6tRmWVX/EpkO/dJ3293svXgd0iUKIL/gy9zE4/YxDuM 90ElodSV5FCiBNV0WIdNQwdXyoPtTiSTnbjXJxa9HJa+q3QERypi8f8FgFiNrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wz8zk1bPYz19Q2; Wed, 4 Sep 2024 04:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4844iopX080710; Wed, 4 Sep 2024 04:44:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4844io5V080707; Wed, 4 Sep 2024 04:44:50 GMT (envelope-from git) Date: Wed, 4 Sep 2024 04:44:50 GMT Message-Id: <202409040444.4844io5V080707@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: d86a98ea7a48 - main - Uses/electronfix.mk: Rework to not require listing supported electron versions List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d86a98ea7a484cc5a3b4b95342ceb60906abafbd Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d86a98ea7a484cc5a3b4b95342ceb60906abafbd commit d86a98ea7a484cc5a3b4b95342ceb60906abafbd Author: Gleb Popov AuthorDate: 2024-07-16 09:57:58 +0000 Commit: Gleb Popov CommitDate: 2024-09-04 04:44:28 +0000 Uses/electronfix.mk: Rework to not require listing supported electron versions --- Mk/Uses/electronfix.mk | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/Mk/Uses/electronfix.mk b/Mk/Uses/electronfix.mk index 73e2e69ffcaf..f5e33da516cb 100644 --- a/Mk/Uses/electronfix.mk +++ b/Mk/Uses/electronfix.mk @@ -17,24 +17,18 @@ .if !defined(_INCLUDE_USES_ELECTRONFIX_MK) _INCLUDE_USES_ELECTRONFIX_MK= yes -_ELECTRONFIX_MK_VALID_VERSIONS= 22 23 24 25 27 28 30 +. if empty(electronfix_ARGS) +. error USES=electronfix requires a version argument +. endif -# === parse version arguments === -_ELECTRONFIX_MK_VERSION= # empty -. for _ver in ${_ELECTRONFIX_MK_VALID_VERSIONS} -. if ${electronfix_ARGS:M${_ver}} -. if !empty(_ELECTRONFIX_MK_VERSION) -BROKEN= USES=electronfix:${electronfix_ARGS} contains multiple version definitions -. else -_ELECTRONFIX_MK_VERSION= ${_ver} -. endif -. endif -. endfor +_ELECTRON_MAKEFILE_VERSION= ${.CURDIR}/../../devel/electron${electronfix_ARGS}/Makefile.version -. include "${.CURDIR}/../../devel/electron${_ELECTRONFIX_MK_VERSION}/Makefile.version" +. if !exists(${_ELECTRON_MAKEFILE_VERSION}) +. error Unknown Electron version in USES=electronfix:${electronfix_ARGS} +. endif -BUILD_DEPENDS+= electron${_ELECTRONFIX_MK_VERSION}:devel/electron${_ELECTRONFIX_MK_VERSION} -RUN_DEPENDS+= electron${_ELECTRONFIX_MK_VERSION}:devel/electron${_ELECTRONFIX_MK_VERSION} +BUILD_DEPENDS+= electron${electronfix_ARGS}:devel/electron${electronfix_ARGS} +RUN_DEPENDS+= electron${electronfix_ARGS}:devel/electron${electronfix_ARGS} ELECTRONFIX_SYMLINK_FILES?= \ chromedriver \ @@ -58,11 +52,11 @@ electronfix-post-install: ${RM} ${STAGEDIR}${DATADIR}/libvulkan.so.1 . for f in ${ELECTRONFIX_SYMLINK_FILES} ${RM} ${STAGEDIR}${DATADIR}/${f} - ${LN} -s ${LOCALBASE}/share/electron${_ELECTRONFIX_MK_VERSION}/${f} ${STAGEDIR}${DATADIR}/${f} + ${LN} -s ${LOCALBASE}/share/electron${electronfix_ARGS}/${f} ${STAGEDIR}${DATADIR}/${f} . endfor . ifdef ELECTRONFIX_MAIN_EXECUTABLE # We have to copy the electron binary instead of symlinking - ${CP} ${LOCALBASE}/share/electron${_ELECTRONFIX_MK_VERSION}/electron ${STAGEDIR}${DATADIR}/${ELECTRONFIX_MAIN_EXECUTABLE} + ${CP} ${LOCALBASE}/share/electron${electronfix_ARGS}/electron ${STAGEDIR}${DATADIR}/${ELECTRONFIX_MAIN_EXECUTABLE} . endif electronfix-stage-qa: