git: 2dc24e344934 - main - Mk: unregister expired www/node21

From: Rene Ladan <rene_at_FreeBSD.org>
Date: Sun, 30 Jun 2024 11:57:39 UTC
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2dc24e3449341a15cb2461f06a9a2e04a8aa5646

commit 2dc24e3449341a15cb2461f06a9a2e04a8aa5646
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2024-06-30 11:57:10 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2024-06-30 11:57:10 +0000

    Mk: unregister expired www/node21
---
 Mk/Uses/nodejs.mk          | 8 ++++----
 Mk/bsd.default-versions.mk | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk
index e6fe010026eb..710c278b4934 100644
--- a/Mk/Uses/nodejs.mk
+++ b/Mk/Uses/nodejs.mk
@@ -7,13 +7,13 @@
 #   - build     use node as build-time dependency
 #   - run       use node as runtime dependency
 #   - env       set the environment (NODEJS_VERSION and NODEJS_SUFFIX)
-#   - version   available version: lts, current, 18, 20, 21, 22
+#   - version   available version: lts, current, 18, 20, 22
 #
 # Note:
 # - The supported versions follow upstream release schedule
 #   https://github.com/nodejs/Release/blob/main/README.md#release-schedule
 #   - lts is 20 now
-#   - current is 21 now
+#   - current is 22 now
 # - USES=nodejs means USES=nodejs:build,run
 # - If you define a version, you must provide run and/or build
 #
@@ -22,13 +22,13 @@
 .if !defined(_INCLUDE_USES_NODEJS_MK)
 _INCLUDE_USES_NODEJS_MK=	yes
 
-_VALID_NODEJS_VERSIONS=	18 20 21 22 current lts
+_VALID_NODEJS_VERSIONS=	18 20 22 current lts
 
 .  if ! ${_VALID_NODEJS_VERSIONS:M${NODEJS_DEFAULT}}
 IGNORE=	Invalid default nodejs version ${NODEJS_DEFAULT}; valid versions are ${_VALID_NODEJS_VERSIONS}
 .  endif
 
-.  if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N18:N20:N21:N22)
+.  if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N18:N20:N22)
 IGNORE=		USES=nodejs has invalid arguments ${nodejs_ARGS}
 .  endif
 
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index dbf645f790e1..d18a136e2705 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -105,7 +105,7 @@ MONO_DEFAULT?=		5.20
 MYSQL_DEFAULT?=		8.0
 # Possible values: ninja, samurai
 NINJA_DEFAULT?=		ninja
-# Possible value: 18, 20, 21, 22, current, lts (Note: current = 22 and lts = 20)
+# Possible value: 18, 20, 22, current, lts (Note: current = 22 and lts = 20)
 NODEJS_DEFAULT?=	lts
 # Possible value: 25, 26
 OPENLDAP_DEFAULT?=	26