Index: head/graphics/libavif/Makefile
===================================================================
--- head/graphics/libavif/Makefile	(revision 556124)
+++ head/graphics/libavif/Makefile	(revision 556125)
@@ -1,59 +1,60 @@
 # $FreeBSD$
 
 PORTNAME=	libavif
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	2340cdb5f0c2.patch:-p1 # https://github.com/AOMediaCodec/libavif/pull/296
 PATCHFILES+=	76244a1fca21.patch:-p1 # unbreak SVTAV1, not upstreamed yet
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Library for encoding and decoding .avif files
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		cmake compiler:c11 jpeg pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	AOMediaCodec
 CMAKE_ON=	AVIF_BUILD_APPS AVIF_BUILD_TESTS
 TEST_TARGET=	avif_test_all
 
 OPTIONS_DEFINE=	AOM DAV1D GAV1 LIBYUV PIXBUF RAV1E SVTAV1
 OPTIONS_DEFAULT=AOM DAV1D PIXBUF
 OPTIONS_SUB=	yes
 
 AOM_DESC=		AV1 encoding/decoding via libaom
 AOM_LIB_DEPENDS=	libaom.so:multimedia/aom
 AOM_CMAKE_BOOL=		AVIF_CODEC_AOM
 
 DAV1D_DESC=		AV1 decoding via libdav1d
 DAV1D_LIB_DEPENDS=	libdav1d.so:multimedia/dav1d
 DAV1D_CMAKE_BOOL=	AVIF_CODEC_DAV1D
 
 GAV1_DESC=		AV1 decoding via libgav1
 GAV1_LIB_DEPENDS=	libgav1.so:multimedia/libgav1
 GAV1_CMAKE_BOOL=	AVIF_CODEC_LIBGAV1
 
 LIBYUV_DESC=		Colorspace conversion via libyuv
 LIBYUV_LIB_DEPENDS=	libyuv.so:graphics/libyuv
 LIBYUV_BROKEN=		libyuv >= 1755 is required, see https://chromium.googlesource.com/libyuv/libyuv/+/d426247a3bf6%5E!/
 
 PIXBUF_USES=		gnome
 PIXBUF_USE=		GNOME=gdkpixbuf2
 PIXBUF_CMAKE_BOOL=	AVIF_BUILD_GDK_PIXBUF
 
 RAV1E_DESC=		AV1 encoding via librav1e
 RAV1E_LIB_DEPENDS=	librav1e.so:multimedia/librav1e
 RAV1E_CMAKE_BOOL=	AVIF_CODEC_RAV1E
 
 SVTAV1_DESC=		AV1 encoding via SVT-AV1
 SVTAV1_LIB_DEPENDS=	libSvtAv1Enc.so:multimedia/svt-av1
 SVTAV1_CMAKE_BOOL=	AVIF_CODEC_SVT
 
 .include <bsd.port.mk>
Index: head/mail/thunderbird/Makefile
===================================================================
--- head/mail/thunderbird/Makefile	(revision 556124)
+++ head/mail/thunderbird/Makefile	(revision 556125)
@@ -1,80 +1,80 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	thunderbird
 DISTVERSION=	78.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail news net-im
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source
 DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
 BUILD_DEPENDS=	nspr>=4.26:devel/nspr \
 		nss>=3.56:security/nss \
 		icu>=67.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=2.6.6:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.35:graphics/png \
 		libvpx>=1.8.2:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libbotan-2.so:security/botan2
 
 SSP_UNSAFE=	yes
 USE_GECKO=	gecko
 USE_MOZILLA=	-sqlite
 
 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_DEFINE=	LIGHTNING
 OPTIONS_DEFAULT=CANBERRA LIGHTNING
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MLIGHTNING}
 MOZ_OPTIONS+=	--enable-calendar
 .else
 MOZ_OPTIONS+=	--disable-calendar
 .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
 
 pre-configure:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
 	(cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13)
 	(cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
 
 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.post.mk>
Index: head/multimedia/dav1d/Makefile
===================================================================
--- head/multimedia/dav1d/Makefile	(revision 556124)
+++ head/multimedia/dav1d/Makefile	(revision 556125)
@@ -1,51 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	dav1d
-DISTVERSION=	0.7.1
+DISTVERSION=	0.8.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Small and fast AV1 decoder
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_amd64=	nasm:devel/nasm
 BUILD_DEPENDS_i386=	nasm:devel/nasm
 
 USES=		compiler:c11 meson
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 GL_SITE=	https://code.videolan.org
 GL_ACCOUNT=	videolan
-GL_COMMIT=	e9df70c4348a3f9ba7269feacd17cfb57bf23852
+GL_COMMIT=	2ca1bfc39fe5c182d885f2750779d5b1678d8ef9
 LDFLAGS_i386=	-Wl,-z,notext
 
 OPTIONS_DEFINE=	SDL TEST
 OPTIONS_SUB=	yes
 
 SDL_USES=	pkgconfig sdl
 SDL_USE=	SDL=sdl2
 SDL_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
 SDL_LIB_DEPENDS=	libplacebo.so:graphics/libplacebo \
 			libvulkan.so:graphics/vulkan-loader
 SDL_MESON_TRUE=	enable_examples
 
-TEST_GL_TUPLE=	videolan:dav1d-test-data:4e3d3de97b643c3bbb027005d5ecc005fa3e5d98:testdata/tests/dav1d-test-data
+TEST_GL_TUPLE=	videolan:dav1d-test-data:0b1ae65ec0c949bb1aac496d1b3f8bde5ffb10b8:testdata/tests/dav1d-test-data
 TEST_MESON_TRUE=enable_tests testdata_tests
 
 .if make(makesum) # for optional distfiles
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}"
 .endif
 
 # https://bugs.llvm.org/show_bug.cgi?id=40635
 .if !empty(CFLAGS:M-flto*)
 MESON_ARGS+=	${MESON_ARGS_${CHOSEN_COMPILER_TYPE}_${ARCH}}
 MESON_ARGS_clang_amd64=	-Dstack_alignment=16
 MESON_ARGS_clang_i386=	-Dstack_alignment=4
 .endif
 
 pre-install-TEST-on: do-test
 
 .include <bsd.port.mk>
