diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
index c2642ba0cf16..f0f70e4fc382 100644
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@@ -1,208 +1,209 @@
 PORTNAME=	baresip
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.16.0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small SIP client
 WWW=		https://github.com/baresip
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	re>=${PORTVERSION:R}:audio/re
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cmake pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	baresip
 
 # FIXME values of the next 3 variables taken from source code Makefile
 ABI_MAJOR=	18
 ABI_AGE=	16
 ABI_REV=	0
 PLIST_SUB=	ABI_MAJOR=${ABI_MAJOR}
 PLIST_SUB+=	ABI_AGE=${ABI_AGE} \
 		ABI_REV=${ABI_REV}
 
 OPTIONS_DEFINE=		ALSA AV1 AVCODEC AVFILTER AVFORMAT CTRL_DBUS DOCS \
 			EXAMPLES G711 G722 G726 GST MQTT OPUS OPUS_MS PLC \
 			PORTAUDIO PULSEAUDIO SDL SNAPSHOT SNDFILE SWSCALE V4L2 \
 			VPX X11
 OPTIONS_DEFAULT=	DOCS EXAMPLES
 OPTIONS_SUB=		yes
 
 ALSA_DESC=		ALSA audio driver
 AV1_DESC=		AV1 Video Codec
 AVCODEC_DESC=		Video codecs using libavcodec
 AVFILTER_DESC=		Video filter using libavfilter
 AVFORMAT_DESC=		libavformat media-source
 CTRL_DBUS_DESC=		[broken] DBUS interface for baresip
 G711_DESC=		G.711 audio codec
 G722_DESC=		G.722 audio codec
 G726_DESC=		G.726 audio codec
 GST_DESC=		Gstreamer audio module
 MQTT_DESC=		Message Queue Telemetry Transport (MQTT) client
 OPUS_DESC=		Opus audio codec
 OPUS_MS_DESC=		Opus Multistream audio codec
 PLC_DESC=		Packet Loss Concealment
 PORTAUDIO_DESC=		Portaudio audio driver
 PULSEAUDIO_DESC=	Pulseaudio audio driver
 SDL_DESC=		libSDL2 video output
 SNAPSHOT_DESC=		Snapshot video module
 SNDFILE_DESC=		sndfile wav dumper
 SWSCALE_DESC=		Video filter for scaling and pixel conversion
 V4L2_DESC=		Video4Linux2 module
 VPX_DESC=		VP8/VP9 video codecs
 X11_DESC=		X11 video output
 
 MODULES_LIST:=	account;aubridge;auconv;aufile;auresamp;ausine
 MODULES_LIST:=	$(MODULES_LIST);cons;contact;ctrl_tcp
 MODULES_LIST:=	$(MODULES_LIST);debug_cmd;dtls_srtp
 MODULES_LIST:=	$(MODULES_LIST);ebuacip;echo
 MODULES_LIST:=	$(MODULES_LIST);fakevideo;httpd;httpreq;ice;l16
 MODULES_LIST:=	$(MODULES_LIST);menu;mixausrc;mixminus;mwi;natpmp;netroam
 MODULES_LIST:=	$(MODULES_LIST);pcp;presence;rtcpsummary
 MODULES_LIST:=	$(MODULES_LIST);selfview;serreg;srtp;stdio;stun;syslog
 MODULES_LIST:=	$(MODULES_LIST);turn;uuid;vidbridge;vidinfo;vumeter
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MALSA}
 ALSA_DEPEND=	${LOCALBASE}/include/alsa/asoundlib.h:audio/alsa-lib
 MODULES_LIST:=	$(MODULES_LIST);alsa
 .endif
 
 .if ${PORT_OPTIONS:MAV1}
 LIB_DEPENDS+=	libaom.so:multimedia/aom
 MODULES_LIST:=	$(MODULES_LIST);av1
 .endif
 
 .if ${PORT_OPTIONS:MAVCODEC}
 AVCODEC_DEPEND=	${LOCALBASE}/include/libavcodec/avcodec.h:multimedia/ffmpeg \
 		libdrm>0:graphics/libdrm
 MODULES_LIST:=	$(MODULES_LIST);avcodec
 .endif
 
 .if ${PORT_OPTIONS:MAVFILTER}
 AVFILTER_DEPEND=	${LOCALBASE}/include/libavfilter/avfilter.h:multimedia/ffmpeg
 MODULES_LIST:=		$(MODULES_LIST);avfilter
 .endif
 
 .if ${PORT_OPTIONS:MAVFORMAT}
 AVFORMAT_DEPEND=	${LOCALBASE}/include/libavformat/avformat.h:multimedia/ffmpeg
 MODULES_LIST:=		$(MODULES_LIST);avformat
 .endif
 
 .if ${PORT_OPTIONS:MG711}
 G711_DEPEND=	${LOCALBASE}/include/spandsp/g711.h:comms/spandsp
 MODULES_LIST:=	$(MODULES_LIST);g711
 .endif
 
 .if ${PORT_OPTIONS:MG722}
 G722_DEPEND=	${LOCALBASE}/include/spandsp/g722.h:comms/spandsp
 MODULES_LIST:=	$(MODULES_LIST);g722
 .endif
 
 .if ${PORT_OPTIONS:MG726}
 G726_DEPEND=	${LOCALBASE}/include/spandsp/g726.h:comms/spandsp
 MODULES_LIST:=	$(MODULES_LIST);g726
 .endif
 
 .if ${PORT_OPTIONS:MGST}
 GST_DEPEND=		${LOCALBASE}/include/gstreamer-1.0/gst/gst.h:multimedia/gstreamer1
 PORT_OPTIONS+=		GSTREAMER
 USES+=			gnome
 USE_GNOME+=		glib20
 USE_GSTREAMER1+=	yes
 .endif
 
 .if ${PORT_OPTIONS:MMQTT}
 LIB_DEPENDS+=	libmosquitto.so:net/mosquitto
 MODULES_LIST:=	$(MODULES_LIST);mqtt
 .endif
 
 .if ${PORT_OPTIONS:MOPUS}
 OPUS_DEPEND=	${LOCALBASE}/include/opus/opus.h:audio/opus
 MODULES_LIST:=	$(MODULES_LIST);opus
 .endif
 
 .if ${PORT_OPTIONS:MOPUS_MS}
 OPUS_MS_DEPEND=	${LOCALBASE}/include/opus/opus.h:audio/opus
 MODULES_LIST:=	$(MODULES_LIST);opus_multistream
 .endif
 
 .if ${PORT_OPTIONS:MPLC}
 PLC_DEPEND=	${LOCALBASE}/include/spandsp/plc.h:comms/spandsp
 MODULES_LIST:=	$(MODULES_LIST);plc
 .endif
 
 .if ${PORT_OPTIONS:MPORTAUDIO}
 PORTAUDIO_DEPEND=	${LOCALBASE}/include/portaudio.h:audio/portaudio
 MODULES_LIST:=		$(MODULES_LIST);portaudio
 .endif
 
 # Port calls it PULSE, standard OPTION is PULSEAUDIO
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 PORT_OPTIONS+=		PULSE
 PULSEAUDIO_DEPEND=	${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio
 MODULES_LIST:=		$(MODULES_LIST);pulse
 .endif
 
 .if ${PORT_OPTIONS:MSDL}
 USES+=		sdl
 USE_SDL=	sdl2
 SDLDEPEND=	mesa-libs>0:graphics/mesa-libs
 MODULES_LIST:=	$(MODULES_LIST);sdl
 .endif
 
 .if ${PORT_OPTIONS:MSNAPSHOT}
 LIB_DEPENDS+=	libpng16.so:graphics/png
 MODULES_LIST:=	$(MODULES_LIST);snapshot
 .endif
 
 .if ${PORT_OPTIONS:MSNDFILE}
 SNDFILE_DEPEND=	${LOCALBASE}/include/sndfile.h:audio/libsndfile
 MODULES_LIST:=	$(MODULES_LIST);sndfile
 .endif
 
 .if ${PORT_OPTIONS:MSWSCALE}
 SWSCALE_DEPEND=	${LOCALBASE}/include/libavformat/avformat.h:multimedia/ffmpeg
 MODULES_LIST:=	$(MODULES_LIST);swscale
 .endif
 
 .if ${PORT_OPTIONS:MV4L2}
 V4L2_DEPEND=	${LOCALBASE}/include/libv4l2.h:multimedia/libv4l \
 		v4l_compat>0:multimedia/v4l_compat
 
 MODULES_LIST:=	$(MODULES_LIST);v4l2
 .endif
 
 .if ${PORT_OPTIONS:MVPX}
 VPX_DEPEND=	${LOCALBASE}/include/vpx/vp8.h:multimedia/libvpx
 MODULES_LIST:=	$(MODULES_LIST);vp8;vp9
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 USES+=		xorg
 USE_XORG=	x11
 USE_XORG+=	ice sm xext
 MODULES_LIST:=	$(MODULES_LIST);x11
 .endif
 
 .for o in ${PORT_OPTIONS}
 BUILD_DEPENDS+=	${$o_DEPEND}
 RUN_DEPENDS+=	${$o_DEPEND}
 .endfor
 
 CMAKE_ARGS+=	-DMODULES="$(MODULES_LIST)" \
 		-DRE_INCLUDE_DIR:STRING="${LOCALBASE}/include/re" \
 		-DREM_INCLUDE_DIR:STRING="${LOCALBASE}/include/rem"
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	${RMDIR} ${STAGEDIR}${DOCSDIR}/examples
 
 .include <bsd.port.mk>
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 39d60bf16605..500fe49cad69 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -1,200 +1,200 @@
 PORTNAME=	opencascade
 DISTVERSIONPREFIX=	V
 DISTVERSION=	7_8_1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad science
 DIST_SUBDIR=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Open CASCADE Technology, 3D modeling & numerical simulation
 WWW=		https://www.opencascade.org/
 
 LICENSE=	OCTPL
 LICENSE_NAME=	LGPL21 with exception
 LICENSE_FILE=	${WRKSRC}/OCCT_LGPL_EXCEPTION.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	rapidjson>0:devel/rapidjson			\
 		${LOCALBASE}/lib/qt5/bin/qmake:devel/qt5-qmake	\
 		${LOCALBASE}/lib/qt5/bin/moc:devel/qt5-buildtools
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig	\
 		libfreetype.so:print/freetype2		\
 		libtbbmalloc.so:devel/onetbb		\
 		libexpat.so:textproc/expat2		\
 		libdraco.so:archivers/draco		\
 		libpng16.so:graphics/png		\
 		libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R}
 RUN_DEPENDS=	bash:shells/bash
 
 # Check ${WRKSRC}/dox/overview/overview.md
 # and ${WRKSRC}/dox/dev_guides/building
 USES=		alias:10 cmake compiler:c++14-lang eigen:3 gettext-runtime	\
 		gl gnome localbase python qt:5 shebangfix tk xorg
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xi xmu xrender xscrnsaver xt
 USE_GL=		egl gl glesv2 glu
 USE_GNOME=	libxml2
 USE_QT=		core declarative gui network quick3d linguisttools widgets xml
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Open-Cascade-SAS
 GH_PROJECT=	OCCT
 
 SHEBANG_FILES=	adm/templates/*.sh	\
 		adm/templates/*.sh.in	\
 		adm/templates/*.sh.main	\
 		adm/genconf.tcl		\
 		adm/start.tcl		\
 		gendoc
 ENVSH=		adm/templates/env.sh
 
 OPTIONS_DEFINE=	DOCS DOXYGEN FFMPEG VIS
 VIS_DESC=	Build Visualizazion module (requires OpenGL, freetype, ftgl)
 OPTIONS_DEFAULT=FFMPEG VIS
 OPTIONS_SUB=	yes
 
 REINPLACE_ARGS=	-i ""
 LDFLAGS+=	-Wl,--allow-shlib-undefined -lexecinfo
 CMAKE_ARGS+=	-DINSTALL_DIR=${OCCROOT}				\
 		-DINSTALL_DIR_INCLUDE=${PREFIX}/include/OpenCASCADE	\
 		-DINSTALL_DIR_LIB=${PREFIX}/lib				\
 		-DINSTALL_DIR_CMAKE=${PREFIX}/lib/cmake			\
 		-DINSTALL_DIR_DATA=${OCCROOT}/data			\
 		-DINSTALL_DIR_RESOURCE=${OCCROOT}/resources		\
 		-DINSTALL_DIR_SAMPLES=${OCCROOT}/samples		\
 		-DINSTALL_DIR_TESTS=${OCCROOT}/tests			\
 		-DINSTALL_TEST_CASES:BOOL=ON				\
 		-DBUILD_Inspector:BOOL=ON				\
 		-DUSE_TCL:BOOL=ON					\
 		-DCAN_USE_TK:BOOL=ON -DUSE_TK:BOOL=ON			\
 		-DCAN_USE_XLIB:BOOL=ON -DUSE_XLIB:BOOL=ON		\
 		-DCAN_USE_FREETYPE:BOOL=ON -DUSE_FREETYPE:BOOL=ON	\
 		-DCAN_USE_VTK:BOOL=ON -DUSE_VTK:BOOL=ON			\
 		-DCAN_USE_EIGEN:BOOL=ON -DUSE_EIGEN:BOOL=ON		\
 		-DCAN_USE_RAPIDJSON:BOOL=ON -DUSE_RAPIDJSON:BOOL=ON	\
 		-DCAN_USE_DRACO:BOOL=ON -DUSE_DRACO:BOOL=ON		\
 		-DCAN_USE_TBB:BOOL=ON -DUSE_TBB:BOOL=ON			\
 		-D3RDPARTY_QT_DIR:PATH=${QT_LIBDIR}			\
 		-D3RDPARTY_DRACO_DIR:PATH=${LOCALBASE}			\
 		-D3RDPARTY_DRACO_LIBRARY=libdraco.so			\
 		-D3RDPARTY_DRACO_LIBRARY_DIR:PATH=${LOCALBASE}/lib	\
 		-D3RDPARTY_DRACO_INCLUDE_DIR:PATH=${LOCALBASE}/include/draco	\
 		-D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTK_VER}
 CONFIGURE_ENV+=	DESTDIR=${STAGEDIR}
 
 .if defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-DCMAKE_MESSAGE_CONTEXT_SHOW:BOOL=ON	\
 		-DCMAKE_MESSAGE_LOG_LEVEL:STRING=DEBUG
 .endif
 
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	opencascade740 # OpenCAS/bin/DRAWEXE
 
 LOCCROOT=	OpenCAS
 OCCROOT=	${PREFIX}/${LOCCROOT}
 PLIST_SUB=	OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE}	\
 		VE=${PORTVERSION:R} VER=${PORTVERSION}
 
 FFMPEG_CMAKE_ON=	-DCAN_USE_FFMPEG:BOOL=ON -DUSE_FFMPEG:BOOL=ON \
 			-D3RDPARTY_FFMPEG_INCLUDE_DIR=${LOCALBASE}/ffmpeg4/include \
 			-D3RDPARTY_FFMPEG_DIR=${LOCALBASE}/ffmpeg4
 FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=OFF
 FFMPEG_LIB_DEPENDS=	libavcodec.so.58:multimedia/ffmpeg4	\
 			libtheoraenc.so:multimedia/libtheora	\
 			libunistring.so:devel/libunistring	\
 			libvdpau.so:multimedia/libvdpau		\
 			libxvidcore.so:multimedia/xvid		\
 			libp11-kit.so:security/p11-kit		\
 			libx264.so:multimedia/libx264		\
 			libtasn1.so:security/libtasn1		\
 			libvorbis.so:audio/libvorbis		\
 			libdav1d.so:multimedia/dav1d		\
 			libnettle.so:security/nettle		\
 			libgnutls.so:security/gnutls		\
 			libvpx.so:multimedia/libvpx		\
 			libx265.so:multimedia/x265		\
 			libdrm.so:graphics/libdrm		\
 			libva.so:multimedia/libva		\
 			libaom.so:multimedia/aom		\
 			libmp3lame.so:audio/lame		\
 			libffi.so:devel/libffi			\
 			libidn2.so:dns/libidn2			\
 			libogg.so:audio/libogg			\
 			libopus.so:audio/opus			\
 			libgmp.so:math/gmp
 
 VIS_CMAKE_ON=		-DCAN_USE_FREEIMAGE:BOOL=ON -DUSE_FREEIMAGE:BOOL=ON	\
 			-DCAN_USE_OPENGL:BOOL=ON -DUSE_OPENGL:BOOL=ON	\
 			-DCAN_USE_GLES2:BOOL=ON -DUSE_GLES2:BOOL=ON	\
 			-D3RDPARTY_FREETYPE_DIR=${LOCALBASE}
 VIS_CMAKE_OFF=		-DUSE_FREEIMAGE:BOOL=OFF	\
 			-DUSE_GLES2:BOOL=OFF
 VIS_LIB_DEPENDS=	libftgl.so:graphics/ftgl	\
 			libfreeimageplus.so:graphics/freeimage
 VIS_USE=		GL=glesv2,opengl
 
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_USES=		tex
 DOXYGEN_USE=		TEX=latex:build
 DOXYGEN_BUILD_DEPENDS=	bash:shells/bash		\
 			doxygen:devel/doxygen		\
 			dot:graphics/graphviz		\
 			pdftex:print/tex-basic-engines	\
 			inkscape:graphics/inkscape
 DOXYGEN_RUN_DEPENDS=	${LOCALBASE}/www/MathJax/MathJax.js:www/mathjax
 DOXYGEN_CMAKE_ON=	-DBUILD_DOC_Overview:BOOL=ON	\
 			-DINSTALL_DOC_Overview:BOOL=ON
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == mips || ${ARCH} == powerpc || ${ARCH} == powerpcspe || ${ARCH} == "i386"
 BITS=	32
 .else
 BITS=	64
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Warning: to build OpenCascade, you should have at least"
 	@${ECHO_MSG} "2.6 Gb of free disk space in build area!"
 	@${ECHO_MSG}
 
 pre-patch:
 	${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/src/BRepMesh/delabella.cpp\
 		${WRKSRC}/src/OSD/OSD_MemInfo.cxx
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|' ${WRKSRC}/gendoc
 	${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|' ${WRKSRC}/adm/genconfdeps.tcl
 	${GREP} -rl x86_64 ${WRKSRC} | ${XARGS} ${REINPLACE_CMD}	\
 		-e 's|x86_64|amd64|'
 .for es in ${ENVSH}
 	${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es}
 .endfor
 
 post-stage:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake/OpenCASCADE
 	${MV} ${STAGEDIR}${PREFIX}/lib/cmake/*.cmake	\
 		${STAGEDIR}${PREFIX}/lib/cmake/OpenCASCADE
 
 post-install:
 	${MV} ${STAGEDIR}${OCCROOT}/bin/DRAWEXE-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/DRAWEXE
 	${RLN} ${STAGEDIR}${PREFIX}/bin/DRAWEXE ${STAGEDIR}${OCCROOT}/bin
 
 post-install-DOXYGEN-on:
 	${RLN} ${STAGEDIR}${OCCROOT}/${DOCSDIR_REL} ${STAGEDIR}${DOCSDIR}
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 	${RM} -rf /tmp/testOCC
 	${MKDIR} /tmp/testOCC
 	bash -c "\
 	cd ${OCCROOT} && . ${OCCROOT}/bin/env.sh &&	\
 	CSF_TestScriptsPath=${OCCROOT}/tests		\
 	CSF_TestDataPath=${OCCROOT}/data		\
 	DRAWEXE -f ${FILESDIR}/regtest "
 .endif
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/devel/godot/Makefile b/devel/godot/Makefile
index 4a3afc5a0a63..5f5b5469b3db 100644
--- a/devel/godot/Makefile
+++ b/devel/godot/Makefile
@@ -1,114 +1,114 @@
 PORTNAME=	godot
 DISTVERSION=	4.2.1
 DISTVERSIONSUFFIX=	-stable
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel games
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT?=	Game runtime engine
 WWW=		https://godotengine.org/
 
 LICENSE=		MIT CC-BY-3.0
 LICENSE_COMB=		multi
 LICENSE_FILE_CC-BY-3.0=	${WRKSRC}/LOGO_LICENSE.txt
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	yasm:devel/yasm
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgraphite2.so:graphics/graphite2 \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libpcre2-8.so:devel/pcre2 \
 		libpng.so:graphics/png \
 		libvpx.so:multimedia/libvpx
 RUN_DEPENDS=	xdg-user-dir:devel/xdg-user-dirs \
 		xdg-open:devel/xdg-utils \
 		xmessage:x11/xmessage
 
 USES=		compiler:c++17-lang cpe gl pkgconfig scons xorg
 USE_XORG=	x11 xcursor xext xi xinerama xrandr xrender
 USE_GL=		gl glew glu
 
 CPE_VENDOR=	godotengine
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	godotengine
 
 MAKE_ARGS+=		platform=linuxbsd builtin_freetype=False \
 			builtin_graphite=False builtin_harfbuzz=False \
 			builtin_libpng=False builtin_libvpx=False \
 			builtin_pcre2=False builtin_zlib=False verbose=True
 MAKE_ARGS+=		${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
 MAKE_ARGS_clang=	use_llvm=True linker=lld
 CXXFLAGS_i386=		${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
 CXXFLAGS_i386_gcc=	-march=i586
 
 OPTIONS_DEFINE=		EXAMPLES TOOLS UDEV
 OPTIONS_DEFAULT=	ALSA UDEV
 # Moved to devel/godot-tools
 OPTIONS_EXCLUDE?=	EXAMPLES TOOLS
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
 
 AUDIO_DESC=		Audio support
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_MAKE_ARGS=		alsa=True
 ALSA_MAKE_ARGS_OFF=	alsa=False
 # 4.2 head at 21/3
 EXAMPLES_GH_TUPLE=	godotengine:godot-demo-projects:98e9176b7310:DEMOS
 EXAMPLES_PORTEXAMPLES=	*
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_MAKE_ARGS=	pulseaudio=True
 PULSEAUDIO_MAKE_ARGS_OFF=	pulseaudio=False
 TOOLS_DESC=		Include development tools (IDE)
 TOOLS_MAKE_ARGS=	target=editor
 TOOLS_MAKE_ARGS_OFF=	target=template_release
 TOOLS_DESKTOP_ENTRIES=	"Godot" "${COMMENT}" "${GODOTFILE}" \
 			"${GODOTFILE}" "Development;IDE;" ""
 TOOLS_PLIST_FILES=	share/pixmaps/${GODOTFILE}.png \
 			share/pixmaps/${GODOTFILE}.svg
 UDEV_DESC=		Libudev support (Joystick)
 UDEV_BUILD_DEPENDS=	${PREFIX}/include/linux/input.h:devel/evdev-proto
 UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 UDEV_MAKE_ARGS=		udev=True
 UDEV_MAKE_ARGS_OFF=	udev=False
 
 GODOTFILE=		${PORTNAME}${PKGNAMESUFFIX}
 PLIST_FILES=		bin/${GODOTFILE}
 
 .ifmake makesum
 # Always include optional distfiles
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}" OPTIONS_EXCLUDE=
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc*} || ${ARCH:Mriscv64*}
 MAKE_ARGS+=	module_embree_enabled=no \
 		module_raycast_enabled=no \
 		module_webm_enabled=no
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|custom_build|${OPSYS}_Ports_build|' \
 		${WRKSRC}/methods.py
 
 # The official godot binary name reflects options used to compile
 # We just want a simple name matching the portname
 # This gives us bin/godot for runtime and bin/godot-tools for the IDE
 do-install:
 	@${RM} ${WRKSRC}/bin/*.debugsymbols
 	cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.linuxbsd* \
 		${STAGEDIR}/${PREFIX}/bin/${GODOTFILE}
 
 do-install-EXAMPLES-on:
 	(cd ${WRKSRC_DEMOS} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" \
 		${STAGEDIR}${EXAMPLESDIR})
 
 do-install-TOOLS-on:
 	${INSTALL_DATA} ${WRKSRC}/icon.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.png
 	${INSTALL_DATA} ${WRKSRC}/icon.svg \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg
 
 .include <bsd.port.mk>
diff --git a/devel/godot35/Makefile b/devel/godot35/Makefile
index 0fe0ee959b0b..a2a52121597f 100644
--- a/devel/godot35/Makefile
+++ b/devel/godot35/Makefile
@@ -1,113 +1,113 @@
 PORTNAME=	godot
 DISTVERSION=	3.5.3
 DISTVERSIONSUFFIX=	-stable
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	devel games
 PKGNAMESUFFIX?=	35
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT?=	Game runtime engine - LTS v3.5
 WWW=		https://godotengine.org/
 
 LICENSE=		MIT CC-BY-3.0
 LICENSE_COMB=		multi
 LICENSE_FILE_CC-BY-3.0=	${WRKSRC}/LOGO_LICENSE.md
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	yasm:devel/yasm
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpcre2-8.so:devel/pcre2 \
 		libpng.so:graphics/png \
 		libvpx.so:multimedia/libvpx
 RUN_DEPENDS=	xdg-user-dir:devel/xdg-user-dirs \
 		xdg-open:devel/xdg-utils \
 		xmessage:x11/xmessage
 
 USES=		compiler:c++14-lang cpe gl pkgconfig scons xorg
 USE_XORG=	x11 xcursor xext xi xinerama xrandr xrender
 USE_GL=		gl glew glu
 
 CPE_VENDOR=	godotengine
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	godotengine
 
 MAKE_ARGS+=		platform=x11 builtin_freetype=False \
 			builtin_libpng=False builtin_libvpx=False \
 			builtin_pcre2=False builtin_zlib=False verbose=True
 MAKE_ARGS+=		${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
 MAKE_ARGS_clang=	use_llvm=True linker=lld
 CXXFLAGS_i386=		${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
 CXXFLAGS_i386_gcc=	-march=i586
 
 OPTIONS_DEFINE=		EXAMPLES TOOLS UDEV
 OPTIONS_DEFAULT=	ALSA UDEV
 # Moved to devel/godot-tools
 OPTIONS_EXCLUDE?=	EXAMPLES TOOLS
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
 
 AUDIO_DESC=		Audio support
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_MAKE_ARGS=		alsa=True
 ALSA_MAKE_ARGS_OFF=	alsa=False
 # 3.5 head as of 28/2
 EXAMPLES_GH_TUPLE=	godotengine:godot-demo-projects:c0180d20d10d:DEMOS
 EXAMPLES_PORTEXAMPLES=	*
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_MAKE_ARGS=	pulseaudio=True
 PULSEAUDIO_MAKE_ARGS_OFF=	pulseaudio=False
 TOOLS_DESC=		Include development tools (IDE)
 TOOLS_MAKE_ARGS=	target=release_debug tools=True
 TOOLS_MAKE_ARGS_OFF=	target=release tools=False
 TOOLS_DESKTOP_ENTRIES=	"Godot" "${COMMENT}" "${GODOTFILE}" \
 			"${GODOTFILE}" "Development;IDE;" ""
 TOOLS_PLIST_FILES=	share/pixmaps/${GODOTFILE}.png \
 			share/pixmaps/${GODOTFILE}.svg
 UDEV_DESC=		Libudev support (Joystick)
 UDEV_BUILD_DEPENDS=	${PREFIX}/include/linux/input.h:devel/evdev-proto
 UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 UDEV_MAKE_ARGS=		udev=True
 UDEV_MAKE_ARGS_OFF=	udev=False
 
 GODOTFILE=		${PORTNAME}${PKGNAMESUFFIX}
 PLIST_FILES=		bin/${GODOTFILE}
 
 .ifmake makesum
 # Always include optional distfiles
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}" OPTIONS_EXCLUDE=
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc*} || ${ARCH:Mriscv64*}
 MAKE_ARGS+=	module_embree_enabled=no \
 		module_raycast_enabled=no \
 		module_webm_enabled=no
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|custom_build|${OPSYS}_Ports_build|' \
 		${WRKSRC}/methods.py
 	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \
 		${WRKSRC}/platform/x11/os_x11.cpp
 
 # The official godot binary name reflects options used to compile
 # We just want a simple name matching the portname
 # This gives us bin/godot for runtime and bin/godot-tools for the IDE
 do-install:
 	@${RM} ${WRKSRC}/bin/*.debugsymbols
 	cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.x11* \
 		${STAGEDIR}/${PREFIX}/bin/${GODOTFILE}
 
 do-install-EXAMPLES-on:
 	(cd ${WRKSRC_DEMOS} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" \
 		${STAGEDIR}${EXAMPLESDIR})
 
 do-install-TOOLS-on:
 	${INSTALL_DATA} ${WRKSRC}/icon.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.png
 	${INSTALL_DATA} ${WRKSRC}/icon.svg \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg
 
 .include <bsd.port.mk>
diff --git a/devel/py-aiortc/Makefile b/devel/py-aiortc/Makefile
index 2a97ffeaee3d..e3fb918fc518 100644
--- a/devel/py-aiortc/Makefile
+++ b/devel/py-aiortc/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	aiortc
 DISTVERSION=	1.9.0
+PORTREVISION=	1
 CATEGORIES=	devel multimedia python www
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	WebRTC and ORTC in Python
 WWW=		https://github.com/aiortc/aiortc/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libopus.so:audio/opus \
 		libvpx.so:multimedia/libvpx
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}aioice>=0.9.0:devel/py-aioice@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}av>=9.0.0:multimedia/py-av@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-crc32c>=1.1:devel/py-google-crc32c@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=23.1.0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyee>=9.0.0:devel/py-pyee@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pylibsrtp>=0.5.6:devel/py-pylibsrtp@${PY_FLAVOR}
 
 USES=		localbase python
 USE_PYTHON=	autoplist concurrent cryptography distutils
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/codecs/*.so
 
 .include <bsd.port.mk>
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index 39df8dd3055d..04e1246cf446 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,321 +1,322 @@
 PORTNAME=	vscode
 DISTVERSION=	1.94.2
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:node_modules
 DISTFILES=	vscode-node-modules-${DISTVERSION}${EXTRACT_SUFX}:node_modules \
 		vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX}:node_modules
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Visual Studio Code - Open Source ("Code - OSS")
 WWW=		https://code.visualstudio.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 ONLY_FOR_ARCHS=	amd64
 
 EXTRACT_DEPENDS=jq:textproc/jq \
 		node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION}
 BUILD_DEPENDS=	zip:archivers/zip \
 		electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		jq:textproc/jq \
 		rg:textproc/ripgrep \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libsndio.so:audio/sndio \
 		libdbus-1.so:devel/dbus \
 		libicuuc.so:devel/icu \
 		libepoll-shim.so:devel/libepoll-shim \
 		libevent.so:devel/libevent \
 		libffi.so:devel/libffi \
 		libinotify.so:devel/libinotify \
 		libnotify.so:devel/libnotify \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libpcre2-8.so:devel/pcre2 \
 		libre2.so:devel/re2 \
 		liblcms2.so:graphics/lcms2 \
 		libdrm.so:graphics/libdrm \
 		libpng.so:graphics/png \
 		libwayland-client.so:graphics/wayland \
 		libwebp.so:graphics/webp \
 		libdav1d.so:multimedia/dav1d \
 		libvpx.so:multimedia/libvpx \
 		libopenh264.so:multimedia/openh264 \
 		libpipewire-0.3.so:multimedia/pipewire \
 		libcups.so:print/cups \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libkrb5.so.3:security/krb5 \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxshmfence.so:x11/libxshmfence \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		bash:shells/bash
 TEST_DEPENDS=	electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
 		bash:shells/bash
 
 USES=		desktop-file-utils gl gmake gnome iconv:wchar_t jpeg \
 		localbase:ldflags nodejs:20,build pkgconfig python:build \
 		shebangfix xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft
 
 SOURCE_COMMIT_HASH=	384ff7382de624fb94dbaf6da11977bba1ecd427
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \
 		xrandr xrender xscrnsaver xtst
 USE_GL=		gbm gl glesv2
 USE_GNOME=	atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
 
 USE_LDCONFIG=	${DATADIR}
 
 SHEBANG_REGEX=	./(extensions|node_modules|resources|scripts|src)/.*\.sh$$
 PATHFIX_FILES=	src/vs/workbench/contrib/debug/node/terminals.ts
 
 DATADIR=	${PREFIX}/share/code-oss
 TMPDIR=		${WRKDIR}
 
 MAKE_ENV+=	BUILD_SOURCEVERSION=${SOURCE_COMMIT_HASH}
 # Don't download electron binary distribution on electron node_modules installation
 MAKE_ENV+=	ELECTRON_SKIP_BINARY_DOWNLOAD=1
 # Don't download browser binaries on playwright node_modules installation
 MAKE_ENV+=	PLAYWRIGHT_BROWSERS_PATH=${WRKDIR}/pw-browsers \
 		PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 # Don't create __pycache__ directory when executing node-gyp
 # This is a workaround to avoid filesystem violations during poudriere build
 MAKE_ENV+=	PYTHONDONTWRITEBYTECODE=1
 
 NODEJS_DIR=	${.CURDIR:H:H}/www/node20
 .include "${NODEJS_DIR}/Makefile.version"
 ELECTRON_DIR=	${.CURDIR:H:H}/devel/electron30
 .include "${ELECTRON_DIR}/Makefile.version"
 
 ELECTRON_DOWNLOAD_URL=	https://github.com/electron/electron/releases/download/v${ELECTRON_VER}
 ELECTRON_DOWNLOAD_URL_HASH!=	/sbin/sha256 -q -s ${ELECTRON_DOWNLOAD_URL}
 ELECTRON_ARCH=		${ARCH:S/aarch64/arm64/:S/amd64/x64/:S/i386/ia32/}
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "The limit imposed by poudriere(8) for the maximum number of files allowed to be"
 	@${ECHO_MSG} "opened by a jail (default 1024) is exceeded during the build of ${PORTNAME}."
 	@${ECHO_MSG} "To successfully build ${PORTNAME} with poudriere(8), you must add the following"
 	@${ECHO_MSG} "line to poudriere.conf:"
 	@${ECHO_MSG} "MAX_FILES_${PORTNAME}=8192"
 	@${ECHO_MSG} ""
 
 post-extract:
 	@${CP} ${WRKSRC}/build/.moduleignore.linux \
 		${WRKSRC}/build/.moduleignore.freebsd
 	@${ECHO_MSG} "===>  Installing node modules in ${WRKSRC}"
 	@${TAR} -xzf ${WRKDIR}/vscode-.-node-modules${EXTRACT_SUFX} -C ${WRKSRC}
 	@for dir in `node -p "JSON.stringify(require('${WRKSRC}/build/npm/dirs').dirs)" | jq -r '.[]'`; do \
 		if [ -f ${WRKDIR}/vscode-`echo $${dir} | tr _ __ | tr / _`-node-modules${EXTRACT_SUFX} ]; then \
 			${ECHO_MSG} "===>  Installing node modules in ${WRKSRC}/$${dir}"; \
 			${TAR} -xzf ${WRKDIR}/vscode-`echo $${dir} | tr _ __ | tr / _`-node-modules${EXTRACT_SUFX} -C ${WRKSRC}/$${dir}; \
 		fi; \
 	done
 
 post-patch:
 	@${REINPLACE_CMD} -E 's|^(target=").*(")$$|\1${ELECTRON_VER}\2|' \
 		${WRKSRC}/.npmrc
 	@${REINPLACE_CMD} -E 's|^(target=").*(")$$|\1${NODEJS_PORTVERSION}\2|' \
 		${WRKSRC}/remote/.npmrc
 	@(cd ${WRKSRC} && \
 		${FIND} -E . -type f -iregex '${SHEBANG_REGEX}' \
 			-exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" {} ';')
 	@(cd ${WRKSRC} && \
 		${FIND} ${PATHFIX_FILES} -type f \
 			-exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" {} ';')
 	@${REINPLACE_CMD} -e 's/@@NAME_LONG@@/Code - OSS/; \
 			s/@@NAME_SHORT@@/Code - OSS/; \
 			s/@@PRODNAME@@/Code - OSS/; \
 			s/@@NAME@@/code-oss/g; \
 			s|@@EXEC@@|${PREFIX}/bin/code-oss|; \
 			s/@@ICON@@/com.visualstudio.code.oss/; \
 			s/@@URLPROTOCOL@@/code-oss/; \
 			s/@@LICENSE@@/MIT/; \
 			s/@@APPNAME@@/code-oss/g; \
 			s|/usr/share|${PREFIX}/share|' \
 		${WRKSRC}/resources/completions/bash/code \
 		${WRKSRC}/resources/completions/zsh/_code \
 		${WRKSRC}/resources/linux/bin/code.sh \
 		${WRKSRC}/resources/linux/code.appdata.xml \
 		${WRKSRC}/resources/linux/code.desktop \
 		${WRKSRC}/resources/linux/code-url-handler.desktop
 	@(cd ${WRKDIR}/builtInExtensions && \
 		${FIND} . -type f -name '*.sh' \
 			-exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" \
 					-e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' {} ';')
 
 pre-build:
 # rebuild native node modules in top directory
 	@for subdir in `${FIND} ${WRKSRC}/node_modules -type f -name binding.gyp -exec ${DIRNAME} {} ';'`; do \
 		${ECHO_MSG} "===>   Rebuilding native modules in $${subdir}"; \
 		cd $${subdir} && \
 		${SETENV} ${MAKE_ENV} \
 			npm_config_runtime=electron \
 			npm_config_target=${ELECTRON_VER} \
 			npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \
 			node-gyp --userconfig=${WRKSRC}/.npmrc rebuild; \
 	done
 # rebuild native node modules in subdirectories
 	@for dir in `node -p "JSON.stringify(require('${WRKSRC}/build/npm/dirs').dirs)" | jq -r '.[]'`; do \
 		for subdir in `${FIND} ${WRKSRC}/$${dir}/node_modules -type f -name binding.gyp -exec ${DIRNAME} {} ';' 2> /dev/null`; do \
 			${ECHO_MSG} "===>   Rebuilding native modules in $${subdir}"; \
 			if [ "`${ECHO_CMD} $${subdir} | ${GREP} /build/`" ]; then \
 				cd $${subdir} && \
 				${SETENV} ${MAKE_ENV} \
 					npm_config_runtime=node \
 					npm_config_target=${NODEJS_PORTVERSION} \
 					npm_config_nodedir=${LOCALBASE} \
 					node-gyp --userconfig=${WRKSRC}/build/.npmrc rebuild; \
 			elif [ "`${ECHO_CMD} $${subdir} | ${GREP} /remote/`" ]; then \
 				cd $${subdir} && \
 				${SETENV} ${MAKE_ENV} \
 					npm_config_runtime=node \
 					npm_config_target=${NODEJS_PORTVERSION} \
 					npm_config_nodedir=${LOCALBASE} \
 					node-gyp --userconfig=${WRKSRC}/remote/.npmrc rebuild; \
 			else \
 				cd $${subdir} && \
 				${SETENV} ${MAKE_ENV} \
 					npm_config_runtime=electron \
 					npm_config_target=${ELECTRON_VER} \
 					npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \
 					node-gyp --userconfig=${WRKSRC}/.npmrc rebuild; \
 			fi; \
 		done; \
 	done
 # copy rg binary file to @vscode/ripgrep node module directory
 	@${MKDIR} ${WRKSRC}/node_modules/@vscode/ripgrep/bin
 	@${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/node_modules/@vscode/ripgrep/bin
 	@${MKDIR} ${WRKSRC}/remote/node_modules/@vscode/ripgrep/bin
 	@${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/remote/node_modules/@vscode/ripgrep/bin
 
 do-build:
 # setup download cache for gulp-atom-electron
 	@${MKDIR} ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH}
 	@cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \
 		zip -q -r ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH}/electron-v${ELECTRON_VER}-linux-${ELECTRON_ARCH}.zip .
 	@cd ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH} && \
 		${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \
 		${SED} -e 's/ / */' > SHASUMS256.txt
 # add newline character at the end of the file if not already
 	@${AWK} '1' ${WRKSRC}/build/checksums/electron.txt > \
 		${WRKSRC}/build/checksums/electron.txt.new
 	@${MV} -f ${WRKSRC}/build/checksums/electron.txt.new \
 		${WRKSRC}/build/checksums/electron.txt
 	@cd ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH} && \
 		${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \
 		${SED} -e 's/ / */' >> ${WRKSRC}/build/checksums/electron.txt
 # build and package vscode
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npx tsc -p build/tsconfig.build.json
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		npm_config_runtime=electron \
 		npm_config_target=${ELECTRON_VER} \
 		npm_config_nodedir=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers \
 		npm --userconfig=${WRKSRC}/.npmrc run gulp vscode-linux-${ELECTRON_ARCH}-min
 # move marketplace extensions
 	@${MV} ${WRKDIR}/builtInExtensions/* ${WRKDIR}/VSCode-linux-${ELECTRON_ARCH}/resources/app/extensions
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/resources/completions/bash/code \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/code-oss
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/resources/completions/zsh/_code \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_code-oss
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata
 	${INSTALL_DATA} ${WRKSRC}/resources/linux/code.appdata.xml \
 		${STAGEDIR}${PREFIX}/share/appdata/code-oss.appdata.xml
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
 .for f in code.desktop code-url-handler.desktop
 	${INSTALL_DATA} ${WRKSRC}/resources/linux/${f} \
 		${STAGEDIR}${PREFIX}/share/applications/${f:S/code/code-oss/}
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/resources/linux/code.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/com.visualstudio.code.oss.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKDIR}/VSCode-linux-${ELECTRON_ARCH} && \
 		${TAR} -cf - . | ${TAR} -xf - -C ${STAGEDIR}${DATADIR}
 	@${FIND} ${STAGEDIR}${DATADIR}/resources/app -type f -exec ${FILE} {} ';' | \
 		${GREP} 'ELF.*FreeBSD' | ${AWK} -F ': ' '{print $$1}' | ${XARGS} ${STRIP_CMD}
 .for f in chromedriver mksnapshot v8_context_snapshot_generator
 	@${RM} ${STAGEDIR}${DATADIR}/${f}
 .endfor
 	@${RM} -r ${STAGEDIR}${DATADIR}/gen
 	@${RM} -r ${STAGEDIR}${DATADIR}/node_headers
 	@${RM} -r ${STAGEDIR}${DATADIR}/resources/completions
 	${RLN} ${STAGEDIR}${DATADIR}/bin/code-oss ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${FILESDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 pre-test:
 # setup electron dependency for unit tests
 	@${MKDIR} ${WRKSRC}/.build/electron
 	@cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \
 		${TAR} -cf - . | ${TAR} -xf - -C ${WRKSRC}/.build/electron
 	@cd ${WRKSRC}/.build/electron && ${MV} -f electron code-oss
 
 do-test:
 # Note: Xvfb or something similar is necessary for headless testing
 # unit tests
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ./scripts/test.sh || ${TRUE}
 # UI smoke tests
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} yarn smoketest
 
 build-remote-extension-host: configure pre-build
 # setup download cache for node
 	@${MKDIR} ${WRKSRC}/.build/node/v${NODEJS_PORTVERSION}/linux-${ELECTRON_ARCH}
 	@${CP} ${LOCALBASE}/bin/node ${WRKSRC}/.build/node/v${NODEJS_PORTVERSION}/linux-${ELECTRON_ARCH}
 # build vscode remote extension host
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		npm_config_runtime=node \
 		npm_config_target=${NODEJS_PORTVERSION} \
 		npm_config_nodedir=${LOCALBASE} \
 		npm --userconfig=${WRKSRC}/remote/.npmrc run gulp vscode-reh-linux-${ELECTRON_ARCH}-min
 	@${MKDIR} ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH}
 	cd ${WRKDIR}/vscode-reh-linux-${ELECTRON_ARCH} && ${TAR} -cf - . | \
 		${TAR} -xf - -C ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH}
 	@${FIND} ${WRKDIR}/vscode-reh -type f -exec ${FILE} {} ';' | \
 		${GREP} 'ELF.*FreeBSD' | ${AWK} -F ': ' '{print $$1}' | ${XARGS} ${STRIP_CMD}
 	cd ${WRKDIR}/vscode-reh && \
 		${TAR} -czf ../vscode-reh-${DISTVERSION}-${OPSYS:tl}${OSREL:R}-${ARCH}.tar.gz .
 	# cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm run gulp vscode-reh-web-linux-${ELECTRON_ARCH}-min
 
 ### targets for port maintainer(s)
 make-node-modules-archive: extract
 	@${ECHO_MSG} "===>  Fetching and installing node modules in ${WRKSRC}"
 	@cd ${WRKSRC} && \
 	${SETENV} ${MAKE_ENV} npm install --ignore-scripts --no-progress --no-audit --no-fund && \
 	${TAR} -czf ${WRKDIR}/vscode-.-node-modules${EXTRACT_SUFX} node_modules
 	@for dir in `node -p "JSON.stringify(require('${WRKSRC}/build/npm/dirs').dirs)" | jq -r '.[]'`; do \
 		cd ${WRKSRC}/$${dir} && \
 		${ECHO_MSG} "===>  Fetching and installing node modules in ${WRKSRC}/$${dir}" && \
 		${SETENV} ${MAKE_ENV} npm install --ignore-scripts --no-progress --no-audit --no-fund && \
 		if [ -d node_modules ]; then \
 			${TAR} -czf ${WRKDIR}/vscode-`echo $${dir} | tr _ __ | tr / _`-node-modules${EXTRACT_SUFX} node_modules; \
 		fi; \
 	done
 	@cd ${WRKDIR} && \
 	${TAR} -czf vscode-node-modules-${DISTVERSION}${EXTRACT_SUFX} vscode-*-node-modules.tar.gz
 
 make-marketplace-exts-archive: extract
 	@${RM} -r ${WRKSRC}/.build/builtInExtensions
 	@cd ${WRKSRC} && \
 	${SETENV} ${MAKE_ENV} npm run download-builtin-extensions
 	@cd ${WRKSRC}/.build && \
 	${TAR} -czf ${WRKDIR}/vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} builtInExtensions
 
 .include <bsd.port.mk>
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 64311690a814..407b757de882 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -1,409 +1,409 @@
 PORTNAME=	virtualbox-ose
 PORTVERSION=	5.2.44
-PORTREVISION?=	21
+PORTREVISION?=	22
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/:src \
 		LOCAL/bofh/emulators/virtualbox-ose-legacy:docs
 PKGNAMESUFFIX?=	-legacy
 DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX}:src \
 		VirtualBox-docs-${PORTVERSION}${EXTRACT_SUFX}:docs
 EXTRACT_ONLY=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} \
 		VirtualBox-docs-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	General-purpose full virtualizer for x86 hardware
 WWW=		https://www.virtualbox.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
 BUILD_DEPENDS=	gtar:archivers/gtar \
 		kmk:devel/kBuild \
 		libIDL-config-2:devel/libIDL \
 		yasm:devel/yasm \
 		xsltproc:textproc/libxslt
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libcurl.so:ftp/curl
 RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-legacy
 
 USES=		compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2
 USE_GNOME=	libxml2
 
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-java --passive-mesa --disable-docs
 CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"
 
 CONFLICTS_INSTALL=	virtualbox-ose-additions-* \
 			virtualbox-ose-devel \
 			virtualbox-ose \
 			virtualbox-ose-lite
 
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 
 PORTSCOUT=	limit:^5\.
 
 VBOXUSER?=	vboxusers
 VBOXWSUSER?=	vboxusers
 VBOXGROUP?=	vboxusers
 USERS=		${VBOXUSER}
 GROUPS=		${VBOXGROUP}
 VBOX_DIR=	${PREFIX}/${VBOX_DIR_REL}
 VBOX_DIR_REL=	lib/virtualbox
 VBOX_ETC=	${PREFIX}/etc/vbox
 VBOX_LINKS=	VBoxVRDP
 VBOX_PROGS=	VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxHeadless \
 		VBoxManage
 VBOX_UTILS=	VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \
 		VBoxSVC VBoxXPCOMIPCD
 
 OPTIONS_DEFINE=		ALSA DBUS DEBUG DOCS GUESTADDITIONS NLS PULSEAUDIO \
 			PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11
 OPTIONS_DEFAULT=	DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
 OPTIONS_SUB=		yes
 
 DEBUG_DESC=		Debug symbols, additional logs and assertions
 GUESTADDITIONS_DESC=	Build with Guest Additions
 NLS_DESC=		Native language support (requires QT5)
 QT5_DESC=		Build with QT5 frontend (requires X11)
 R0LOGGING_DESC=		Enable R0 logging (requires DEBUG)
 UDPTUNNEL_DESC=		Build with UDP tunnel support
 VDE_DESC=		Build with VDE support
 VNC_DESC=		Build with VNC support
 VPX_DESC=		Use libvpx for video recording
 WEBSERVICE_DESC=	Build Webservice
 
 ALSA_CONFIGURE_OFF=	--disable-alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 DBUS_CONFIGURE_OFF=	--disable-dbus
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DEBUG_CONFIGURE_ON=	--build-debug
 NLS_IMPLIES=		QT5
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PYTHON_USES=		python
 PYTHON_USES_OFF=	python:build
 PYTHON_USE=		PYTHON=distutils,noegginfo,noflavors
 PYTHON_CONFIGURE_OFF=	--disable-python
 PYTHON_VARS=		pydistutils_pkgname=vboxapi pydistutils_pkgversion=1.0
 QT5_USES=		gl qmake:no_env qt:5 xorg
 QT5_USE=		QT=buildtools:build,core,dbus,gui,linguisttools:build,opengl \
 			QT=printsupport,widgets,x11extras XORG=xcb GL=gl
 QT5_CONFIGURE_ON=	--enable-qt5
 QT5_CONFIGURE_OFF=	--disable-qt
 QT5_IMPLIES=		X11
 R0LOGGING_IMPLIES=	DEBUG
 UDPTUNNEL_CONFIGURE_OFF=	--disable-udptunnel
 VDE_CONFIGURE_ON=	--enable-vde
 VDE_RUN_DEPENDS=	vde_switch:net/vde2
 VNC_CONFIGURE_ON=	--enable-vnc
 VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 VPX_CONFIGURE_OFF=	--disable-libvpx
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 WEBSERVICE_BUILD_DEPENDS=	soapcpp2:devel/gsoap
 X11_USES=		sdl xorg
 X11_USE=		SDL=sdl XORG=x11,xcursor,xext,xinerama,xmu,xorgproto,xt
 X11_CONFIGURE_OFF=	--build-headless
 
 PLIST_SUB=	GUEST_VER=${PORTVERSION} \
 		PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \
 		VBOXGROUP=${VBOXGROUP}
 SUB_LIST=	VBOXDIR=${VBOX_DIR} \
 		VBOXGROUP=${VBOXGROUP} \
 		VBOXUSER=${VBOXUSER} \
 		VBOXWSUSER=${VBOXWSUSER}
 USE_RC_SUBR=	vboxheadless vboxwatchdog
 
 .include <bsd.port.options.mk>
 
 .if ${SLAVE_PORT} == no
 CONFLICTS_INSTALL+=	virtualbox-ose-nox11
 OPTIONS_DEFAULT+=	PYTHON
 .else
 CONFLICTS_INSTALL+=	virtualbox-ose
 .endif
 
 .if ${ARCH} == "amd64"
 _ELF32!=	kldstat -q -m elf32 && ${ECHO_CMD} yes || ${ECHO_CMD} no
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 KMK_BUILDTYPE=	debug
 KMK_FLAGS+=	BUILD_TYPE=debug
 .else
 KMK_BUILDTYPE=	release
 .endif
 
 .if ${PORT_OPTIONS:MGUESTADDITIONS}
 GUESTADDITIONS=	VBoxGuestAdditions_${PORTVERSION}.iso
 DISTFILES+=	${GUESTADDITIONS}:src
 LICENSE+=	Additions
 LICENSE_COMB=	multi
 LICENSE_NAME_Additions=	Guest Additions
 LICENSE_PERMS_Additions=	auto-accept
 LICENSE_DISTFILES_Additions=	${GUESTADDITIONS}
 .endif
 
 .if ${PORT_OPTIONS:MQT5}
 PLIST_SUB+=	QT=""
 VBOX_PROGS+=	VirtualBox
 VBOX_UTILS+=	VBoxTestOGL
 VBOX_WITH_QT=	1
 .else
 PLIST_SUB+=	QT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MWEBSERVICE}
 USE_RC_SUBR+=	vboxinit vboxwebsrv
 VBOX_LINKS+=	vboxwebsrv
 VBOX_UTILS+=	vboxwebsrv webtest
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 VBOX_PROGS+=	VBoxSDL
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
 PLIST_SUB+=	SDK=""
 .else
 PLIST_SUB+=	SDK="@comment "
 .endif
 
 .if ${ARCH} == i386
 KMK_ARCH=	freebsd.x86
 PLIST_SUB+=	I386=""
 .else
 KMK_ARCH=	freebsd.${ARCH}
 PLIST_SUB+=	I386="@comment "
 .endif
 
 PLIST_SUB+=	ARCH="${KMK_ARCH}"
 
 KMK_BUILDDIR=	${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 KMK_FLAGS+=	-j${MAKE_JOBS_NUMBER}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_MAJOR_VER} >= 3
 PLIST_SUB+=	PYTHON_PYCDIR=/__pycache__/ \
 		PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
 .else
 PLIST_SUB+=	PYTHON_PYCDIR=/ \
 		PYTHON_PYCEXT=.pyc
 .endif
 
 .if ${SSL_DEFAULT} != base
 CONFIGURE_ARGS+=	--with-openssl-dir="${OPENSSLBASE}"
 .endif
 
 pre-everything::
 .if ${ARCH} == "amd64"
 .if ${_ELF32} != yes
 	@${ECHO_MSG} 'Requires 32-bit runtime support in kernel.'
 	@${ECHO_MSG} 'Rebuild kernel with "options COMPAT_FREEBSD32" and reboot.'
 	@${FALSE}
 .elif !exists(/usr/lib32/libc.so)
 	@${ECHO_MSG} 'Requires 32-bit libraries installed under /usr/lib32.'
 	@${ECHO_MSG} 'Do: cd /usr/src; make build32 install32; service ldconfig restart'
 	@${FALSE}
 .endif
 .endif
 
 post-patch:
 	@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' > \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_DOCBOOK = ${DBKXSLDIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_DOCBOOK_DTD = ${DBKXMLDIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_SHARED_LIBS = ${VBOX_DIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	# Please keep this even if using Clang to avoid repeated regressions.
 	# PR 245048
 	@${ECHO_CMD} "VBOX_WITH_RUNPATH = ${_GCC_RUNTIME:D${_GCC_RUNTIME}\:}${VBOX_DIR}" >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk
 .if ${SSL_DEFAULT} != base
 	@${ECHO_CMD} 'VBOX_WITH_ALT_HASH_CODE = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${ECHO_CMD} 'VBOX_WITH_EXTPACK_VBOXDTRACE =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_INSTALLER = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_VBOXDRV =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_TESTCASES =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'SDK_VBOX_LIBPNG_INCS = ${PREFIX}/include/libpng' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_QT}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_QT}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_VALIDATIONKIT =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 .if ${PORT_OPTIONS:MR0LOGGING}
 	@${ECHO_CMD} 'VBOX_WITH_R0_LOGGING = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 .if ${PORT_OPTIONS:MWEBSERVICE}
 	@${ECHO_CMD} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_GSOAP_BIN = ${PREFIX}/bin' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long \
 		-Wno-dynamic-exception-spec -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${REINPLACE_CMD} -E -e '/soap_socket_errno\(/s/(soap_socket_errno)(\([^)]+\))/\1/' \
 		${WRKSRC}/src/VBox/Main/webservice/vboxweb.cpp
 .else
 	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wno-dynamic-exception-spec \
 		-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
 	    -e 's| -mpreferred-stack-boundary=2||' \
 	    -e 's|%%PYTHON_VERSION%%|${PYTHON_VERSION}|' \
 		${WRKSRC}/Config.kmk
 	@${REINPLACE_CMD} -e 's| -fpermissive||' ${WRKSRC}/Config.kmk \
 	    ${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk
 	@${ECHO_CMD} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk
 	@${SED} -e 's|GXX3|VBoxGccFreeBSD|g' \
 	    ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \
 	    ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure \
 	    ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
 	    ${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
 	    ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
 	@${REINPLACE_CMD} \
 	    -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
 	    -e 's|SUPPYTHONLIBS=.*|SUPPYTHONLIBS="${PYTHON_VERSION}${PYTHON_ABIVER}"|' \
 	    ${WRKSRC}/configure
 .if empty(ICONV_LIB)
 	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \
 	    ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
 	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 .if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${ARCH} == i386
 	@${ECHO_CMD} 'VBOX_FREEBSD = -fPIC' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|%%VBOX_DIR%%|${VBOX_DIR}|g' \
 	    -e 's|%%VBOX_ETC%%|${VBOX_ETC}|g' \
 	    -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh
 	@${REINPLACE_CMD} \
 	    -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \
 	    ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400093
 	@${REINPLACE_CMD} -e 's|enum vtype|enum enum_vtype_uint8|g' \
 	    ${WRKSRC}/src/VBox/Additions/freebsd/vboxvfs/vboxvfs*.[ch]
 .endif
 
 do-build:
 	cd ${WRKSRC} && ${SH} -c '. ${WRKSRC}/env.sh && \
 	    ${SETENV} ${MAKE_ENV} ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}'
 .if ${PORT_OPTIONS:MPYTHON}
 	${PYTHON_CMD} -mcompileall \
 	    ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom
 .endif
 
 do-install:
 .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
 	${MKDIR} ${STAGEDIR}${DATADIR}/sdk
 .endif
 	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom && \
 	    ${COPYTREE_SHARE} "idl samples" ${STAGEDIR}${DATADIR}
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/virtualbox
 	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/include && \
 	    ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox
 
 	${MKDIR} ${STAGEDIR}${VBOX_DIR}
 	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \
 	    "*.fd *.r0 *.rc *.so components" ${STAGEDIR}${VBOX_DIR}
 .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
 	${RLN} ${STAGEDIR}${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
 .endif
 
 	${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \
 	    ${STAGEDIR}${VBOX_DIR}
 .for f in ${VBOX_PROGS} ${VBOX_UTILS}
 	${INSTALL_PROGRAM} ${KMK_BUILDDIR}/bin/${f} ${STAGEDIR}${VBOX_DIR}
 .endfor
 .for f in ${VBOX_PROGS} ${VBOX_LINKS}
 	${LN} -fs ../${VBOX_DIR_REL}/VBox.sh ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 .for f in ${VBOX_PROGS}
 	${LN} -fs ../${VBOX_DIR_REL}/VBox.sh ${STAGEDIR}${PREFIX}/bin/${f:tl}
 .endfor
 
 .if ${PORT_OPTIONS:MGUESTADDITIONS}
 	${MKDIR} ${STAGEDIR}${VBOX_DIR}/additions
 	${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} \
 	    ${STAGEDIR}${VBOX_DIR}/additions/
 	${RLN} ${STAGEDIR}${VBOX_DIR}/additions/${GUESTADDITIONS} \
 	    ${STAGEDIR}${VBOX_DIR}/additions/VBoxGuestAdditions.iso
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/VirtualBox-docs-${PORTVERSION}/UserManual.pdf \
 	    ${STAGEDIR}${DOCSDIR}
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 	cd ${KMK_BUILDDIR}/obj/VirtualBox/qtnls && \
 	    ${COPYTREE_SHARE} "*.qm" ${STAGEDIR}${DATADIR}/nls
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 	cd ${KMK_BUILDDIR}/bin/sdk/installer && \
 	    ${SETENV} VBOX_INSTALL_PATH="${VBOX_DIR}" \
 	    ${PYTHON_CMD} vboxapisetup.py install --root=${STAGEDIR}
 
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom
 	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom && \
 	    ${COPYTREE_SHARE} "*" ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom
 	@${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python
 	${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom \
 	    ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python
 .endif
 
 .if ${PORT_OPTIONS:MQT5}
 	${INSTALL_DATA} \
 	    ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png \
 	    ${STAGEDIR}${PREFIX}/share/pixmaps/VBox.png
 	${INSTALL_DATA} \
 	    ${WRKSRC}/src/VBox/Installer/freebsd/virtualbox.desktop \
 	    ${STAGEDIR}${PREFIX}/share/applications/virtualbox.desktop
 .endif
 
 .if ${PORT_OPTIONS:MVNC}
 	${MKDIR} ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/${KMK_ARCH}
 	${INSTALL_DATA} ${KMK_BUILDDIR}/bin/ExtensionPacks/VNC/ExtPack* \
 	    ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/
 	${INSTALL_LIB} ${KMK_BUILDDIR}/bin/ExtensionPacks/VNC/${KMK_ARCH}/* \
 	    ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/${KMK_ARCH}/
 .endif
 
 .if ${PORT_OPTIONS:MWEBSERVICE}
 	${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/webservice
 	${INSTALL_DATA} ${KMK_BUILDDIR}/obj/webservice/vboxweb.wsdl \
 	    ${STAGEDIR}${DATADIR}/sdk/bindings/webservice/
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/virtualbox/*.so \
 		${STAGEDIR}${PREFIX}/lib/virtualbox/components/*.so
 
 .include <bsd.port.post.mk>
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 814e2d49a6ab..f9ee258848de 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -1,428 +1,428 @@
 PORTNAME=	virtualbox-ose
 PORTVERSION=	6.1.50
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/:src \
 		LOCAL/bofh/emulators/virtualbox-ose:docs
 DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX}:src \
 		VirtualBox-docs-${PORTVERSION}${EXTRACT_SUFX}:docs
 EXTRACT_ONLY=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} \
 		VirtualBox-docs-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	General-purpose full virtualizer for x86 hardware
 WWW=		https://www.virtualbox.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	gtar:archivers/gtar \
 		kmk:devel/kBuild \
 		libIDL-config-2:devel/libIDL \
 		yasm:devel/yasm \
 		xsltproc:textproc/libxslt
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libcurl.so:ftp/curl
 RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod
 
 USES=		compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2
 USE_GNOME=	libxml2
 
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-java --passive-mesa --disable-docs
 CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"
 
 CONFLICTS_INSTALL=	virtualbox-ose-additions-* \
 			virtualbox-ose-devel \
 			virtualbox-ose-legacy \
 			virtualbox-ose-lite
 
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 
 VBOXUSER?=	vboxusers
 VBOXWSUSER?=	vboxusers
 VBOXGROUP?=	vboxusers
 USERS=		${VBOXUSER}
 GROUPS=		${VBOXGROUP}
 VBOX_DIR=	${PREFIX}/${VBOX_DIR_REL}
 VBOX_DIR_REL=	lib/virtualbox
 VBOX_ETC=	${PREFIX}/etc/vbox
 VBOX_LINKS=	VBoxVRDP
 VBOX_PROGS=	VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxHeadless \
 		VBoxManage
 VBOX_UTILS=	VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \
 		VBoxSVC VBoxXPCOMIPCD
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		AIO ALSA DBUS DEBUG DOCS GUESTADDITIONS NLS OPUS PULSEAUDIO \
 			PYTHON QT5 R0LOGGING UDPTUNNEL VBOXIMG VDE VNC WEBSERVICE VPX X11
 OPTIONS_DEFAULT=	AIO DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
 # Since version 6.1.24 pulseaudio is broken at runtime, preventing
 # virtual machines from starting if configured to use it.
 OPTIONS_EXCLUDE+=	PULSEAUDIO
 OPTIONS_SUB=		yes
 
 AIO_DESC=		Enable Asyncronous IO support (check pkg-message)
 DEBUG_DESC=		Debug symbols, additional logs and assertions
 GUESTADDITIONS_DESC=	Build with Guest Additions
 NLS_DESC=		Native language support (requires QT5)
 OPUS_DESC=		Use libvpx for audio recording (requires VPX)
 QT5_DESC=		Build with QT5 frontend (requires X11)
 R0LOGGING_DESC=		Enable R0 logging (requires DEBUG)
 UDPTUNNEL_DESC=		Build with UDP tunnel support
 VBOXIMG_DESC=		Build vboximg-mount (requires fuse-libs)
 VDE_DESC=		Build with VDE support
 VNC_DESC=		Build with VNC support
 VPX_DESC=		Use libvpx for video recording
 WEBSERVICE_DESC=	Build Webservice
 
 ALSA_CONFIGURE_OFF=	--disable-alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 DBUS_CONFIGURE_OFF=	--disable-dbus
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DEBUG_CONFIGURE_ON=	--build-debug
 NLS_IMPLIES=		QT5
 OPUS_CONFIGURE_OFF=	--disable-libopus
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_IMPLIES=		VPX
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PYTHON_USES=		python
 PYTHON_USES_OFF=	python:build
 PYTHON_USE=		PYTHON=distutils,noegginfo,noflavors
 PYTHON_CONFIGURE_OFF=	--disable-python
 PYTHON_VARS=		pydistutils_pkgname=vboxapi pydistutils_pkgversion=1.0
 QT5_USES=		gl qmake:no_env qt:5 xorg
 QT5_USE=		QT=buildtools:build,core,dbus,gui,linguisttools:build,opengl \
 			QT=printsupport,widgets,x11extras XORG=xcb GL=gl
 QT5_CONFIGURE_ON=	--enable-qt5
 QT5_CONFIGURE_OFF=	--disable-qt
 QT5_IMPLIES=		X11
 R0LOGGING_IMPLIES=	DEBUG
 UDPTUNNEL_CONFIGURE_OFF=	--disable-udptunnel
 VBOXIMG_LIB_DEPENDS=	libfuse.so.2:sysutils/fusefs-libs
 VDE_CONFIGURE_ON=	--enable-vde
 VDE_RUN_DEPENDS=	vde_switch:net/vde2
 VNC_CONFIGURE_ON=	--enable-vnc
 VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 VPX_CONFIGURE_OFF=	--disable-libvpx
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 WEBSERVICE_BUILD_DEPENDS=	soapcpp2:devel/gsoap
 X11_USES=		sdl xorg
 X11_USE=		SDL=sdl XORG=x11,xcursor,xext,xinerama,xmu,xorgproto,xt
 X11_CONFIGURE_OFF=	--build-headless
 
 ENV=
 .export ENV
 
 PLIST_SUB=	GUEST_VER=${PORTVERSION} \
 		PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \
 		VBOXGROUP=${VBOXGROUP}
 SUB_LIST=	VBOXDIR=${VBOX_DIR} \
 		VBOX_ETC=${VBOX_ETC} \
 		VBOXGROUP=${VBOXGROUP} \
 		VBOXUSER=${VBOXUSER} \
 		VBOXWSUSER=${VBOXWSUSER}
 USE_RC_SUBR=	vboxheadless vboxwatchdog
 
 .include <bsd.port.options.mk>
 
 .if ${SLAVE_PORT} == no
 CONFLICTS_INSTALL+=	virtualbox-ose-nox11
 OPTIONS_DEFAULT+=	PYTHON
 .else
 CONFLICTS_INSTALL+=	virtualbox-ose
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 KMK_BUILDTYPE=	debug
 KMK_FLAGS+=	BUILD_TYPE=debug
 .else
 KMK_BUILDTYPE=	release
 .endif
 
 .if ${PORT_OPTIONS:MGUESTADDITIONS}
 GUESTADDITIONS=	VBoxGuestAdditions_${PORTVERSION}.iso
 DISTFILES+=	${GUESTADDITIONS}:src
 LICENSE+=	Additions
 LICENSE_COMB=	multi
 LICENSE_NAME_Additions=	Guest Additions
 LICENSE_PERMS_Additions=	auto-accept
 LICENSE_DISTFILES_Additions=	${GUESTADDITIONS}
 .endif
 
 .if ${PORT_OPTIONS:MQT5}
 PLIST_SUB+=	QT=""
 VBOX_PROGS+=	VirtualBox VirtualBoxVM
 VBOX_UTILS+=	VBoxTestOGL
 VBOX_WITH_QT=	1
 .else
 PLIST_SUB+=	QT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MWEBSERVICE}
 USE_RC_SUBR+=	vboxinit vboxwebsrv
 VBOX_LINKS+=	vboxwebsrv
 VBOX_UTILS+=	vboxwebsrv webtest
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 VBOX_PROGS+=	VBoxSDL
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
 PLIST_SUB+=	SDK=""
 .else
 PLIST_SUB+=	SDK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVBOXIMG}
 EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-vboximg-Config.kmk
 VBOX_UTILS+=	vboximg-mount
 PLIST_SUB+=	VBOXIMG=""
 .else
 PLIST_SUB+=	VBOXIMG="@comment "
 .endif
 
 KMK_ARCH=	freebsd.${ARCH}
 PLIST_SUB+=	ARCH="${KMK_ARCH}"
 
 KMK_BUILDDIR=	${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 KMK_FLAGS+=	-j${MAKE_JOBS_NUMBER}
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 # 1) llvm10 in FreeBSD before r364284 miscompiles virtualbox 6.1 causing errors.
 # 2) llvm15 in FreeBSD miscompiles virtualbox 6.1 causing errors: PR#270189.
 # Force llvm from ports.
 .if ${OPSYS} == FreeBSD
 # USES must be before .include <bsd.port.pre.mk>, but CHOSEN_COMPILER_TYPE must be after.
 # This is a workaround with possibility to define different llvm via VBOX_LLVM_VER in make.conf.
 #USES+=		llvm:min=11,max=14
 #CC=		clang${LLVM_VERSION}
 #CXX=		clang++${LLVM_VERSION}
 BUILD_DEPENDS+=	clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
 CC=		clang${VBOX_LLVM_VER}
 CXX=		clang++${VBOX_LLVM_VER}
 .if ${LLVM_DEFAULT} < 11 || ${LLVM_DEFAULT} > 14
 VBOX_LLVM_VER?=	14
 .else
 VBOX_LLVM_VER?=	${LLVM_DEFAULT}
 .endif
 .endif
 PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
 EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
 .endif
 
 .if ${PYTHON_MAJOR_VER} >= 3
 PLIST_SUB+=	PYTHON_PYCDIR=/__pycache__/ \
 		PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
 .else
 PLIST_SUB+=	PYTHON_PYCDIR=/ \
 		PYTHON_PYCEXT=.pyc
 .endif
 
 .if ${SSL_DEFAULT} != base
 CONFIGURE_ARGS+=	--with-openssl-dir="${OPENSSLBASE}"
 .endif
 
 post-patch:
 	@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' > \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_DOCBOOK = ${DBKXSLDIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_DOCBOOK_DTD = ${DBKXMLDIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_SHARED_LIBS = ${VBOX_DIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	# Please keep this even if using Clang to avoid repeated regressions.
 	# PR 245048
 	@${ECHO_CMD} "VBOX_WITH_RUNPATH = ${_GCC_RUNTIME:D${_GCC_RUNTIME}\:}${VBOX_DIR}" >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk
 .if ${SSL_DEFAULT} != base
 	@${ECHO_CMD} 'VBOX_WITH_ALT_HASH_CODE = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${ECHO_CMD} 'VBOX_WITH_EXTPACK_VBOXDTRACE =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_INSTALLER = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_VBOXDRV =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_TESTCASES =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'SDK_VBOX_LIBPNG_INCS = ${PREFIX}/include/libpng' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_QT}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_QT}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_VALIDATIONKIT =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 .if ${PORT_OPTIONS:MR0LOGGING}
 	@${ECHO_CMD} 'VBOX_WITH_R0_LOGGING = 1' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 .if ${PORT_OPTIONS:MWEBSERVICE}
 	@${ECHO_CMD} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_GSOAP_BIN = ${PREFIX}/bin' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 .endif
 .if empty(PORT_OPTIONS:MX11)
 	@${ECHO} 'VBOX_WITH_VMSVGA3D =' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 .if ${CHOSEN_COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
 	    -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk
 	@${REINPLACE_CMD} -e 's| -fpermissive||' ${WRKSRC}/Config.kmk \
 	    ${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk
 	@${ECHO_CMD} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk
 	@${SED} -e 's|GXX3|VBoxGccFreeBSD|g' \
 	    ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \
 	    ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk
 .endif
 	# Causes a "reinplace" QA warning with default LOCALBASE
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure \
 	    ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
 	    ${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
 	    ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
 	@${REINPLACE_CMD} \
 	    -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
 	    -e 's|SUPPYTHONLIBS=.*|SUPPYTHONLIBS="${PYTHON_VERSION}${PYTHON_ABIVER}"|' \
 	    ${WRKSRC}/configure
 .if empty(ICONV_LIB)
 	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \
 	    ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
 	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|%%VBOX_DIR%%|${VBOX_DIR}|g' \
 	    -e 's|%%VBOX_ETC%%|${VBOX_ETC}|g' \
 	    -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh
 	@${REINPLACE_CMD} -e 's|%%VBOX_ETC%%|${VBOX_ETC}|g' \
 	    ${WRKSRC}/src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp
 	@${REINPLACE_CMD} \
 	    -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \
 	    ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
 
 post-patch-AIO-off:
 	@${REINPLACE_CMD} 's|r3/freebsd/fileaio-freebsd.cpp|r3/posix/fileaio-posix.cpp|' \
 		${WRKSRC}/src/VBox/Runtime/Makefile.kmk
 
 do-build:
 	cd ${WRKSRC} && ${SH} -c '. ${WRKSRC}/env.sh && \
 	    ${SETENV} ${MAKE_ENV} ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}'
 .if ${PORT_OPTIONS:MPYTHON}
 	${PYTHON_CMD} -mcompileall \
 	    ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom
 .endif
 
 do-install:
 .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
 	${MKDIR} ${STAGEDIR}${DATADIR}/sdk
 .endif
 	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom && \
 	    ${COPYTREE_SHARE} "idl samples" ${STAGEDIR}${DATADIR}
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/virtualbox
 	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/include && \
 	    ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox
 
 	${MKDIR} ${STAGEDIR}${VBOX_DIR}
 	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \
 	    "*.fd *.r0 *.so components" ${STAGEDIR}${VBOX_DIR}
 .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
 	${RLN} ${STAGEDIR}${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
 .endif
 
 	${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \
 	    ${STAGEDIR}${VBOX_DIR}
 .for f in ${VBOX_PROGS} ${VBOX_UTILS}
 	${INSTALL_PROGRAM} ${KMK_BUILDDIR}/bin/${f} ${STAGEDIR}${VBOX_DIR}
 .endfor
 .for f in ${VBOX_PROGS} ${VBOX_LINKS}
 	${LN} -fs ../${VBOX_DIR_REL}/VBox.sh ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 .for f in ${VBOX_PROGS}
 	${LN} -fs ../${VBOX_DIR_REL}/VBox.sh ${STAGEDIR}${PREFIX}/bin/${f:tl}
 .endfor
 
 .if ${PORT_OPTIONS:MGUESTADDITIONS}
 	${MKDIR} ${STAGEDIR}${VBOX_DIR}/additions
 	${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} \
 	    ${STAGEDIR}${VBOX_DIR}/additions/
 	${RLN} ${STAGEDIR}${VBOX_DIR}/additions/${GUESTADDITIONS} \
 	    ${STAGEDIR}${VBOX_DIR}/additions/VBoxGuestAdditions.iso
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/VirtualBox-docs-${PORTVERSION}/UserManual.pdf \
 	    ${STAGEDIR}${DOCSDIR}
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 	cd ${KMK_BUILDDIR}/obj/VirtualBox/qtnls && \
 	    ${COPYTREE_SHARE} "*.qm" ${STAGEDIR}${DATADIR}/nls
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 	cd ${KMK_BUILDDIR}/bin/sdk/installer && \
 	    ${SETENV} VBOX_INSTALL_PATH="${VBOX_DIR}" \
 	    ${PYTHON_CMD} vboxapisetup.py install --root=${STAGEDIR}
 
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom
 	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom && \
 	    ${COPYTREE_SHARE} "*" ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom
 	@${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python
 	${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom \
 	    ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python
 .endif
 
 .if ${PORT_OPTIONS:MQT5}
 	${INSTALL_DATA} \
 	    ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png \
 	    ${STAGEDIR}${PREFIX}/share/pixmaps/VBox.png
 	${INSTALL_DATA} \
 	    ${WRKSRC}/src/VBox/Installer/freebsd/virtualbox.desktop \
 	    ${STAGEDIR}${PREFIX}/share/applications/virtualbox.desktop
 .endif
 
 .if ${PORT_OPTIONS:MVNC}
 	${MKDIR} ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/${KMK_ARCH}
 	${INSTALL_DATA} ${KMK_BUILDDIR}/bin/ExtensionPacks/VNC/ExtPack* \
 	    ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/
 	${INSTALL_LIB} ${KMK_BUILDDIR}/bin/ExtensionPacks/VNC/${KMK_ARCH}/* \
 	    ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/${KMK_ARCH}/
 .endif
 
 .if ${PORT_OPTIONS:MVBOXIMG}
 	${LN} -fs ../${VBOX_DIR_REL}/vboximg-mount ${STAGEDIR}${PREFIX}/bin/
 .endif
 
 .if ${PORT_OPTIONS:MWEBSERVICE}
 	${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/webservice
 	${INSTALL_DATA} ${KMK_BUILDDIR}/obj/webservice/vboxweb.wsdl \
 	    ${STAGEDIR}${DATADIR}/sdk/bindings/webservice/
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/virtualbox/*.so \
 		${STAGEDIR}${PREFIX}/lib/virtualbox/components/*.so
 
 .include <bsd.port.post.mk>
diff --git a/games/NBlood/Makefile b/games/NBlood/Makefile
index 7cd38e5337c3..a1ae1d1c44d2 100644
--- a/games/NBlood/Makefile
+++ b/games/NBlood/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	NBlood
 DISTVERSION=	r14114
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Reverse-engineered ports of Build games using EDuke32 engine
 WWW=		https://github.com/nukeykt/NBlood
 
 LICENSE=	GPLv2 BUILDLIC
 LICENSE_COMB=	multi
 LICENSE_NAME_BUILDLIC=	BUILD SOURCE CODE LICENSE
 LICENSE_FILE_BUILDLIC=	${WRKSRC}/source/build/buildlic.txt
 LICENSE_FILE_GPLv2=	${WRKSRC}/source/duke3d/gpl-2.0.txt
 LICENSE_PERMS_BUILDLIC=	dist-mirror pkg-mirror auto-accept
 
 BUILD_DEPENDS=	nasm:devel/nasm
 LIB_DEPENDS=	libvpx.so:multimedia/libvpx \
 		libFLAC.so:audio/flac \
 		libvorbis.so:audio/libvorbis
 
 USES=		compiler:c++14-lang gl gmake pkgconfig sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	nukeykt
 USE_GL=		glu
 USE_SDL=	sdl2
 
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	CC=${CC} CXX=${CXX} CLANG=1 PRETTY_OUTPUT=0 USE_MIMALLOC=0
 PLIST_FILES=	bin/pcexhumed \
 		bin/nblood \
 		bin/rednukem
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == riscv64
 MAKE_ARGS+=	LTO=0
 .endif
 
 post-patch:
 	${MV} ${WRKSRC}/source/build/include/lz4.h ${WRKSRC}/source/build/include/my_lz4.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pcexhumed ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/nblood ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/rednukem ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile
index 630fc87c0e0d..266585b0704d 100644
--- a/games/eduke32/Makefile
+++ b/games/eduke32/Makefile
@@ -1,127 +1,127 @@
 PORTNAME=	eduke32
 PORTVERSION=	20240316
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://dukeworld.com/eduke32/synthesis/${PORTVERSION}-${GITREVISION}/:eduke32 \
 		LOCAL/pkubaj/:erp \
 		http://www.duke4.org/files/nightfright/related/:related \
 		http://dukeworld.com/classic%20dukeworld/share/:shareware \
 		https://image.dosgamesarchive.com/games/:shareware \
 		https://www.quaddicted.com/files/idgames2/planetquake/planetduke/:shareware \
 		https://ftp.swin.edu.au/gentoo/distfiles/:shareware \
 		ftp://ftp.3drealms.com/share/:shareware
 DISTFILES=	${PORTNAME}_src_${PORTVERSION}-${GITREVISION}${EXTRACT_SUFX}:eduke32
 EXTRACT_ONLY=	${PORTNAME}_src_${PORTVERSION}-${GITREVISION}${EXTRACT_SUFX}
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Duke Nukem 3D Port based on JFDuke and EDuke
 WWW=		https://eduke32.com/
 
 LICENSE=	GPLv2 BUILDLIC
 LICENSE_COMB=	multi
 LICENSE_NAME_BUILDLIC=	BUILD SOURCE CODE LICENSE
 LICENSE_FILE_BUILDLIC=	${WRKSRC}/source/build/buildlic.txt
 LICENSE_FILE_GPLv2=	${WRKSRC}/source/duke3d/gpl-2.0.txt
 LICENSE_PERMS_BUILDLIC=	dist-mirror pkg-mirror auto-accept
 
 LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis \
 		libvpx.so:multimedia/libvpx \
 		libpng.so:graphics/png
 
 USES=		compiler:c11 dos2unix gl gmake gnome localbase pkgconfig sdl tar:xz
 USE_GL=		gl glu
 USE_GNOME=	gtk20
 USE_SDL=	sdl2 mixer2
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}-${GITREVISION}
 GITREVISION=	10564-0bc78c53d
 DATADIR=	${PREFIX}/share/duke3d
 SUB_FILES=	pkg-message
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	CC=${CC} CXX=${CXX} CLANG=1 PRETTY_OUTPUT=0 USE_MIMALLOC=0
 
 PLIST_FILES=	bin/eduke32 bin/mapster32
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		ERP EXAMPLES OFFENSIVE
 OPTIONS_RADIO=		GAMEDATA
 OPTIONS_RADIO_GAMEDATA=	SHAREWARE FULL
 OPTIONS_DEFINE_amd64=	ASM
 OPTIONS_DEFAULT_amd64=	ASM
 OPTIONS_DEFINE_i386=	ASM
 OPTIONS_DEFAULT_i386=	ASM
 
 ASM_BUILD_DEPENDS=	nasm:devel/nasm
 ASM_MAKE_ARGS_OFF=	NOASM=1
 ERP_DESC=		Install Enhanced Resource Pack
 ERP_DISTFILES=		duke-erp-210701.zip:erp
 ERP_PLIST_FILES=	${DATADIR}/duke-erp-210701.zip
 OFFENSIVE_DESC=		Install Full XXX Pack
 OFFENSIVE_IMPLIES=	ERP
 OFFENSIVE_DISTFILES=	duke3d_xxx.zip:related
 OFFENSIVE_PLIST_FILES=	${DATADIR}/duke3d_xxx.zip
 SHAREWARE_DESC=		Install shareware game data version 1.3
 SHAREWARE_EXTRACT_ONLY=	3dduke13.zip
 SHAREWARE_DISTFILES=	3dduke13.zip:shareware
 SHAREWARE_PLIST_FILES=	${DATADIR}/duke3d.grp ${DATADIR}/duke.rts
 FULL_DESC=		Install duke3d.grp and duke.rts from $${DISTDIR}/duke3d
 FULL_DISTFILES=		duke3d/duke3d.grp duke3d/duke.rts
 FULL_PLIST_FILES=	${DATADIR}/duke3d.grp ${DATADIR}/duke.rts
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == i386 || ${ARCH} == riscv64
 MAKE_ARGS+=	LTO=0
 .endif
 
 .if ${PORT_OPTIONS:MFULL}
 
 # Avoid checksumming original (commercial) game data files: A variety of
 # editions exist with the same file names and they should all work.
 # This is a hack that would break when bsd.port.mk changes or DIST_SUBDIR
 # is set.
 _CKSUMFILES=	${ALLFILES:Nduke3d/duke*}
 
 .if !exists(${DISTDIR}/duke3d/duke3d.grp) || !exists(${DISTDIR}/duke3d/duke.rts)
 IGNORE=	option FULL selected, but duke3d.grp or duke.rts not found in ${DISTDIR}/duke3d
 .endif
 
 .endif
 
 post-extract-SHAREWARE-on:
 	@cd ${WRKDIR} && ${UNZIP_NATIVE_CMD} -qo DN3DSW13.SHR
 
 post-patch:
 	@${REINPLACE_CMD} \
 		's|"/usr/local/share/games/" APPBASENAME|"${DATADIR}"|' \
 		${WRKSRC}/source/duke3d/src/common.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/eduke32 ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/mapster32 ${STAGEDIR}${PREFIX}/bin/
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/package/sdk/tiles.cfg ${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/package/sdk/samples/* ${STAGEDIR}${EXAMPLESDIR}/
 
 do-install-ERP-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/duke-erp-210701.zip ${STAGEDIR}${DATADIR}/
 
 do-install-OFFENSIVE-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/duke3d_xxx.zip ${STAGEDIR}${DATADIR}/
 
 do-install-SHAREWARE-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/DUKE3D.GRP ${STAGEDIR}${DATADIR}/duke3d.grp
 	${INSTALL_DATA} ${WRKDIR}/DUKE.RTS ${STAGEDIR}${DATADIR}/duke.rts
 
 do-install-FULL-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/duke3d/duke3d.grp ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${DISTDIR}/duke3d/duke.rts ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/games/openbor/Makefile b/games/openbor/Makefile
index 2cfab43af187..4b1ba61e4584 100644
--- a/games/openbor/Makefile
+++ b/games/openbor/Makefile
@@ -1,118 +1,118 @@
 PORTNAME=	openbor
 # Hint: svn revision is git rev-list --count ${GH_TAGNAME}
 PORTVERSION?=	7691
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	games
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 .if ${PORTVERSION} < 3971
 PATCHFILES+=	794ba23189a3.patch:-p2
 .elif ${PORTVERSION} < 7084
 PATCHFILES+=	731d96887795.patch:-p2
 .endif
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	2D side scrolling engine for beat 'em ups, shooters, and more #'
 WWW=		https://www.chronocrash.com/
 
 LICENSE=	BSD3CLAUSE GPLv2+
 .if ${PORTVERSION} >= 4134
 LICENSE+=	ISCL
 .endif
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE
 LICENSE_FILE_GPLv2+ =	${_LICENSE_STORE}/GPLv2 # source/gfxlib/hq2x.c
 LICENSE_FILE_ISCL=	${WRKSRC}/source/webmlib/nestegg/LICENSE
 
 LIB_DEPENDS=	libpng.so:graphics/png
 .if ${PORTVERSION} >= 4134
 LIB_DEPENDS+=	libvpx.so:multimedia/libvpx
 .endif
 
 .ifdef PKGNAMESUFFIX
 PORTSCOUT=	ignore:1
 .endif
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DCurrent
 GH_TAGNAME?=	cbade65a
 
 USES+=		cpe gmake pkgconfig sdl
 .if ${PORTVERSION} < 4433
 USE_CSTD=	gnu89
 .endif
 .if ${PORTVERSION} < 4108
 USE_SDL=	gfx
 .elif ${PORTVERSION} < 6639 || ${PORTVERSION} >= 7416
 USE_SDL=	gfx2
 .else
 USE_SDL=	sdl2
 .endif
 WRKSRC_SUBDIR=	engine
 MAKE_ENV=	BUILD_LINUX=1 SDKPATH="${LOCALBASE}" \
 		GCC_TARGET="${CONFIGURE_TARGET:S/amd64/x86_64/}"
 MAKE_ARGS=	CC="${CC}" LIBRARIES="${LOCALBASE}/lib" \
 		TARGET_ARCH=${ARCH:S/i386/x86/} ARCHFLAGS="" \
 		TARGET_FINAL='${TARGET}' BUILD_MMX="" ECHO="${ECHO}"
 .if ${PORTVERSION} < 7098
 CFLAGS+=	-fcommon # https://github.com/DCurrent/openbor/issues/206
 .endif
 LDFLAGS+=	-Wl,--as-needed # ogg, pthread, zlib
 SUB_FILES=	pkg-message
 SUB_LIST=	PKGBASE=${PKGBASE}
 PLIST_FILES=	bin/${PKGBASE} \
 		share/pixmaps/${PKGBASE}.png
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 PORTDOCS=	README
 
 DESKTOP_ENTRIES="OpenBOR v${${PORTVERSION}<7533:?3:4}.0 Build ${PORTVERSION}" \
 		"" \
 		"${PKGBASE}" \
 		"${PKGBASE}" \
 		"Game;ArcadeGame;" \
 		""
 
 OPTIONS_DEFINE=		DOCS TREMOR
 OPTIONS_DEFAULT=	${MACHINE_CPU:Msoftfp:C/.+/TREMOR/}
 OPTIONS_DEFINE_i386=	MMX
 OPTIONS_DEFAULT_i386=	MMX # runtime detection
 
 MMX_BUILD_DEPENDS=	yasm:devel/yasm
 MMX_MAKE_ARGS=		BUILD_MMX=1
 
 TREMOR_LIB_DEPENDS=	libvorbisidec.so:audio/libtremor
 TREMOR_MAKE_ARGS=	BUILD_TREMOR=1 BUILD_VORBIS=""
 TREMOR_LIB_DEPENDS_OFF=	libvorbisfile.so:audio/libvorbis
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/ -O[0-9]//; s/ -g//; s/ -Werror//' \
 		-e 's/ -fomit-frame-pointer//' \
 		-e 's/ -freorder-blocks//' \
 		-e 's/ -Wno-unused-result//' \
 		-e 's/ -Wl,-rpath,$$(LIBRARIES)//' \
 		-e '/echo/!s/	@/	/' \
 		-e 's/@echo/@$$(ECHO)/' \
 		-e 's/$$(LIBS)/$$(LDFLAGS) &/' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's/\.openbor/.${PKGBASE}/' \
 		${WRKSRC}/sdl/sdlport.c
 	@${GREP} -Flr 'malloc.h' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
 		's,malloc\.h,stdlib.h,'
 	@${REINPLACE_CMD} -e 's/^function \(.*\) {/\1() {/' \
 		-e '/^[[:space:]]*VERSION_.*=0000/d' \
 		-e '/.*read -r VERSION_/d' \
 		${WRKSRC}/version.sh
 
 do-configure:
 	(cd ${WRKSRC} && VERSION_BUILD=${PORTVERSION} VERSION_COMMIT=${GH_TAGNAME} \
 		${SH} ./version.sh)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/OpenBOR.elf \
 		${STAGEDIR}${PREFIX}/bin/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/resources/OpenBOR_Icon_128x128.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PKGBASE}.png
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 01c05f57d4a9..a339bead3802 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,99 +1,100 @@
 PORTNAME=	scummvm
 PORTVERSION=	2.8.1
+PORTREVISION=	1
 CATEGORIES=	games emulators
 MASTER_SITES=	https://downloads.scummvm.org/frs/${PORTNAME}/${PORTVERSION}/
 
 PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
 PATCHFILES=	65977961b20ba97b1213b5267da0cb1efb49063b.patch:-p1
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Interpreter for several adventure games
 WWW=		https://www.scummvm.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liba52.so:audio/liba52 \
 		libfaad.so:audio/faad \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libmad.so:audio/libmad \
 		libmpeg2.so:multimedia/libmpeg2 \
 		libogg.so:audio/libogg \
 		libpng.so:graphics/png \
 		libtheoradec.so:multimedia/libtheora \
 		libvorbis.so:audio/libvorbis
 
 USES=		compiler:c++11-lang cpe gl gmake gnome iconv jpeg \
 		localbase:ldflags pkgconfig sdl tar:xz
 USE_GL=		gl glew
 USE_SDL=	sdl2
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-alsa \
 		--disable-debug \
 		--disable-fluidlite \
 		--disable-gtk \
 		--disable-nasm \
 		--disable-tremor \
 		--enable-verbose-build \
 		--with-zlib-prefix=/usr
 
 LDFLAGS+=	-lpthread
 
 OPTIONS_DEFINE=		CURL DOCS FLAC GIF FLUIDSYNTH MIKMOD MT32EMU SNDIO SONIVOX TTS VPX XENGINES
 OPTIONS_DEFAULT=	GIF MIKMOD MT32EMU
 OPTIONS_SUB=		yes
 
 CURL_DESC=	Enable ScummVM cloud storage backend
 MT32EMU_DESC=	MT-32 emulator
 SONIVOX_DESC=	Sonivox EAS (Embedded Audio Synthesis) sound driver
 TTS_DESC=	Text-to-Speech support
 XENGINES_DESC=	Experimental/Unstable engine support
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_OFF=	--disable-libcurl
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_OFF=	--disable-flac
 
 FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CONFIGURE_OFF=	--disable-fluidsynth
 
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CONFIGURE_OFF=	--disable-gif
 
 MIKMOD_LIB_DEPENDS=	libmikmod.so:audio/libmikmod
 MIKMOD_CONFIGURE_ON=	--enable-mikmod
 MIKMOD_CONFIGURE_OFF=	--disable-mikmod
 
 MT32EMU_CONFIGURE_OFF=	--disable-mt32emu
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CONFIGURE_OFF=	--disable-sndio
 
 SONIVOX_LIB_DEPENDS=	libsonivox.so:audio/sonivox
 SONIVOX_CONFIGURE_ON=	--enable-sonivox
 SONIVOX_CONFIGURE_OFF=	--disable-sonivox
 
 TTS_LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
 TTS_CONFIGURE_ON=	--enable-tts
 TTS_CONFIGURE_OFF=	--disable-tts
 
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_ON=	--enable-vpx
 VPX_CONFIGURE_OFF=	--disable-vpx
 
 XENGINES_CONFIGURE_ON=	--enable-all-engines
 XENGINES_CONFIGURE_OFF=	--disable-all-unstable-engines
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7
 CONFIGURE_ENV+=	ASFLAGS=-meabi=5
 .endif
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.post.mk>
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 0df9a029bff7..e223b09a392e 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,77 +1,78 @@
 PORTNAME=	thunderbird
 DISTVERSION=	128.4.1
+PORTREVISION=	1
 CATEGORIES=	mail news net-im wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
 DISTFILES=	${DISTNAME}esr.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 WWW=		https://www.mozilla.com/thunderbird/
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.101:security/nss \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=8.5.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.43:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.14.0:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libbotan-2.so:security/botan2
 
 USE_GECKO=	gecko
 # cannot use system icu: calendar is completely broken by
 # https://unicode-org.atlassian.net/browse/ICU-22132 (fix not in 74.1)
 USE_MOZILLA=	-icu -sqlite
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 
 USES=		tar:xz
 
 MOZ_OPTIONS=	--enable-application=comm/mail --enable-official-branding
 MOZ_OPTIONS+=	--with-system-bz2 --with-system-jsonc --with-system-botan
 MOZ_MK_OPTIONS=	MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
 MOZ_EXPORT=		MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
 
 PORTNAME_ICON=	${MOZILLA}.png
 PORTNAME_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
 
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
 
 OPTIONS_DEFAULT=CANBERRA
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 MOZ_OPTIONS+=	--without-wasm-sandboxed-libraries
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 
 post-extract:
 	@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \
 		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/comm/mail/app/nsMailApp.cpp
 
 port-pre-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${LN} -sf ${PORTNAME_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME_ICON}
 
 .include <bsd.port.mk>
diff --git a/multimedia/avidemux-plugins/Makefile b/multimedia/avidemux-plugins/Makefile
index e69f338a8bad..027aad601ef4 100644
--- a/multimedia/avidemux-plugins/Makefile
+++ b/multimedia/avidemux-plugins/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	avidemux
 PORTVERSION=	${AVIDEMUX_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-plugins
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor (Plugins)
 
 LIB_DEPENDS=	libADM6avutil.so.56:multimedia/avidemux
 
 MASTERDIR=	${.CURDIR}/../avidemux
 PLIST=		${.CURDIR}/pkg-plist
 
 .include "${MASTERDIR}/Makefile.common"
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/avidemux_plugins
 
 CMAKE_ARGS+=	-DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${PREFIX}"
 PLUGIN_UI=	COMMON SETTINGS
 
 .if ${PORT_OPTIONS:MCLI}
 BUILD_DEPENDS+=	avidemux-cli>0:multimedia/avidemux-cli
 RUN_DEPENDS+=	avidemux-cli>0:multimedia/avidemux-cli
 PLUGIN_UI+=	CLI
 .endif
 
 .if ${PORT_OPTIONS:MQT5}
 BUILD_DEPENDS+=	avidemux-qt5>0:multimedia/avidemux-qt5
 RUN_DEPENDS+=	avidemux-qt5>0:multimedia/avidemux-qt5
 PLUGIN_UI+=	QT4
 .endif
 
 CMAKE_ARGS+=	-DPLUGIN_UI="${PLUGIN_UI}"
 
 post-configure: post-configure-common
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile
index 3e126ae0c6a0..9bec48fa94e3 100644
--- a/multimedia/emby-server/Makefile
+++ b/multimedia/emby-server/Makefile
@@ -1,156 +1,156 @@
 PORTNAME=	emby-server
 DISTVERSION=	4.8.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	https://github.com/MediaBrowser/Emby.Releases/releases/download/${DISTVERSION}/ \
 		https://mediabrowser.github.io/embytools/
 DISTNAME=	emby-server-freebsd14_${DISTVERSION}_amd64
 DISTFILES=	${DISTNAME}.tar.xz \
 		ffdetect-${FFDETECT_VERSION}.tar.xz \
 		ffmpeg-${FFMPEG_VERSION}.tar.gz \
 		license.docx
 DIST_SUBDIR?=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}.tar.xz \
 		ffdetect-${FFDETECT_VERSION}.tar.xz \
 		ffmpeg-${FFMPEG_VERSION}.tar.gz
 
 MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Media server to organize, play & stream audio/video to various devices
 WWW=		https://emby.media/
 
 LICENSE=	UNKNOWN
 LICENSE_NAME=	custom
 LICENSE_FILE=	${DISTDIR}/${DIST_SUBDIR}/license.docx
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	nasm:devel/nasm \
 		${LOCALBASE}/include/CL/opencl.h:devel/opencl
 LIB_DEPENDS=	libaribb24.so:multimedia/aribb24 \
 		libass.so:multimedia/libass \
 		libchromaprint.so:audio/chromaprint \
 		libdav1d.so:multimedia/dav1d \
 		libdrm.so:graphics/libdrm \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libgnutls.so:security/gnutls \
 		libmfx.so:multimedia/intel-media-sdk \
 		libOpenCL.so:devel/ocl-icd \
 		libogg.so:audio/libogg \
 		libopus.so:audio/opus \
 		libpng.so:graphics/png \
 		libraw.so:graphics/libraw \
 		libtesseract.so:graphics/tesseract \
 		libtheora.so:multimedia/libtheora \
 		libva.so:multimedia/libva \
 		libvorbis.so:audio/libvorbis \
 		libvpx.so:multimedia/libvpx \
 		libwebp.so:graphics/webp \
 		libx264.so:multimedia/libx264 \
 		libx265.so:multimedia/x265 \
 		libzvbi.so:devel/libzvbi
 
 RUN_DEPENDS=	dotnet>0:lang/dotnet \
 		icu>0:devel/icu \
 		krb5>0:security/krb5 \
 		libexif>0:graphics/libexif \
 		libheif>0:graphics/libheif \
 		libimagequant>0:graphics/libimagequant \
 		libinotify>0:devel/libinotify \
 		libjxl>0:graphics/libjxl \
 		libunwind>0:devel/libunwind \
 		openexr>0:graphics/openexr \
 		openjpeg>0:graphics/openjpeg \
 		orc>0:devel/orc \
 		pango>0:x11-toolkits/pango \
 		tiff>0:graphics/tiff
 
 USES=		compiler:c11 gmake iconv localbase:ldflags magick:6 pkgconfig sqlite ssl:run
 USE_RC_SUBR=	${PORTNAME}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--cc="${CC}" \
 		--disable-alsa \
 		--disable-doc \
 		--disable-ffplay \
 		--disable-libxcb \
 		--disable-outdev=xv \
 		--disable-sdl2 \
 		--disable-shared \
 		--disable-sndio \
 		--disable-v4l2-m2m \
 		--disable-vdpau \
 		--disable-vulkan \
 		--disable-xlib \
 		--enable-chromaprint \
 		--enable-fontconfig \
 		--enable-gnutls \
 		--enable-gpl \
 		--enable-iconv \
 		--enable-libaribb24 \
 		--enable-libass \
 		--enable-libdav1d \
 		--enable-libdrm \
 		--enable-libfreetype \
 		--enable-libfribidi \
 		--enable-libmfx \
 		--enable-libopus \
 		--enable-libtesseract \
 		--enable-libtheora \
 		--enable-libvorbis \
 		--enable-libvpx \
 		--enable-libwebp \
 		--enable-libx264 \
 		--enable-libx265 \
 		--enable-libzvbi \
 		--enable-opencl \
 		--enable-optimizations \
 		--enable-static \
 		--enable-vaapi \
 		--enable-version3
 
 MAKE_ENV=	V=1
 
 CONFLICTS_INSTALL?=	emby-server-devel
 
 NOPRECIOUSMAKEVARS=	yes
 SUB_FILES=	SQLitePCLRaw.provider.sqlite3.dll.config
 SUB_LIST=	GROUP=${GROUPS} \
 		PORTNAME=${PORTNAME} \
 		RC_NAME=emby_server \
 		USER=${USERS}
 
 WRKSRC=		${WRKDIR}/${FFMPEG_WRKSRC}
 
 USERS=		emby
 GROUPS=		emby
 
 OPTIONS_DEFINE=		LAME
 OPTIONS_DEFAULT=	LAME
 
 LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CONFIGURE_ENABLE=	libmp3lame
 
 FFDETECT_VERSION=	2023_06_25-x64_freebsd14
 FFMPEG_VERSION=		2023_06_25-u1
 FFMPEG_WRKSRC=		ffmpeg-2023_06_25_public
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/emby-server/bin
 	(${INSTALL_PROGRAM} ${WRKDIR}/bin/ffdetect ${STAGEDIR}${PREFIX}/lib/emby-server/bin)
 	(${INSTALL_PROGRAM} ${WRKSRC}/ffmpeg ${STAGEDIR}${PREFIX}/lib/emby-server/bin)
 	(${INSTALL_PROGRAM} ${WRKSRC}/ffprobe ${STAGEDIR}${PREFIX}/lib/emby-server/bin)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/emby-server/lib
 	(cd ${WRKDIR}/lib && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/lib/emby-server/lib)
 	${RLN} ${LOCALBASE}/lib/libimagequant.so.0.4 ${STAGEDIR}${PREFIX}/lib/emby-server/lib/libimagequant.so.0
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/emby-server/system
 	(${INSTALL_DATA} ${WRKDIR}/SQLitePCLRaw.provider.sqlite3.dll.config ${STAGEDIR}${PREFIX}/lib/emby-server/system)
 	(cd ${WRKDIR}/system && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/emby-server/system "! -name EmbyServer")
 	(${INSTALL_PROGRAM} ${WRKDIR}/system/EmbyServer ${STAGEDIR}${PREFIX}/lib/emby-server/system)
 
 post-install:
 	@${FIND} -s ${STAGEDIR}${PREFIX}/lib -not -type d | ${SORT} | ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 1adf574f0712..80eecb8c51c5 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,688 +1,688 @@
 PORTNAME=	ffmpeg
 PORTVERSION=	6.1.2
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	https://ffmpeg.org/releases/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Realtime audio/video encoder/converter and streaming server
 WWW=		https://ffmpeg.org/
 
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_aarch64=	as:devel/binutils
 BUILD_DEPENDS_amd64=	nasm:devel/nasm
 BUILD_DEPENDS_armv6=	as:devel/binutils
 BUILD_DEPENDS_armv7=	as:devel/binutils
 BUILD_DEPENDS_i386=	nasm:devel/nasm
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	ffbuild/config.log
 USES=		compiler:c11 cpe gmake localbase:ldflags perl5 \
 		pkgconfig shebangfix tar:xz
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 SHEBANG_FILES=	doc/texi2pod.pl
 NOPRECIOUSMAKEVARS=	yes # ARCH
 
 PORTSCOUT=	limit:^6\.
 
 # Option CHROMAPRINT disabled, it cannot work and people are baffled.
 OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB AOM ARIBB24 ARIBCAPTION ASM ASS BS2B CACA CDIO \
 		CODEC2 DAV1D DAVS2 DC1394 DEBUG DOCS DRM FDK_AAC FLITE \
 		FONTCONFIG FREETYPE FREI0R FRIBIDI GLSLANG GME GSM HARFBUZZ ICONV ILBC \
 		JACK JXL KLVANC KVAZAAR LADSPA LAME LCMS2 LENSFUN LIBBLURAY LIBPLACEBO LIBRSVG2 \
 		LIBXML2 LTO LV2 MODPLUG MYSOFA NETWORK NVENC OPENAL OPENCL OPENGL \
 		OPENH264 OPENJPEG OPENMPT OPENVINO OPTIMIZED_CFLAGS OPUS POCKETSPHINX \
 		PULSEAUDIO RAV1E RABBITMQ RIST RTCPU RUBBERBAND SDL SHADERC SMB SNAPPY \
 		SNDIO SOXR SPEEX SRT SSH SVTAV1 SVTHEVC SVTVP9 TENSORFLOW \
 		TESSERACT THEORA TWOLAME UAVS3D V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB \
 		VMAF VO_AMRWBENC VORBIS VPX VULKAN WEBP X264 X265 \
 		XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI
 # intel-media-sdk only for i386/amd64
 OPTIONS_DEFINE_amd64=	MFX VPL
 OPTIONS_DEFINE_i386=	MFX
 
 OPTIONS_DEFAULT=	AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP \
 			GNUTLS HARFBUZZ ICONV JXL LAME LCMS2 LIBPLACEBO LIBXML2 NETWORK \
 			OPTIMIZED_CFLAGS OPUS RTCPU SHADERC SVTAV1 V4L VAAPI VDPAU VMAF \
 			VORBIS VPX VULKAN WEBP X264 X265 XCB
 OPTIONS_DEFAULT_aarch64=LTO
 OPTIONS_DEFAULT_amd64=	LTO NVENC
 OPTIONS_DEFAULT_i386=	NVENC
 
 # i386 is too register-starved for LTO (PR257124)
 OPTIONS_EXCLUDE_i386=	LTO
 
 .if !exists(${.CURDIR:H:H}/multimedia/libaribcaption)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/b6138633cdf2
 OPTIONS_EXCLUDE+=	ARIBCAPTION
 .endif
 
 .if !exists(${.CURDIR:H:H}/multimedia/davs2)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/5985a1bf7233
 OPTIONS_EXCLUDE+=	DAVS2
 .endif
 
 .if !exists(${.CURDIR:H:H}/multimedia/uavs3d)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/c952db9d68d3
 OPTIONS_EXCLUDE+=	UAVS3D
 .endif
 
 .if !exists(${.CURDIR:H:H}/multimedia/xavs2)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/85a921f4618
 OPTIONS_EXCLUDE+=	XAVS2
 .endif
 
 .if !exists(${.CURDIR:H:H}/multimedia/klvanc)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/8732dfa9954
 OPTIONS_EXCLUDE+=	KLVANC
 .endif
 
 .if !exists(${.CURDIR:H:H}/science/openvino)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ff37ebaf30e6
 OPTIONS_EXCLUDE+=	OPENVINO
 .endif
 
 OPTIONS_RADIO=	RTMP SSL
 OPTIONS_RADIO_RTMP=	GCRYPT GMP
 OPTIONS_RADIO_SSL=	GNUTLS MBEDTLS OPENSSL
 OPTIONS_GROUP=	LICENSE
 OPTIONS_GROUP_LICENSE=	GPL3 NONFREE
 
 ASS_DESC=	Subtitles rendering via libass
 AOM_DESC=	AV1 video encoding/decoding via libaom
 ARIBB24_DESC=	ARIB text and caption decoding via libaribb24
 ARIBCAPTION_DESC=	ARIB text and caption decoding via libaribcaption
 BS2B_DESC=	Bauer Stereophonic-to-Binaural filter
 CHROMAPRINT_DESC=	Audio fingerprinting with chromaprint
 CODEC2_DESC=	Codec 2 audio encoding/decoding via libcodec2
 DAV1D_DESC=	AV1 video decoding via libdav1d
 DAVS2_DESC=	AVS2 decoding via libdavs2
 DC1394_DESC=	IIDC-1394 grabbing using libdc1394
 DRM_DESC=	KMS grabbing using libdrm
 FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
 FLITE_DESC=	Voice synthesis support via libflite
 GLSLANG_DESC=	GLSL->SPIRV compilation via libglslang
 GME_DESC=	Game Music Emu demuxer
 GPL3_DESC=	Allow (L)GPL version 3 code(cs)
 HARFBUZZ_DESC=	Text shaping via HarfBuzz
 ILBC_DESC=	Internet Low Bit Rate codec
 KLVANC_DESC=	Kernel Labs VANC processing
 KVAZAAR_DESC=	H.265 video codec support via Kvazaar
 LICENSE_DESC=	Licensing options
 LV2_DESC=	LV2 audio filtering
 MFX_DESC=	Intel MediaSDK (aka Quick Sync Video)
 MYSOFA_DESC=	SOFAlizer binaural filter
 NETWORK_DESC=	Networking support
 NONFREE_DESC=	Allow use of nonfree code
 NVENC_DESC=	NVIDIA decoder/encoder with CUDA support
 OPENMPT_DESC=	Decoding tracked files via libopenmpt
 OPENH264_DESC=	H.264 video codec support via OpenH264
 OPENVINO_DESC=	OpenVINO as a DNN module backend for DNN based filters like dnn_processing
 POCKETSPHINX_DESC=	Automatic Speech Recognition via PocketSphinx
 RAV1E_DESC=	AV1 encoding via librav1e
 RABBITMQ_DESC=	AMQP 0-9-1 protocol via RabbitMQ
 RIST_DESC=	Reliable Internet Stream Transport protocol via librist
 RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband
 RTCPU_DESC=	Detect CPU capabilities at runtime
 RTMP_DESC=	RTMP(T)E protocol support
 SHADERC_DESC=	GLSL->SPIRV compilation via libshaderc
 SRT_DESC=	Haivision SRT protocol via libsrt
 SVTAV1_DESC=	AV1 encoding via SVT-AV1
 SVTHEVC_DESC=	HEVC encoding via SVT-HEVC
 SVTVP9_DESC=	VP9 encoding via SVT-VP9
 LIBPLACEBO_DESC=GPU filters from libplacebo
 TENSORFLOW_DESC=TensorFlow as a DNN module backend for DNN based filters like sr
 TESSERACT_DESC=	Optical Character Recognition via Tesseract
 THEORA_DESC=	Encoding support for theora via libtheora
 UAVS3D_DESC=	AVS3 decoding via libuavs3d
 VAPOURSYNTH_DESC=	VapourSynth demuxer
 VIDSTAB_DESC=	Video stabilization filter
 VMAF_DESC=	VMAF filter via libvmaf
 VPL_DESC=	Intel oneVPL (aka Quick Sync Video)
 VULKAN_DESC=	Vulkan filters
 XAVS2_DESC=	AVS2 encoding via libxavs2
 XCB_DESC=	X11 grabbing using XCB
 XVID_DESC=	Encoding support for MPEG-4 ASP via libxvid
 ZIMG_DESC=	"z" library video scaling filter
 ZMQ_DESC=	Message passing via libzmq${ZMQ_VERSION}
 ZVBI_DESC=	Teletext support via libzvbi
 
 OPTIONS_SUB=	yes
 
 # alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
 
 # Opencore AMR NB
 AMR_NB_LIB_DEPENDS=	libopencore-amrnb.so:audio/opencore-amr
 AMR_NB_CONFIGURE_ENABLE=	libopencore-amrnb
 AMR_NB_IMPLIES=		GPL3
 
 # Opencore AMR WB
 AMR_WB_LIB_DEPENDS=	libopencore-amrwb.so:audio/opencore-amr
 AMR_WB_CONFIGURE_ENABLE=	libopencore-amrwb
 AMR_WB_IMPLIES=		GPL3
 
 # aom
 AOM_LIB_DEPENDS=	libaom.so:multimedia/aom
 AOM_CONFIGURE_ENABLE=	libaom
 
 # arib
 ARIBB24_LIB_DEPENDS=	libaribb24.so:multimedia/aribb24
 ARIBB24_CONFIGURE_ENABLE=	libaribb24
 
 # aribcaption
 ARIBCAPTION_LIB_DEPENDS=	libaribcaption.so:multimedia/libaribcaption
 ARIBCAPTION_CONFIGURE_ENABLE=	libaribcaption
 
 # asm support
 ASM_CONFIGURE_ENABLE=	asm
 
 # ass
 ASS_LIB_DEPENDS=	libass.so:multimedia/libass
 ASS_CONFIGURE_ENABLE=	libass
 
 # bs2b
 BS2B_LIB_DEPENDS=	libbs2b.so:audio/libbs2b
 BS2B_CONFIGURE_ENABLE=	libbs2b
 
 # caca
 CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
 CACA_CONFIGURE_ENABLE=	libcaca
 
 # cdio
 CDIO_LIB_DEPENDS=	libcdio_paranoia.so:sysutils/libcdio-paranoia
 CDIO_CONFIGURE_ENABLE=	libcdio
 
 # chromaprint
 CHROMAPRINT_BROKEN=		Dependency loop
 CHROMAPRINT_LIB_DEPENDS=	libchromaprint.so:audio/chromaprint
 CHROMAPRINT_CONFIGURE_ENABLE=	chromaprint
 
 # codec2
 CODEC2_LIB_DEPENDS=	libcodec2.so:audio/codec2
 CODEC2_CONFIGURE_ENABLE=	libcodec2
 
 # dav1d
 DAV1D_LIB_DEPENDS=	libdav1d.so:multimedia/dav1d
 DAV1D_CONFIGURE_ENABLE=	libdav1d
 
 # davs2
 DAVS2_LIB_DEPENDS=	libdavs2.so:multimedia/davs2
 DAVS2_CONFIGURE_ENABLE=	libdavs2
 
 # dc1394
 DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
 DC1394_CONFIGURE_ENABLE=	libdc1394
 
 # debugging
 DEBUG_CONFIGURE_ON=	--disable-stripping
 DEBUG_CONFIGURE_OFF=	--disable-debug
 
 # docs
 DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
 DOCS_CONFIGURE_ENABLE=	htmlpages
 DOCS_BINARY_ALIAS=	makeinfo=${FALSE} # force texi2html
 
 # drm
 DRM_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 DRM_CONFIGURE_ENABLE=	libdrm
 
 # fdk_aac
 FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
 FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
 FDK_AAC_IMPLIES=	NONFREE
 
 # flite
 FLITE_LIB_DEPENDS=	libflite.so:audio/flite
 FLITE_CONFIGURE_ENABLE=	libflite
 
 # fontconfig
 FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 FONTCONFIG_CONFIGURE_ENABLE=	fontconfig
 
 # freetype
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	libfreetype
 
 # frei0r
 FREI0R_BUILD_DEPENDS=	${LOCALBASE}/include/frei0r.h:graphics/frei0r
 FREI0R_CONFIGURE_ENABLE=	frei0r
 
 # fribidi
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_ENABLE=	libfribidi
 
 # gcrypt
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 GCRYPT_CONFIGURE_ENABLE=	gcrypt
 
 # glslang
 GLSLANG_BUILD_DEPENDS=	glslang>0:graphics/glslang \
 			spirv-tools>0:graphics/spirv-tools
 GLSLANG_CONFIGURE_ENABLE=	libglslang
 GLSLANG_LDFLAGS=	-lm
 GLSLANG_IMPLIES=	VULKAN
 
 # gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ENABLE=	gnutls
 
 # gme
 GME_LIB_DEPENDS=	libgme.so:audio/libgme
 GME_CONFIGURE_ENABLE=	libgme
 
 # gmp
 GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 GMP_CONFIGURE_ENABLE=	gmp
 GMP_IMPLIES=		GPL3
 
 # gsm
 GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 GSM_CONFIGURE_ENABLE=	libgsm
 
 # harfbuzz
 HARFBUZZ_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 HARFBUZZ_CONFIGURE_ENABLE=	libharfbuzz
 
 # iconv
 ICONV_USES=	iconv
 ICONV_CONFIGURE_ENABLE=	iconv
 
 # ilbc
 ILBC_LIB_DEPENDS=	libilbc.so:net/libilbc
 ILBC_CONFIGURE_ENABLE=	libilbc
 
 # jack
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=	libjack
 
 # jxl
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_CONFIGURE_ENABLE=	libjxl
 
 # klvanc
 KLVANC_LIB_DEPENDS=	libklvanc.so:multimedia/libklvanc
 KLVANC_CONFIGURE_ENABLE=	libklvanc
 
 # kvazaar
 KVAZAAR_LIB_DEPENDS=	libkvazaar.so:multimedia/kvazaar
 KVAZAAR_CONFIGURE_ENABLE=	libkvazaar
 
 # ladspa
 LADSPA_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa
 LADSPA_CONFIGURE_ENABLE=	ladspa
 
 # lame
 LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CONFIGURE_ENABLE=	libmp3lame
 
 # lcms2
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 LCMS2_CONFIGURE_ENABLE=	lcms2
 
 # lensfun
 LENSFUN_LIB_DEPENDS=	liblensfun.so:graphics/lensfun
 LENSFUN_CONFIGURE_ENABLE=	liblensfun
 
 # libbluray
 LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_ENABLE=	libbluray
 
 # libplacebo
 LIBPLACEBO_LIB_DEPENDS=	libplacebo.so:graphics/libplacebo
 LIBPLACEBO_CONFIGURE_ENABLE=	libplacebo
 LIBPLACEBO_IMPLIES=	VULKAN
 
 # librsvg
 LIBRSVG2_USES=			gnome
 LIBRSVG2_USE=			GNOME=cairo,librsvg2
 LIBRSVG2_CONFIGURE_ENABLE=	librsvg
 
 # libxml
 LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 LIBXML2_CONFIGURE_ENABLE=	libxml2
 
 # lto
 LTO_CONFIGURE_ON=	--enable-lto
 
 # lv2
 LV2_BUILD_DEPENDS=	lv2>0:audio/lv2
 LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv
 LV2_CONFIGURE_ENABLE=	lv2
 
 # libv4l
 V4L_BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_ENABLE=	libv4l2
 V4L_CONFIGURE_OFF=		--disable-indev=v4l2 \
 				--disable-outdev=v4l2
 
 # mbedtls
 MBEDTLS_LIB_DEPENDS=	libmbedtls.so:security/mbedtls
 MBEDTLS_CONFIGURE_ENABLE=	mbedtls
 
 # mfx
 MFX_LIB_DEPENDS=	libmfx.so:multimedia/intel-media-sdk
 MFX_CONFIGURE_ENABLE=	libmfx
 
 # modplug
 MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CONFIGURE_ENABLE=	libmodplug
 
 # mysofa
 MYSOFA_LIB_DEPENDS=	libmysofa.so:audio/libmysofa
 MYSOFA_CONFIGURE_ENABLE=	libmysofa
 
 # network
 NETWORK_CONFIGURE_ENABLE=	network
 
 # nvenc
 NVENC_BUILD_DEPENDS=	ffnvcodec-headers>=11.1.5.2:multimedia/ffnvcodec-headers
 NVENC_CONFIGURE_ENABLE=	nvenc
 
 # OpenAL
 OPENAL_LIB_DEPENDS=	libopenal.so:audio/openal-soft
 OPENAL_CONFIGURE_ENABLE=	openal
 
 # opencl
 OPENCL_BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:devel/opencl
 OPENCL_LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 OPENCL_CONFIGURE_ENABLE=	opencl
 
 # opengl
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gl
 OPENGL_CONFIGURE_ENABLE=	opengl
 
 # openh264
 OPENH264_LIB_DEPENDS=	libopenh264.so:multimedia/openh264
 OPENH264_CONFIGURE_ENABLE=	libopenh264
 
 # openjpeg
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
 
 # openmpt
 OPENMPT_LIB_DEPENDS=	libopenmpt.so:audio/libopenmpt
 OPENMPT_CONFIGURE_ENABLE=	libopenmpt
 
 # openssl/libtls
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ENABLE=	${"${SSL_DEFAULT:Mlibressl*}"!="":?libtls:openssl}
 OPENSSL_IMPLIES=	NONFREE
 
 # openvino
 OPENVINO_LIB_DEPENDS=	libinference_engine_c_api.so:science/openvino
 OPENVINO_CONFIGURE_ENABLE=	libopenvino
 
 # optimizations
 OPTIMIZED_CFLAGS_CONFIGURE_ENABLE=	optimizations
 
 # opus
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CONFIGURE_ENABLE=	libopus
 
 # pocketsphinx
 POCKETSPHINX_LIB_DEPENDS=	libpocketsphinx.so:audio/pocketsphinx
 POCKETSPHINX_CONFIGURE_ENABLE=	pocketsphinx
 POCKETSPHINX_BROKEN=	pocketsphinx < 5prealpha is not supported
 
 # pulseaudio
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	libpulse
 
 # rav1e
 RAV1E_LIB_DEPENDS=	librav1e.so:multimedia/librav1e
 RAV1E_CONFIGURE_ENABLE=	librav1e
 
 # rabbitmq
 RABBITMQ_LIB_DEPENDS=	librabbitmq.so:net/rabbitmq-c
 RABBITMQ_CONFIGURE_ENABLE=	librabbitmq
 
 # rist
 RIST_LIB_DEPENDS=	librist.so:multimedia/librist
 RIST_CONFIGURE_ENABLE=	librist
 
 # rubberband
 RUBBERBAND_LIB_DEPENDS=	librubberband.so:audio/rubberband
 RUBBERBAND_CONFIGURE_ENABLE=	librubberband
 
 # rtcpu
 RTCPU_CONFIGURE_ENABLE=	runtime-cpudetect
 
 # sdl
 SDL_USES=		sdl
 SDL_USE=		SDL=sdl2
 SDL_CONFIGURE_ENABLE=	sdl2
 
 # shaderc
 SHADERC_LIB_DEPENDS=	libshaderc_shared.so:graphics/shaderc
 SHADERC_CONFIGURE_ENABLE=	libshaderc
 SHADERC_IMPLIES=	VULKAN
 SHADERC_PREVENTS=	GLSLANG
 
 # smbclient
 SMB_USES=		samba:lib
 SMB_CONFIGURE_ENABLE=	libsmbclient
 SMB_IMPLIES=		GPL3
 
 # snappy
 SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
 SNAPPY_CONFIGURE_ENABLE=	libsnappy
 
 # sndio
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CONFIGURE_ENABLE=	sndio
 
 # soxr
 SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
 SOXR_CONFIGURE_ENABLE=	libsoxr
 
 # speex
 SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 SPEEX_CONFIGURE_ENABLE=	libspeex
 
 # ssh
 SSH_LIB_DEPENDS=	libssh.so:security/libssh
 SSH_CONFIGURE_ENABLE=	libssh
 
 # srt
 SRT_LIB_DEPENDS=	libsrt.so:www/srt
 SRT_CONFIGURE_ENABLE=	libsrt
 
 # svt-av1
 SVTAV1_LIB_DEPENDS=	libSvtAv1Enc.so:multimedia/svt-av1
 SVTAV1_CONFIGURE_ON=	--enable-libsvtav1
 
 # svt-hevc
 SVTHEVC_LIB_DEPENDS=	libSvtHevcEnc.so:multimedia/svt-hevc
 SVTHEVC_CONFIGURE_ON=	--enable-libsvthevc
 SVTHEVC_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-HEVC/raw/v1.5.1-12-g6cca5b93/ffmpeg_plugin/:svthevc
 SVTHEVC_PATCHFILES=	master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \
 			0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc
 .if make(makesum)
 .MAKEFLAGS:		WITH+=SVTHEVC
 .endif
 
 # svt-vp9
 SVTVP9_LIB_DEPENDS=	libSvtVp9Enc.so:multimedia/svt-vp9
 SVTVP9_CONFIGURE_ON=	--enable-libsvtvp9
 SVTVP9_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.3.0-20-gbab25a6/ffmpeg_plugin/:svtvp9
 SVTVP9_PATCHFILES=	master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9
 .if make(makesum)
 .MAKEFLAGS:		WITH+=SVTVP9
 .endif
 
 # tensorflow
 TENSORFLOW_LIB_DEPENDS=	libtensorflow.so:science/py-tensorflow
 TENSORFLOW_CONFIGURE_ENABLE=	libtensorflow
 
 # tesseract
 TESSERACT_LIB_DEPENDS=	libtesseract.so:graphics/tesseract
 TESSERACT_CONFIGURE_ENABLE=	libtesseract
 
 # theora
 THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=	libtheora
 
 # twolame
 TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
 TWOLAME_CONFIGURE_ENABLE=	libtwolame
 
 # uavs3d
 UAVS3D_LIB_DEPENDS=	libuavs3d.so:multimedia/uavs3d
 UAVS3D_CONFIGURE_ENABLE=	libuavs3d
 
 # vaapi
 VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CONFIGURE_ENABLE=	vaapi
 
 # vapoursynth
 VAPOURSYNTH_LIB_DEPENDS=	libvapoursynth-script.so:multimedia/vapoursynth
 VAPOURSYNTH_CONFIGURE_ENABLE=	vapoursynth
 
 # vdpau
 VDPAU_USES=		xorg
 VDPAU_USE=		XORG=x11
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
 
 # vmaf
 VMAF_LIB_DEPENDS=	libvmaf.so:multimedia/vmaf
 VMAF_CONFIGURE_ENABLE=	libvmaf
 
 # vo-amrwbenc
 VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:audio/vo-amrwbenc
 VO_AMRWBENC_CONFIGURE_ENABLE=	libvo-amrwbenc
 VO_AMRWBENC_IMPLIES=	GPL3
 
 # vid.stab
 VIDSTAB_LIB_DEPENDS=	libvidstab.so:multimedia/vid.stab
 VIDSTAB_CONFIGURE_ENABLE=	libvidstab
 
 # vorbis
 VORBIS_LIB_DEPENDS=	libvorbisenc.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	libvorbis
 
 # vpl
 VPL_LIB_DEPENDS=	libvpl.so:multimedia/onevpl
 VPL_CONFIGURE_ENABLE=	libvpl
 
 # vp8
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_ENABLE=	libvpx
 
 # vulkan
 VULKAN_BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 VULKAN_CONFIGURE_ENABLE=	vulkan
 
 # webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CONFIGURE_ENABLE=	libwebp
 
 # x264
 X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 X264_CONFIGURE_ENABLE=	libx264
 
 # x265
 X265_LIB_DEPENDS=	libx265.so:multimedia/x265
 X265_CONFIGURE_ENABLE=	libx265
 
 # xavs2
 XAVS2_LIB_DEPENDS=	libxavs2.so:multimedia/xavs2
 XAVS2_CONFIGURE_ENABLE=	libxavs2
 
 # xcb
 XCB_USES=		xorg
 XCB_USE=		XORG=xcb
 XCB_CONFIGURE_ENABLE=	libxcb
 
 # xvid
 XVID_LIB_DEPENDS=	libxvidcore.so:multimedia/xvid
 XVID_CONFIGURE_ENABLE=	libxvid
 
 # xv
 XVIDEO_USES=		xorg
 XVIDEO_USE=		XORG=x11,xext,xv
 XVIDEO_CONFIGURE_OFF=	--disable-outdev=xv
 
 # zimg
 ZIMG_LIB_DEPENDS=	libzimg.so:graphics/sekrit-twc-zimg
 ZIMG_CONFIGURE_ENABLE=	libzimg
 
 # zmq
 ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq${ZMQ_VERSION}
 ZMQ_CONFIGURE_ENABLE=	libzmq
 ZMQ_VERSION?=		4
 
 # zvbi
 ZVBI_LIB_DEPENDS=	libzvbi.so:devel/libzvbi
 ZVBI_CONFIGURE_ENABLE=	libzvbi
 
 # License knobs
 GPL3_CONFIGURE_ENABLE=	version3
 GPL3_VARS=		LICENSE="GPLv3+ LGPL3+"
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING.GPLv3
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING.LGPLv3
 
 NONFREE_CONFIGURE_ENABLE=nonfree
 
 INSTALL_TARGET=	install-progs install-doc install-data \
 		install-libs install-headers install-examples
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 MAKE_ENV+=	V=1
 CFLAGS_armv6=	-Wno-error=int-conversion
 CFLAGS_armv7=	-Wno-error=int-conversion
 CFLAGS_i386=	-Wno-error=int-conversion
 CFLAGS_powerpc=	-Wno-error=int-conversion
 LDFLAGS_aarch64=-Wl,-z,notext
 LDFLAGS_armv6=	-Wl,-z,notext
 LDFLAGS_armv7=	-Wl,-z,notext
 LDFLAGS_i386=	-Wl,-z,notext
 
 CONFIGURE_ARGS+=--prefix="${PREFIX}" \
 		--mandir="${PREFIX}/share/man" \
 		--datadir="${DATADIR}" \
 		--docdir="${DOCSDIR}" \
 		--pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
 		--disable-static \
 		--disable-libcelt \
 		--enable-shared \
 		--enable-pic \
 		--enable-gpl \
 		--cc="${CC}" \
 		--cxx="${CXX}"
 
 DOC_FILES=	Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \
 		README.md RELEASE_NOTES
 # under doc subdirectory
 DOC_DOCFILES=	APIchanges *.txt
 PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNONFREE}
 LICENSE+=	NONFREE
 LICENSE_COMB=	multi
 LICENSE_NAME_NONFREE=	Non free code
 LICENSE_TEXT_NONFREE=	enabling OPENSSL or FDK_AAC restricts redistribution
 LICENSE_PERMS_NONFREE=	auto-accept
 .endif
 
 post-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${DOC_FILES}" ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \
 		"${DOC_DOCFILES}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/multimedia/ffmpeg4/Makefile b/multimedia/ffmpeg4/Makefile
index 6492d959f0d4..82fe0575e606 100644
--- a/multimedia/ffmpeg4/Makefile
+++ b/multimedia/ffmpeg4/Makefile
@@ -1,646 +1,646 @@
 PORTNAME=	ffmpeg
 PORTVERSION=	4.4.4
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	https://ffmpeg.org/releases/
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Realtime audio/video encoder/converter and streaming server (legacy 4.* series)
 WWW=		https://ffmpeg.org/
 
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_aarch64=	as:devel/binutils
 BUILD_DEPENDS_amd64=	nasm:devel/nasm
 BUILD_DEPENDS_armv6=	as:devel/binutils
 BUILD_DEPENDS_armv7=	as:devel/binutils
 BUILD_DEPENDS_i386=	nasm:devel/nasm
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	ffbuild/config.log
 USES=		compiler:c11 cpe gmake localbase:ldflags perl5 \
 		pkgconfig shebangfix tar:xz
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 SHEBANG_FILES=	doc/texi2pod.pl
 NOPRECIOUSMAKEVARS=	yes # ARCH
 
 .ifdef PKGNAMESUFFIX
 PORTSCOUT=	limit:^4\.
 PREFIX=		${LOCALBASE}/${PKGBASE} # avoid conflict with the default
 .endif
 
 # Option CHROMAPRINT disabled, it cannot work and people are baffled.
 OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB AOM ARIBB24 ASM ASS BS2B CACA CDIO \
 		CODEC2 DAV1D DAVS2 DC1394 DEBUG DOCS DRM FDK_AAC FLITE \
 		FONTCONFIG FREETYPE FREI0R FRIBIDI GLSLANG GME GSM ICONV ILBC \
 		JACK KLVANC KVAZAAR LADSPA LAME LENSFUN LIBBLURAY LIBRSVG2 \
 		LIBXML2 LTO LV2 MODPLUG MYSOFA NETWORK NVENC OPENAL OPENCL OPENGL \
 		OPENH264 OPENJPEG OPENMPT OPENVINO OPTIMIZED_CFLAGS OPUS POCKETSPHINX \
 		PULSEAUDIO RAV1E RABBITMQ RIST RTCPU RUBBERBAND SDL SMB SNAPPY \
 		SNDIO SOXR SPEEX SRT SSH SVTAV1 SVTHEVC SVTVP9 TENSORFLOW \
 		TESSERACT THEORA TWOLAME UAVS3D V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB \
 		VMAF VO_AMRWBENC VORBIS VPX VULKAN WEBP X264 X265 \
 		XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI
 # intel-media-sdk only for i386/amd64
 OPTIONS_DEFINE_amd64=	MFX
 OPTIONS_DEFINE_i386=	MFX
 
 OPTIONS_DEFAULT=	AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP \
 			GNUTLS ICONV LAME LIBXML2 NETWORK OPTIMIZED_CFLAGS OPUS \
 			RTCPU SVTAV1 V4L VAAPI VDPAU VMAF VORBIS VPX WEBP X264 \
 			X265 XCB
 OPTIONS_DEFAULT_amd64=	NVENC
 OPTIONS_DEFAULT_i386=	NVENC
 
 # i386 is too register-starved for LTO (PR257124)
 OPTIONS_EXCLUDE_i386=	LTO
 
 .if !exists(${.CURDIR:H:H}/multimedia/davs2)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/5985a1bf7233
 OPTIONS_EXCLUDE+=	DAVS2
 .endif
 
 .if !exists(${.CURDIR:H:H}/multimedia/uavs3d)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/c952db9d68d3
 OPTIONS_EXCLUDE+=	UAVS3D
 .endif
 
 .if !exists(${.CURDIR:H:H}/multimedia/xavs2)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/85a921f4618
 OPTIONS_EXCLUDE+=	XAVS2
 .endif
 
 .if !exists(${.CURDIR:H:H}/multimedia/klvanc)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/8732dfa9954
 OPTIONS_EXCLUDE+=	KLVANC
 .endif
 
 .if !exists(${.CURDIR:H:H}/science/openvino)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ff37ebaf30e6
 OPTIONS_EXCLUDE+=	OPENVINO
 .endif
 
 OPTIONS_RADIO=	RTMP SSL
 OPTIONS_RADIO_RTMP=	GCRYPT GMP
 OPTIONS_RADIO_SSL=	GNUTLS MBEDTLS OPENSSL
 OPTIONS_GROUP=	LICENSE
 OPTIONS_GROUP_LICENSE=	GPL3 NONFREE
 
 ASS_DESC=	Subtitles rendering via libass
 AOM_DESC=	AV1 video encoding/decoding via libaom
 ARIBB24_DESC=	ARIB text and caption decoding via libaribb24
 BS2B_DESC=	Bauer Stereophonic-to-Binaural filter
 CHROMAPRINT_DESC=	Audio fingerprinting with chromaprint
 CODEC2_DESC=	Codec 2 audio encoding/decoding via libcodec2
 DAV1D_DESC=	AV1 video decoding via libdav1d
 DAVS2_DESC=	AVS2 decoding via libdavs2
 DC1394_DESC=	IIDC-1394 grabbing using libdc1394
 DRM_DESC=	KMS grabbing using libdrm
 FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
 FLITE_DESC=	Voice synthesis support via libflite
 GLSLANG_DESC=	GLSL->SPIRV compilation via libglslang
 GME_DESC=	Game Music Emu demuxer
 GPL3_DESC=	Allow (L)GPL version 3 code(cs)
 ILBC_DESC=	Internet Low Bit Rate codec
 KLVANC_DESC=	Kernel Labs VANC processing
 KVAZAAR_DESC=	H.265 video codec support via Kvazaar
 LICENSE_DESC=	Licensing options
 LV2_DESC=	LV2 audio filtering
 MFX_DESC=	Intel MediaSDK (aka Quick Sync Video)
 MYSOFA_DESC=	SOFAlizer binaural filter
 NETWORK_DESC=	Networking support
 NONFREE_DESC=	Allow use of nonfree code
 NVENC_DESC=	NVIDIA decoder/encoder with CUDA support
 OPENMPT_DESC=	Decoding tracked files via libopenmpt
 OPENH264_DESC=	H.264 video codec support via OpenH264
 OPENVINO_DESC=	OpenVINO as a DNN module backend for DNN based filters like dnn_processing
 POCKETSPHINX_DESC=	Automatic Speech Recognition via PocketSphinx
 RAV1E_DESC=	AV1 encoding via librav1e
 RABBITMQ_DESC=	AMQP 0-9-1 protocol via RabbitMQ
 RIST_DESC=	Reliable Internet Stream Transport protocol via librist
 RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband
 RTCPU_DESC=	Detect CPU capabilities at runtime
 RTMP_DESC=	RTMP(T)E protocol support
 SRT_DESC=	Haivision SRT protocol via libsrt
 SVTAV1_DESC=	AV1 encoding via SVT-AV1
 SVTHEVC_DESC=	HEVC encoding via SVT-HEVC
 SVTVP9_DESC=	VP9 encoding via SVT-VP9
 TENSORFLOW_DESC=TensorFlow as a DNN module backend for DNN based filters like sr
 TESSERACT_DESC=	Optical Character Recognition via Tesseract
 THEORA_DESC=	Encoding support for theora via libtheora
 UAVS3D_DESC=	AVS3 decoding via libuavs3d
 VAPOURSYNTH_DESC=	VapourSynth demuxer
 VIDSTAB_DESC=	Video stabilization filter
 VMAF_DESC=	VMAF filter via libvmaf
 VULKAN_DESC=	Vulkan filters
 XAVS2_DESC=	AVS2 encoding via libxavs2
 XCB_DESC=	X11 grabbing using XCB
 XVID_DESC=	Encoding support for MPEG-4 ASP via libxvid
 ZIMG_DESC=	"z" library video scaling filter
 ZMQ_DESC=	Message passing via libzmq${ZMQ_VERSION}
 ZVBI_DESC=	Teletext support via libzvbi
 
 OPTIONS_SUB=	yes
 
 # alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
 
 # Opencore AMR NB
 AMR_NB_LIB_DEPENDS=	libopencore-amrnb.so:audio/opencore-amr
 AMR_NB_CONFIGURE_ENABLE=	libopencore-amrnb
 AMR_NB_IMPLIES=		GPL3
 
 # Opencore AMR WB
 AMR_WB_LIB_DEPENDS=	libopencore-amrwb.so:audio/opencore-amr
 AMR_WB_CONFIGURE_ENABLE=	libopencore-amrwb
 AMR_WB_IMPLIES=		GPL3
 
 # aom
 AOM_LIB_DEPENDS=	libaom.so:multimedia/aom
 AOM_CONFIGURE_ENABLE=	libaom
 
 # arib
 ARIBB24_LIB_DEPENDS=	libaribb24.so:multimedia/aribb24
 ARIBB24_CONFIGURE_ENABLE=	libaribb24
 
 # asm support
 ASM_CONFIGURE_ENABLE=	asm
 
 # ass
 ASS_LIB_DEPENDS=	libass.so:multimedia/libass
 ASS_CONFIGURE_ENABLE=	libass
 
 # bs2b
 BS2B_LIB_DEPENDS=	libbs2b.so:audio/libbs2b
 BS2B_CONFIGURE_ENABLE=	libbs2b
 
 # caca
 CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
 CACA_CONFIGURE_ENABLE=	libcaca
 
 # cdio
 CDIO_LIB_DEPENDS=	libcdio_paranoia.so:sysutils/libcdio-paranoia
 CDIO_CONFIGURE_ENABLE=	libcdio
 
 # chromaprint
 CHROMAPRINT_BROKEN=		Dependency loop
 CHROMAPRINT_LIB_DEPENDS=	libchromaprint.so:audio/chromaprint
 CHROMAPRINT_CONFIGURE_ENABLE=	chromaprint
 
 # codec2
 CODEC2_LIB_DEPENDS=	libcodec2.so:audio/codec2
 CODEC2_CONFIGURE_ENABLE=	libcodec2
 
 # dav1d
 DAV1D_LIB_DEPENDS=	libdav1d.so:multimedia/dav1d
 DAV1D_CONFIGURE_ENABLE=	libdav1d
 
 # davs2
 DAVS2_LIB_DEPENDS=	libdavs2.so:multimedia/davs2
 DAVS2_CONFIGURE_ENABLE=	libdavs2
 
 # dc1394
 DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
 DC1394_CONFIGURE_ENABLE=	libdc1394
 
 # debugging
 DEBUG_CONFIGURE_ON=	--disable-stripping
 DEBUG_CONFIGURE_OFF=	--disable-debug
 
 # docs
 DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
 DOCS_CONFIGURE_ENABLE=	htmlpages
 DOCS_BINARY_ALIAS=	makeinfo=${FALSE} # force texi2html
 
 # drm
 DRM_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 DRM_CONFIGURE_ENABLE=	libdrm
 
 # fdk_aac
 FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
 FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
 FDK_AAC_IMPLIES=	NONFREE
 
 # flite
 FLITE_LIB_DEPENDS=	libflite.so:audio/flite
 FLITE_CONFIGURE_ENABLE=	libflite
 
 # fontconfig
 FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 FONTCONFIG_CONFIGURE_ENABLE=	fontconfig
 
 # freetype
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	libfreetype
 
 # frei0r
 FREI0R_BUILD_DEPENDS=	${LOCALBASE}/include/frei0r.h:graphics/frei0r
 FREI0R_CONFIGURE_ENABLE=	frei0r
 
 # fribidi
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_ENABLE=	libfribidi
 
 # gcrypt
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 GCRYPT_CONFIGURE_ENABLE=	gcrypt
 
 # glslang
 GLSLANG_BUILD_DEPENDS=	glslang>0:graphics/glslang \
 			spirv-tools>0:graphics/spirv-tools
 GLSLANG_CONFIGURE_ENABLE=	libglslang
 GLSLANG_LDFLAGS=	-lm
 GLSLANG_IMPLIES=	VULKAN
 
 # gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ENABLE=	gnutls
 
 # gme
 GME_LIB_DEPENDS=	libgme.so:audio/libgme
 GME_CONFIGURE_ENABLE=	libgme
 
 # gmp
 GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 GMP_CONFIGURE_ENABLE=	gmp
 GMP_IMPLIES=		GPL3
 
 # gsm
 GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 GSM_CONFIGURE_ENABLE=	libgsm
 
 # iconv
 ICONV_USES=	iconv
 ICONV_CONFIGURE_ENABLE=	iconv
 
 # ilbc
 ILBC_LIB_DEPENDS=	libilbc.so:net/libilbc
 ILBC_CONFIGURE_ENABLE=	libilbc
 
 # jack
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=	libjack
 
 # klvanc
 KLVANC_LIB_DEPENDS=	libklvanc.so:multimedia/libklvanc
 KLVANC_CONFIGURE_ENABLE=	libklvanc
 
 # kvazaar
 KVAZAAR_LIB_DEPENDS=	libkvazaar.so:multimedia/kvazaar
 KVAZAAR_CONFIGURE_ENABLE=	libkvazaar
 
 # ladspa
 LADSPA_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa
 LADSPA_CONFIGURE_ENABLE=	ladspa
 
 # lame
 LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CONFIGURE_ENABLE=	libmp3lame
 
 # lensfun
 LENSFUN_LIB_DEPENDS=	liblensfun.so:graphics/lensfun
 LENSFUN_CONFIGURE_ENABLE=	liblensfun
 
 # libbluray
 LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_ENABLE=	libbluray
 
 # librsvg
 LIBRSVG2_USES=			gnome
 LIBRSVG2_USE=			GNOME=cairo,librsvg2
 LIBRSVG2_CONFIGURE_ENABLE=	librsvg
 
 # libxml
 LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 LIBXML2_CONFIGURE_ENABLE=	libxml2
 
 # lto
 LTO_CONFIGURE_ENABLE=	lto
 
 # lv2
 LV2_BUILD_DEPENDS=	lv2>0:audio/lv2
 LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv
 LV2_CONFIGURE_ENABLE=	lv2
 
 # libv4l
 V4L_BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_ENABLE=	libv4l2
 V4L_CONFIGURE_OFF=		--disable-indev=v4l2 \
 				--disable-outdev=v4l2
 
 # mbedtls
 MBEDTLS_LIB_DEPENDS=	libmbedtls.so:security/mbedtls
 MBEDTLS_CONFIGURE_ENABLE=	mbedtls
 
 # mfx
 MFX_LIB_DEPENDS=	libmfx.so:multimedia/intel-media-sdk
 MFX_CONFIGURE_ENABLE=	libmfx
 
 # modplug
 MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CONFIGURE_ENABLE=	libmodplug
 
 # mysofa
 MYSOFA_LIB_DEPENDS=	libmysofa.so:audio/libmysofa
 MYSOFA_CONFIGURE_ENABLE=	libmysofa
 
 # network
 NETWORK_CONFIGURE_ENABLE=	network
 
 # nvenc
 NVENC_BUILD_DEPENDS=	${LOCALBASE}/include/ffnvcodec/nvEncodeAPI.h:multimedia/ffnvcodec-headers
 NVENC_CONFIGURE_ENABLE=	nvenc
 
 # OpenAL
 OPENAL_LIB_DEPENDS=	libopenal.so:audio/openal-soft
 OPENAL_CONFIGURE_ENABLE=	openal
 
 # opencl
 OPENCL_BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:devel/opencl
 OPENCL_LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 OPENCL_CONFIGURE_ENABLE=	opencl
 
 # opengl
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gl
 OPENGL_CONFIGURE_ENABLE=	opengl
 
 # openh264
 OPENH264_LIB_DEPENDS=	libopenh264.so:multimedia/openh264
 OPENH264_CONFIGURE_ENABLE=	libopenh264
 
 # openjpeg
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
 
 # openmpt
 OPENMPT_LIB_DEPENDS=	libopenmpt.so:audio/libopenmpt
 OPENMPT_CONFIGURE_ENABLE=	libopenmpt
 
 # openssl/libtls
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ENABLE=	${"${SSL_DEFAULT:Mlibressl*}"!="":?libtls:openssl}
 OPENSSL_IMPLIES=	NONFREE
 
 # openvino
 OPENVINO_LIB_DEPENDS=	libinference_engine_c_api.so:science/openvino
 OPENVINO_CONFIGURE_ENABLE=	libopenvino
 
 # optimizations
 OPTIMIZED_CFLAGS_CONFIGURE_ENABLE=	optimizations
 
 # opus
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CONFIGURE_ENABLE=	libopus
 
 # pocketsphinx
 POCKETSPHINX_LIB_DEPENDS=	libpocketsphinx.so:audio/pocketsphinx
 POCKETSPHINX_CONFIGURE_ENABLE=	pocketsphinx
 POCKETSPHINX_BROKEN=	pocketsphinx < 5prealpha is not supported
 
 # pulseaudio
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	libpulse
 
 # rav1e
 RAV1E_LIB_DEPENDS=	librav1e.so:multimedia/librav1e
 RAV1E_CONFIGURE_ENABLE=	librav1e
 
 # rabbitmq
 RABBITMQ_LIB_DEPENDS=	librabbitmq.so:net/rabbitmq-c
 RABBITMQ_CONFIGURE_ENABLE=	librabbitmq
 
 # rist
 RIST_LIB_DEPENDS=	librist.so:multimedia/librist
 RIST_CONFIGURE_ENABLE=	librist
 
 # rubberband
 RUBBERBAND_LIB_DEPENDS=	librubberband.so:audio/rubberband
 RUBBERBAND_CONFIGURE_ENABLE=	librubberband
 
 # rtcpu
 RTCPU_CONFIGURE_ENABLE=	runtime-cpudetect
 
 # sdl
 SDL_USES=		sdl
 SDL_USE=		SDL=sdl2
 SDL_CONFIGURE_ENABLE=	sdl2
 
 # smbclient
 SMB_USES=		samba:lib
 SMB_CONFIGURE_ENABLE=	libsmbclient
 SMB_IMPLIES=		GPL3
 
 # snappy
 SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
 SNAPPY_CONFIGURE_ENABLE=	libsnappy
 
 # sndio
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CONFIGURE_ENABLE=	sndio
 
 # soxr
 SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
 SOXR_CONFIGURE_ENABLE=	libsoxr
 
 # speex
 SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 SPEEX_CONFIGURE_ENABLE=	libspeex
 
 # ssh
 SSH_LIB_DEPENDS=	libssh.so:security/libssh
 SSH_CONFIGURE_ENABLE=	libssh
 
 # srt
 SRT_LIB_DEPENDS=	libsrt.so:www/srt
 SRT_CONFIGURE_ENABLE=	libsrt
 
 # svt-av1
 SVTAV1_LIB_DEPENDS=	libSvtAv1Enc.so:multimedia/svt-av1
 SVTAV1_CONFIGURE_ON=	--enable-libsvtav1
 
 # svt-hevc
 SVTHEVC_LIB_DEPENDS=	libSvtHevcEnc.so:multimedia/svt-hevc
 SVTHEVC_CONFIGURE_ON=	--enable-libsvthevc
 SVTHEVC_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-HEVC/raw/v1.5.0-3-g86b58f77/ffmpeg_plugin/:svthevc
 SVTHEVC_PATCHFILES=	0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \
 			0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc
 .if make(makesum)
 .MAKEFLAGS:		WITH+=SVTHEVC
 .endif
 
 # svt-vp9
 SVTVP9_LIB_DEPENDS=	libSvtVp9Enc.so:multimedia/svt-vp9
 SVTVP9_CONFIGURE_ON=	--enable-libsvtvp9
 SVTVP9_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.3.0-4-gabd5c59/ffmpeg_plugin/:svtvp9
 SVTVP9_PATCHFILES=	master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9
 .if make(makesum)
 .MAKEFLAGS:		WITH+=SVTVP9
 .endif
 
 # tensorflow
 TENSORFLOW_LIB_DEPENDS=	libtensorflow.so:science/py-tensorflow
 TENSORFLOW_CONFIGURE_ENABLE=	libtensorflow
 
 # tesseract
 TESSERACT_LIB_DEPENDS=	libtesseract.so:graphics/tesseract
 TESSERACT_CONFIGURE_ENABLE=	libtesseract
 
 # theora
 THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=	libtheora
 
 # twolame
 TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
 TWOLAME_CONFIGURE_ENABLE=	libtwolame
 
 # uavs3d
 UAVS3D_LIB_DEPENDS=	libuavs3d.so:multimedia/uavs3d
 UAVS3D_CONFIGURE_ENABLE=	libuavs3d
 
 # vaapi
 VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CONFIGURE_ENABLE=	vaapi
 
 # vapoursynth
 VAPOURSYNTH_LIB_DEPENDS=	libvapoursynth-script.so:multimedia/vapoursynth
 VAPOURSYNTH_CONFIGURE_ENABLE=	vapoursynth
 
 # vdpau
 VDPAU_USES=		xorg
 VDPAU_USE=		XORG=x11
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
 
 # vmaf
 VMAF_LIB_DEPENDS=	libvmaf.so:multimedia/vmaf
 VMAF_CONFIGURE_ENABLE=	libvmaf
 
 # vo-amrwbenc
 VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:audio/vo-amrwbenc
 VO_AMRWBENC_CONFIGURE_ENABLE=	libvo-amrwbenc
 VO_AMRWBENC_IMPLIES=	GPL3
 
 # vid.stab
 VIDSTAB_LIB_DEPENDS=	libvidstab.so:multimedia/vid.stab
 VIDSTAB_CONFIGURE_ENABLE=	libvidstab
 
 # vorbis
 VORBIS_LIB_DEPENDS=	libvorbisenc.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	libvorbis
 
 # vp8
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_ENABLE=	libvpx
 
 # vulkan
 VULKAN_BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 VULKAN_CONFIGURE_ENABLE=	vulkan
 
 # webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CONFIGURE_ENABLE=	libwebp
 
 # x264
 X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 X264_CONFIGURE_ENABLE=	libx264
 
 # x265
 X265_LIB_DEPENDS=	libx265.so:multimedia/x265
 X265_CONFIGURE_ENABLE=	libx265
 
 # xavs2
 XAVS2_LIB_DEPENDS=	libxavs2.so:multimedia/xavs2
 XAVS2_CONFIGURE_ENABLE=	libxavs2
 
 # xcb
 XCB_USES=		xorg
 XCB_USE=		XORG=xcb
 XCB_CONFIGURE_ENABLE=	libxcb
 
 # xvid
 XVID_LIB_DEPENDS=	libxvidcore.so:multimedia/xvid
 XVID_CONFIGURE_ENABLE=	libxvid
 
 # xv
 XVIDEO_USES=		xorg
 XVIDEO_USE=		XORG=x11,xext,xv
 XVIDEO_CONFIGURE_OFF=	--disable-outdev=xv
 
 # zimg
 ZIMG_LIB_DEPENDS=	libzimg.so:graphics/sekrit-twc-zimg
 ZIMG_CONFIGURE_ENABLE=	libzimg
 
 # zmq
 ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq${ZMQ_VERSION}
 ZMQ_CONFIGURE_ENABLE=	libzmq
 ZMQ_VERSION?=		4
 
 # zvbi
 ZVBI_LIB_DEPENDS=	libzvbi.so:devel/libzvbi
 ZVBI_CONFIGURE_ENABLE=	libzvbi
 
 # License knobs
 GPL3_CONFIGURE_ENABLE=	version3
 GPL3_VARS=		LICENSE="GPLv3+ LGPL3+"
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING.GPLv3
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING.LGPLv3
 
 NONFREE_CONFIGURE_ENABLE=nonfree
 
 INSTALL_TARGET=	install-progs install-doc install-data \
 		install-libs install-headers install-examples
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 MAKE_ENV+=	V=1
 LDFLAGS_aarch64=-Wl,-z,notext
 LDFLAGS_armv6=	-Wl,-z,notext
 LDFLAGS_armv7=	-Wl,-z,notext
 LDFLAGS_i386=	-Wl,-z,notext
 
 CONFIGURE_ARGS+=--prefix="${PREFIX}" \
 		--mandir="${PREFIX}/share/man" \
 		--datadir="${DATADIR}" \
 		--docdir="${DOCSDIR}" \
 		--pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
 		--disable-static \
 		--disable-libcelt \
 		--enable-shared \
 		--enable-pic \
 		--enable-gpl \
 		--enable-avresample \
 		--cc="${CC}" \
 		--cxx="${CXX}"
 
 DOC_FILES=	Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \
 		README.md RELEASE_NOTES
 # under doc subdirectory
 DOC_DOCFILES=	APIchanges *.txt
 PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNONFREE}
 LICENSE+=	NONFREE
 LICENSE_COMB=	multi
 LICENSE_NAME_NONFREE=	Non free code
 LICENSE_TEXT_NONFREE=	enabling OPENSSL or FDK_AAC restricts redistribution
 LICENSE_PERMS_NONFREE=	auto-accept
 .endif
 
 post-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${DOC_FILES}" ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \
 		"${DOC_DOCFILES}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/multimedia/gstreamer1-plugins-vpx/Makefile b/multimedia/gstreamer1-plugins-vpx/Makefile
index 4987bc13b523..60fa49766a3a 100644
--- a/multimedia/gstreamer1-plugins-vpx/Makefile
+++ b/multimedia/gstreamer1-plugins-vpx/Makefile
@@ -1,15 +1,15 @@
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	GStreamer vp8 codec plugin
 
 LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 
 MASTERDIR=	${.CURDIR:H:H}/multimedia/gstreamer1-plugins
 
 PLIST=		${.CURDIR}/pkg-plist
 
 DIST=		good
 GST_PLUGIN=	vpx
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 165298f17787..44e2ff08bba3 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -1,133 +1,133 @@
 PORTNAME=	handbrake
 DISTVERSION=	1.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	https://github.com/HandBrake/HandBrake/releases/download/${DISTVERSION}/
 MASTER_SITES+=	https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/:contrib
 DISTNAME=	HandBrake-${DISTVERSION}
 DISTFILES=	${DISTNAME}-source.tar.bz2 ${CONTRIB_FILES:S/$/:contrib/}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	naito.yuichiro@gmail.com
 COMMENT=	Versatile DVD ripper and video transcoder
 WWW=		https://handbrake.fr/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 powerpc powerpc64 powerpc64le
 
 BUILD_DEPENDS=	bash:shells/bash \
 		nasm:devel/nasm \
 		cmake:devel/cmake-core \
 		meson:devel/meson \
 		git:devel/git@lite
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libgudev-1.0.so:devel/libgudev \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libturbojpeg.so:graphics/libjpeg-turbo \
 		libxml2.so:textproc/libxml2 \
 		libass.so:multimedia/libass \
 		libspeex.so:audio/speex \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis \
 		libvorbisenc.so:audio/libvorbis \
 		libtheoradec.so:multimedia/libtheora \
 		libtheoraenc.so:multimedia/libtheora \
 		libx264.so:multimedia/libx264 \
 		libvpx.so:multimedia/libvpx \
 		libmp3lame.so:audio/lame \
 		libopus.so:audio/opus \
 		libjansson.so:devel/jansson
 
 USES=		autoreconf:build compiler:c11 gmake iconv libtool:build \
 		localbase:ldflags ninja:build pkgconfig python:build
 
 CONTRIB_FILES=	SVT-AV1-v1.7.0.tar.gz \
 		fdk-aac-2.0.2.tar.gz \
 		ffmpeg-6.1.tar.bz2 \
 		libbluray-1.3.4.tar.bz2 \
 		libdvdnav-6.1.1.tar.bz2 \
 		libdvdread-6.1.3.tar.bz2 \
 		dav1d-1.3.0.tar.bz2 \
 		dovi_tool-libdovi-3.1.2.tar.gz \
 		x265-snapshot-20230403-12776.tar.gz \
 		zimg-3.0.5.tar.gz
 
 .if !defined(PACKAGE_BUILDING)
 # DVDCSS version hardcoded in contrib/libdvdread/libdvdread-5.0.0-6-gcb1ae87/src/dvd_input.c (dlopen'ed)
 LIB_DEPENDS+=	libdvdcss.so:multimedia/libdvdcss
 .endif
 
 GNU_CONFIGURE=	yes
 MAKE_ENV=	V=1 ACLOCAL=${LOCALBASE}/bin/aclocal
 
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 CONFIGURE_ARGS=	--force --enable-x265
 CONFIGURE_TARGET=	build
 
 BUILD_WRKSRC=	${WRKSRC}/build
 INSTALL_WRKSRC=	${WRKSRC}/build
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	#
 INSTALL_TARGET=	install-strip
 
 NOPRECIOUSMAKEVARS=	yes			# for ffmpeg and x264
 
 # Enforce linking to bundled libraries instead of system libraries
 LDFLAGS+=	-L${BUILD_WRKSRC}/contrib/lib
 
 OPTIONS_DEFINE=		FDK_AAC VPL X11
 OPTIONS_DEFAULT=	VPL X11
 OPTIONS_EXCLUDE_powerpc=	VPL
 OPTIONS_EXCLUDE_powerpc64=	VPL
 OPTIONS_EXCLUDE_powerpc64le=	VPL
 
 OPTIONS_SUB=	yes
 
 FDK_AAC_DESC=	Enable non-free Fraunhofer FDK AAC codec
 VPL_DESC=	Intel oneVPL (aka Quick Sync Video)
 X11_DESC=	Build GTK 3 based GUI program
 
 FDK_AAC_CONFIGURE_ENABLE=	fdk-aac
 FDK_AAC_VARS=			LICENSE+=FDK_AAC LICENSE_COMB=multi
 LICENSE_NAME_FDK_AAC=		Software License for The Fraunhofer FDK AAC Codec Library for Android
 LICENSE_FILE_FDK_AAC=		${WRKDIR}/${DISTFILES:Mfdk*:R:R}/NOTICE
 LICENSE_PERMS_FDK_AAC=		dist-mirror pkg-mirror auto-accept
 
 VPL_LIB_DEPENDS=	libvpl.so:multimedia/onevpl \
 			libmfx.so:multimedia/intel-media-sdk \
 			libva-drm.so:multimedia/libva
 VPL_CONFIGURE_ON=	--enable-qsv
 
 X11_CONFIGURE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
 X11_MAKE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
 X11_CONFIGURE_OFF=	--disable-gtk
 X11_LIB_DEPENDS=	libvpx.so:multimedia/libvpx \
 			libnotify.so:devel/libnotify
 X11_USES=	gettext desktop-file-utils gnome gstreamer
 X11_USE=	gstreamer=gdkpixbuf,libav \
 		gnome=gtk30,intltool,cairo,gdkpixbuf2
 
 # HandBrake tries to fetch its dependencies during build phase, which is not
 # considered good in FreeBSD.  Instead, we will provide the downloaded files.
 post-extract: .SILENT
 	${MKDIR} ${WRKSRC}/download
 
 pre-configure:
 	cd ${DISTDIR}/${DIST_SUBDIR} && \
 	    ${INSTALL_DATA} ${CONTRIB_FILES} \
 	    ${WRKSRC}/download
 
 # for powerpc64
 # picked from multimedia/ffmpeg/files/patch-libswscale_ppc_yuv2rgb__altivec.c
 	${CP} ${FILESDIR}/P02-freebsd-ppc-libswscale.patch ${WRKSRC}/contrib/ffmpeg
 
 post-install-X11-on:
 	${LN} -sf ghb ${STAGEDIR}${PREFIX}/bin/HandBrake
 
 .include <bsd.port.mk>
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index c92c1bdcda14..9ed45565cb05 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	libvpx
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.14.1
+DISTVERSION=	1.15.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	VP8/VP9 reference encoder/decoder
 WWW=		https://www.webmproject.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_amd64=	nasm:devel/nasm
 BUILD_DEPENDS_armv6=	as:devel/binutils
 BUILD_DEPENDS_armv7=	as:devel/binutils
 BUILD_DEPENDS_i386=	nasm:devel/nasm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	webmproject
 
 USES=		compiler:c++11-lib cpe gmake perl5 shebangfix
 CPE_VENDOR=	webmproject
 HAS_CONFIGURE=	yes
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	build/make/ads2gas.pl
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--disable-install-docs \
 		--disable-install-srcs \
 		--disable-unit-tests \
 		--enable-multi-res-encoding \
 		--enable-pic \
 		--enable-shared \
 		--enable-vp9-highbitdepth \
 		--enable-vp9-postproc \
 		--enable-vp9-temporal-denoising \
 		--size-limit=16384x16384
 MAKE_ARGS+=	verbose=yes
 ALL_TARGET=	# empty
 
 post-patch:
 	@${REINPLACE_CMD} -E '/gcctarget|link_with_cc/s/gcc[[:>:]]/$${CC}/' \
 		${WRKSRC}/build/make/configure.sh
 # Extract (snapshot) version from the port instead of CHANGELOG
 	@${REINPLACE_CMD} '/^git_version_id/s/""/"${DISTVERSIONFULL}"/' \
 		${WRKSRC}/build/make/version.sh
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vpx*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libvpx.so.*.*.*
 
 .include <bsd.port.mk>
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index 086d4a0c583b..34d1e4202184 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1717012823
-SHA256 (webmproject-libvpx-v1.14.1_GH0.tar.gz) = 901747254d80a7937c933d03bd7c5d41e8e6c883e0665fadcb172542167c7977
-SIZE (webmproject-libvpx-v1.14.1_GH0.tar.gz) = 5614104
+TIMESTAMP = 1729707897
+SHA256 (webmproject-libvpx-v1.15.0_GH0.tar.gz) = e935eded7d81631a538bfae703fd1e293aad1c7fd3407ba00440c95105d2011e
+SIZE (webmproject-libvpx-v1.15.0_GH0.tar.gz) = 5629622
diff --git a/multimedia/libvpx/files/patch-vpx__ports_aarch32__cpudetect.c b/multimedia/libvpx/files/patch-vpx__ports_aarch32__cpudetect.c
index a6d4484fefe3..e1819f05b29c 100644
--- a/multimedia/libvpx/files/patch-vpx__ports_aarch32__cpudetect.c
+++ b/multimedia/libvpx/files/patch-vpx__ports_aarch32__cpudetect.c
@@ -1,39 +1,40 @@
 - Assume NEON is enabled on armv7
 - Implement runtime detection on FreeBSD
 
---- vpx_ports/aarch32_cpudetect.c.orig	2024-01-09 21:12:22 UTC
+--- vpx_ports/aarch32_cpudetect.c.orig	2024-10-23 18:24:57 UTC
 +++ vpx_ports/aarch32_cpudetect.c
 @@ -12,7 +12,7 @@
  #include "./vpx_config.h"
  #include "arm_cpudetect.h"
  
 -#if !CONFIG_RUNTIME_CPU_DETECT
 +#if !CONFIG_RUNTIME_CPU_DETECT || defined(__ARM_NEON)
  
  static int arm_get_cpu_caps(void) {
    // This function should actually be a no-op. There is no way to adjust any of
-@@ -57,9 +57,23 @@ static int arm_get_cpu_caps(void) {
+@@ -57,10 +57,24 @@ static int arm_get_cpu_caps(void) {
    return flags;
  }
  
--#elif defined(__linux__)  // end defined(AOM_USE_ANDROID_CPU_FEATURES)
-+#elif defined(__linux__) || defined(__FreeBSD__)  // end defined(AOM_USE_ANDROID_CPU_FEATURES)
+-#elif defined(__linux__)  // end defined(VPX_USE_ANDROID_CPU_FEATURES)
++#elif defined(__linux__) || defined(__FreeBSD__)  // end defined(VPX_USE_ANDROID_CPU_FEATURES)
  
  #include <sys/auxv.h>
-+
+ 
 +#if defined(__FreeBSD__)
 +static unsigned long getauxval(unsigned long type)
 +{
 +    /* Only AT_HWCAP* return unsigned long */
 +    if (type != AT_HWCAP && type != AT_HWCAP2) {
 +        return 0;
 +    }
 +
 +    unsigned long ret = 0;
 +    elf_aux_info(type, &ret, sizeof(ret));
 +    return ret;
 +}
 +#endif
