Framework: sync with upstream

Taken from: FreeBSD
opnsense2 · Apr 20, 2023 · efd2a1c · efd2a1c
1 parent 14a6b2c
commit efd2a1c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/MOVED b/MOVED
@@ -14444,7 +14444,6 @@ audio/festvox-czech||2020-05-05|Has expired: Broken for more than 6 months
 audio/gkrellmvolume2||2020-05-05|Has expired: Broken for more than 6 months
 audio/mixmos||2020-05-05|Has expired: Broken for more than 6 months
 audio/mma||2020-05-05|Has expired: Broken for more than 6 months
-audio/pd-cyclone||2020-05-05|Has expired: Broken for more than 6 months
 audio/shorten||2020-05-05|Has expired: Broken for more than 6 months
 audio/taglib-sharp||2020-05-05|Has expired: Broken for more than 6 months
 audio/xhippo||2020-05-05|Has expired: Broken for more than 6 months
@@ -17908,3 +17907,5 @@ textproc/rubygem-rouge329|textproc/rubygem-rouge|2023-04-09|Remove obsoleted por
 www/rubygem-erubi19|www/rubygem-erubi|2023-04-09|Remove obsoleted port. Use www/rubygem-erubi instead
 multimedia/mythtv-frontend|multimedia/mythtv|2023-04-10|Frontend is no part of multimedia/mythtv
 lang/ruby27|lang/ruby30|2023-04-13|Please migrate to newer versions. Ruby 2.7 will reach its EoL on April 12, 2023
+www/py-requests-futures0|www/py-requests-futures|2023-04-19|Remove obsoleted port. Use www/py-requests-futures instead
+mail/rubygem-mail27|mail/rubygem-mail|2023-04-19|Remove obsoleted port. Use mail/rubygem-mail instead
diff --git 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, 14, 16, 18, 19
+#   - version   available version: lts, current, 14, 16, 18, 19, 20
 #
 # Note:
 # - The supported versions follow upstream release schedule
 #   https://github.com/nodejs/Release/blob/main/README.md#release-schedule
 #   - lts is 18 now
-#   - current is 19 now
+#   - current is 20 now
 # - USES=nodejs means USES=nodejs:build,run
 # - If you define a version, you must provide run and/or build
 #
@@ -22,14 +22,14 @@
 .if !defined(_INCLUDE_USES_NODEJS_MK)
 _INCLUDE_USES_NODEJS_MK=	yes
 
-_VALID_NODEJS_VERSIONS=	14 16 18 19 current lts
+_VALID_NODEJS_VERSIONS=	14 16 18 19 20 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:N14:N16:N18:N19)
-IGNORE=		USES=nodejs has invalid arguments ${nodejs_ARGS}.
+.  if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N14:N16:N18:N19:N20)
+IGNORE=		USES=nodejs has invalid arguments ${nodejs_ARGS}
 .  endif
 
 .  if empty(nodejs_ARGS)
@@ -47,7 +47,7 @@ _NODEJS_VER=	${version}
 _NODEJS_VER=	${NODEJS_DEFAULT}
 .  endif
 
-NODEJS_VERSION=	${_NODEJS_VER:S|current|19|:S|lts|18|}
+NODEJS_VERSION=	${_NODEJS_VER:S|current|20|:S|lts|18|}
 NODEJS_SUFFIX=	-node${NODEJS_VERSION}
 
 .  if ${nodejs_ARGS:M*build*}

diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk
@@ -148,20 +148,20 @@ RUBY?=			${LOCALBASE}/bin/ruby${RUBY_SUFFIX}
 #
 # Ruby 3.0
 #
-RUBY_DISTVERSION=	3.0.5
-RUBY_PORTREVISION=	1
+RUBY_DISTVERSION=	3.0.6
+RUBY_PORTREVISION=	0
 .      elif ${RUBY_VER} == 3.1
 #
 # Ruby 3.1
 #
-RUBY_DISTVERSION=	3.1.3
-RUBY_PORTREVISION=	2
+RUBY_DISTVERSION=	3.1.4
+RUBY_PORTREVISION=	0
 
 .      elif ${RUBY_VER} == 3.2
 #
 # Ruby 3.2
 #
-RUBY_DISTVERSION=	3.2.1
+RUBY_DISTVERSION=	3.2.2
 RUBY_PORTREVISION=	0
 
 # When adding a version, please keep the comment in

diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
@@ -93,7 +93,7 @@ MONO_DEFAULT?=		5.10
 MYSQL_DEFAULT?=		8.0
 # Possible values: ninja, samurai
 NINJA_DEFAULT?=		ninja
-# Possible value: 14, 16, 18, 19, current, lts (Note: current = 19 and lts = 18)
+# Possible value: 14, 16, 18, 19, 20, current, lts (Note: current = 20 and lts = 18)
 NODEJS_DEFAULT?=	lts
 # Possible value: 24, 25, 26
 OPENLDAP_DEFAULT?=	26