Index: head/multimedia/dav1d/distinfo
===================================================================
--- head/multimedia/dav1d/distinfo	(revision 556124)
+++ head/multimedia/dav1d/distinfo	(revision 556125)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1592690579
-SHA256 (videolan-dav1d-e9df70c4348a3f9ba7269feacd17cfb57bf23852_GL0.tar.gz) = 90002f27418d622dd762723f41b3f5dc448d720402d5fc52e229d70b471f84fc
-SIZE (videolan-dav1d-e9df70c4348a3f9ba7269feacd17cfb57bf23852_GL0.tar.gz) = 854884
-SHA256 (videolan-dav1d-test-data-4e3d3de97b643c3bbb027005d5ecc005fa3e5d98_GL0.tar.gz) = a8c74bd386865d82cb1107cb43cff61b1865baab1d91204f4095903ab0de6579
-SIZE (videolan-dav1d-test-data-4e3d3de97b643c3bbb027005d5ecc005fa3e5d98_GL0.tar.gz) = 50246844
+TIMESTAMP = 1606162629
+SHA256 (videolan-dav1d-2ca1bfc39fe5c182d885f2750779d5b1678d8ef9_GL0.tar.gz) = d1ab5a53e5805d4781f5882af45f727e638d41a551baf826699393d468ed281d
+SIZE (videolan-dav1d-2ca1bfc39fe5c182d885f2750779d5b1678d8ef9_GL0.tar.gz) = 892192
+SHA256 (videolan-dav1d-test-data-0b1ae65ec0c949bb1aac496d1b3f8bde5ffb10b8_GL0.tar.gz) = 57327b0c5a483c15f3aaf3b64a149f906d87da530cea3bd944ac92154001db44
+SIZE (videolan-dav1d-test-data-0b1ae65ec0c949bb1aac496d1b3f8bde5ffb10b8_GL0.tar.gz) = 50290574
Index: head/multimedia/dav1d/pkg-plist
===================================================================
--- head/multimedia/dav1d/pkg-plist	(revision 556124)
+++ head/multimedia/dav1d/pkg-plist	(revision 556125)
@@ -1,12 +1,12 @@
 bin/dav1d
 %%SDL%%bin/dav1dplay
 include/dav1d/common.h
 include/dav1d/data.h
 include/dav1d/dav1d.h
 include/dav1d/headers.h
 include/dav1d/picture.h
 include/dav1d/version.h
 lib/libdav1d.so
-lib/libdav1d.so.4
-lib/libdav1d.so.4.0.2
+lib/libdav1d.so.5
+lib/libdav1d.so.5.0.0
 libdata/pkgconfig/dav1d.pc
Index: head/multimedia/ffmpeg/Makefile
===================================================================
--- head/multimedia/ffmpeg/Makefile	(revision 556124)
+++ head/multimedia/ffmpeg/Makefile	(revision 556125)
@@ -1,651 +1,651 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ffmpeg
 PORTVERSION=	4.3.1