- 
++
  // Define hwcap values ourselves: building with an old auxv header where these
  // hwcap values are not defined should not prevent features from being enabled.
+ #define VPX_AARCH32_HWCAP_NEON (1 << 12)
diff --git a/multimedia/libvpx/pkg-plist b/multimedia/libvpx/pkg-plist
index 539cbb668a2c..d3003eb1d3b2 100644
--- a/multimedia/libvpx/pkg-plist
+++ b/multimedia/libvpx/pkg-plist
@@ -1,19 +1,19 @@
 bin/vpxdec
 bin/vpxenc
 include/vpx/vp8.h
 include/vpx/vp8cx.h
 include/vpx/vp8dx.h
 include/vpx/vpx_codec.h
 include/vpx/vpx_decoder.h
 include/vpx/vpx_encoder.h
 include/vpx/vpx_ext_ratectrl.h
 include/vpx/vpx_frame_buffer.h
 include/vpx/vpx_image.h
 include/vpx/vpx_integer.h
 include/vpx/vpx_tpl.h
 lib/libvpx.a
 lib/libvpx.so
 lib/libvpx.so.9
-lib/libvpx.so.9.0
-lib/libvpx.so.9.0.1
+lib/libvpx.so.9.1
+lib/libvpx.so.9.1.0
 libdata/pkgconfig/vpx.pc
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index a8b755a25bf3..d75317de460d 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -1,186 +1,186 @@
 PORTNAME=	xine
 DISTVERSION=	1.2.13
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${DISTVERSION}
 PKGNAMEPREFIX=	lib
 DISTNAME=	${PORTNAME}-lib-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libraries for xine multimedia player
 WWW=		https://www.xine-project.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libFLAC.so:audio/flac \
 		liba52.so:audio/liba52 \
 		libvorbis.so:audio/libvorbis \
 		libspeex.so:audio/speex \
 		libmng.so:graphics/libmng \
 		libpng.so:graphics/png \
 		libdvdread.so:multimedia/libdvdread \
 		libfreetype.so:print/freetype2 \
 		libfame.so:multimedia/libfame \
 		libcdio_paranoia.so:sysutils/libcdio-paranoia \
 		libmodplug.so:audio/libmodplug \
 		libvcdinfo.so:multimedia/vcdimager \
 		libtheora.so:multimedia/libtheora \
 		libmad.so:audio/libmad \
 		libdca.so:multimedia/libdca \
 		libavcodec.so:multimedia/ffmpeg \
 		libfaad.so:audio/faad \
 		libvdpau.so:multimedia/libvdpau \
 		libvpx.so:multimedia/libvpx \
 		libiso9660.so:sysutils/libcdio \
 		libogg.so:audio/libogg \
 		libdvdnav.so:multimedia/libdvdnav \
 		libwayland-client.so:graphics/wayland
 
 USES=		compiler cpe gl gmake gnome iconv libtool:keepla jpeg \
 		localbase pathfix perl5 pkgconfig tar:xz xorg
 LLD_UNSAFE=	yes
 CPE_PRODUCT=	xine-lib
 CPE_VENDOR=	xine
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_XORG=	x11 xcb xv xinerama xext sm ice
 USE_GL=		gl glu
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-libflac \
 		--enable-musepack \
 		--enable-real-codecs \
 		--without-esound \
 		--disable-crypto
 
 MAKE_ENV=	V=1
 MAKE_ARGS=	pkgdatadir="${DATADIR}" \
 		datadir="${DATADIR}" \
 		libdir="${PREFIX}/lib"
 
 CFLAGS_i386=	-fomit-frame-pointer
 
 DOCSDIR=	${PREFIX}/share/doc/xine-lib
 # Please sync with XINE_PLUGINSDIR in multimedia/xine
 # and multimedia/vdr-plugin-xineliboutput
 PLUGINSDIR=	lib/xine/plugins/2.11
 PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
 
 OPTIONS_DEFINE=		AALIB ALSA AOM CACA DAV1D DOCS DMX_IMAGE DVB \
 			IMAGEMAGICK IPV6 JACK LIBBLURAY NFS NLS PIXBUF PULSEAUDIO \
 			SDL SFTP SMB SNDIO V4L VAAPI WAVPACK WAYLAND XVMC
 OPTIONS_DEFAULT=	DVB OPENSSL PIXBUF VAAPI
 OPTIONS_DEFINE_i386=	W32DLL
 OPTIONS_DEFAULT_i386=	W32DLL
 OPTIONS_GROUP=		TLS
 OPTIONS_GROUP_TLS=	GNUTLS OPENSSL
 OPTIONS_SUB=		yes
 
 AOM_DESC=		Enable libaom AV1 decoder support
 DAV1D_DESC=		Enable dav1d AV1 decoder support
 DMX_IMAGE_DESC=		DMX image plugin
 DVB_DESC=		DVB plugin
 NFS_DESC=		Enable NFS support using libnfs
 SDL_DESC=		Enable support for SDL 1 video output
 SFTP_DESC=		Enable SFTP support using libssh2
 TLS_DESC=		Enable TLS support for https and ftps
 W32DLL_DESC=		Win32 codec support
 WAYLAND_DESC=		Enable Wayland support
 
 AALIB_LIB_DEPENDS=		libaa.so:graphics/aalib
 AALIB_CONFIGURE_ENABLE=		aalib
 ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_WITH=		alsa
 AOM_LIB_DEPENDS=		libaom.so:multimedia/aom
 AOM_CONFIGURE_WITH=		libaom
 CACA_LIB_DEPENDS=		libcaca.so:graphics/libcaca
 CACA_CONFIGURE_WITH=		caca
 DAV1D_LIB_DEPENDS=		libdav1d.so:multimedia/dav1d
 DAV1D_CONFIGURE_WITH=		dav1d
 DVB_BUILD_DEPENDS=		v4l_compat>=1.0.20100321:multimedia/v4l_compat
 DVB_CONFIGURE_ENABLE=		dvb
 GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=		--enable-tls
 IMAGEMAGICK_USES=		magick
 IMAGEMAGICK_CONFIGURE_WITH=	imagemagick
 IMAGEMAGICK_IMPLIES=		DMX_IMAGE
 IPV6_CONFIGURE_ENABLE=		ipv6
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_CONFIGURE_WITH=		jack
 LIBBLURAY_LIB_DEPENDS=		libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_ENABLE=	bluray
 NLS_USES=			gettext
 NLS_CONFIGURE_ENABLE=		nls
 NFS_LIB_DEPENDS=		libnfs.so:net/libnfs
 NFS_CONFIGURE_ENABLE=		nfs
 OPENSSL_CONFIGURE_ON=		--enable-tls
 OPENSSL_CONFIGURE_ENV=		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
 				OPENSSL_CFLAGS="-I${OPENSSLINC}"
 OPENSSL_USES=			ssl
 PIXBUF_CONFIGURE_ENABLE=	gdkpixbuf
 PIXBUF_IMPLIES=			DMX_IMAGE
 PIXBUF_USE=			GNOME=gdkpixbuf2,glib20
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
 SDL_CONFIGURE_WITH=		sdl
 SDL_USES=			sdl
 SDL_USE=			SDL=sdl
 SFTP_LIB_DEPENDS=		libssh2.so:security/libssh2
 SFTP_CONFIGURE_ENABLE=		sftp
 SMB_USES=			samba:lib
 SMB_CONFIGURE_ENV=		LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \
 				LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}"
 SMB_CONFIGURE_ENABLE=		samba
 SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
 SNDIO_CONFIGURE_ENABLE=		sndio
 VAAPI_LIB_DEPENDS=		libva.so:multimedia/libva
 VAAPI_CONFIGURE_ENABLE=		vaapi
 V4L_BUILD_DEPENDS=		v4l_compat>=1.0.20100321:multimedia/v4l_compat
 V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_ENABLE=		libv4l v4l v4l2
 W32DLL_CONFIGURE_ENABLE=	w32dll
 W32DLL_PLIST_FILES=		${PLUGINSDIR}/xineplug_decode_w32dll.so
 WAVPACK_LIB_DEPENDS=		libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_WITH=		wavpack
 WAYLAND_LIB_DEPENDS=		libwayland-egl.so:graphics/wayland \
 				libwayland-client.so:graphics/wayland
 WAYLAND_CONFIGURE_ENABLE=	wayland
 
 .if defined(WITH_NVIDIA304_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1)
 XVMC_CONFIGURE_WITH=		xvmc-lib=XvMCNVIDIA
 XVMC_LIB_DEPENDS=		libXvMCNVIDIA.so:x11/nvidia-driver-304
 .else
 XVMC_CONFIGURE_WITH=		xvmc-lib=XvMCW
 XVMC_LIB_DEPENDS=		libXvMC.so:x11/libXvMC
 .endif
 XVMC_CONFIGURE_ENABLE=		xvmc
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64
 BUILD_DEPENDS+=	as:devel/binutils
 .endif
 
 .if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}
 CONFIGURE_ARGS+=	--disable-tls
 .endif
 
 pre-configure-GNUTLS-off:
 	@${REINPLACE_CMD} -e 's|have_gnutls=yes|have_gnutls=no|' \
 		${WRKSRC}/configure
 
 post-patch:
 	@${REINPLACE_CMD} -e '/xine_set_flags/s/XINE_PROTECTED//' \
 		${WRKSRC}/include/xine.h
 .if ${COMPILER_TYPE} == "clang"
 	@${REINPLACE_CMD} -e 's|-fno-rename-registers||' \
 		${WRKSRC}/src/libw32dll/Makefile.in
 .endif
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/post/*.so
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 76a31e365c92..bf04cb1542e1 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -1,105 +1,105 @@
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	Convenient video file and movie encoder
 WWW=		http://www.mplayerhq.hu/
 
 .include "${.CURDIR}/../mplayer/Makefile.common"
 
 OPTIONS_DEFINE=	AMR_NB AMR_WB ASS BLURAY CDIO DV DVDNAV FAAC FONTCONFIG \
 		FRIBIDI GIF GNUTLS GSM IPV6 JACK JPEG LADSPA LIBMNG LZO \
 		MAD NAS NLS OPENAL OPENJPEG OPUS PULSEAUDIO \
 		SMB SPEEX THEORA TWOLAME V4L VPX \
 		X264 XVID
 
 OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG GIF GNUTLS JPEG X264 XVID
 
 OPTIONS_DEFINE_i386=	RTCPU
 OPTIONS_DEFINE_amd64=	RTCPU
 OPTIONS_DEFINE_powerpc=	RTCPU
 
 OPTIONS_DEFAULT_i386=	RTCPU
 OPTIONS_DEFAULT_amd64=	RTCPU
 OPTIONS_DEFAULT_powerpc=RTCPU
 
 ASS_DESC?=	Subtitles rendering via libass
 BLURAY_DESC?=	BluRay support
 DVDNAV_DESC?=	DVD navigation features support
 LZO_DESC?=	Enable external liblzo library
 RTCPU_DESC?=	Use runtime CPU detection
 
 PATCHDIR=	${.CURDIR}/../mplayer/files
 FILESDIR=	${PATCHDIR}
 DATADIR=	${PREFIX}/share/mplayer
 
 TOOLFILES=	aconvert.sh binary_codecs.sh calcbpp.pl \
 		checktree.sh countquant.pl divx2svcd.sh \
 		dvd2divxscript.pl edgedetect.fp edgeenh.fp \
 		emboss.fp mencvcd.sh midentify.sh \
 		mpconsole.sh mphelp_check.py mplmult.sh \
 		plotpsnr.pl psnr-video.sh qepdvcd.sh \
 		subedit.pl subsearch.sh vobshift.py \
 		w32codec_dl.pl wma2ogg.pl
 
 USES+=		alias iconv pkgconfig python shebangfix
 SHEBANG_FILES=	TOOLS/calcbpp.pl TOOLS/checktree.sh TOOLS/countquant.pl	\
 		TOOLS/divx2svcd.sh TOOLS/dvd2divxscript.pl TOOLS/mencvcd.sh \
 		TOOLS/mphelp_check.py TOOLS/plotpsnr.pl TOOLS/psnr-video.sh \
 		TOOLS/qepdvcd.sh TOOLS/subedit.pl TOOLS/vobshift.py \
 		TOOLS/w32codec_dl.pl TOOLS/wma2ogg.pl
 
 PYTHON_NO_DEPENDS=	yes
 
 .include "${.CURDIR}/../mplayer/Makefile.optvars"
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--disable-mplayer \
 			--disable-libdca \
 			--disable-x11 \
 			--disable-vdpau \
 			--disable-rtc \
 			--disable-arts \
 			--disable-caca \
 			--disable-lirc \
 			--disable-sdl \
 			--disable-svga \
 			--disable-aa \
 			--disable-joystick \
 			--disable-directfb \
 			--disable-mpg123 \
 			--disable-enca \
 			--disable-musepack \
 			--disable-sndio \
 			--disable-librtmp
 
 LIB_DEPENDS+=	libmp3lame.so:audio/lame
 
 ALL_TARGET=	mencoder
 
 .include "${.CURDIR}/../mplayer/Makefile.options"
 
 pre-everything::
 	@${ECHO_MSG} "N - O - T - E"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
 	@${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:"
 	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
 
 post-patch: common-post-patch
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${STAGEDIR}${PREFIX}/share/man/man1/mencoder.1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/tools
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/tools
 .for tool in ${TOOLFILES}
 	${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${STAGEDIR}${DATADIR}/tools
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 3812f1a070a8..9f4123e4b374 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,404 +1,404 @@
 PORTNAME=	vlc
 DISTVERSION=	3.0.21
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio net www
 MASTER_SITES=	https://get.videolan.org/${PORTNAME}/${DISTVERSION:S/a$//}/ \
 		https://mirror.init7.net/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
 		http://mirror.clarkson.edu/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
 		http://ftp.kaist.ac.kr/vlc/${PORTNAME}/${DISTVERSION:S/a$//}/ \
 		http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Qt based multimedia player and streaming server
 WWW=		https://www.videolan.org
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	gsed:textproc/gsed \
 		ffmpeg>=3.4.1,1:multimedia/ffmpeg \
 		yasm:devel/yasm
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libdvbpsi.so:multimedia/libdvbpsi \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libidn.so:dns/libidn \
 		libmatroska.so:multimedia/libmatroska \
 		libgpg-error.so:security/libgpg-error \
 		libebml.so:textproc/libebml
 RUN_DEPENDS=	ffmpeg>=3.4.1,1:multimedia/ffmpeg
 
 USES=		compiler:c++17-lang cpe desktop-file-utils elfctl gettext-tools \
 		gl gmake gnome iconv:wchar_t libtool localbase pathfix pkgconfig \
 		tar:xz
 USE_GL=		opengl
 
 CPE_VENDOR=	videolan
 
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-avcodec --enable-avformat --enable-dvbpsi \
 		--enable-fontconfig --enable-freetype --enable-libgcrypt \
 		--enable-libxml2 --enable-oss --enable-postproc \
 		--enable-swscale --enable-vlc \
 		--disable-alsa --disable-aribb25 \
 		--disable-chromaprint --disable-crystalhd --disable-dc1394 \
 		--disable-decklink --disable-dsm --disable-dv1394 \
 		--disable-fdkaac --disable-gst-decode --disable-gles2 \
 		--disable-kai --disable-kate --disable-kva --disable-libcddb \
 		--disable-mpc --disable-mpg123 --disable-vnc --disable-opencv \
 		--disable-projectm --disable-schroedinger --disable-secret \
 		--disable-sid --disable-soxr --disable-telx --disable-tiger \
 		--disable-tremor --disable-udev --disable-update-check \
 		--disable-vsxu --disable-wasapi --disable-x26410b \
 		--with-kde-solid=${PREFIX}/share/solid/actions \
 		ac_cv_search_pthread_rwlock_init=-pthread \
 		BUILDCC="${CC}"
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 .endif
 INSTALL_TARGET=	install-strip
 CFLAGS+=	-Wno-unreachable-code-generic-assoc
 CFLAGS_i386=	-fomit-frame-pointer
 ELF_FEATURES=	+noaslr:bin/.libs/vlc # See PR 270038
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 
 PORTDATA=	*
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	A52 AALIB AOM ARIBSUB ASS AVAHI CACA CHROMECAST DAV1D DBUS DCA \
 		DEBUG DOCS DVDNAV DVDREAD DEBUG FAAD FLAC FLUID FREERDP FRIBIDI \
 		GME GNUTLS GOOM HARFBUZZ JACK JPEG LIBBLURAY LIBPLACEBO LIBRSVG2 \
 		LIBSSH2 LIRC LIVEMEDIA LUA MAD MFX MODPLUG MPEG2 MTP \
 		NCURSES NFS NLS NOTIFY OGGSPOTS OGG OPTIMIZED_CFLAGS OPUS PNG \
 		PULSEAUDIO QT5 REALRTSP RUNROOT SAMPLERATE SDL SHOUTCAST \
 		SKINS SMB SNDIO SPEEX SRT STREAM TAGLIB THEORA TWOLAME UPNP V4L \
 		VAAPI VCD VDPAU VORBIS VPX WAYLAND X11 X264 X265 ZVBI
 OPTIONS_DEFINE_powerpc=		ALTIVEC
 OPTIONS_DEFINE_powerpc64=	ALTIVEC
 OPTIONS_DEFAULT=ASS AVAHI CHROMECAST DAV1D DBUS DVDNAV DVDREAD GNUTLS HARFBUZZ \
 		JPEG LIVEMEDIA LUA OGG OPTIMIZED_CFLAGS OPUS PNG QT5 SAMPLERATE \
 		SKINS SPEEX STREAM TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD \
 		VDPAU VORBIS WAYLAND X11
 OPTIONS_DEFAULT_powerpc=	ALTIVEC
 OPTIONS_DEFAULT_powerpc64=	ALTIVEC
 OPTIONS_EXCLUDE=	LIBPLACEBO # https://code.videolan.org/videolan/vlc/-/commit/8e22c39ea3c3
 OPTIONS_EXCLUDE+=	VAAPI # Not compatible until VLC 4
 OPTIONS_SUB=		yes
 
 AOM_DESC=		AV1 video encoding/decoding via libaom
 ARIBSUB_DESC=		ARIB text decoding via libaribb24
 ASS_DESC=		ASS/SSA subtitle rendering
 CHROMECAST_DESC=	Streaming to Chromecast devices
 DAV1D_DESC=		AV1 video decoding via libdav1d
 DVDNAV_DESC=		DVD menu navigation
 DVDREAD_DESC=		DVD Playback support
 FLUID_DESC=		Fluidsynth MIDI support
 FREERDP_DESC=		RDP support
 GME_DESC=		Game Music Emu (libgme) support
 GOOM_DESC=		Goom visualisation plugin
 HARFBUZZ_DESC=		OpenType text shaping engine
 LIBPLACEBO_DESC=	HDR tonemapping support through libplacebo
 LIBSSH2_DESC=		SCP/SFTP support via libssh2
 MFX_DESC=		Intel MediaSDK (aka Quick Sync Video)
 OGGSPOTS_DESC=		Experimental OggSpots codec
 REALRTSP_DESC=		Real RTSP access module
 RUNROOT_DESC=		Enable running as root
 SKINS_DESC=		Build skins2 interface module (implies QT5)
 SRT_DESC=		Secure Reliable Transport support
 STREAM_DESC=		stream output
 TAGLIB_DESC=		ID3 tag and Ogg comment support
 VCD_DESC=		Audio/Video CD support
 ZVBI_DESC=		VBI decoding support
 
 A52_LIB_DEPENDS=	liba52.so:audio/liba52
 A52_CONFIGURE_ON=	--with-a52=${LOCALBASE}
 A52_CONFIGURE_ENABLE=	a52
 
 AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
 AALIB_CONFIGURE_ENABLE=	aa
 
 ALTIVEC_CONFIGURE_ENABLE=	altivec
 ALTIVEC_CFLAGS=		-maltivec
 
 AOM_LIB_DEPENDS=	libaom.so:multimedia/aom
 AOM_CONFIGURE_ENABLE=	aom
 
 ARIBSUB_LIB_DEPENDS=	libaribb24.so:multimedia/aribb24
 ARIBSUB_CONFIGURE_ENABLE=	aribsub
 
 ASS_LIB_DEPENDS=	libass.so:multimedia/libass
 ASS_CONFIGURE_ENABLE=	libass
 
 AVAHI_LIB_DEPENDS=	libavahi-common.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	avahi
 
 CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
 CACA_CONFIGURE_ENABLE=	caca
 
 CHROMECAST_LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 			libprotobuf-lite.so:devel/protobuf
 CHROMECAST_USE=		cxxstd=c++17
 CHROMECAST_CONFIGURE_ENABLE=	chromecast
 
 DAV1D_LIB_DEPENDS=	libdav1d.so:multimedia/dav1d
 DAV1D_CONFIGURE_ENABLE=	dav1d
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_ENABLE=	dbus
 
 DCA_LIB_DEPENDS=	libdca.so:multimedia/libdca
 DCA_CONFIGURE_ENABLE=	dca
 
 DVDNAV_LIB_DEPENDS=	libdvdnav.so:multimedia/libdvdnav
 DVDNAV_CONFIGURE_ENABLE=	dvdnav
 
 DVDREAD_LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 DVDREAD_CONFIGURE_ENABLE=	dvdread
 
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
 FAAD_CONFIGURE_ENABLE=	faad
 FAAD_CONFIGURE_ENV=	CPPFLAGS_faad="-I${LOCALBASE}/include" \
 			LIBS_faad="-L${LOCALBASE}/lib"
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_ENABLE=	flac
 
 FLUID_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUID_CONFIGURE_ENABLE=	fluidsynth
 
 FREERDP_LIB_DEPENDS=	libfreerdp2.so:net/freerdp
 FREERDP_CONFIGURE_ENABLE=	freerdp
 FREERDP_CONFIGURE_ENV=	FREERDP_CFLAGS="-I${LOCALBASE}/include/freerdp2 \
 					-I${LOCALBASE}/include/winpr2" \
 			FREERDP_LIBS="-L${LOCALBASE}/lib"
 FREERDP_CFLAGS=		-Wno-error=incompatible-function-pointer-types
 
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_ENABLE=	fribidi
 
 GME_LIB_DEPENDS=	libgme.so:audio/libgme
 GME_CONFIGURE_ENABLE=	gme
 GME_CONFIGURE_ENV=	LIBS_gme="-L${LOCALBASE}/lib -lgme"
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ENABLE=gnutls
 
 GOOM_LIB_DEPENDS=	libgoom2.so:graphics/goom
 GOOM_CONFIGURE_ENABLE=	goom
 
 HARFBUZZ_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 HARFBUZZ_CONFIGURE_ENABLE=	harfbuzz
 
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=	jack
 
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_ENABLE=	jpeg
 
 LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_ENABLE=	bluray
 
 LIBPLACEBO_LIB_DEPENDS=	libplacebo.so:graphics/libplacebo
 LIBPLACEBO_CONFIGURE_ENABLE=	libplacebo
 
 LIBRSVG2_USE=			GNOME=librsvg2,cairo
 LIBRSVG2_CONFIGURE_ENABLE=	svg svgdec
 
 LIBSSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
 LIBSSH2_CONFIGURE_ENABLE=	sftp
 
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_ENABLE=	lirc
 LIRC_CONFIGURE_ENV=	LIBS_lirc="-L${LOCALBASE}/lib -llirc_client"
 
 LIVEMEDIA_LIB_DEPENDS=	libliveMedia.so:net/liveMedia
 LIVEMEDIA_USES=		ssl
 LIVEMEDIA_CONFIGURE_ENABLE=	live555
 LIVEMEDIA_CONFIGURE_ENV=	\
 	LIVE555_CFLAGS="-I${LOCALBASE}/include/liveMedia \
 			-I${LOCALBASE}/include/UsageEnvironment \
 			-I${LOCALBASE}/include/groupsock \
 			-I${LOCALBASE}/include/BasicUsageEnvironment" \
 	LIVE555_LIBS="-L${LOCALBASE}/lib -lliveMedia \
 			-lgroupsock -lBasicUsageEnvironment \
 			-lUsageEnvironment \
 			-L${OPENSSLLIB} -lssl -lcrypto"
 
 LUA_USES=		lua
 LUA_CONFIGURE_ON=	LUAC=${LUAC_CMD} LUA_CFLAGS="-I${LUA_INCDIR}" \
 			LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
 LUA_CONFIGURE_ENABLE=	lua
 
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CONFIGURE_ON=	--with-mad=${LOCALBASE}
 MAD_CONFIGURE_ENABLE=	mad
 
 MFX_LIB_DEPENDS=	libmfx.so:multimedia/intel-media-sdk
 MFX_CONFIGURE_ENABLE=	mfx
 
 MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CONFIGURE_ENABLE=	mod
 
 MPEG2_LIB_DEPENDS=	libmpeg2.so:multimedia/libmpeg2
 MPEG2_CONFIGURE_ENABLE=	libmpeg2
 
 MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
 MTP_CONFIGURE_ENABLE=	mtp
 
 NCURSES_USES=			ncurses
 NCURSES_CONFIGURE_ENABLE=	ncurses
 NCURSES_CONFIGURE_ENV=		NCURSES_CFLAGS="-I${NCURSESINC}" \
 				NCURSES_LIBS="-L${NCURSESLIB} -lncursesw"
 
 NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
 NFS_CONFIGURE_ENABLE=	nfs
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_USE=		GNOME=gtk30,cairo
 NOTIFY_CONFIGURE_ENABLE=	notify
 
 OGGSPOTS_IMPLIES=	OGG
 OGGSPOTS_CONFIGURE_ENABLE=	oggspots
 
 OGG_LIB_DEPENDS=	libogg.so:audio/libogg
 OGG_CONFIGURE_ENABLE=	ogg
 
 OPTIMIZED_CFLAGS_CONFIGURE_ENABLE=	optimizations
 
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CONFIGURE_ENABLE=	opus
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_ENABLE=	png
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 
 QT5_IMPLIES=		X11
 QT5_USES=		qt:5
 QT5_USE=		QT=gui,core,svg,widgets,x11extras,buildtools:build
 QT5_CONFIGURE_ENABLE=	qt
 
 REALRTSP_CONFIGURE_ENABLE=	realrtsp
 
 RUNROOT_CONFIGURE_ENABLE=	run-as-root
 
 SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:audio/libsamplerate
 SAMPLERATE_CONFIGURE_ENABLE=	samplerate
 
 SDL_USES=		sdl
 SDL_USE=		SDL=image
 SDL_CONFIGURE_ENABLE=	sdl-image
 
 SHOUTCAST_LIB_DEPENDS=	libshout.so:audio/libshout
 SHOUTCAST_CONFIGURE_ENABLE=	shout
 
 SKINS_IMPLIES=		QT5
 SKINS_USES=		libarchive xorg
 SKINS_USE=		XORG=xext,xinerama,xpm
 SKINS_CONFIGURE_ENABLE=	archive skins2
 
 SMB_USES=		samba:lib
 SMB_CONFIGURE_ENABLE=	smbclient
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CONFIGURE_ENABLE=	sndio
 
 SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex \
 			libspeexdsp.so:audio/speexdsp
 SPEEX_CONFIGURE_ENABLE=	speex
 
 SRT_LIB_DEPENDS=	libsrt.so:www/srt
 SRT_CONFIGURE_ENABLE=	srt
 
 STREAM_CONFIGURE_ENABLE=	sout
 
 TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CONFIGURE_ENABLE=	taglib
 
 THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=	theora
 
 TWOLAME_LIB_DEPENDS=		libtwolame.so:audio/twolame
 TWOLAME_CONFIGURE_ENABLE=	twolame
 
 UPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 UPNP_CONFIGURE_ENABLE=	upnp
 
 V4L_BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_ENABLE=	v4l2
 
 VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CONFIGURE_ENABLE=	libva
 
 VCD_CONFIGURE_ENABLE=	vcd
 
 VDPAU_IMPLIES=		X11
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	vorbis
 
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_ENABLE=	vpx
 
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 WAYLAND_CONFIGURE_ENABLE=	wayland
 
 X11_LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms
 X11_USES=		xorg
 X11_USE=		XORG=xcb,xorgproto,sm,ice,x11
 X11_CONFIGURE_ENABLE=	xcb xvideo
 X11_CONFIGURE_WITH=	x
 
 X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 X264_CONFIGURE_ENABLE=	x264
 
 X265_LIB_DEPENDS=	libx265.so:multimedia/x265
 X265_CONFIGURE_ENABLE=	x265
 
 ZVBI_LIB_DEPENDS=	libzvbi.so:devel/libzvbi
 ZVBI_CONFIGURE_ENABLE=	zvbi
 
 WITH_CDROM_DEVICE?=/dev/cd0
 WITH_DVD_DEVICE?=/dev/cd0
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug --disable-optimizations
 CFLAGS+=-g -O0
 CXXFLAGS+=-g -O0
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e '\|LIBS|s|-lrt||' \
 		-e 's|LIBS="-llirc_client|LIBS="$$LIBS_lirc|' \
 		-e '/PKG_CONFIG/s|\"gl\"|"opengl"|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/dev/cdrom|${WITH_CDROM_DEVICE}|g' \
 		-e 's|/dev/dvd|${WITH_DVD_DEVICE}|g' \
 		${WRKSRC}/src/libvlc-module.c
 	@${RM} -r ${WRKSRC}/modules/access/v4l2/linux
 # XXX FreeBSD doesn't have strerror_l() - use the android version of error.c
 	@${CP} ${WRKSRC}/src/android/error.c ${WRKSRC}/src/posix
 
 post-install:
 	@(cd ${STAGEDIR}${PREFIX} && ${FIND} -s lib/vlc -not -name '*.la' \
 		-type f -o -type l >> ${TMPPLIST})
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/vlc/plugins/*/*.so
 	# plugin cache becomes stale after strip. Regenerate it:
 	${WRKSRC}/bin/vlc-cache-gen ${STAGEDIR}${PREFIX}/lib/vlc/plugins
 
 .include <bsd.port.mk>
