diff --git a/MOVED b/MOVED
index 5889cd87df4..cf3cf52cf95 100644
--- a/MOVED
+++ b/MOVED
@@ -3055,3 +3055,8 @@ lang/swi-pl|lang/swipl|2024-03-17|Port renamed on request
 devel/rubygem-with_advisory_lock|devel/rubygem-with_advisory_lock61|2024-03-18|Port renamed to follow naming convention
 emulators/cpmemu||2024-03-19|Has expired: BROKEN on all versions since last year
 devel/grpc142||2024-03-20|Has expired: Please use devel/grpc instead
+www/h2o-devel|www/h2o|2024-03-23|Upstream no longer supports releases, this port is folded into www/h2o instead
+security/rubygem-metasploit-aggregator||2024-03-24|Has expired: No longer used, no longer maintained upstream
+net-p2p/tooth||2024-03-24|Has expired: Project has been renamed to Tuba. Consider porting to the new project. See https://github.com/GeopJr/Tuba
+www/tidy-devel|www/tidy-html5|2024-03-25|Has expired: no more dev at SF, replaced by www/tidy-html5
+www/tidy-lib|www/tidy-html5|2024-03-25|Has expired: no more dev at SF, replaced by www/tidy-html5
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index ca0a4fef23b..e3b733d3582 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}=	${WRKDIR}/${_wrksrc}
 
 CARGO_BUILDDEP?=	yes
 .  if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.76.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.77.0:lang/${RUST_DEFAULT}
 .  elif ${CARGO_BUILDDEP:tl} == "any-version"
 BUILD_DEPENDS+=	${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
 .  endif
@@ -139,8 +139,11 @@ CARGO_ENV+= \
 CARGO_ENV+=	RUST_BACKTRACE=1
 .  endif
 
+.  if !defined(_WITHOUT_LTO) && (!defined(WITHOUT_LTO_PORTS) || ${WITHOUT_LTO_PORTS:N${PKGORIGIN}})
 _CARGO_MSG=	"===>   Additional optimization to port applied"
-WITH_LTO=	yes
+_WITH_LTO=	yes
+.undef _WITHOUT_LTO
+.  endif
 
 # Adjust -C target-cpu if -march/-mcpu is set by bsd.cpu.mk
 .  if ${ARCH} == amd64 || ${ARCH} == i386
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 520a4923dcc..6199d598ba4 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -96,11 +96,11 @@ KDE_APPLICATIONS_SHLIB_G_VER?=	${KDE_APPLICATIONS5_SHLIB_G_VER}
 
 
 # Current KDE desktop.
-KDE_PLASMA5_VERSION?=		5.27.10
+KDE_PLASMA5_VERSION?=		5.27.11
 KDE_PLASMA5_BRANCH?=		stable
 
 # Next KDE Plasma desktop
-KDE_PLASMA6_VERSION?=		6.0.0
+KDE_PLASMA6_VERSION?=		6.0.2
 KDE_PLASMA6_BRANCH?=		stable
 
 # Current KDE frameworks.
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index 0ba5c191463..e098234fcbc 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -34,7 +34,7 @@ linux_ARGS=		${LINUX_DEFAULT}
 .  if ${linux_ARGS} == c7
 LINUX_DIST_VER?=	7.9.2009
 .  else
-IGNORE=			Invalid Linux distribution: ${linux_ARGS}
+ERROR+=			"Invalid Linux distribution: ${linux_ARGS}"
 .  endif
 
 .  ifndef ONLY_FOR_ARCHS
@@ -212,20 +212,12 @@ DISTFILES_aarch64?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_aarch64}:aarch64/} \
 .    endif
 .    if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mamd64)) \
  && empty(NOT_FOR_ARCHS:Mamd64)
-.      if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mi386)) \
- && empty(NOT_FOR_ARCHS:Mi386)
 DISTFILES_amd64?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