-PORTREVISION=	6
+PORTREVISION=	7
 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
 
 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
 BUILD_DEPENDS_powerpc64=as:devel/binutils
 BUILD_DEPENDS_powerpc=	as:devel/binutils
 
 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:^4\.
 
 # Option CHROMAPRINT disabled, it cannot work and people are baffled.
 OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB AOM ARIBB24 ASM ASS BS2B CACA CDIO CELT \
 		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 MFX MODPLUG MYSOFA OPENAL OPENCL OPENCV OPENGL OPENH264 \
 		OPENJPEG OPENMPT OPTIMIZED_CFLAGS OPUS POCKETSPHINX PULSEAUDIO \
 		RAV1E RABBITMQ RTCPU RUBBERBAND SDL SMB SNAPPY SNDIO SOXR SPEEX SRT SSH \
 		SVTAV1 SVTHEVC SVTVP9 TENSORFLOW TESSERACT THEORA TWOLAME V4L \
 		VAAPI VAPOURSYNTH VDPAU VIDSTAB VMAF VO_AMRWBENC VORBIS VPX VULKAN \
 		WAVPACK WEBP X264 X265 XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI
 
 OPTIONS_DEFAULT=	AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP GNUTLS ICONV \
 			LAME LIBXML2 OPENCV OPTIMIZED_CFLAGS OPUS RTCPU THEORA V4L VAAPI \
 			VDPAU VORBIS VPX X264 X265 XCB XVID
 
 .if !exists(${.CURDIR:H:H}/multimedia/aribb24)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/100bfac6d6ec
 OPTIONS_EXCLUDE+=	ARIBB24
 .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/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}/net/srt)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/a2fc8dbae853
 OPTIONS_EXCLUDE+=	SRT
 .endif
 
 .if !exists(${.CURDIR:H:H}/science/tensorflow)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/d8c0bbb0aa4
 OPTIONS_EXCLUDE+=	TENSORFLOW
 .endif
 
 OPTIONS_RADIO=	RTMP SSL
 OPTIONS_RADIO_RTMP=	GCRYPT GMP LIBRTMP
 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
 LTO_DESC=	Use Link-Time Optimization
 LV2_DESC=	LV2 audio filtering
 MFX_DESC=	Intel MediaSDK (aka Quick Sync Video)
 MYSOFA_DESC=	SOFAlizer binaural filter
 NONFREE_DESC=	Allow use of nonfree code
 OPENMPT_DESC=	Decoding tracked files via libopenmpt
 OPENH264_DESC=	H.264 video codec support via OpenH264
 POCKETSPHINX_DESC=	Automatic Speech Recognition via PocketSphinx
 RAV1E_DESC=	AV1 encoding via librav1e
 RABBITMQ_DESC=	AMQP 0-9-1 protocol via RabbitMQ
 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
 LIBRTMP_DESC=	${RTMP_DESC} via librtmp
 TENSORFLOW_DESC=TensorFlow as a DNN module backend for DNN based filters like sr
 TESSERACT_DESC=	Optical Character Recognition via Tesseract
 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
 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
 
 # celt
 CELT_LIB_DEPENDS=	libcelt0.so:audio/celt
 CELT_CONFIGURE_ENABLE=	libcelt
 
 # 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
 
 # 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
 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
 FLITE_LDFLAGS=		-fuse-ld=lld
 .endif
 
 # 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:devel/glslang \
 			spirv-tools>0:devel/spirv-tools
 GLSLANG_CONFIGURE_ENABLE=	libglslang
 GLSLANG_LDFLAGS=	-lm
 
 # 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
 
 # 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
 
 # opencv
 OPENCV_LIB_DEPENDS=	libopencv_imgproc.so:graphics/opencv-core
 OPENCV_CONFIGURE_ENABLE=	libopencv
 
 # 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
 
 # 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
 
 # rubberband
 RUBBERBAND_LIB_DEPENDS=	librubberband.so:audio/rubberband
 RUBBERBAND_CONFIGURE_ENABLE=	librubberband
 
 # rtcpu
 RTCPU_CONFIGURE_ENABLE=	runtime-cpudetect
 
 # rtmp
 LIBRTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
 LIBRTMP_CONFIGURE_ENABLE=	librtmp
 
 # 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:net/srt
 SRT_CONFIGURE_ENABLE=	libsrt
 
 # svt-av1
 SVTAV1_LIB_DEPENDS=	libSvtAv1Enc.so:multimedia/svt-av1
 SVTAV1_CONFIGURE_ON=	--enable-libsvtav1
 SVTAV1_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.4/ffmpeg_plugin/:svtav1
 SVTAV1_PATCHFILES=	0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1
 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
 # https://github.com/OpenVisualCloud/SVT-AV1/issues/691
 SVTAV1_LDFLAGS=		-fuse-ld=lld
 .endif
 .if make(makesum)
 .MAKEFLAGS:		WITH+=SVTAV1
 .endif
 
 # svt-hevc
 SVTHEVC_LIB_DEPENDS=	libSvtHevcEnc.so:multimedia/svt-hevc
 SVTHEVC_CONFIGURE_ON=	--enable-libsvthevc
 SVTHEVC_PATCH_SITES=	https://github.com/Intel/SVT-HEVC/raw/v1.5.0/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 exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
 SVTHEVC_LDFLAGS=	-fuse-ld=lld
 .endif
 .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/ffmpeg_plugin/:svtvp9
 SVTVP9_PATCHFILES=	n4.3.1-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9
 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
 SVTVP9_LDFLAGS=		-fuse-ld=lld
 .endif
 .if make(makesum)
 .MAKEFLAGS:		WITH+=SVTVP9
 .endif
 
 # tensorflow
 TENSORFLOW_LIB_DEPENDS=	libtensorflow.so:science/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
 
 # 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:devel/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 VULKAN_CONFIGURE_ENABLE=	vulkan
 VULKAN_IMPLIES=		GLSLANG
 
 # wavpack
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_ENABLE=	libwavpack
 
 # 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
 NONFREE_VARS=		RESTRICTED="enabling OPENSSL or FDK_AAC restricts redistribution"
 
 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}/man" \
 		--datadir="${DATADIR}" \
 		--pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
 		--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 ${ARCH} == powerpc64 && ${PORT_OPTIONS:MLTO}
 USE_GCC=	yes
 .endif
 
 post-patch:
 # {C,LD}FLAGS safeness
 	@${REINPLACE_CMD} -E \
 		-e 's|require_pkg_config opencv|require_pkg_config opencv-core|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${DOC_FILES}" ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \
 		"${DOC_DOCFILES}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/multimedia/kodi-devel/Makefile
