git: 63ff13713ef5 - main - Mk: unregister expired NodeJS 10 and Ruby 2.6

The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=63ff13713ef542d7ee39b62169163309744e7ff7

commit 63ff13713ef542d7ee39b62169163309744e7ff7
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2022-03-31 14:38:19 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2022-03-31 14:38:38 +0000

    Mk: unregister expired NodeJS 10 and Ruby 2.6
---
 Mk/Uses/nodejs.mk          |  8 +++-----
 Mk/bsd.default-versions.mk |  4 ++--
 Mk/bsd.ruby.mk             | 15 ++-------------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk
index af38aba78e55..23aad97fa580 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>
-# version:      lts, current, 10, 14, 16, 17
+# version:      lts, current, 14, 16, 17
 # 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=	10 14 16 17 lts current
+_VALID_NODEJS_VERSION=	14 16 17 lts current
 _NODEJS_VERSION_SUFFIX=	${NODEJS_DEFAULT}
 
 .if ! ${_VALID_NODEJS_VERSION:M${_NODEJS_VERSION_SUFFIX}}
@@ -23,9 +23,7 @@ IGNORE=	Invalid nodejs default version ${_NODEJS_VERSION_SUFFIX}; valid versions
 nodejs_ARGS=	build,run
 .endif
 
-. if ${nodejs_ARGS:M10}
-_NODEJS_VERSION_SUFFIX=	10
-. elif ${nodejs_ARGS:M14}
+. if ${nodejs_ARGS:M14}
 _NODEJS_VERSION_SUFFIX=	14
 . elif ${nodejs_ARGS:M16}
 _NODEJS_VERSION_SUFFIX=	16
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index c4a56a4337ac..1f991e608c70 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -115,7 +115,7 @@ PYTHON_DEFAULT?=	3.8
 PYTHON2_DEFAULT?=	2.7
 # Possible values: 3.7, 3.8, 3.9, 3.10, 3.11
 PYTHON3_DEFAULT?=	3.8
-# Possible values: 2.6, 2.7, 3.0, 3.1
+# Possible values: 2.7, 3.0, 3.1
 RUBY_DEFAULT?=		2.7
 # Possible values: rust, rust-nightly
 RUST_DEFAULT?=		rust
@@ -163,7 +163,7 @@ TCLTK_DEFAULT?=		8.6
 # Possible values: 4, 6
 VARNISH_DEFAULT?=	4
 
-# Possible value: 10, 14, 16, 17, lts, current
+# Possible value: 14, 16, 17, lts, current
 NODEJS_DEFAULT?=    lts
 
 .endif
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 83bb14174b2a..82bff4d01783 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -131,16 +131,7 @@ RUBY?=			${LOCALBASE}/bin/ruby${RUBY_SUFFIX}
 .if defined(RUBY_VER)
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-. if ${RUBY_VER} == 2.6
-#
-# Ruby 2.6
-#
-RUBY_DISTVERSION=	2.6.9
-RUBY_PORTREVISION=	1
-RUBY_PORTEPOCH=		1
-RUBY26=			""	# PLIST_SUB helpers
-
-. elif ${RUBY_VER} == 2.7
+. if ${RUBY_VER} == 2.7
 #
 # Ruby 2.7
 #
@@ -172,7 +163,7 @@ RUBY31=			""	# PLIST_SUB helpers
 #
 # Other versions
 #
-IGNORE=	Only ruby 2.6, 2.7, 3.0 and 3.1 are supported
+IGNORE=	Only ruby 2.7, 3.0 and 3.1 are supported
 _INVALID_RUBY_VER=	1
 . endif
 RUBY_VERSION=	${RUBY_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}
@@ -180,7 +171,6 @@ RUBY_VERSION=	${RUBY_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}
 
 .if !defined(_INVALID_RUBY_VER)
 
-RUBY26?=		"@comment "
 RUBY27?=		"@comment "
 RUBY30?=		"@comment "
 RUBY31?=		"@comment "
@@ -291,7 +281,6 @@ PLIST_SUB+=		${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \
 			RUBY_ARCH="${RUBY_ARCH}" \
 			RUBY_SUFFIX="${RUBY_SUFFIX}" \
 			RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \
-			RUBY26=${RUBY26} \
 			RUBY27=${RUBY27} \
 			RUBY30=${RUBY30} \
 			RUBY31=${RUBY31}