-			${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
+			${LIB_DISTNAMES_i386:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
 			${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
 			${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
 			${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
 			${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}
-.      else
-DISTFILES_amd64?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}/} \
-			${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
-			${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}/} \
-			${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}
-.      endif
 .    endif
 .    if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mi386)) \
  && empty(NOT_FOR_ARCHS:Mi386)
diff --git a/Mk/Uses/octave.mk b/Mk/Uses/octave.mk
index 0f392822db9..31c98e616fe 100644
--- a/Mk/Uses/octave.mk
+++ b/Mk/Uses/octave.mk
@@ -55,7 +55,7 @@ OCTAVE_SRC?=	${DISTNAME}
 WRKSRC?=	${WRKDIR}/${OCTAVE_SRC}/src
 
 MAKE_ENV+=	PACKAGE=${OCTAVE_DISTNAME}.tar.gz
-MAKE_ARGS=	CC="${CC}" CXX="${CXX}" LD_CXX="${CXX}" DL_LD="${CXX}" MKOCTFILE="${LOCALBASE}/bin/mkoctfile" OCTAVE_VERSION=-${OCTAVE_VERSION}
+MAKE_ARGS+=	CC="${CC}" CXX="${CXX}" LD_CXX="${CXX}" DL_LD="${CXX}" MKOCTFILE="${LOCALBASE}/bin/mkoctfile" OCTAVE_VERSION=-${OCTAVE_VERSION}
 
 LOAD_OCTAVE_PKG_CMD=	${LOCALBASE}/libexec/octave/load-octave-pkg
 
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index dad34dac322..229ad7bbda6 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -606,7 +606,7 @@ _PYTHONPKGLIST=	${WRKDIR}/.PLIST.pymodtmp
 
 # cryptography* support
 .  if ${PYCRYPTOGRAPHY_DEFAULT} == rust
-CRYPTOGRAPHY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=41.0.7,1:security/py-cryptography@${PY_FLAVOR}
+CRYPTOGRAPHY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=42.0.5,1:security/py-cryptography@${PY_FLAVOR}
 .  else
 CRYPTOGRAPHY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography-legacy>=3.4.8_1,1:security/py-cryptography-legacy@${PY_FLAVOR}
 .  endif
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 9eab10ea5be..73bdfda972c 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -64,7 +64,7 @@ GHOSTSCRIPT_DEFAULT?=	10
 # Possible values: mesa-libs, mesa-devel
 GL_DEFAULT?=		mesa-libs
 # Possible values: 1.19, 1.20, 1.21, 1.22, 1.23-devel
-GO_DEFAULT?=		1.20
+GO_DEFAULT?=		1.21
 # Possible values: 1.8, 2.2, 3.0
 GUILE_DEFAULT?=		2.2
 # Possible versions: 6, 7
@@ -75,11 +75,11 @@ GUILE_DEFAULT?=		2.2
 IMAGEMAGICK_DEFAULT?=	7
 # Possible values: 8, 11, 17, 18, 19, 20, 21
 JAVA_DEFAULT?=		8
-# Possible values: 3.0.0, 3.1.0
+# Possible values: 3.2.0, 3.1.0
 .  if !defined(WANT_LAZARUS_DEVEL)
-LAZARUS_DEFAULT?=	3.0.0
+LAZARUS_DEFAULT?=	3.2.0
 .  else
-LAZARUS_DEFAULT?=	3.1.0
+LAZARUS_DEFAULT?=	3.3.1
 .  endif
 # Possible values: rust, legacy
 .  if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64)
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index d85925014ea..400ad0f97a5 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -74,7 +74,7 @@ BINARY_ALIAS+=	python3=${PYTHON_CMD}
 BUNDLE_LIBS=	yes
 
 BUILD_DEPENDS+=	rust-cbindgen>=0.26.0:devel/rust-cbindgen \
-				${RUST_DEFAULT}>=1.76.0:lang/${RUST_DEFAULT} \
+				${RUST_DEFAULT}>=1.77.0:lang/${RUST_DEFAULT} \
 				node:www/node
 LIB_DEPENDS+=	libdrm.so:graphics/libdrm
 RUN_DEPENDS+=	${LOCALBASE}/lib/libpci.so:devel/libpci
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk
index 83a03c885ff..964b817ff70 100644
--- a/Mk/bsd.options.mk
+++ b/Mk/bsd.options.mk
@@ -219,7 +219,11 @@ OPTIONS_DEFINE+=	${opt}
 .  endfor
 
 # Add per arch defaults
+.  if defined(OPTIONS_DEFAULT_${ARCH})
 OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${ARCH}}
+.  else
+OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_OTHER_ARCHS}
+.  endif
 
 _ALL_EXCLUDE=	${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE} \
 		${OPTIONS_SLAVE} ${OPTIONS_EXCLUDE_${OPSYS}} \
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index bd2b50a0d4a..3e6dd7ec1da 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1568,7 +1568,7 @@ EXTRACT_SUFX?=			.tar.gz
 .    if defined(USE_LINUX_PREFIX)
 PREFIX=					${LINUXBASE}
 DATADIR?=				${PREFIX}/usr/share/${PORTNAME}
