git: 3204f5b51a46 - main - Revert: "Mk: unregister expired www/node18"

The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3204f5b51a465abb9444931dcb4c668145af5a00

commit 3204f5b51a465abb9444931dcb4c668145af5a00
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2025-06-01 21:18:49 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2025-06-01 21:20:02 +0000

    Revert: "Mk: unregister expired www/node18"
    
    This reverts commit 16956a660928f7dff5738ca259aaa86d489a60a7.
    
    This has to be committed together with the removal of www/*node18,
    which we cannot do yet because of textproc/kibana8.
    
    Noticed by:     bofh
---
 Mk/Uses/nodejs.mk          | 6 +++---
 Mk/bsd.default-versions.mk | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk
index 36db2250bfd3..d758bba2adcb 100644
--- a/Mk/Uses/nodejs.mk
+++ b/Mk/Uses/nodejs.mk
@@ -7,7 +7,7 @@
 #   - 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, 20, 22, 23, 24
+#   - version   available version: lts, current, 18, 20, 22, 23, 24
 #
 # Note:
 # - The supported versions follow upstream release schedule
@@ -22,13 +22,13 @@
 .if !defined(_INCLUDE_USES_NODEJS_MK)
 _INCLUDE_USES_NODEJS_MK=	yes
 
-_VALID_NODEJS_VERSIONS=	20 22 23 24 current lts
+_VALID_NODEJS_VERSIONS=	18 20 22 23 24 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:N20:N22:N23:N24)
+.  if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N18:N20:N22:N23:N24)
 IGNORE=		USES=nodejs has invalid arguments ${nodejs_ARGS}
 .  endif
 
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 05ebae8835df..4f67b9cd6ab0 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -109,7 +109,7 @@ MONO_DEFAULT?=		5.20
 MYSQL_DEFAULT?=		8.0
 # Possible values: ninja, samurai
 NINJA_DEFAULT?=		ninja
-# Possible value: 20, 22, 23, 24, current, lts (Note: current = 24 and lts = 22)
+# Possible value: 18, 20, 22, 23, 24, current, lts (Note: current = 24 and lts = 22)
 NODEJS_DEFAULT?=	lts
 # Possible value: 25, 26
 OPENLDAP_DEFAULT?=	26