diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index da456fcf36b0..3730d9f295ff 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -1,164 +1,164 @@
 PORTNAME=	gnash
 PORTVERSION=	0.8.10
-PORTREVISION=	64
+PORTREVISION=	65
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	http://git.savannah.gnu.org/cgit/gnash.git/snapshot/
 DISTNAME=	gnash-2b3bdede0305c4fc3ad21a0a4197330606c9b880
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNU Flash movie player
 WWW=		https://www.gnu.org/software/gnash/
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libnspr4.so:devel/nspr \
 		libgif.so:graphics/giflib \
 		libpng.so:graphics/png \
 		libcurl.so:ftp/curl \
 		libspeex.so:audio/speex \
 		libspeexdsp.so:audio/speexdsp \
 		libboost_thread.so:devel/boost-libs \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libavcodec.so.58:multimedia/ffmpeg4 \
 		libtheora.so:multimedia/libtheora \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis \
 		libdca.so:multimedia/libdca \
 		libgsm.so:audio/gsm \
 		libdc1394.so:multimedia/libdc1394
 
 CONFLICTS=	gnash-devel
 
 USES=		cpe tar:bzip2 compiler:c++11-lang autoreconf gmake libtool \
 		pkgconfig jpeg gnome gl sdl desktop-file-utils xorg localbase:ldflags
 CPE_VENDOR=	gnu
 USE_CSTD=	gnu11
 USE_CXXSTD=	c++11
 USE_XORG=	x11 xau xdmcp xext xi xinerama ice sm xv
 USE_GNOME=	atk gdkpixbuf2 gtk20 libxml2 pango
 USE_GL=		egl
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
 
 SYSCONFIGDIR=	${PREFIX}/etc
 
 # jemalloc leads to infinite recursion on FreeBSD
 CFLAGS+=	-I${LOCALBASE}/ffmpeg4/include
 CPPFLAGS+=	-I${LOCALBASE}/ffmpeg4/include
 LDFLAGS+=	-L${LOCALBASE}/ffmpeg4/lib
 CONFIGURE_ARGS=	--with-boost-incl="${LOCALBASE}/include" \
 		--with-boost-lib="${LOCALBASE}/lib" \
 		--with-plugins-install=prefix \
 		--sysconfdir="${SYSCONFIGDIR}" \
 		--enable-gui=gtk \
 		--enable-media=ffmpeg \
 		--with-ffmpeg-incl="${LOCALBASE}/ffmpeg4/include/libavcodec" \
 		--with-ffmpeg-lib=${LOCALBASE}/ffmpeg4/lib \
 		--disable-testsuite \
 		--disable-kparts3 \
 		--disable-jemalloc \
 		--without-gconf
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 #MAKE_ARGS+=	INCLUDES="-I${LOCALBASE}/include/ffmpeg"
 
 GNASHVER=	0.8.11dev
 CONFIG_FILES=	gnashpluginrc gnashrc
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 PLIST_SUB+=	GNASHVER="${GNASHVER}"
 
 USE_LDCONFIG=	${PREFIX}/lib/gnash
 
 OPTIONS_DEFINE=	CYGNAL VAAPI DOCS NLS
 OPTIONS_SINGLE=	MEDIA RENDERER
 OPTIONS_SINGLE_RENDERER=AGG OPENGL CAIRO
 OPTIONS_DEFAULT=AGG VAAPI
 
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 CYGNAL_DESC=	Cygnal media server
 AGG_DESC=	AGG renderer
 OPENGL_DESC=	OpenGL renderer (experimental)
 CAIRO_DESC=	Cairo renderer
 VAAPI_DESC=	VAAPI support
 
 CYGNAL_CONFIGURE_ENABLE=	cygnal
 VAAPI_CPPFLAGS=	-I../libdevice/vaapi
 
 .include <bsd.port.options.mk>
 
 # Cygnal option processing
 .if ${PORT_OPTIONS:MCYGNAL}
 CONFIG_FILES+=	cygnalrc
 .endif
 
 # NLS option processing (not sure if --disable-nls actually has any effect)
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 CONFIGURE_ARGS+=	--disable-npapi --disable-kparts4
 
 #
 # Renderer options processing
 #
 GNASH_RENDERERS=
 
 .if ${PORT_OPTIONS:MAGG}
 LIB_DEPENDS+=		libagg.so:graphics/agg
 GNASH_RENDERERS+=	agg
 .endif
 
 .if ${PORT_OPTIONS:MOPENGL}
 IGNORE=		support for OpenGL is currently broken, use option AGG
 GNASH_RENDERERS+=	ogl
 LIB_DEPENDS+=		libgdkglext-x11-1.0.so:x11-toolkits/gtkglext
 .endif
 
 .if ${PORT_OPTIONS:MCAIRO}
 LIB_DEPENDS+=		libcairo.so:graphics/cairo
 GNASH_RENDERERS+=	cairo
 .endif
 
 .if ${GNASH_RENDERERS} == ""
 IGNORE=			needs at least one renderer enabled. Please rerun 'make config' and enable AGG, OPENGL or CAIRO
 .endif
 
 CONFIGURE_ARGS+=	--enable-renderer=${GNASH_RENDERERS:S/^ //W:S/ /,/gW}
 
 #
 # Hardware acceleration options processing
 #
 .if ${PORT_OPTIONS:MVAAPI}
 LIB_DEPENDS+=		libva.so:multimedia/libva
 CONFIGURE_ARGS+=	--enable-device=egl,x11,vaapi
 .else
 CONFIGURE_ARGS+=	--enable-hwaccel=none # XVideo
 CONFIGURE_ARGS+=	--enable-device=egl,x11
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's|lib64|lib|g' -e 's|lib32|lib|g' \
 		${WRKSRC}/macros/libslist
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 			-e 's|/usr/X11R6|${LOCALBASE}|g' \
 		${WRKSRC}/macros/incllist
 	${REINPLACE_CMD} -e 's|CODEC_ID_|AV_CODEC_ID_|' \
 		${WRKSRC}/libmedia/ffmpeg/VideoDecoderFfmpegVaapi.cpp
 
 post-install:
 	# eglinfo conflicts with mesa-demos
 	${MV} ${STAGEDIR}/${PREFIX}/bin/eglinfo ${STAGEDIR}/${PREFIX}/bin/eglinfo-gnash
 .for conf in ${CONFIG_FILES}
 	${MV} ${STAGEDIR}/${SYSCONFIGDIR}/${conf} ${STAGEDIR}${SYSCONFIGDIR}/${conf}.dist
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 66e88195aa25..40664bf4a515 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,249 +1,249 @@
 PORTNAME=	opencv
 DISTVERSION=	4.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Open Source Computer Vision library
 WWW=		https://www.opencv.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libharfbuzz.so:print/harfbuzz \
 		libhdf5.so:science/hdf5
 
 USES=		cmake compiler:c++14-lang cpe localbase:ldflags pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	WeChatCV:wechat
 GH_PROJECT=	opencv_contrib:contrib \
 		ade:ade \
 		opencv_3rdparty:extra_mod_3rdparty_boost_descr \
 		opencv_3rdparty:extra_mod_3rdparty_vgg \
 		opencv_3rdparty:wechat \
 		opencv_3rdparty:face \
 		opencv_3rdparty:ippicv
 GH_TAGNAME=	v0.1.1f:ade \
 		34e4206aef44d50e6bbcd0ab06354b52e7466d26:extra_mod_3rdparty_boost_descr \
 		fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg \
 		a8b69ccc738421293254aec5ddb38bd523503252:wechat \
 		8afa57abc8229d611c4937165d20e2a2d9fc5a12:face \
 		a56b6ac6f030c312b2dce17430eef13aed9af274:ippicv
 
 CMAKE_ON=	OPENCV_GENERATE_PKGCONFIG \
 		OPENCV_SKIP_CMAKE_CXX_STANDARD
 CMAKE_OFF=	OPENCV_GENERATE_SETUPVARS \
 		BUILD_opencv_python2 \
 		BUILD_TESTS
 CMAKE_OFF+=	WITH_OBSENSOR # linux/uvcvideo.h is included when WITH_OBSENSOR is enabled
 CMAKE_ARGS=	-DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules"
 
 DATADIR=	${PREFIX}/share/${PORTNAME}4
 
 PLIST_SUB=	SHLIB_VER=${DISTVERSION}
 
 OPTIONS_DEFINE=		EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL \
 			PATENTED PROTOBUF PYTHON TBB TESSERACT
 
 OPTIONS_GROUP=		GUI IMAGE VIDEO
 OPTIONS_GROUP_GUI=	GTK3 VTK
 OPTIONS_GROUP_IMAGE=	GPHOTO2 JPEG OPENEXR PNG TIFF
 OPTIONS_GROUP_VIDEO=	DC1394 FFMPEG GSTREAMER V4L VULKAN WEBP XINE
 
 OPTIONS_SINGLE=		BLAS
 OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NOBLAS
 
 OPTIONS_RADIO=		JPEG2K
 OPTIONS_RADIO_JPEG2K=	JASPER OPENJPEG
 
 OPTIONS_DEFAULT=	EIGEN GDAL GDCM OPENCL PROTOBUF PYTHON \
 			DC1394 GSTREAMER V4L VULKAN WEBP \
 			GPHOTO2 JPEG OPENEXR PNG TIFF \
 			OPENBLAS \
 			OPENJPEG
 OPTIONS_SUB=		yes
 
 # Normal options (EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL PATENTED PROTOBUF PYTHON TBB)
 EIGEN_DESC=		Add Eigen v3 Support, builds sfm modules
 EIGEN_CMAKE_BOOL=	WITH_EIGEN
 EIGEN_USES=		eigen:3
 
 GDAL_DESC=		Add Geospatial Data Abstraction Library Support
 GDAL_CMAKE_BOOL=	WITH_GDAL
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 
 GDCM_DESC=		Add Open source DICOM library Support
 GDCM_CMAKE_BOOL=	WITH_GDCM
 GDCM_LIB_DEPENDS=	libgdcmMSFF.so:devel/gdcm
 
 HARDENING_DESC=		Enables Build Hardening
 HARDENING_CMAKE_BOOL=	ENABLE_BUILD_HARDENING
 
 JAVA_DESC=		Enable Java Support
 JAVA_BUILD_DEPENDS=	ant:devel/apache-ant
 JAVA_CMAKE_BOOL=	BUILD_opencv_java BUILD_opencv_java_bindings_generator BUILD_JAVA
 JAVA_MAKE_ENV=		JAVACMD=${JAVA}
 JAVA_USE=		JAVA=yes
 
 LTO_DESC=		Enables Link Time Optimizations
 LTO_CMAKE_BOOL=		ENABLE_THIN_LTO
 
 OPENCL_DESC=		Add OpenCL Support
 OPENCL_CMAKE_BOOL=	WITH_OPENCL
 OPENCL_BUILD_DEPENDS=	opencl>=0:devel/opencl
 OPENCL_RUN_DEPENDS=	opencl>=0:devel/opencl
 
 PATENTED_DESC=		Enable patented 2d feature detection USE AT OWN RISK
 PATENTED_CMAKE_BOOL=	OPENCV_ENABLE_NONFREE
 
 PROTOBUF_DESC=		Enable protobuf support, builds dnn modules
 PROTOBUF_CMAKE_BOOL=	WITH_PROTOBUF # by default the bundled protobuf is built
 
 PYTHON_DESC=		Enable Python Support 3.6 or greater
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY}
 PYTHON_USES=		python
 PYTHON_CMAKE_BOOL=	BUILD_opencv_python3
 PYTHON_CMAKE_ON=	-DOPENCV_PYTHON3_INSTALL_PATH=${PYTHON_SITELIBDIR}
 
 TBB_DESC=		Add Intel Threading Building Blocks Support
 TBB_CMAKE_BOOL=		WITH_TBB
 TBB_LIB_DEPENDS=	libtbb.so:devel/onetbb
 
 TESSERACT_DESC=		Add Tesseract-based OCR
 TESSERACT_LIB_DEPENDS=	libtesseract.so:graphics/tesseract
 TESSERACT_CMAKE_BOOL=	WITH_TESSERACT
 ###
 
 # GUI group options (GTK3 VTK)
 GTK3_USES=		gnome
 GTK3_USE=		gnome=gtk30,cairo,gdkpixbuf2
 GTK3_CMAKE_BOOL=	WITH_GTK
 
 VTK_DESC=		Include VTK library support (build opencv_viz module)
 VTK_CMAKE_BOOL=		WITH_VTK
 VTK_LIB_DEPENDS=	libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 VTK_USES=		qt:5
 VTK_USE=		QT=buildtools:build,qmake:build
 ###
 
 # IMAGE group options (GPHOTO2 JPEG OPENEXR PNG TIFF)
 GPHOTO2_DESC=		Add Gphoto2 Support
 GPHOTO2_CMAKE_BOOL=	WITH_GPHOTO2
 GPHOTO2_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 
 JPEG_DESC=		Add LibJpeg Support
 JPEG_CMAKE_BOOL=	WITH_JPEG
 JPEG_USES=		jpeg
 
 OPENEXR_DESC=		Add OpenEXR Support
 OPENEXR_CMAKE_BOOL=	WITH_OPENEXR
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 
 PNG_DESC=		Add LibPNG Support
 PNG_CMAKE_BOOL=		WITH_PNG
 PNG_LIB_DEPENDS=	libpng16.so:graphics/png
 
 TIFF_DESC=		Add LibTIFF Support
 TIFF_CMAKE_BOOL=	WITH_TIFF
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 ###
 
 # VIDEO group options (DC1394 FFMPEG GSTREAMER V4L VULKAN WEBP XINE)
 DC1394_DESC=		IEEE 1394 camera support
 DC1394_CMAKE_BOOL=	WITH_1394
 DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
 
 FFMPEG_DESC=		Link with ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 GSTREAMER_DESC=		Add GSTREAMER Support
 GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER
 GSTREAMER_USES=		gstreamer
 GSTREAMER_USE=		gnome=glib20
 
 V4L_DESC=		Enable support for Video for Linux
 V4L_CMAKE_BOOL=		WITH_V4L WITH_LIBV4L
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 VULKAN_DESC=		Add Vulkan Support
 VULKAN_CMAKE_BOOL=	WITH_VULKAN
 VULKAN_CMAKE_ON=	-DVULKAN_INCLUDE_DIRS=${LOCALBASE}/include
 VULKAN_BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 
 WEBP_DESC=		Add Webp Support
 WEBP_CMAKE_BOOL=	WITH_WEBP
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 XINE_DESC=		Add Xine Support
 XINE_CMAKE_BOOL=	WITH_XINE
 XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 ###
 
 # BLAS group options (ATLAS OPENBLAS NOBLAS)
 ATLAS_DESC=		ATLAS blas implementation with lapacke
 ATLAS_USES=		blaslapack:atlas
 ATLAS_BUILD_DEPENDS=	cblas>0:math/cblas \
 			lapacke>0:math/lapacke
 
 OPENBLAS_DESC=		OpenBLAS blas implementation with lapacke
 OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_BUILD_DEPENDS=	cblas>0:math/cblas \
 			lapacke>0:math/lapacke
 
 NOBLAS_DESC=		Disable support for lapack/blas
 NOBLAS_CMAKE_BOOL_OFF=	WITH_LAPACK
 ###
 
 # JPEG2K group options (JASPER OPENJPEG)
 JASPER_DESC=		Add Jasper Support for JPEG2000
 JASPER_CMAKE_BOOL=	WITH_JASPER
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 
 OPENJPEG_DESC=		Add OpenJPEG Support for JPEG2000, OpenCV preferred
 OPENJPEG_CMAKE_BOOL=	WITH_OPENJPEG
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 ###
 
 _IPPICV_i386=		ippicv/ippicv_2020_lnx_ia32_20191018_general.tgz
 _IPPICV_amd64=		ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64le && defined(MACHINE_CPU) && ${MACHINE_CPU:Mvsx3}
 CMAKE_ARGS+=		-DCPU_BASELINE:STRING="VSX;VSX3;"
 .endif
 
 post-extract:
 	# Handle contrib
 	${MV} ${WRKSRC_contrib} ${WRKSRC}/contrib
 	# Handle prefetched ade modul
 	${MKDIR} ${BUILD_WRKSRC}/3rdparty/ade
 	${MV} ${WRKSRC_ade} ${BUILD_WRKSRC}/3rdparty/ade
 	# Handle prefetched xfeatures2d
 	${MKDIR} ${BUILD_WRKSRC}/downloads/xfeatures2d
 	${CP} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
 	${CP} ${WRKSRC_extra_mod_3rdparty_vgg}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
 	# Handle prefetched wechat
 	${MKDIR} ${BUILD_WRKSRC}/downloads/wechat_qrcode
 	${CP} ${WRKSRC_wechat}/* ${BUILD_WRKSRC}/downloads/wechat_qrcode/
 	# Handle Face
 	${MKDIR} ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
 	${CP} ${WRKSRC_face}/* ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
 	# Handle ippicv
 .if defined(_IPPICV_${ARCH})
 	${MKDIR} ${BUILD_WRKSRC}/3rdparty/ippicv
 	(cd ${BUILD_WRKSRC}/3rdparty/ippicv && ${EXTRACT_CMD} -xf ${WRKSRC_ippicv}/${_IPPICV_${ARCH}})
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/lib/atlas-base|${LOCALBASE}/lib|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
 	${REINPLACE_CMD} -e 's|/usr/include/atlas|${LOCALBASE}/include|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/misc/visp/Makefile b/misc/visp/Makefile
index ea9ed18da500..c9d4cc2d751b 100644
--- a/misc/visp/Makefile
+++ b/misc/visp/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	visp
 DISTVERSION=	3.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	https://visp-doc.inria.fr/download/releases/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Modular library for visual tracking and visual servoing
 WWW=		https://visp.inria.fr/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	doxygen:devel/doxygen \
 		latex:print/tex-formats \
 		nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libblas.so:math/blas \
 		libboost_system.so:devel/boost-libs \
 		libdmtx.so:graphics/libdmtx \
 		libflann.so:math/flann \
 		libgsl.so:math/gsl \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas \
 		libopencv_core.so:graphics/opencv \
 		libopencv_videoio.so:graphics/opencv \
 		libpcap.so:net/libpcap \
 		libpng.so:graphics/png \
 		libv4l2.so:multimedia/libv4l \
 		libdc1394.so:multimedia/libdc1394
 
 USES=		cmake compiler:c++14-lang eigen:3 fortran gl gnome jpeg python:build qt:5 xorg zip
 USE_QT=		opengl widgets
 USE_GNOME=	libxml2
 USE_XORG=	ice sm x11 xext
 USE_GL=		gl glu opengl
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	WITH_QBDEVICE BUILD_EXAMPLES BUILD_TUTORIALS BUILD_TESTS BUILD_DEMOS
 
 OPTIONS_DEFINE=		COIN OGRE PCL ZBAR
 OPTIONS_DEFAULT=	COIN OGRE PCL ZBAR
 
 COIN_DESC=		Use Coin3D for simulation or augmented reality capabilities
 COIN_CMAKE_BOOL=	USE_COIN3D
 COIN_LIB_DEPENDS=	libCoin.so:graphics/Coin
 
 OGRE_DESC=		Include Ogre support for 3D Rendering
 OGRE_CMAKE_BOOL=	USE_OGRE
 OGRE_LIB_DEPENDS=	libOgreMain.so:graphics/ogre3d19
 
 PCL_DESC=		Include Point Cloud Library support
 PCL_CMAKE_BOOL=		USE_PCL
 PCL_LIB_DEPENDS=	libpcl_common.so:graphics/pcl-pointclouds \
 			libvtkCommonCore-9.2.so:math/vtk9 # vtk9 is incurred by pcl-pointclouds
 
 ZBAR_DESC=		Use ZBAR to read bar codes and QR codes
 ZBAR_CMAKE_BOOL=	USE_ZBAR
 ZBAR_LIB_DEPENDS=	libzbar.so:graphics/zbar
 
 .include <bsd.port.mk>
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 5e702f13b1b8..7bddf7438189 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,687 +1,687 @@
 PORTNAME=	ffmpeg
 PORTVERSION=	6.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 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_amd64=	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 125bee7bd13c..b63fea39cbda 100644
--- a/multimedia/ffmpeg4/Makefile
+++ b/multimedia/ffmpeg4/Makefile
@@ -1,646 +1,646 @@
 PORTNAME=	ffmpeg
 PORTVERSION=	4.4.4
-PORTREVISION=	12
+PORTREVISION=	13
 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/x11-toolkits/pangolin/Makefile b/x11-toolkits/pangolin/Makefile
index 5f4eb73064f4..07dd88c4bf08 100644
--- a/x11-toolkits/pangolin/Makefile
+++ b/x11-toolkits/pangolin/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	pangolin
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Lightweight rapid development library for managing OpenGL display
 WWW=		https://github.com/stevenlovegrove/Pangolin
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libdc1394.so:multimedia/libdc1394 \
 		liblz4.so:archivers/liblz4 \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libzstd.so:archivers/zstd \
 		libwayland-client.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		cmake compiler:c++17-lang eigen:3 gl jpeg localbase:ldflags pkgconfig xorg
 USE_XORG=	ice sm x11 xext
 USE_GL=		gl glew glu
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	stevenlovegrove
 GH_PROJECT=	Pangolin
 
 CMAKE_OFF=	BUILD_PANGOLIN_PYTHON
 
 LDFLAGS+=	-pthread
 
 .include <bsd.port.mk>