===================================================================
--- head/multimedia/kodi-devel/Makefile	(revision 556124)
+++ head/multimedia/kodi-devel/Makefile	(revision 556125)
@@ -1,238 +1,238 @@
 # $FreeBSD$
 
 PORTNAME=	kodi
 DISTVERSION=	19.0.a20200727
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Award winning media center application
 
 LICENSE=	GPLv2+
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386
 
 BUILD_DEPENDS=	flatbuffers>=0:devel/flatbuffers \
 		rapidjson>=0:devel/rapidjson \
 		swig:devel/swig
 LIB_DEPENDS=	libass.so:multimedia/libass \
 		libavcodec.so:multimedia/ffmpeg \
 		libavfilter.so:multimedia/ffmpeg \
 		libavformat.so:multimedia/ffmpeg \
 		libavutil.so:multimedia/ffmpeg \
 		libcdio.so:sysutils/libcdio \
 		libcrossguid.so:devel/libcrossguid \
 		libcurl.so:ftp/curl \
 		libdav1d.so:multimedia/dav1d \
 		libdrm.so:graphics/libdrm \
 		libdvdnav.so:multimedia/libdvdnav \
 		libdvdread.so:multimedia/libdvdread \
 		libexpat.so:textproc/expat2 \
 		libfmt.so:devel/libfmt \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libfstrcmp.so:devel/fstrcmp \
 		libgif.so:graphics/giflib \
 		libgnutls.so:security/gnutls \
 		liblcms2.so:graphics/lcms2 \
 		liblzo2.so:archivers/lzo2 \
 		libpcre.so:devel/pcre \
 		libpcrecpp.so:devel/pcre \
 		libpng.so:graphics/png \
 		libpostproc.so:multimedia/ffmpeg \
 		libspdlog.so:devel/spdlog \
 		libswresample.so:multimedia/ffmpeg \
 		libswscale.so:multimedia/ffmpeg \
 		libtag.so:audio/taglib \
 		libtinyxml.so:textproc/tinyxml \
 		libudev.so:devel/libudev-devd \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		cmake compiler:c++14-lang gettext gl gnome iconv:wchar_t jpeg \
 		pkgconfig python:3.5+ sqlite ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	xbmc
 GH_PROJECT=	xbmc
 GH_TAGNAME=	19.0a1-Matrix
 USE_GL=		egl gl glu
 USE_GNOME=	libxml2 libxslt
 USE_JAVA=	yes
 JAVA_BUILD=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DAPP_BUILD_DATE="${DISTVERSION:E:S/^a//}" \
 		-DDVDNAV_LIBRARY="${LOCALBASE}/lib/libdvdnav.so" \
 		-DDVDREAD_LIBRARY="${LOCALBASE}/lib/libdvdread.so" \
 		-DGIT_VERSION="${GH_TAGNAME:C/^(.{12}).*/\1/}" \
 		-DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include"
 CMAKE_OFF=	ENABLE_ALSA ENABLE_DVDCSS ENABLE_INTERNAL_CROSSGUID \
 		ENABLE_INTERNAL_FFMPEG ENABLE_TESTING
 CONFIGURE_ENV=	CPU_FEATURES=" Features=0xdeadbeef<${_CPU_FEATURES:ts,}>" \
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB}"
 
 CONFLICTS_INSTALL=	kodi
 
 _KODIARCH_i386=		x86
 _KODIARCH_amd64=	x86_64
 PLIST_SUB=		ARCH=${_KODIARCH_${ARCH}:U${ARCH}} \
 			OPSYS=${OPSYS:tl}
 PORTDATA=		*
 
 OPTIONS_DEFINE=		AVAHI CEC DBUS LIBBLURAY MYSQL NFS SMB SSE UPNP VAAPI \
 			VDPAU WEBSERVER
 OPTIONS_DEFAULT=	AVAHI CEC DBUS GBM LIBBLURAY MYSQL NFS SMB SNDIO UPNP \
 			VAAPI VDPAU WAYLAND WEBSERVER X11
 OPTIONS_DEFAULT_amd64=	SSE
 OPTIONS_GROUP=		SOUND
 OPTIONS_GROUP_SOUND=	PULSEAUDIO SNDIO
 OPTIONS_MULTI=		PLATFORM
 OPTIONS_MULTI_PLATFORM=	GBM WAYLAND X11
 OPTIONS_EXCLUDE_aarch64=	SSE
 OPTIONS_EXCLUDE_armv6=	SSE
 OPTIONS_EXCLUDE_armv7=	SSE
 OPTIONS_SUB=		yes
 
 CEC_DESC=	CEC adapter support
 GBM_DESC=	GBM support (requires a kernel with evdev support)
 PLATFORM_DESC=	Platform
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CMAKE_BOOL=	ENABLE_AVAHI
 
 CEC_LIB_DEPENDS=	libcec.so:multimedia/libcec
 CEC_CMAKE_BOOL=		ENABLE_CEC
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CMAKE_BOOL=	ENABLE_DBUS
 
 GBM_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 GBM_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libinput.so:x11/libinput \
 			libxkbcommon.so:x11/libxkbcommon
 GBM_USE=		GL=gbm
 GBM_VARS=		_KODI_PLATFORMS+=GBM
 _KODI_GBM_ARGS=		-DCORE_PLATFORM_NAME:STRING="gbm" \
 			-DGBM_RENDER_SYSTEM:STRING="gl"
 
 LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CMAKE_BOOL=	ENABLE_BLURAY
 
 MYSQL_USES=		mysql
 MYSQL_CMAKE_BOOL=	ENABLE_MYSQLCLIENT
 
 NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
 NFS_CMAKE_BOOL=		ENABLE_NFS
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	ENABLE_PULSEAUDIO
 
 SMB_USES=	samba:lib
 SMB_CMAKE_BOOL=	ENABLE_SMBCLIENT
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CMAKE_BOOL=	ENABLE_SNDIO
 
 SSE_CMAKE_BOOL=		${_SSE_CPU_FEATURES:S/./_/g:S/^/ENABLE_/}
 SSE_VARS=		_CPU_FEATURES+=${_SSE_CPU_FEATURES:ts,}
 _SSE_CPU_FEATURES=	SSE SSE2 SSE3 SSE4.1 SSE4.2 SSSE3
 
 UPNP_CMAKE_BOOL=	ENABLE_UPNP
 # XXX: Upstream is https://github.com/plutinosoft/Neptune
 UPNP_CXXFLAGS=		-DNPT_CONFIG_HAVE_ARPA_INET_H \
 			-DNPT_CONFIG_HAVE_GETADDRINFO \
 			-DNPT_CONFIG_HAVE_GETIFADDRS \
 			-DNPT_CONFIG_HAVE_INET_NTOP -DNPT_CONFIG_HAVE_INET_PTON \
 			-DNPT_CONFIG_HAVE_NET_IF_DL_H \
 			-DNPT_CONFIG_HAVE_SOCKADDR_DL \
 			-DNPT_CONFIG_HAVE_SOCKADDR_IN_SIN_LEN
 
 VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CMAKE_BOOL=	ENABLE_VAAPI
 
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CMAKE_BOOL=	ENABLE_VDPAU
 
 WAYLAND_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 			wayland-protocols>=0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libinput.so:x11/libinput \
 			libwayland-client++.so:graphics/waylandpp \
 			libwayland-client.so:graphics/wayland \
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_VARS=		_KODI_PLATFORMS+=WAYLAND
 _KODI_WAYLAND_ARGS=	-DCORE_PLATFORM_NAME:STRING="wayland" \
 			-DWAYLAND_RENDER_SYSTEM:STRING="gl"
 
 WEBSERVER_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
 WEBSERVER_CMAKE_BOOL=	ENABLE_MICROHTTPD
 
 X11_USES=	xorg
 X11_USE=	XORG=x11,xext,xrandr
 X11_VARS=	_KODI_PLATFORMS+=X11
 _KODI_X11_ARGS=	-DCORE_PLATFORM_NAME:STRING="x11"
 _KODI_X11_BINS=	kodi-x11 kodi-xrandr
 
 .include <bsd.port.options.mk>
 
 post-patch:
 # Do not try to download dvdnav/dvdread during the build, instead
 # we'll manually point the build to the system's libdvd{nav,read}.so
 # (see CMAKE_ARGS).
 	@${REINPLACE_CMD} 's@KODI_DEPENDSBUILD@true@' \
 		${WRKSRC}/cmake/modules/FindLibDvd.cmake
 # Abort build if freebsd.xml and linux.xml differ again.  The
 # upstream devs forget to sync them.  When that happens it might
 # be time to file a PR again.
 	@cd ${WRKSRC}/system/settings && \
 		if ! /usr/bin/cmp -s freebsd.xml linux.xml; then \
 			${ECHO_MSG} "=> freebsd.xml out of sync with linux.xml again"; \
 			${FALSE}; \
 		fi
 # Make sure Kodi can find keyboard layouts from xkeyboard-config
 	@${REINPLACE_CMD} 's,/usr/share/X11/xkb/rules/,${LOCALBASE}/share/X11/xkb/rules/,g' \
 		${WRKSRC}/xbmc/platform/linux/input/LibInputSettings.cpp
 
 do-configure:
 .for platform in ${_KODI_PLATFORMS:O}
 	@${ECHO_MSG} "===> Performing out-of-source build for ${platform}"
 	${MKDIR} ${CONFIGURE_WRKSRC}/${platform}
 	@cd ${CONFIGURE_WRKSRC}/${platform} && ${SETENV} ${CONFIGURE_ENV} \
 		${CMAKE_BIN} ${CMAKE_ARGS} ${_KODI_${platform}_ARGS} \
 		${CMAKE_SOURCE_PATH}
 .endfor
 
 do-build:
 # build in reverse to avoid touching some source files in later
 # builds and triggering rebuilds/relinks in the first platform
 # install phase.
 .for platform in ${_KODI_PLATFORMS:O:[-1..1]}
 	@${ECHO_MSG} "===>  Building for ${platform}"
 	@${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}/${platform} ${ALL_TARGET}
 .endfor
 
 do-install:
 # Do a full install for the first platform including shared data files...
 .for platform in ${_KODI_PLATFORMS:O:[1]}
 	@${ECHO_MSG} "===>  Installing for ${platform}"
 	@cd ${INSTALL_WRKSRC}/${platform} && ${SETENV} ${MAKE_ENV} ${FAKEROOT} \
 		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
 .endfor
 # ... followed by only the other platform binaries
 .for platform in ${_KODI_PLATFORMS:O:[2..-1]}
 	@${ECHO_MSG} "===>  Installing for ${platform}"
 	cd ${INSTALL_WRKSRC}/${platform} && \
 		${INSTALL_PROGRAM} ${_KODI_${platform}_BINS:Ukodi-${platform:tl}} \
 		${STAGEDIR}${PREFIX}/lib/kodi
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	@cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf kodi.bin.1.gz kodi.1.gz
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/TexturePacker
 	@${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -name '*.so' | ${XARGS} ${STRIP_CMD}
 # Nothing useful here...
 	@${RM} -r ${STAGEDIR}${DOCSDIR}
 # No firewalld on FreeBSD...
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/firewalld
 
 .include <bsd.port.mk>
Index: head/multimedia/vlc/Makefile
===================================================================
--- head/multimedia/vlc/Makefile	(revision 556124)
+++ head/multimedia/vlc/Makefile	(revision 556125)
@@ -1,408 +1,408 @@
 # Created by: Brian Somers <brian@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	vlc
 DISTVERSION=	3.0.11
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
 		http://ftp.snt.utwente.nl/pub/software/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
 		ftp://ftp.crans.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Qt based multimedia player and streaming server
 
 LICENSE=	GPLv2
 
 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
 BUILD_DEPENDS=	gsed:textproc/gsed \
 		ffmpeg>=3.4.1,1:multimedia/ffmpeg \
 		yasm:devel/yasm
 RUN_DEPENDS=	ffmpeg>=3.4.1,1:multimedia/ffmpeg
 
 USES=		compiler:c++17-lang desktop-file-utils gettext-tools gmake gnome \
 		iconv libtool localbase pathfix pkgconfig tar:xz
 
 # VLC git (post 2.2.4) requires C++11 support and passes the appropriate flag
 # to the compiler. Until the port is updated, we explicitly pass -std=c++11 to
 # the compiler because Qt 5.7+ requires C++11 support, and FreeBSD 10's clang
 # does not default to C++11 mode.
 # USE_CXXSTD=	c++11
 
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 GNU_CONFIGURE=	yes
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 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-archive --disable-chromaprint --disable-crystalhd \
 		--disable-dc1394 --disable-decklink --disable-dsm \
 		--disable-dv1394 --disable-fdkaac --disable-gst-decode \
 		--disable-gles2 --disable-kai --disable-kva \
 		--disable-vnc --disable-opencv --disable-projectm \
 		--disable-secret --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
 CFLAGS_i386=	-fomit-frame-pointer
 
 OPTIONS_DEFINE=	A52 AALIB AOM ASS AVAHI CACA CHROMECAST DAV1D DBUS DCA DOCS DVDREAD \
 		DEBUG DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GME GNUTLS \
 		GOOM HARFBUZZ JACK JPEG KATE LIBBLURAY LIBPLACEBO LIBRSVG2 LIBSSH2 LIRC \
 		LIVEMEDIA LUA MAD MFX MODPLUG MPEG2 MTP MUSEPACK \
 		NCURSES NFS NLS NOTIFY OGG OGGSPOTS OPTIMIZED_CFLAGS OPUS PNG PULSEAUDIO \
 		QT5 REALRTSP RUNROOT SAMPLERATE SIDPLAY SCHROEDINGER \
 		SDL SHOUTCAST SKINS SMB SNDIO STREAM SPEEX TAGLIB THEORA \
 		TWOLAME UPNP V4L VAAPI VCD VDPAU VPX VORBIS WAYLAND X11 X264 X265 ZVBI
 OPTIONS_DEFINE_powerpc=	ALTIVEC
 OPTIONS_DEFINE_powerpc64=	ALTIVEC
 OPTIONS_DEFAULT=AVAHI DAV1D DBUS DVDREAD DVDNAV GNUTLS JPEG \
 		LIVEMEDIA LUA OGG OPTIMIZED_CFLAGS \
 		OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME \
 		V4L VAAPI VCD VDPAU VORBIS WAYLAND X11
 OPTIONS_DEFAULT_powerpc=	ALTIVEC
 OPTIONS_DEFAULT_powerpc64=	ALTIVEC
 OPTIONS_SUB=	yes
 
 AOM_DESC=	AV1 video encoding/decoding via libaom
 ASS_DESC=	ASS/SSA subtitle rendering
 CHROMECAST_DESC=Streaming to Chromecast devices
 DAV1D_DESC=	AV1 video decoding via libdav1d
 DVDREAD_DESC=	DVD Playback support
 DVDNAV_DESC=	DVD menu navigation
 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
 KATE_DESC=	Kate codec support
 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
 SIDPLAY_DESC=	C64 sid demux support
 SKINS_DESC=	Skins interface module
 STREAM_DESC=	stream output
 TAGLIB_DESC=	ID3 tag and Ogg comment support
 VCD_DESC=	Audio/Video CD support
 ZVBI_DESC=	VBI decoding support
 
 A52_CONFIGURE_ENABLE=	a52
 A52_CONFIGURE_ON=	--with-a52=${LOCALBASE}
 A52_LIB_DEPENDS=	liba52.so:audio/liba52
 
 AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
 AALIB_CONFIGURE_ENABLE=	aa
 
 ASS_LIB_DEPENDS=	libass.so:multimedia/libass
 ASS_CONFIGURE_ENABLE=	libass
 
 ALTIVEC_CONFIGURE_ENABLE=	altivec
 
 AOM_LIB_DEPENDS=	libaom.so:multimedia/aom
 AOM_CONFIGURE_ENABLE=	aom
 
 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=	libprotobuf-lite.so:devel/protobuf
 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
 
 DVDREAD_LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 DVDREAD_CONFIGURE_ENABLE=	dvdread
 
 DVDNAV_LIB_DEPENDS=	libdvdnav.so:multimedia/libdvdnav
 DVDNAV_CONFIGURE_ENABLE=dvdnav
 
 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"
 
 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
 
 KATE_LIB_DEPENDS=	libkate.so:multimedia/libkate
 KATE_CONFIGURE_ENABLE=	kate
 
 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
 
 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_USES=		ssl
 LIVEMEDIA_LIB_DEPENDS=	libliveMedia.so:net/liveMedia
 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_ENABLE=	lua
 LUA_CONFIGURE_ON=	LUAC=${LUAC_CMD} LUA_CFLAGS="-I${LUA_INCDIR}" \
 			LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
 
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CONFIGURE_ENABLE=	mad
 MAD_CONFIGURE_ON=	--with-mad=${LOCALBASE}
 
 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
 
 MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack
 MUSEPACK_CONFIGURE_ENABLE=	mpc
 MUSEPACK_CONFIGURE_ENV=		LIBS_mpc="-L${LOCALBASE}/lib -lmpcdec"
 
 NCURSES_USES=			ncurses
 NCURSES_CONFIGURE_ENV=		NCURSES_CFLAGS="-I${NCURSESINC}" \
 				NCURSES_LIBS="-L${NCURSESLIB} -lncursesw"
 NCURSES_CONFIGURE_ENABLE=	ncurses
 
 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
 
 OGG_LIB_DEPENDS=	libogg.so:audio/libogg
 OGG_CONFIGURE_ENABLE=	ogg
 
 OGGSPOTS_CONFIGURE_ENABLE=	oggspots
 OGGSPOTS_IMPLIES=	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_USES=	qt:5
 QT5_USE=	QT=gui,core,svg,widgets,x11extras,buildtools_build
 QT5_CONFIGURE_ENABLE=	qt
 QT5_IMPLIES=	X11
 
 REALRTSP_CONFIGURE_ENABLE=	realrtsp
 
 RUNROOT_CONFIGURE_ENABLE=	run-as-root
 
 SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:audio/libsamplerate
 SAMPLERATE_CONFIGURE_ENABLE=	samplerate
 
 SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger
 SCHROEDINGER_CONFIGURE_ENABLE=	schroedinger
 
 SDL_USES=		sdl
 SDL_USE=		SDL=image
 SDL_CONFIGURE_ENABLE=	sdl-image
 
 SIDPLAY_LIB_DEPENDS=	libsidplay2.so:audio/libsidplay2
 SIDPLAY_LDFLAGS=	-L${LOCALBASE}/lib/sidplay/builders
 SIDPLAY_CONFIGURE_ENABLE=	sid
 CONFIGURE_ARGS+=	--disable-sid
 
 SKINS_USE=		XORG=xext,xinerama,xpm
 SKINS_LIB_DEPENDS=	libminizip.so:archivers/minizip \
 			libtar.so:devel/libtar
 SKINS_CONFIGURE_ENABLE=	skins2 libtar
 SKINS_IMPLIES=		QT5
 
 SHOUTCAST_LIB_DEPENDS=	libshout.so:audio/libshout
 SHOUTCAST_CONFIGURE_ENABLE=	shout
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CONFIGURE_ENABLE=	sndio
 
 SMB_USES=		samba:lib
 SMB_CONFIGURE_ENABLE=	smbclient
 
 STREAM_CONFIGURE_ENABLE=sout
 
 SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 SPEEX_CONFIGURE_ENABLE=	speex
 
 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_LIB_DEPENDS=	libcddb.so:audio/libcddb
 VCD_CONFIGURE_ENABLE=	vcd libcddb
 
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
 VDPAU_IMPLIES=		X11
 
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_ENABLE=	vpx
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=vorbis
 
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 WAYLAND_CONFIGURE_ENABLE=	wayland
 
 X11_USE=		GL=gl XORG=xcb,xorgproto,sm,ice,x11
 X11_USES=		gl xorg
 X11_LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms
 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
 
 PORTDATA=	*
 PORTDOCS=	*
 
 WITH_CDROM_DEVICE?=/dev/cd0
 WITH_DVD_DEVICE?=/dev/cd0
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
 INSTALLS_ICONS=	yes
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 WITH_DEBUG=yes
 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|' \
 		${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>
Index: head/www/firefox/Makefile
===================================================================
--- head/www/firefox/Makefile	(revision 556124)
+++ head/www/firefox/Makefile	(revision 556125)
@@ -1,61 +1,61 @@
 # Created by: Alan Eldridge <alane@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	firefox
 DISTVERSION=	83.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
 DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.26:devel/nspr \
 		nss>=3.58:security/nss \
 		icu>=67.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=2.6.8:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.35:graphics/png \
 		libvpx>=1.8.2:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
 USE_GECKO=	gecko
 CONFLICTS_INSTALL=	firefox-esr
 USE_MOZILLA=	-sqlite
 
 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"
 
 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
 
 pre-configure:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
 	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
 
 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>
Index: head/www/firefox-esr/Makefile
===================================================================
--- head/www/firefox-esr/Makefile	(revision 556124)
+++ head/www/firefox-esr/Makefile	(revision 556125)
@@ -1,63 +1,63 @@
 # Created by: Alan Eldridge <alane@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	firefox
 DISTVERSION=	78.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www
 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
 
 BUILD_DEPENDS=	nspr>=4.26:devel/nspr \
 		nss>=3.56:security/nss \
 		icu>=67.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=2.6.6:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.35:graphics/png \
 		libvpx>=1.8.2:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
 USE_GECKO=	gecko
 CPE_PRODUCT=	${PORTNAME}_esr
 CONFLICTS_INSTALL=	firefox
 USE_MOZILLA=	-sqlite
 
 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"
 
 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
 
 pre-configure:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
 	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
 
 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>