-DOCSDIR?=				${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
+DOCSDIR?=				${PREFIX}/usr/share/doc/${PORTNAME}-${DISTVERSION}
 NO_LICENSES_INSTALL=	yes
 NO_MTREE=				yes
 .    endif
@@ -1633,7 +1633,8 @@ PKG_NOTE_flavor=	${FLAVOR}
 .    endif
 
 WRK_ENV+=		HOME=${WRKDIR} \
-				PWD="$${PWD}"
+				PWD="$${PWD}" \
+				__MAKE_CONF=${NONEXISTENT}
 .    for e in OSVERSION PATH TERM TMPDIR \
 				UNAME_b UNAME_i UNAME_K UNAME_m UNAME_n \
 				UNAME_p UNAME_r UNAME_s UNAME_U UNAME_v
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 1e7ef262203..25019117c79 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -104,7 +104,6 @@ MASTER_SITE_CRAN+= \
 	http://cran.utstat.utoronto.ca/%SUBDIR%/ \
 	https://cran.csiro.au/%SUBDIR%/ \
 	https://mirrors.tuna.tsinghua.edu.cn/CRAN/%SUBDIR%/ \
-	http://camoruco.ing.uc.edu.ve/cran/%SUBDIR%/ \
 	https://mirror.las.iastate.edu/CRAN/%SUBDIR%/ \
 	https://cran.ma.imperial.ac.uk/%SUBDIR%/ \
 	https://cran.ism.ac.jp/%SUBDIR%/
@@ -134,8 +133,7 @@ MASTER_SITE_DEBIAN_POOL+= \
 .if !defined(IGNORE_MASTER_SITE_ECLIPSE)
 MASTER_SITE_ECLIPSE+= \
 	https://ftp-stud.hs-esslingen.de/pub/Mirrors/eclipse/%SUBDIR%/ \
-	https://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/%SUBDIR%/ \
-	http://eclipse.stu.edu.tw/%SUBDIR%/
+	https://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/%SUBDIR%/
 .endif
 
 # List: https://www.exim.org/mirmon/ftp_mirrors.html
@@ -566,14 +564,12 @@ WWW?=	https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/
 .if !defined(IGNORE_MASTER_SITE_GNOME)
 MASTER_SITE_GNOME+= \
 	https://download.gnome.org/%SUBDIR%/ \
-	http://download.gnome.org/%SUBDIR%/ \
 	https://gitlab.gnome.org/GNOME/${PORTNAME}/-/archive/${PORTVERSION}/ \
-	http://ftp.belnet.be/mirror/ftp.gnome.org/%SUBDIR%/ \
-	ftp://ftp.belnet.be/mirror/ftp.gnome.org/%SUBDIR%/ \
+	http://ftp.belnet.be/mirror/ftp.gnome.org/gnomeftp/%SUBDIR%/ \
+	ftp://ftp.belnet.be/mirror/ftp.gnome.org/gnomeftp/%SUBDIR%/ \
 	https://ftp.acc.umu.se/pub/GNOME/%SUBDIR%/ \
 	ftp://ftp.cse.buffalo.edu/pub/Gnome/%SUBDIR%/ \
 	https://fr2.rpmfind.net/linux/gnome.org/%SUBDIR%/ \
-	http://www.gtlib.gatech.edu/pub/gnome/%SUBDIR%/ \
 	ftp://ftp.kddlabs.co.jp/pub/GNOME/%SUBDIR%/ \
 	ftp://ftp.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/%SUBDIR%/ \
 	ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/%SUBDIR%/
@@ -686,13 +682,6 @@ MASTER_SITE_MATE+= \
 
 .if !defined(IGNORE_MASTER_SITE_MOZDEV)
 MASTER_SITE_MOZDEV+= \
-	http://ftp.scarlet.be/pub/mozdev/%SUBDIR%/ \
-	http://ftp.rz.tu-bs.de/pub/mirror/downloads.mozdev.org/%SUBDIR%/ \
-	http://ftp.ntua.gr/pub/www/mozdev/%SUBDIR%/ \
-	http://mozdev.oregonstate.edu/%SUBDIR%/ \
-	http://ftp.ntua.gr/pub/www/mozdev/%SUBDIR%/ \
-	http://www.devlib.org/mozdev/%SUBDIR%/ \
-	ftp://ftp.heanet.ie/pub/mozdev/%SUBDIR%/ \
 	http://mirrors.ibiblio.org/mozdev.org/%SUBDIR%/
 .endif
 
@@ -784,8 +773,7 @@ MASTER_SITE_OSSP+= \
 
 .if !defined(IGNORE_MASTER_SITE_PACKETSTORM)
 MASTER_SITE_PACKETSTORM+= \
-	https://dl.packetstormsecurity.net/%SUBDIR%/ \
-	https://packetstorm.foofus.com/%SUBDIR%/
+	https://dl.packetstormsecurity.net/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_PERL_CPAN)
@@ -853,8 +841,6 @@ MASTER_SITE_QMAIL+= \
 	http://qmail.glasswings.com.au/%SUBDIR%/ \
 	http://qmail.psshee.com/%SUBDIR%/ \
 	http://www.agria.hu/qmail/%SUBDIR%/ \
-	http://qmail.netvisao.pt/%SUBDIR%/ \
-	http://qmail.ipg.sk/%SUBDIR%/ \
 	http://qmail.omnis.ch/%SUBDIR%/ \
 	http://www.qmail.org/%SUBDIR%/
 .endif
@@ -865,7 +851,6 @@ MASTER_SITE_QT+= \
 	http://master.qt.io/%SUBDIR%/ \
 	https://www.mirrorservice.org/sites/download.qt-project.org/%SUBDIR%/ \
 	http://www.nic.funet.fi/pub/mirrors/download.qt-project.org/%SUBDIR%/ \
-	http://qtmirror.ics.com/pub/qtproject/%SUBDIR%/ \
 	https://ftp.jaist.ac.jp/pub/qtproject/%SUBDIR%/
 .endif
 
@@ -908,9 +893,9 @@ MASTER_SITE_SAVANNAH+= \
 .  for p in https http
 MASTER_SITE_SOURCEFORGE+= ${p}://downloads.sourceforge.net/project/%SUBDIR%/
 .    for m in cfhcable cytranet deac-ams deac-fra deac-riga excellmedia \
-	freefr gigenet ixpeering jaist jztkft kumisystems liquidtelecom \
+	freefr gigenet ixpeering jaist kumisystems liquidtelecom \
 	nchc netactuate netcologne netix onboardcloud phoenixnap \
-	razaoinfo sinalbr sitsa sonik tenet udomain ufpr versaweb
+	razaoinfo sinalbr sitsa tenet udomain ufpr versaweb
 MASTER_SITE_SOURCEFORGE+= ${p}://${m}.dl.sourceforge.net/project/%SUBDIR%/
 .    endfor
 .  endfor
@@ -1007,7 +992,6 @@ MASTER_SITE_TOR+= \
 		http://tor.cyberarmy.at/dist/%SUBDIR%/ \
 		http://tor.dont-know-me.at/dist/%SUBDIR%/ \
 		http://tor.factor.cc/dist/%SUBDIR%/ \
-		http://tor.homosu.net/dist/%SUBDIR%/ \
 		http://tor.idnr.ws/dist/%SUBDIR%/ \
 		http://tor.kamagurka.org/dist/%SUBDIR%/ \
 		http://tor.spline.de/dist/%SUBDIR%/ \
@@ -1039,8 +1023,7 @@ MASTER_SITE_XFCE+= \
 	https://mirror.netcologne.de/xfce/src/%SUBDIR%/${_XFCE_PATH}/ \
 	https://ftp.cixug.es/xfce/src/%SUBDIR%/${_XFCE_PATH}/ \
 	https://archive.be.xfce.org/src/%SUBDIR%/${_XFCE_PATH}/ \
-	https://archive.al-us.xfce.org/src/%SUBDIR%/${_XFCE_PATH}/ \
-	http://mirror.perldude.de/archive.xfce.org/src/%SUBDIR%/${_XFCE_PATH}/
+	https://archive.al-us.xfce.org/src/%SUBDIR%/${_XFCE_PATH}/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_XORG)
@@ -1053,7 +1036,6 @@ MASTER_SITE_XORG+= \
 	https://www.mirrorservice.org/sites/ftp.x.org/pub/%SUBDIR%/ \
 	https://ftp.yz.yamagata-u.ac.jp/pub/X11/x.org/%SUBDIR%/ \
 	http://piotrkosoft.net/pub/mirrors/ftp.x.org/pub/%SUBDIR%/ \
-	http://xorg.mirrors.pair.com/%SUBDIR%/ \
 	http://ftp.kaist.ac.kr/x.org/%SUBDIR%/
 .endif
 
diff --git a/Templates/config.site b/Templates/config.site
index 9bda8780bf3..ea136fbbe72 100644
--- a/Templates/config.site
+++ b/Templates/config.site
@@ -862,7 +862,7 @@
 : ${gl_cv_func_btowc_eof=yes}
 : ${gl_cv_func_btowc_nul=yes}
 : ${gl_cv_func_fcntl_f_dupfd_cloexec=yes}
-: ${gl_cv_func_fnmatch_posix=yes}
+: ${gl_cv_func_fnmatch_posix=no}
 : ${gl_cv_func_fopen_slash=yes}
 : ${gl_cv_func_frexp_no_libm=yes}
 : ${gl_cv_func_fseeko=yes}
diff --git a/UPDATING b/UPDATING
index e226a9cd469..b9007e7aa8b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,13 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20240326:
+  AFFECTS: users of net/bird2
+  AUTHOR: olivier@FreeBSD.org
+
+  The net/bird2 default flavor has ben switched to netlink on FreeBSD >= 14.0
+  There is not change for FreeBSD < 14.0 (default flavor is still rtsock)
+
 20240319:
   AFFECTS: users of net/rdist6
   AUTHOR: cy@FreeBSD.org