From nobody Fri Jun 03 17:01:51 2022 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 709411BD6312; Fri, 3 Jun 2022 17:01:53 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LF8LR5xRtz3wK0; Fri, 3 Jun 2022 17:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654275712; 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=w5C3xGBWkmy/u/1B71YBtV0TlaLqbROJ8hP7KGhrfSc=; b=iqbXX6IA09ztftopndRdxzloodoWurQTYNPQuj5+Q5tCE8Cso3nbqd5kUdzU0sFZLq3Cvi BC7e9Gamru8KXfg1MMRVzIapNn877z5618sgERhZ1q079lrD5CXELtP31efOz/+zuMX8VX a7Jhhvux1eKWjqZEhSQGZAekFc6Xfb9cTqmSnu/g9AxhW/+AT+vlYf5Ob9uP4/L6jF5Z0a RWuegMf4J6M6EIJiy1b6wx3+0MXHqh/MS3c0y6Idr9eai99vzPAeWJp4TRQ+Iu2VVAWgGW 5n5tmewYVDtS/WbPl5TNde+0+neyZDerNMucH/32q+t6f8UlhxGRP770S0I99A== 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 8BD494F79; Fri, 3 Jun 2022 17:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 253H1phX050337; Fri, 3 Jun 2022 17:01:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 253H1pOY050336; Fri, 3 Jun 2022 17:01:51 GMT (envelope-from git) Date: Fri, 3 Jun 2022 17:01:51 GMT Message-Id: <202206031701.253H1pOY050336@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 25bb8b00152f - main - Mk/Uses/nodejs.mk: Handle www/node update to v18 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25bb8b00152f9e06ea3cba953dede66df54a5e1c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654275712; 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=w5C3xGBWkmy/u/1B71YBtV0TlaLqbROJ8hP7KGhrfSc=; b=xOVjbS4qxIz+QFODRsRKJ28edbvxSIOOPDlRozonOl7RqlNP8goqwjaGiin6Q5JK1l7AkM LUAz0gmJNFhx4F8sEIrdPg3ZkeiYgHtDYSdHJWaUxLYzc1atx9czOWl14GjbG6aWFXiZWS i59E4zk9u2uUHB0QpCbYSnZDLvWhGQcQvbkBp5eq3favOj30O6sAtQo4Jqo0KVMCi0fQen qbFGGanqS//SHeE12YSm3xXMar1vuFQnqfcEXEUFDY/h7dpDsRAO8Y1J4vjghnYh5eELFQ 8ozV3iACPVDaKGJKDzMWYMNaM2qjIwkb7DJmBPm8hl4JlVgtIB3c6haMHlwV0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654275712; a=rsa-sha256; cv=none; b=s4AdhWmHQ8gGNcVkWZlOpp4wnq1q7pbppFM6jJNc+pjhFFgAtBOcvl56l6SM+rtP65jVWF TRACfBgAu9//0cfgo5KyS3kUt3F4wLeVol8KwEXYdRX+I02rTfO7Sis9Gmksm0iHZhhGbB ZsVF+NDUXtLT7BLz1xG2YtV+au5YJ1dBLSbYd9T+SeIZU2rkZcRN8XKfagzalSiHDa6b7J D/wM6k0fSJri72gmPjkf2oMJpIKmhZe1ttX1vd54hmSyxPvI6eYGhrR6wNOONVmBqcvXGb Y9n7XnqWzf7VU78gLRwRSwx4ZbMnD6j3izmGB5/b2tYO/wWLW4wC0VhcY4VSGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=25bb8b00152f9e06ea3cba953dede66df54a5e1c commit 25bb8b00152f9e06ea3cba953dede66df54a5e1c Author: Joseph Mingrone AuthorDate: 2022-06-01 18:27:26 +0000 Commit: Joseph Mingrone CommitDate: 2022-06-03 17:01:42 +0000 Mk/Uses/nodejs.mk: Handle www/node update to v18 PR: 263590 Sponsored by: The FreeBSD Foundation --- Mk/Uses/nodejs.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk index a54751b1b4dd..8a5a7eefefb6 100644 --- a/Mk/Uses/nodejs.mk +++ b/Mk/Uses/nodejs.mk @@ -3,7 +3,7 @@ # Feature: nodejs # Usage: USES=nodejs or USES=nodejs:args # Valid ARGS: build and/or run -# version: lts, current, 14, 16, 17 +# version: lts, current, 14, 16, 18 # Default is: build,run # Note: if you define a version, you must provide run and/or build # @@ -12,7 +12,7 @@ .if !defined(_INCLUDE_USES_NODEJS_MK) _INCLUDE_USES_NODEJS_MK= yes -_VALID_NODEJS_VERSION= 14 16 17 lts current +_VALID_NODEJS_VERSION= 14 16 18 lts current _NODEJS_VERSION_SUFFIX= ${NODEJS_DEFAULT} . if ! ${_VALID_NODEJS_VERSION:M${_NODEJS_VERSION_SUFFIX}} @@ -29,18 +29,18 @@ _NODEJS_VERSION_SUFFIX= 14 _NODEJS_VERSION_SUFFIX= 16 . elif ${nodejs_ARGS:Mlts} _NODEJS_VERSION_SUFFIX= lts -. elif ${nodejs_ARGS:M17} -_NODEJS_VERSION_SUFFIX= 17 +. elif ${nodejs_ARGS:M18} +_NODEJS_VERSION_SUFFIX= 18 . elif ${nodejs_ARGS:Mcurrent} _NODEJS_VERSION_SUFFIX= current . elif defined(NODEJS_DEFAULT) . endif -# The nodejs 17 version is named www/node +# The nodejs 18 version is named www/node . if ${_NODEJS_VERSION_SUFFIX:Mcurrent} _NODEJS_VERSION_SUFFIX= . endif -. if ${_NODEJS_VERSION_SUFFIX:M17} +. if ${_NODEJS_VERSION_SUFFIX:M18} _NODEJS_VERSION_SUFFIX= . endif # The nodejs LTS is version 16