diff --git a/net-im/py-toxcore-c/Makefile b/net-im/py-toxcore-c/Makefile
index 9e3957db9c20..dd444d45a14e 100644
--- a/net-im/py-toxcore-c/Makefile
+++ b/net-im/py-toxcore-c/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	toxcore-c
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	net-im net-p2p python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python binding for Project-Tox
 WWW=		https://github.com/TokTok/py-toxcore-c
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libtoxcore.so:net-im/tox \
 		libsodium.so:security/libsodium \
 		libvpx.so:multimedia/libvpx \
 		libopus.so:audio/opus
 
 USES=		localbase python
 USE_GITHUB=	yes
 GH_ACCOUNT=	TokTok
 GH_PROJECT=	py-toxcore-c
 USE_PYTHON=	distutils autoplist
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pytox*.so
 
 .include <bsd.port.mk>
diff --git a/net-im/qTox/Makefile b/net-im/qTox/Makefile
index a5871a6ba591..04e787391ffc 100644
--- a/net-im/qTox/Makefile
+++ b/net-im/qTox/Makefile
@@ -1,96 +1,96 @@
 PORTNAME=	qTox
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.17.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Qt 5 based Tox client
 WWW=		https://qtox.github.io/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libexif.so:graphics/libexif \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libopus.so:audio/opus \
 		libqrencode.so:graphics/libqrencode \
 		libsodium.so:security/libsodium \
 		libsqlcipher.so:databases/sqlcipher \
 		libtox_extension_messages.so:net-im/tox_extension_messages \
 		libtoxcore.so:net-im/tox \
 		libtoxext.so:net-im/toxext \
 		libvpx.so:multimedia/libvpx
 
 USES=		cmake compiler:c++11-lib desktop-file-utils gettext openal:soft pkgconfig qt:5
 USE_GITHUB=	yes
 USE_QT=		core gui network xml opengl sql sql-sqlite3:run widgets svg \
 		concurrent:build buildtools:build linguisttools:build qmake:build testlib:build
 
 CMAKE_ARGS=	-DGIT_DESCRIBE:STRING=${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 CMAKE_OFF=	USE_CCACHE
 
 OPTIONS_DEFINE=			FILTERAUDIO PLATFORM_EXTENSIONS SPELL_CHECK APPINDICATOR GTK_SYSTRAY STATUSNOTIFIER
 OPTIONS_DEFAULT=		FILTERAUDIO PLATFORM_EXTENSIONS SPELL_CHECK GTK_SYSTRAY STATUSNOTIFIER # removing GTK_SYSTRAY, STATUSNOTIFIER doesn't reduce dependencies
 
 FILTERAUDIO_DESC=		Enable the echo canceling backend
 FILTERAUDIO_CMAKE_BOOL=		USE_FILTERAUDIO
 FILTERAUDIO_LIB_DEPENDS=	libfilteraudio.so:audio/libfilteraudio
 
 PLATFORM_EXTENSIONS_DESC=	Enable platform specific extensions
 PLATFORM_EXTENSIONS_CMAKE_BOOL=	PLATFORM_EXTENSIONS
 PLATFORM_EXTENSIONS_USES=	xorg
 PLATFORM_EXTENSIONS_USE=	XORG=x11,xscrnsaver
 
 SPELL_CHECK_DESC=	Spell checking support
 SPELL_CHECK_USES=	kde:5
 SPELL_CHECK_USE=	KDE=sonnet
 SPELL_CHECK_CMAKE_BOOL=	SPELL_CHECK
 
 APPINDICATOR_CMAKE_BOOL=	ENABLE_APPINDICATOR
 APPINDICATOR_BROKEN=	can not find appindicator-0.1
 
 GTK_SYSTRAY_DESC=	Enable GTK systray
 GTK_SYSTRAY_CMAKE_BOOL=	ENABLE_GTK_SYSTRAY
 GTK_SYSTRAY_USES=	gnome
 GTK_SYSTRAY_USE=	GNOME=atk,cairo,gdkpixbuf2,gtk20
 
 STATUSNOTIFIER_DESC=	Enable status notifier
 STATUSNOTIFIER_CMAKE_BOOL=	ENABLE_STATUSNOTIFIER
 STATUSNOTIFIER_USES=	gnome
 STATUSNOTIFIER_USE=	GNOME=atk,cairo,gdkpixbuf2,gtk20
 
 PLIST_FILES=	bin/qtox \
 		share/applications/io.github.qtox.qTox.desktop \
 		share/icons/hicolor/scalable/apps/qtox.svgz \
 		share/metainfo/io.github.qtox.qTox.appdata.xml
 .for SZ in 14 16 22 24 32 36 48 64 72 96 128 192 256 512
 PLIST_FILES+=	share/icons/hicolor/${SZ}x${SZ}/apps/qtox.png
 .endfor
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == "gcc" && ${ARCH} == i386 && !${CFLAGS:M-march=*}
 # Needed for __atomic_fetch_add_8
 CFLAGS+=	-march=i586
 .endif
 
 .if !defined(DISTVERSIONSUFFIX)
 FULLVERSION=	${PKGVERSION}
 .else
 FULLVERSION=	"${PKGVERSION} (rev.${DISTVERSIONSUFFIX:S/-g//})"
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Warning: qTox won't build if the option NaCl was selected for Tox!"
 	@${ECHO_MSG}
 
 pre-configure:
 	@${REINPLACE_CMD} '/Comment/s,=.*,=${COMMENT},' \
 		${WRKSRC}/io.github.qtox.qTox.desktop
 
 .include <bsd.port.post.mk>
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index 0068e34a0d5f..082d1a3d3ab4 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -1,149 +1,149 @@
 PORTNAME=	telegram-desktop
 DISTVERSION=	5.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
 DISTNAME=	tdesktop-${DISTVERSION}-full
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Telegram Desktop messaging app
 WWW=		https://desktop.telegram.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	does not build, webrtc related
 #BROKEN_SSL=	openssl openssl31
 #BROKEN_SSL_REASON=	undefined symbol: ERR_load_BIO_strings
 NOT_FOR_ARCHS=		powerpc powerpc64 powerpcspe
 NOT_FOR_ARCHS_REASON=	Only little endian is supported
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		range-v3>0:devel/range-v3 \
 		tl-expected>0:devel/tl-expected \
 		v4l_compat>0:multimedia/v4l_compat \
 		yasm:devel/yasm \
 		${LOCALBASE}/lib/libtg_owt.a:net-im/tg_owt
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libada.so:devel/libada \
 		libavformat.so:multimedia/ffmpeg \
 		libcrc32c.so:devel/crc32c \
 		libdbus-1.so:devel/dbus \
 		libdispatch.so:devel/libdispatch \
 		libfmt.so:devel/libfmt \
 		libhunspell-1.7.so:textproc/hunspell \
 		liblz4.so:archivers/liblz4 \
 		libopenh264.so:multimedia/openh264 \
 		libopus.so:audio/opus \
 		libpipewire-0.3.so:multimedia/pipewire \
 		libprotobuf-lite.so:devel/protobuf \
 		libqrcodegencpp.so:graphics/qr-code-generator \
 		librnnoise.so:audio/rnnoise \
 		libsrtp2.so:net/libsrtp2 \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxxhash.so:devel/xxhash \
 		libvpx.so:multimedia/libvpx
 
 FLAVORS=	qt5 qt6
 FLAVOR?=	${FLAVORS:[1]}
 qt5_PKGNAMESUFFIX=
 qt6_PKGNAMESUFFIX=	-qt6
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-qt6
 qt6_CONFLICTS_INSTALL=	${PORTNAME}
 
 USES=		cmake compiler:c++20-lang desktop-file-utils gl gnome jpeg localbase \
 		minizip openal pkgconfig python:build ssl xorg
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	telegramdesktop
 GH_PROJECT=	tdesktop
 
 .if ${FLAVOR} == qt5
 USES+=		kde:5 qt:5
 USE_QT=		buildtools:build core dbus declarative gui imageformats network qmake:build \
 		svg wayland widgets
 USE_KDE=	coreaddons kimageformats
 .else
 USES+=		kde:6 qt:6
 USE_QT=		5compat base declarative imageformats lottie shadertools svg tools:build wayland
 USE_KDE=	coreaddons kimageformats
 .endif
 
 USE_GL=		gl
 USE_GNOME=	glib20 glibmm26 introspection
 USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst
 
 CMAKE_ARGS=	-DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \
 		-DQT_VERSION_MAJOR=${FLAVOR:S/qt//}
 CMAKE_ON=	DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \
 		DESKTOP_APP_DISABLE_JEMALLOC \
 		DESKTOP_APP_DISABLE_SCUDO \
 		DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
 
 # Since cmake 3.25.0, BSDs are no longer recognised as Linux (in this port).
 CMAKE_ARGS+=	-DLINUX=true
 
 # libdispatch components
 LDFLAGS+=	-lBlocksRuntime
 
 # Telegram uses OpenAL for its audio, but libtgvoip (for voice calls) can use PulseAudio or ALSA.
 # It dynamically loads PulseAudio, and if this fails, it loads ALSA.
 # If both of them are not installed, then voice calls do not work, but other functionalities still work.
 OPTIONS_DEFINE=		SYSTEM_FONTS
 OPTIONS_DEFAULT=	ALSA
 OPTIONS_GROUP=	AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
 
 AUDIO_DESC=		Audio backend for voice calls
 SYSTEM_FONTS_DESC=	Use system fonts instead of bundled patched ones
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 ALSA_CMAKE_BOOL_OFF=	LIBTGVOIP_DISABLE_ALSA
 PULSEAUDIO_CMAKE_BOOL_OFF=	LIBTGVOIP_DISABLE_PULSEAUDIO
 SYSTEM_FONTS_CMAKE_BOOL_OFF=	DESKTOP_APP_USE_PACKAGED_FONTS
 
 # Telegram asks each custom build to have its own API ID and hash.
 TELEGRAM_API_HASH=	20a3432aab43f24bb4460fceac5ba38d
 TELEGRAM_API_ID=	601761
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE)
 CMAKE_ARGS+=	-DCMAKE_CC_COMPILER_LAUNCHER="${LOCALBASE}/bin/ccache" \
 		-DCMAKE_CPP_COMPILER_LAUNCHER="${LOCALBASE}/bin/ccache" \
 		-DCMAKE_CXX_COMPILER_LAUNCHER="${LOCALBASE}/bin/ccache"
 .endif
 
 post-extract:
 	# Some of the third-party components already built, and
 	# can be safely removed
 	${RM} -rf \
 		${WRKSRC}/Telegram/ThirdParty/QR \
 		${WRKSRC}/Telegram/ThirdParty/dispatch \
 		${WRKSRC}/Telegram/ThirdParty/expected \
 		${WRKSRC}/Telegram/ThirdParty/fcitx5-qt \
 		${WRKSRC}/Telegram/ThirdParty/hime \
 		${WRKSRC}/Telegram/ThirdParty/hunspell \
 		${WRKSRC}/Telegram/ThirdParty/jemalloc \
 		${WRKSRC}/Telegram/ThirdParty/jimf \
 		${WRKSRC}/Telegram/ThirdParty/kcoreaddons \
 		${WRKSRC}/Telegram/ThirdParty/kimageformats \
 		${WRKSRC}/Telegram/ThirdParty/lz4 \
 		${WRKSRC}/Telegram/ThirdParty/minizip \
 		${WRKSRC}/Telegram/ThirdParty/plasma-wayland-protocols \
 		${WRKSRC}/Telegram/ThirdParty/range-v3 \
 		${WRKSRC}/Telegram/ThirdParty/wayland \
 		${WRKSRC}/Telegram/ThirdParty/wayland-protocols \
 		${WRKSRC}/Telegram/ThirdParty/xxHash
 
 post-patch:
 	# XXX fix the following on every source file
 	# warning: unknown warning option '-Wno-maybe-uninitialized'
 	# warning: argument unused during compilation: '-fstack-clash-protection'
 	${REINPLACE_CMD} -e /-Wno-maybe-uninitialized/d -e /-fstack-clash-protection/d \
 	    ${WRKSRC}/cmake/options_linux.cmake
 
 .include <bsd.port.mk>
diff --git a/net-im/tg_owt/Makefile b/net-im/tg_owt/Makefile
index 3048bb9ac383..5c5f9f0e775c 100644
--- a/net-im/tg_owt/Makefile
+++ b/net-im/tg_owt/Makefile
@@ -1,70 +1,70 @@
 PORTNAME=	tg_owt
 PORTVERSION=	0.0.20240804
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im
 
 PATCH_SITES=	https://github.com/desktop-app/tg_owt/commit/
 PATCHFILES=	7aa05f2c31977dd9d223290804608e3ad6cd236d.patch:-p1 \
 		a7b3d1e5d6e40ba90000a8d40a74218eca07c59c.patch:-p1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Webrtc library used by telegram-desktop
 WWW=		https://github.com/desktop-app/tg_owt
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat \
 		yasm:devel/yasm
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libavformat.so:multimedia/ffmpeg \
 		libcrc32c.so:devel/crc32c \
 		libjpeg.so:graphics/jpeg-turbo \
 		libopenh264.so:multimedia/openh264 \
 		libopus.so:audio/opus \
 		libpipewire-0.3.so:multimedia/pipewire \
 		libprotobuf.so:devel/protobuf \
 		libsrtp2.so:net/libsrtp2 \
 		libvpx.so:multimedia/libvpx
 
 USES=		cmake gl pkgconfig xorg
 USE_XORG=	x11 xcomposite xdamage xrender xrandr xtst
 USE_GL=		gbm gl
 USE_GITHUB=	yes
 GH_ACCOUNT=	desktop-app
 GH_TAGNAME=	dc17143
 
 CMAME_ON=	TG_OWT_PACKAGED_BUILD
 
 # libyuv cloned from https://chromium.googlesource.com/libyuv/libyuv
 # when updating port check if hash tag in the submodule was updated
 GH_TUPLE=	osokin:libyuv:04821d1:libyuv/src/third_party/libyuv
 
 post-extract:
 	${RM} -rf \
 		${WRKSRC}/src/sdk/android \
 		${WRKSRC}/src/sdk/objc \
 		${WRKSRC}/src/third_party/abseil-cpp \
 		${WRKSRC}/src/third_party/crc32c \
 		${WRKSRC}/src/third_party/libsrtp \
 		${WRKSRC}/src/third_party/libsrtp_config \
 		${WRKSRC}/src/third_party/libvpx \
 		${WRKSRC}/src/third_party/openh264 \
 		${WRKSRC}/src/third_party/yasm
 
 # remove more sources not needed to build telegram-desktop, they are however
 # required at tg_owt configure-time even though they are not built, see
 # nice_target_sources()/remove_target_sources() calls in CMakeLists.txt
 post-configure:
 	${RM} -rf \
 		${WRKSRC}/src/modules/audio_device/android \
 		${WRKSRC}/src/modules/audio_device/mac \
 		${WRKSRC}/src/modules/audio_device/win \
 		${WRKSRC}/src/modules/desktop_capture/mac \
 		${WRKSRC}/src/modules/desktop_capture/wayland \
 		${WRKSRC}/src/modules/desktop_capture/win \
 		${WRKSRC}/src/modules/video_capture/windows \
 		${WRKSRC}/src/rtc_base/win \
 		${WRKSRC}/src/rtc_base/win32*.h
 
 .include <bsd.port.mk>
diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile
index d9b722cc1cb3..a3a56334db81 100644
--- a/net-im/tox/Makefile
+++ b/net-im/tox/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	toxcore
 PORTVERSION=	0.2.19
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	ProjectTox-Core library, a decentralized and secure messenger
 WWW=		https://tox.chat/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	checkmk:devel/check			\
 		gtest:sysutils/coreutils
 LIB_DEPENDS=	libvpx.so:multimedia/libvpx		\
 		libsndfile.so:audio/libsndfile		\
 		libportaudio.so:audio/portaudio		\
 		libsodium.so:security/libsodium		\
 		libopus.so:audio/opus			\
 		libconfig.so:devel/libconfig
 TEST_DEPENDS=	opencv_visualisation:graphics/opencv
 #TEST_DEPENDS=	libopencv_core.so:graphics/opencv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	TokTok camgunz:cmp
 GH_PROJECT=	c-toxcore cmp:cmp
 GH_TAGNAME=	643e6a62d4eb0ec2277de269cda33da02cba2756:cmp
 GH_SUBDIR=	third_party/cmp:cmp
 
 CPE_VENDOR=	toktok
 
 USES=		cmake cpe pathfix pkgconfig
 USE_LDCONFIG=	yes
 PLIST_SUB=	VER=${PORTVERSION:C/0.//}.0 SO=2
 
 OPTIONS_DEFINE=		DAEMON TEST
 OPTIONS_SUB=		yes
 
 DAEMON_DESC=		Bootstrap daemon
 DAEMON_CMAKE_ON=	-DBOOTSTRAP_DAEMON=on
 DAEMON_LIB_DEPENDS=	libconfig.so:devel/libconfig
 
 TEST_CMAKE_ON=		-DAUTOTEST=on
 TEST_TARGET=		test
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDAEMON}
 USERS=		toxdht
 USE_RC_SUBR=	tox-bootstrapd
 SUB_LIST=	TOXDHT=${USERS}
 PLIST_SUB+=	TOXDHT=${USERS}
 KEYS_DIR=	/var/lib/tox-bootstrapd
 PID_DIR=	/var/run/tox-bootstrapd
 PKGMESSAGE=	${PKGDIR}/pkg-message.daemon
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDAEMON}
 	${INSTALL_DATA} ${WRKSRC}/other/bootstrap_daemon/tox-bootstrapd.conf	\
 		${STAGEDIR}${PREFIX}/etc/tox-bootstrapd.conf.sample
 	${MKDIR} ${STAGEDIR}${KEYS_DIR}
 	${MKDIR} ${STAGEDIR}${PID_DIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-im/tox_extension_messages/Makefile b/net-im/tox_extension_messages/Makefile
index 1ba1d4ab0f31..a333ebce728c 100644
--- a/net-im/tox_extension_messages/Makefile
+++ b/net-im/tox_extension_messages/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	tox_extension_messages
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Message extension library for tox
 WWW=		https://github.com/toxext/tox_extension_messages
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopus.so:audio/opus \
 		libsodium.so:security/libsodium \
 		libtoxcore.so:net-im/tox \
 		libtoxext.so:net-im/toxext \
 		libvpx.so:multimedia/libvpx
 
 USES=		cmake localbase:ldflags pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	toxext
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 .include <bsd.port.mk>
diff --git a/net-im/toxext/Makefile b/net-im/toxext/Makefile
index 71b678c5c86a..29935d32a409 100644
--- a/net-im/toxext/Makefile
+++ b/net-im/toxext/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	toxext
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Extension library for tox
 WWW=		https://github.com/toxext/toxext
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopus.so:audio/opus \
 		libsodium.so:security/libsodium \
 		libtoxcore.so:net-im/tox \
 		libvpx.so:multimedia/libvpx
 
 USES=		cmake:testing localbase:ldflags pkgconfig
 USE_GITHUB=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_TESTING_ON=	BUILD_TESTS
 
 CFLAGS+=	-fPIC # see https://github.com/toxext/toxext/issues/7
 
 .include <bsd.port.mk>
diff --git a/net-im/toxic/Makefile b/net-im/toxic/Makefile
index 2e82020d413a..d104332c5862 100644
--- a/net-im/toxic/Makefile
+++ b/net-im/toxic/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	toxic
 PORTVERSION=	0.15.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Console client for Tox
 WWW=		https://tox.chat/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:net-im/tox	\
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 LIB_DEPENDS=	libvpx.so:multimedia/libvpx		\
 		libpng.so:graphics/png			\
 		libcurl.so:ftp/curl			\
 		libv4l2.so:multimedia/libv4l		\
 		libqrencode.so:graphics/libqrencode	\
 		libconfig.so:devel/libconfig
 RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:net-im/tox
 
 USES=		compiler:c11 desktop-file-utils gettext-runtime gmake ncurses	\
 		openal:al,alut pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	JFreegman
 
 OPTIONS_DEFINE=	GAMES X11 PYTHON
 OPTIONS_DEFAULT=GAMES X11
 
 GAMES_DESC=	Includes a games module
 GAMES_MAKE_ARGS_OFF=	DISABLE_GAMES=1
 
 X11_USES=	gnome xorg
 X11_USE=	GNOME=gdkpixbuf2,glib20 XORG=x11
 X11_MAKE_ARGS_OFF=	DISABLE_X11=1 DISABLE_DESKTOP_NOTIFY=1
 X11_LIB_DEPENDS=libnotify.so:devel/libnotify
 
 PYTHON_USES=	python
 PYTHON_MAKE_ARGS=	ENABLE_PYTHON=1
 
 CFLAGS+=	-I${NCURSESINC} -pthread
 LDFLAGS+=	-L${NCURSESLIB}
 LDFLAGS_i386=	-Wl,-znotext
 MAKE_ENV=	USER_CFLAGS="${CFLAGS}" USER_LDFLAGS="${LDFLAGS}"	\
 		MANDIR="${PREFIX}/share/man"
 SUB_FILES=	pkg-message
 
 pre-configure-PYTHON-on:
 	${REINPLACE_CMD} -e '/PYTHON3_LIBS/ s|python3|python-${PYTHON_VER}|'	\
 			 -e 's|python3-config|${PYTHON_VERSION}-config|g'	\
 			 -e 's|--ldflags|--ldflags --embed|'			\
 		${WRKSRC}/cfg/checks/python.mk
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|PREFIX =|PREFIX?=|;s|$$(shell git rev-list HEAD.*$$|${GH_TAGNAME}|'	\
 		${WRKSRC}/cfg/global_vars.mk
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/share/man/man1/toxic.1-e ${STAGEDIR}${PREFIX}/share/man/man5/toxic.conf.5-e
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/toxic
 
 .include <bsd.port.mk>
diff --git a/net-im/uTox/Makefile b/net-im/uTox/Makefile
index f6c137be4759..660264653122 100644
--- a/net-im/uTox/Makefile
+++ b/net-im/uTox/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	uTox
 DISTVERSION=	0.17.2
 DISTVERSIONSUFFIX=	-full
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-im net-p2p
 MASTER_SITES=	https://github.com/uTox/uTox/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight Tox client
 WWW=		https://utox.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 LIB_DEPENDS=	libfilteraudio.so:audio/libfilteraudio \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libopus.so:audio/opus \
 		libsodium.so:security/libsodium \
 		libtoxcore.so:net-im/tox \
 		libv4lconvert.so:multimedia/libv4l \
 		libvpx.so:multimedia/libvpx
 TEST_DEPENDS=	check>=0:devel/check
 
 USES=		cmake compiler:c11 desktop-file-utils openal pkgconfig xorg
 USE_XORG=	ice sm x11 xext xrender
 
 CMAKE_OFF=	ENABLE_LTO ENABLE_TESTS
 WRKSRC=		${WRKDIR}/uTox
 
 OPTIONS_DEFINE=		DBUS
 OPTIONS_DEFAULT=	DBUS
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CMAKE_BOOL=	ENABLE_DBUS
 
 .if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
 # ld.lld lacks default output emulation.  Using -b binary without
 # explicit -m will fail.  Mapping taken from lld/ELF/Driver.cpp.
 _LLD_EMUL_aarch64=	aarch64elf_fbsd
 _LLD_EMUL_amd64=	elf_x86_64_fbsd
 _LLD_EMUL_armv6=	armelf_fbsd
 _LLD_EMUL_armv7=	armelf_fbsd
 _LLD_EMUL_i386=		elf_i386_fbsd
 _LLD_EMUL_powerpc=	elf32ppc_fbsd
 _LLD_EMUL_powerpc64=	elf64ppc_fbsd
 _LLD_EMUL_powerpc64le=	elf64lppc_fbsd
 
 post-patch:
 	@${REINPLACE_CMD} 's,[[:<:]]ld[[:>:]],ld -m${_LLD_EMUL_${ARCH}},' \
 		${WRKSRC}/src/xlib/CMakeLists.txt
 .endif
 
 do-test:
 	@cd ${TEST_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
 		-DENABLE_TESTS:BOOL=yes ${CMAKE_SOURCE_PATH} && \
 		${DO_MAKE_BUILD}
 	@${TEST_WRKSRC}/run_tests.sh
 
 .include <bsd.port.mk>
diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile
index dfdeb17f1a41..5bd2297e5efd 100644
--- a/net/mediastreamer/Makefile
+++ b/net/mediastreamer/Makefile
@@ -1,106 +1,106 @@
 PORTNAME=	mediastreamer
 DISTVERSION=	5.2.94
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Real-time audio and video streaming and processing
 WWW=		https://www.linphone.org/technical-corner/mediastreamer2
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libbctoolbox.so:net/bctoolbox \
 		libbzrtp.so:security/bzrtp \
 		libortp.so:net/ortp \
 		libspeexdsp.so:audio/speexdsp \
 		libsrtp2.so:net/libsrtp2
 
 USES=		cmake compiler gnome python:build sqlite
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.linphone.org/BC
 GL_ACCOUNT=	public
 GL_PROJECT=	${PORTNAME}2
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DCMAKE_PREFIX_PATH=${LOCALBASE} \
 		-DENABLE_ALSA=NO \
 		-DENABLE_BV16=NO \
 		-DENABLE_DOC=NO \
 		-DENABLE_JPEG=NO \
 		-DENABLE_OSS=YES \
 		-DENABLE_PULSEAUDIO=NO \
 		-DENABLE_STATIC=NO \
 		-DENABLE_STRICT=NO \
 		-DENABLE_TOOLS=NO \
 		-DENABLE_UNIT_TESTS=NO
 
 LDFLAGS+=	-pthread
 
 OPTIONS_DEFINE=		MATROSKA VIDEO
 OPTIONS_DEFAULT=	FFMPEG G729 GLX GSM MATROSKA OPUS QTGL SPEEX THEORA \
 			V4L VIDEO VPX XVIDEO
 OPTIONS_GROUP=		AUDIOOPT VIDEOOPT
 OPTIONS_GROUP_AUDIOOPT=	G726 G729 GSM OPUS SPEEX
 OPTIONS_GROUP_VIDEOOPT=	FFMPEG GLX QTGL THEORA V4L VPX XVIDEO
 OPTIONS_SUB=		yes
 
 AUDIOOPT_DESC=	Audio options
 G726_DESC=		G.726 codec support
 G729_DESC=		G.729 codec support
 VIDEOOPT_DESC=	Video options
 QTGL_DESC=		Qt OpenGL rendering support
 
 FFMPEG_IMPLIES=		VIDEO
 FFMPEG_LIB_DEPENDS=	libavcodec.so.58:multimedia/ffmpeg4
 FFMPEG_CMAKE_BOOL=	ENABLE_FFMPEG
 G726_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 G726_CMAKE_BOOL=	ENABLE_G726
 G729_LIB_DEPENDS=	libbcg729.so:audio/bcg729
 G729_CMAKE_BOOL=	ENABLE_G729
 GLX_IMPLIES=	VIDEO
 GLX_USES=	gl
 GLX_USE=	GL=gl,glew
 GLX_CMAKE_BOOL=	ENABLE_GL ENABLE_GLX
 GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 GSM_CMAKE_BOOL=		ENABLE_GSM
 MATROSKA_LIB_DEPENDS=	libbcmatroska2.so:multimedia/bcmatroska2
 MATROSKA_CMAKE_BOOL=	ENABLE_MKV
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CMAKE_BOOL=	ENABLE_OPUS
 QTGL_IMPLIES=	VIDEO
 QTGL_USES=	qt:5
 QTGL_USE=	QT=core,declarative,gui,network,buildtools:build,qmake:build
 QTGL_CMAKE_BOOL=	ENABLE_QT_GL
 SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 SPEEX_CMAKE_BOOL=	ENABLE_SPEEX_CODEC
 THEORA_IMPLIES=		VIDEO
 THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 THEORA_CMAKE_BOOL=	ENABLE_THEORA
 V4L_IMPLIES=		VIDEO
 V4L_BUILD_DEPENDS=	v4l_compat>=1.0.20120501:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CMAKE_BOOL=		ENABLE_V4L
 VIDEO_CMAKE_BOOL=	ENABLE_VIDEO
 VPX_IMPLIES=		VIDEO
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CMAKE_BOOL=		ENABLE_VPX
 XVIDEO_IMPLIES=		VIDEO
 XVIDEO_USES=		xorg
 XVIDEO_USE=		XORG=x11,xorgproto,xv
 XVIDEO_CMAKE_BOOL=	ENABLE_X11 ENABLE_XV
 XVIDEO_LDFLAGS=		-L${LOCALBASE}/lib -lX11
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} 's,gsm/gsm\.h,gsm.h,' \
 		${WRKSRC}/cmake/FindGSM.cmake ${WRKSRC}/src/audiofilters/gsm.c
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${PATCH_WRKSRC}/CMakeLists.txt
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 	@${REINPLACE_CMD} '/-Wno-format-truncation/d' ${WRKSRC}/CMakeLists.txt
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 9fcbea952200..35beb836b86b 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -1,70 +1,71 @@
 PORTNAME=	firefox
 DISTVERSION=	128.4.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
 PKGNAMESUFFIX=	-esr
 DISTFILES=	${DISTNAME}esr.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 WWW=		https://www.mozilla.com/firefox
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.101:security/nss \
 		icu>=73.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=8.5.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.43:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.14.0:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
 USE_GECKO=	gecko
 CPE_PRODUCT=	${PORTNAME}_esr
 CONFLICTS_INSTALL=	firefox
 USE_MOZILLA=	-sqlite
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include"
 
 USES=		tar:xz
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 MOZ_OPTIONS+=	--without-wasm-sandboxed-libraries
 .else
 BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
 		-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
 		${FIREFOX_DESKTOP}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 post-install:
 	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index d653d0aff488..4607b68b471f 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,72 +1,73 @@
 PORTNAME=	firefox
 DISTVERSION=	132.0.1
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	www wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build1/source
 DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 WWW=		https://www.mozilla.com/firefox
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.105:security/nss \
 		icu>=73.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=10.0.1:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.44:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.14.1:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
 USE_GECKO=	gecko
 CONFLICTS_INSTALL=	firefox-esr
 USE_MOZILLA=	-sqlite
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 # work around bindgen not finding ICU, e.g.
 # dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true
 CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include"
 
 USES=		tar:xz
 # helpful when testing beta
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 MOZ_OPTIONS+=	--without-wasm-sandboxed-libraries
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile
index 6958e54d545b..b343c5b778a3 100644
--- a/www/librewolf/Makefile
+++ b/www/librewolf/Makefile
@@ -1,103 +1,104 @@
 PORTNAME=	librewolf
 DISTVERSION=	131.0.3
 DISTVERSIONSUFFIX=	-1.source
+PORTREVISION=	1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://gitlab.com/api/v4/projects/32320088/packages/generic/${PORTNAME}-source/${DISTVERSION}-1/
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Custom version of Firefox, focused on privacy, security and freedom
 WWW=		https://librewolf.net/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.104:security/nss \
 		icu>=73.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=9.0.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.43:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.14.1:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
 USE_GECKO=	gecko
 USE_MOZILLA=	-sqlite
 
 # work around bindgen not finding ICU, e.g.
 # dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true
 CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ENV+=	MOZ_REQUIRE_SIGNING=""
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-1
 
 MOZILLA_CAP=	${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//}
 
 MOZ_EXPORT+=	MOZ_TELEMETRY_REPORTING="" \
 		MOZILLA_OFFICIAL="1" \
 		MOZ_OFFICIAL_BRANDING="1" \
 		MOZ_APP_DISPLAYNAME="${MOZILLA_CAP}" \
 		MOZ_APP_NAME="${MOZILLA}"
 
 MOZ_OPTIONS=	--enable-application=browser \
 		--allow-addon-sideload \
 		--disable-crashreporter \
 		--disable-debug \
 		--disable-default-browser-agent \
 		--disable-tests \
 		--disable-updater \
 		--enable-hardening \
 		--enable-optimize \
 		--enable-release \
 		--with-app-name=${MOZILLA} \
 		--with-branding=browser/branding/${MOZILLA} \
 		--with-unsigned-addon-scopes=app,system \
 		--enable-bootstrap \
 		MOZ_CRASHREPORTER=0 \
 		MOZ_DATA_REPORTING=0
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
 MOZ_OPTIONS+=	--enable-rust-simd
 .endif
 
 .if ${ARCH} == powerpc64
 CFLAGS+=	-DHWY_COMPILE_ONLY_SCALAR
 MOZ_OPTIONS+=	--without-wasm-sandboxed-libraries
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \
 		-e 's|firefox|${MOZILLA}|' \
 		-e 's|Firefox|${MOZILLA_CAP}|' \
 		<${.CURDIR}/../firefox/files/firefox.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 	@${RM} ${WRKSRC}/mozconfig
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile
index fd800a850d77..c1864b0d30c7 100644
--- a/www/qt5-webengine/Makefile
+++ b/www/qt5-webengine/Makefile
@@ -1,172 +1,173 @@
 # QtWebEngine itself is a very thin layer of Qt code on top of a large part of
 # Chromium (everything up to the content/ layer). As such, most of the work in
 # this port revolves around taming Chromium and getting it to build on FreeBSD.
 # While it does build at the moment, there are several items that should be
 # investigated or improved:
 # - We are using several stub files, especially in Chromium's base/ and net/
 #   layers. We should look at implementing the missing bits instead.
 # - We are currently not using any sandboxing mechanism.
 # - We need to see if more "use_system_<FOO>" flags can be passed.
 # - The process of porting QtWebEngine needs to be documented so we can move to
 #   newer releases more easily.
 #
 # Also note that, due to the insane amount of patches this port needs, it tends
 # to lag behind the rest of the official Qt5 ones, which is why we set
 # QT5_VERSION and DISTINFO_FILE here.
 
 # In order to successfully build this port in poudriere you need to add
 # MAX_FILES_qt5_webengine=4096 to /usr/local/etc/poudriere.conf
 
 PORTNAME=	webengine
 PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 5 library to render web content
 
 BUILD_DEPENDS=	bison:devel/bison \
 		${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libdbus-1.so:devel/dbus \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libjsoncpp.so:devel/jsoncpp \
 		liblcms2.so:graphics/lcms2 \
 		libnspr4.so:devel/nspr \
 		libnss3.so:security/nss \
 		libopenh264.so:multimedia/openh264 \
 		libopus.so:audio/opus \
 		libpci.so:devel/libpci \
 		libpng.so:graphics/png \
 		libre2.so:devel/re2 \
 		libsnappy.so:archivers/snappy \
 		libvpx.so:multimedia/libvpx \
 		libwebp.so:graphics/webp
 
 DISTINFO_FILE=	${.CURDIR}/distinfo
 QT5_VERSION=	${_KDE_webengine_VERSION}
 
 OPTIONS_SINGLE=		AUDIO
 OPTIONS_SINGLE_AUDIO=	ALSA PULSEAUDIO SNDIO
 OPTIONS_DEFAULT=	ALSA
 
 AUDIO_DESC=		Audio backend
 
 # Need the alsa plugins to get sound at runtime, otherwise messages
 # that the pcm_oss plugin can't be opened.
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	alsa-plugins>=0:audio/alsa-plugins
 ALSA_VARS=		QMAKE_CONFIGURE_ARGS+=-alsa
 ALSA_VARS_OFF=		QMAKE_CONFIGURE_ARGS+=-no-alsa
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	QMAKE_CONFIGURE_ARGS+=-pulseaudio
 PULSEAUDIO_VARS_OFF=	QMAKE_CONFIGURE_ARGS+=-no-pulseaudio
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_VARS=		QMAKE_CONFIGURE_ARGS+=-sndio
 SNDIO_VARS_OFF=		QMAKE_CONFIGURE_ARGS+=-no-sndio
 
 # We pass `norecursive' to USES=qmake because src/plugins/plugins.pro checks
 # whether webenginewidgets is available, which fails when qmake processes all
 # .pro files at once.
 USES=		gl gnome gperf jpeg minizip ninja:build nodejs:build,lts \
 		perl5 pkgconfig python:build qmake:norecursive,outsource \
 		qt-dist:5,webengine shebangfix xorg
 USE_GL=		gl
 USE_GNOME=	glib20 libxml2 libxslt
 USE_PERL5=	build
 USE_QT=		core declarative gui location network printsupport \
 		webchannel widgets \
 		buildtools:build designer:build qmake:build
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \
 		xorgproto xrandr xrender xscrnsaver xtst
 
 QMAKE_CONFIGURE_ARGS=	-proprietary-codecs -system-ffmpeg
 
 # We could just set it to an empty string as well. "all" does not account for
 # dependencies correctly in the generated Makefiles, use the right target here.
 ALL_TARGET=	first
 
 # We need ar(1) from ports because the Chromium code uses the @file syntax.
 # We then need to ensure ld(1) from ports is used because of the archives ar(1)
 # generated.
 USE_BINUTILS=	yes
 CC+=		"-B${LOCALBASE}/bin"
 CXX+=		"-B${LOCALBASE}/bin"
 
 # The build system reads the environment variable $NINJA_PATH to decide whether
 # to boostrap ninja or not (and also to invoke it afterwards). CC and CXX are
 # read by some Chromium code to determine which compiler to invoke when running
 # some configuration tests.
 # Since we use USES=qmake:norecursive, we also need to pass some variables to
 # MAKE_ENV because part of the configuration process happens during the build.
 CONFIGURE_ENV+=	NINJAFLAGS="-j${MAKE_JOBS_NUMBER}" \
 		NINJA_PATH="${LOCALBASE}/bin/ninja"  \
 		PATH=${CONFIGURE_WRKSRC}/bin:${LOCALBASE}/bin:${PATH}
 MAKE_ENV+=	CC="${CC}" CXX="${CXX}"			\
 		C_INCLUDE_PATH=${LOCALBASE}/include	\
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include	\
 		${CONFIGURE_ENV}
 
 QT_BINARIES=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*}
 PLIST_SUB+=	BE="" LE="@comment "
 .else
 PLIST_SUB+=	BE="@comment " LE=""
 .endif
 
 post-extract:
 # Install FreeBSD's freebsd.pri file.
 	${CP} ${FILESDIR}/freebsd.pri ${WRKSRC}/src/buildtools/config/freebsd.pri
 
 post-extract-SNDIO-on:
 	@cd ${WRKSRC}/src/3rdparty/chromium/media/audio && ${MKDIR} sndio openbsd
 	@${CP} ${FILESDIR}/sndio_*put.* \
 		${WRKSRC}/src/3rdparty/chromium/media/audio/sndio
 	@${CP} ${FILESDIR}/audio_manager_openbsd.* \
 		${WRKSRC}/src/3rdparty/chromium/media/audio/openbsd
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/src/3rdparty/chromium/base/linux_util.cc \
 		${WRKSRC}/src/3rdparty/chromium/base/test/BUILD.gn \
 		${WRKSRC}/src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni \
 		${WRKSRC}/src/3rdparty/chromium/chrome/common/chrome_paths.cc \
 		${WRKSRC}/src/3rdparty/chromium/third_party/pdfium/core/fxge/fx_ge_linux.cpp \
 		${WRKSRC}/src/3rdparty/gn/build/gen.py
 	@${REINPLACE_CMD} -E -e 's|^(MODULE_VERSION = ).*|\1${QT5_VERSION}|' \
 		${WRKSRC}/.qmake.conf
 
 .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*}
 	@${REINPLACE_CMD} -e 's/icudtl.dat/icudtb.dat/' \
 		${WRKSRC}/src/core/core_module.pro
 .endif
 
 pre-configure:
 # Link in ${PYTHON_CMD} to ${CONFIGURE_WRKSRC}/bin -- the scripts hardcode 'python'
 # in too many places to reasonably patch. So just link in ${PYTHON_CMD} to work around
 # $LOCALBASE/bin/python being python3 if the default versions is set to 3.x.
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python
 # Unbundle a few dependencies.
 	cd ${WRKSRC}/src/3rdparty/chromium && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries\
 		fontconfig freetype harfbuzz-ng libdrm libevent libpng libwebp libxml libxslt openh264 opus || ${FALSE}
 # Rerun syncqt.pl -- otherwise the resulting package misses some forwarding headers.
 	cd ${WRKSRC} && ${QT_BINDIR}/syncqt.pl -version ${QT5_VERSION}
 
 post-build:
 # Fix version mismatches for CMake
 .for module in Pdf PdfWidgets WebEngine WebEngineCore WebEngineWidgets
 	@${REINPLACE_CMD} -e '/${QT5_VERSION} $${_Qt5${module}_FIND_VERSION_EXACT}/s|${QT5_VERSION}|'"$$(${MAKE} -C ../../devel/qt5-core -VQT5_VERSION)"'|' \
 		${BUILD_WRKSRC}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/www/qt6-webengine/Makefile b/www/qt6-webengine/Makefile
index b6f2d157f127..becc63ec87a3 100644
--- a/www/qt6-webengine/Makefile
+++ b/www/qt6-webengine/Makefile
@@ -1,184 +1,184 @@
 # QtWebEngine itself is a very thin layer of Qt code on top of a large part of
 # Chromium (everything up to the content/ layer). As such, most of the work in
 # this port revolves around taming Chromium and getting it to build on FreeBSD.
 # While it does build at the moment, there are several items that should be
 # investigated or improved:
 # - We are using several stub files, especially in Chromium's base/ and net/
 #   layers. We should look at implementing the missing bits instead.
 # - We are currently not using any sandboxing mechanism.
 # - The process of porting QtWebEngine needs to be documented so we can move to
 #   newer releases more easily.
 #
 
 PORTNAME?=	webengine
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION?=	0 # Master port for print/qt6-pdf. Please keep this line.
+PORTREVISION?=	1 # Master port for print/qt6-pdf. Please keep this line.
 CATEGORIES?=	www
 PKGNAMEPREFIX=	qt6-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT?=	Qt 6 library to render web content
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \
 		${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libnss3.so:security/nss \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		bison cmake compiler:c++17-lang gl gperf \
 		localbase:ldflags ninja:build nodejs:build,lts \
 		pkgconfig python:build qt-dist:6,webengine
 USE_GL=		opengl
 USE_QT=		base declarative tools
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \
 		xrandr xrender xscrnsaver xshmfence xtst
 
 CMAKE_ON=	QT_FEATURE_webengine_system_ffmpeg \
 		QT_FEATURE_webengine_proprietary_codecs
 
 .if defined(BUILD_QTPDF)
 LIB_DEPENDS+=	libcups.so:print/cups \
 		libopenjp2.so:graphics/openjpeg
 
 CMAKE_ON+=	QT_FEATURE_qtpdf_build
 CMAKE_OFF+=	QT_FEATURE_qtwebengine_build
 
 SYS_LIBS=	freetype
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 LIB_DEPENDS+=	libabsl_base.so:devel/abseil \
 		libavcodec.so:multimedia/ffmpeg \
 		libdbus-1.so:devel/dbus \
 		libdrm.so:graphics/libdrm \
 		libevent.so:devel/libevent \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz.so:print/harfbuzz \
 		libnspr4.so:devel/nspr \
 		libopenh264.so:multimedia/openh264 \
 		libopus.so:audio/opus \
 		libpci.so:devel/libpci \
 		libpng.so:graphics/png \
 		libre2.so:devel/re2 \
 		libsnappy.so:archivers/snappy \
 		libvpx.so:multimedia/libvpx \
 		libwebp.so:graphics/webp
 
 USES+=		gnome jpeg minizip xorg
 USE_GL+=	gbm
 USE_QT+=	positioning quick3d:build webchannel
 USE_GNOME+=	glib20 libxml2 libxslt
 USE_XORG+=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \
 		xrandr xrender xscrnsaver xshmfence xtst
 
 CMAKE_ON+=	QT_FEATURE_qtwebengine_build
 CMAKE_OFF+=	QT_FEATURE_qtpdf_build
 
 SYS_LIBS=	freetype harfbuzz-ng libdrm libevent libpng libxml libxslt openh264 opus
 .endif
 
 # The build system reads the environment variable $NINJA_PATH to decide whether
 # to boostrap ninja or not (and also to invoke it afterwards). CC and CXX are
 # read by some Chromium code to determine which compiler to invoke when running
 # some configuration tests.
 CONFIGURE_ENV+=	NINJAFLAGS="-j${MAKE_JOBS_NUMBER}" \
 		NINJA_PATH="${LOCALBASE}/bin/ninja"  \
 		PATH=${CONFIGURE_WRKSRC}/bin:${LOCALBASE}/bin:${PATH}
 MAKE_ENV+=	CC="${CC}" CXX="${CXX}"			\
 		C_INCLUDE_PATH=${LOCALBASE}/include	\
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include	\
 		${CONFIGURE_ENV}
 # Avoid running multiple make(1) jobs, but only those.  Otherwise the build
 # fails intermittently due race conditions if multiple ninja instances are
 # running at the same time (mostly for the targets "WebEngineCore" and
 # "convert_dict").
 #
 # MAKE_JOBS_UNSAFE is too invasive because it also affects the number of jobs
 # for ninja(1) and would slow everything down which we don't want.  We pass the
 # real number of make jobs via MAKE_JOBS_NUMBER to ninja(1) to CONFIGURE_ENV.
 DO_MAKE_BUILD=	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} -j1 ${MAKE_ARGS:N${DESTDIRNAME}=*}
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 .if !defined(BUILD_QTPDF)
 OPTIONS_DEFINE=		CUPS DRIVER
 OPTIONS_DEFAULT=	ALSA CUPS DRIVER
 OPTIONS_SINGLE=		AUDIO
 OPTIONS_SINGLE_AUDIO=	ALSA PULSEAUDIO SNDIO
 OPTIONS_SUB=		yes
 
 AUDIO_DESC=		Audio backend
 
 # Need the alsa plugins to get sound at runtime, otherwise messages
 # that the pcm_oss plugin can't be opened.
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	alsa-plugins>=0:audio/alsa-plugins
 ALSA_CMAKE_ON=		-DQT_FEATURE_webengine_system_alsa:BOOL=ON
 ALSA_CMAKE_OFF=		-DQT_FEATURE_webengine_system_alsa:BOOL=OFF
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups \
 			liblcms2.so:graphics/lcms2 \
 			libopenjp2.so:graphics/openjpeg \
 			libtiff.so:graphics/tiff
 CUPS_CMAKE_ON=		-DQT_FEATURE_webengine_printing_and_pdf:BOOL=ON
 CUPS_CMAKE_OFF=		-DQT_FEATURE_webengine_printing_and_pdf:BOOL=OFF
 
 DRIVER_DESC=		Install WebEngineDriver
 DRIVER_CMAKE_ON=	-DQT_FEATURE_webenginedriver:BOOL=ON
 DRIVER_CMAKE_OFF=	-DQT_FEATURE_webenginedriver:BOOL=OFF
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_ON=	-DQT_FEATURE_webengine_system_pulseaudio:BOOL=ON
 PULSEAUDIO_CMAKE_OFF=	-DQT_FEATURE_webengine_system_pulseaudio:BOOL=OFF
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CMAKE_ON=		-DQT_FEATURE_webengine_system_sndio:BOOL=ON
 SNDIO_CMAKE_OFF=	-DQT_FEATURE_webengine_system_sndio:BOOL=OFF
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386 || ${ARCH} == armv7
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-32bit-compress_files_js
 .endif
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/src/3rdparty/chromium/media/audio/sndio \
 		${WRKSRC}/src/3rdparty/chromium/sandbox/policy/freebsd \
 		${WRKSRC}/src/3rdparty/chromium/sandbox/policy/openbsd
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%CPPFLAGS%%|${CPPFLAGS}|;s|%%CXXFLAGS%%|${CXXFLAGS}|;s|%%LDFLAGS%%|${LDFLAGS}|' \
 		${WRKSRC}/src/host/BUILD.toolchain.gn.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/src/3rdparty/chromium/third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp \
 		${WRKSRC}/src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
 
 pre-configure:
 # We used to remove bundled libraries to be sure that webengine uses
 # system libraries and not shipped ones.
 #
 # Leads to missing header errors: icu, libvpx, libwebp, re2, snappy, zlib
 # No-Op: flac
 #
 # Don't attempt to unbundle libraries that the Pdf module doesn't use. It
 # causes configuration errors.
 #
 # cd ${WRKSRC} && ${PYTHON_CMD} \
 # ./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC}/src/3rdparty/chromium && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		${SYS_LIBS} || ${FALSE}
 
 .if !defined(BUILD_QTPDF)
 post-install:
 # Fix for deskutils/calibre, perhaps others, where this empty directory
 # is created during build causing a fs-violation.
 	${MKDIR} ${STAGEDIR}${QT_DATADIR}/resources/locales
 
 post-install-DRIVER-on:
 	${STRIP_CMD} ${STAGEDIR}${QT_TOOLDIR}/webenginedriver
 
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile
index bb8668b7123a..4c04dddd0259 100644
--- a/www/tor-browser/Makefile
+++ b/www/tor-browser/Makefile
@@ -1,126 +1,126 @@
 PORTNAME=	tor-browser
 DISTVERSION=	13.5a9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www net security wayland
 MASTER_SITES=	TOR \
 		https://build-sources.tbb.torproject.org/:source1 \
 		LOCAL/jsm:source2
 MASTER_SITE_SUBDIR=	torbrowser/${DISTVERSION}
 DISTNAME=	src-firefox-tor-browser-115.12.0esr-13.5-1-build2
 DISTFILES=	${DISTNAME}.tar.xz \
 		manual_112141.zip:source1 \
 		firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar:source2
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Tor Browser for FreeBSD
 WWW=		https://www.torproject.org/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.94:security/nss \
 		icu>=73.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=8.2.2:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.39:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.13.1:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 USE_GITLAB=nodefault
 GL_SITE=	https://gitlab.torproject.org/
 GL_ACCOUNT=	tpo
 GL_PROJECT=	translation:basebrowser translation:torbrowser
 GL_TAGNAME=	3faf7dcd545109f7bbd8a6374838e139ca422d6c:basebrowser 51bc08246d73990d461f747fb3c8cc7b6f66c1f4:torbrowser
 RUN_DEPENDS=	tor:security/tor \
 		obfs4proxy:security/obfs4proxy-tor
 
 USES=		compiler:c++11-lib libtool \
 		perl5 pkgconfig python shebangfix localbase:ldflags tar:xz python:3
 USE_GECKO=	gecko
 
 SSP_UNSAFE=	yes
 
 SUB_FILES=	torrc-defaults tor-browser.desktop
 BUNDLE_LIBS=	yes
 
 USE_MOZILLA=	-sqlite
 MOZILLA_VER=115.4.0
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include" \
 		MOZ_CHROME_MULTILOCALE="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW en-US"
 MAKE_ENV+=	AB_CD="multi" \
 		LOCALES="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW en-US"
 MOZ_EXPORT+=	MOZ_TELEMETRY_REPORTING="" \
 		MOZILLA_OFFICIAL="1" \
 		MOZ_OFFICIAL_BRANDING="1" \
 		MOZ_APP_DISPLAYNAME="Tor Browser" \
 		MOZ_APP_NAME="tor-browser" \
 		MOZ_CHROME_MULTILOCALE="ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW en-US"
 MOZ_OPTIONS=	--with-base-browser-version=${DISTVERSION} \
 	--enable-official-branding \
 	--enable-optimize \
 	--enable-bundled-fonts \
 	--disable-tests \
 	--disable-debug \
 	--disable-crashreporter \
 	--disable-webrtc \
 	--disable-parental-controls \
 	--enable-proxy-bypass-protection \
 	--disable-system-policies \
 	--disable-backgroundtasks \
 	--with-distribution-id=org.torproject \
 	--with-branding=browser/branding/tb-release
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 SHEBANG_FILES+=	mach
 .include	"${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
 MOZ_OPTIONS+=	--enable-rust-simd
 .endif
 .if ${ARCH} == powerpc64
 MOZ_OPTIONS+=	--without-wasm-sandboxed-libraries
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 MOZILLA_PLIST_DIRS=	bin lib share/pixmaps share/applications share/tor-browser
 MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 post-patch:
 	@${REINPLACE_CMD} 's|LOCALBASE|${LOCALBASE}|g' "${WRKSRC}/browser/app/profile/000-tor-browser.js"
 	${MKDIR} ${WRKSRC}/tmp-manual
 	unzip -d ${WRKSRC}/tmp-manual ${DISTDIR}/manual_112141.zip
 	${MKDIR} ${WRKSRC}/tmp-l10n-central
 	tar -C ${WRKSRC}/tmp-l10n-central -xf ${DISTDIR}/firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar
 pre-configure:
 	@${REINPLACE_CMD} 's|export MOZ_GOOGLE_.*||g' ${WRKSRC}/.mozconfig
 	${PYTHON_CMD} ${FILESDIR}/packagemanual.py ${WRKSRC}/tmp-manual/public ${WRKSRC}/browser/base/content/manual
 post-build:
 	${MKDIR} -p ${WRKSRC}/../.mozbuild/l10n-central
 	find  ${WRKSRC}/tmp-l10n-central -name "*.tar.xz"  -exec tar -C ${WRKSRC}/../.mozbuild/l10n-central -xvf {} \;
 	cd ${WRKSRC}/../.build/ && MOZBUILD_STATE_PATH=${WRKSRC}/../.mozbuild MOZ_AUTOMATION="1" ${WRKSRC}/mach package-multi-locale  --locales ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW
 .for i in ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN zh-TW
 	${CP} ${WRKDIR}/translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c/${i}/base-browser.ftl ${WRKDIR}/.build/dist/bin/browser/localization/${i}/browser/base-browser.ftl
 	${CP} ${WRKDIR}/translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c/${i}/newIdentity.properties ${WRKDIR}/.build/dist/bin/browser/chrome/${i}/locale/browser/newIdentity.properties
 	${CP} ${WRKDIR}/translation-3faf7dcd545109f7bbd8a6374838e139ca422d6c/${i}/securityLevel.properties ${WRKDIR}/.build/dist/bin/browser/chrome/${i}/locale/browser/securityLevel.properties
 	${MKDIR} ${WRKDIR}/.build/dist/bin/chrome/torbutton/locale/${i}/browser
 	test -f ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/tor-browser.ftl && ${CP} ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/tor-browser.ftl ${WRKDIR}/.build/dist/bin/browser/localization/${i}/browser/tor-browser.ftl 
 	${CP} ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/cryptoSafetyPrompt.properties ${WRKDIR}/.build/dist/bin/browser/chrome/${i}/locale/browser/cryptoSafetyPrompt.properties
 .for j in brand.dtd aboutDialog.dtd aboutTBUpdate.dtd torbutton.dtd onboarding.properties brand.properties torlauncher.properties branding/brand.ftl rulesets.properties settings.properties torConnect.properties onionLocation.properties aboutTor.dtd torbutton.properties browserOnboarding.properties 
 	${MKDIR} ${WRKDIR}/.build/dist/bin/chrome/torbutton/locale/${i}/branding
 	${CP} ${WRKDIR}/translation-51bc08246d73990d461f747fb3c8cc7b6f66c1f4/${i}/${j} ${WRKDIR}/.build/dist/bin/chrome/torbutton/locale/${i}/${j}
 .endfor 
 .endfor
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/torrc-defaults ${STAGEDIR}${DATADIR}/torrc-defaults
 	${INSTALL_DATA} ${WRKDIR}/tor-browser.desktop ${STAGEDIR}${PREFIX}/share/applications/tor-browser.desktop
 .include <bsd.port.mk>
diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile
index 0f0b106882b8..22c131472c10 100644
--- a/www/waterfox/Makefile
+++ b/www/waterfox/Makefile
@@ -1,106 +1,106 @@
 PORTNAME=	waterfox
 DISTVERSIONPREFIX=	G
 DISTVERSION=	6.0.19
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Distilled fork of Firefox
 WWW=		https://www.waterfox.net/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.95:security/nss \
 		icu>=74.2:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=8.3.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.39:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.13.0:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
 USE_GECKO=	gecko
 USE_GITHUB=	yes
 GH_ACCOUNT=	BrowserWorks
 GH_PROJECT=	Waterfox
 USE_MOZILLA=	-sqlite
 
 # work around bindgen not finding ICU, e.g.
 # dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true
 CONFIGURE_ENV+=		BINDGEN_CFLAGS="-I${LOCALBASE}/include" \
 			MOZ_REQUIRE_SIGNING=""
 
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 
 BINARY_ALIAS+=		python3=${PYTHON_CMD}
 
 MOZILLA_CAP=	${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//}
 
 MOZ_EXPORT+=	MOZ_TELEMETRY_REPORTING="" \
 		MOZILLA_OFFICIAL="1" \
 		MOZ_OFFICIAL_BRANDING="1" \
 		MOZ_APP_DISPLAYNAME="${MOZILLA_CAP}" \
 		MOZ_APP_NAME="${MOZILLA}"
 
 MOZ_OPTIONS+=	--enable-application=browser \
 		--allow-addon-sideload \
 		--disable-crashreporter \
 		--disable-debug \
 		--disable-default-browser-agent \
 		--disable-tests \
 		--disable-updater \
 		--enable-hardening \
 		--enable-optimize \
 		--enable-release \
 		--with-app-name=${MOZILLA} \
 		--with-unsigned-addon-scopes=app,system \
 		--enable-bootstrap \
 		MOZ_CRASHREPORTER=0 \
 		MOZ_DATA_REPORTING=0
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
 MOZ_OPTIONS+=	--enable-rust-simd
 .endif
 
 .if ${ARCH} == powerpc64
 CFLAGS+=	-DHWY_COMPILE_ONLY_SCALAR
 MOZ_OPTIONS+=	--without-wasm-sandboxed-libraries
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \
 		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
 MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
 		-e 's/firefox/${MOZILLA}/' \
 		-e 's/Firefox/${MOZILLA_CAP}/' \
 		-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
 		${FIREFOX_DESKTOP}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 post-install:
 	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>