diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 118832382742..c3ef5cb72e2b 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -1,70 +1,71 @@
 # Created by: pb@FreeBSD.org
 
 PORTNAME=	dvdauthor
 PORTVERSION=	0.7.2.20190419
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Makes a DVD file structure from one or more MPEG2 streams
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread \
 		libfribidi.so:converters/fribidi \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ldo
 GH_TAGNAME=	d5bb0b
 
 USES=		autoreconf:build bison:alias gettext-tools \
 		gmake gnome iconv localbase pkgconfig
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 
 SUB_FILES=	README.FreeBSD
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=			DOCS MANPAGES
 OPTIONS_RADIO=			IMAGEMAGICK VIDEO-FORMAT
 OPTIONS_RADIO_IMAGEMAGICK=	GRAPHICSMAGICK IMAGEMAGICK6
 OPTIONS_RADIO_VIDEO-FORMAT=	NTSC PAL
 OPTIONS_SUB=			yes
 
 GRAPHICSMAGICK_DESC=		GraphicsMagick image processing support
 IMAGEMAGICK6_DESC=		ImageMagick 6.x image processing support
 NTSC_DESC=			Default video format NTSC
 PAL_DESC=			Default video format PAL
 VIDEO-FORMAT_DESC=		Use default video format
 
 GRAPHICSMAGICK_CONFIGURE_WITH=	graphicsmagick
 GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
 IMAGEMAGICK6_CONFIGURE_WITH=	imagemagick
 IMAGEMAGICK6_LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick6
 MANPAGES_BUILD_DEPENDS=		docbook2man:textproc/docbook-utils \
 				docbook-sgml>0:textproc/docbook-sgml
 NTSC_CONFIGURE_ON=		--enable-default-video-format=NTSC
 PAL_CONFIGURE_ON=		--enable-default-video-format=PAL
 
 pre-configure-MANPAGES-off:
 	@(${MV} ${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/Makefile.am.bak && \
 	 ${GREP} '^dist_pkgdata_DATA' \
 		${WRKSRC}/doc/Makefile.am.bak > ${WRKSRC}/doc/Makefile.am)
 
 pre-configure:
 	@(cd ${WRKSRC} && ${MKDIR} autotools/ && \
 	 ${CP} ${LOCALBASE}/share/gettext/config.rpath autotools/ && \
 	 ${LOCALBASE}/bin/autoreconf -i)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} \
 		${WRKSRC}/AUTHORS ${WRKSRC}/ChangeLog ${WRKSRC}/README \
 		${WRKSRC}/TODO ${WRKDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/dvdread/Makefile b/multimedia/dvdread/Makefile
index 725f25c26d30..77b02cffb461 100644
--- a/multimedia/dvdread/Makefile
+++ b/multimedia/dvdread/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	dvdread
 DISTVERSION=	g20160701
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 PATCH_SITES=	https://github.com/silum/dvdread/commit/
 PATCHFILES=	3bd3e448668b95da784159bf5733b5169831b026.patch:-p1 \
 		584758674f6e9230a3c30046097db269fb0905e1.patch:-p1
 
 MAINTAINER=	daniel.engberg.lists@pyret.net
 COMMENT=	Utility to create ISO images of encrypted DVDs
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libdvdcss.so:multimedia/libdvdcss \
 		libdvdread.so:multimedia/libdvdread
 
 USES=		localbase:ldflags
 USE_CSTD=	c99
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xrgtn
 GH_TAGNAME=	81d07990
 
 # Empty
 ALL_TARGET=
 
 PLIST_FILES=	bin/dvdread
 
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS REGION
 
 REGION_DESC=	Disable automatic removal of region lock in IFO files
 REGION_EXTRA_PATCHES=	${FILESDIR}/extrapatch-region
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dvdread ${STAGEDIR}${PREFIX}/bin
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dvdread
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/gstreamer1-plugins-dvdread/Makefile b/multimedia/gstreamer1-plugins-dvdread/Makefile
index eb17e3aaff6d..e40869c61e79 100644
--- a/multimedia/gstreamer1-plugins-dvdread/Makefile
+++ b/multimedia/gstreamer1-plugins-dvdread/Makefile
@@ -1,11 +1,11 @@
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 COMMENT=	GStreamer DVD access plugin with libdvdread
 
 GST_PLUGIN=	dvdread
 DIST=		ugly
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins-resindvd/Makefile b/multimedia/gstreamer1-plugins-resindvd/Makefile
index c2fb0fb1f077..4ab318edfed0 100644
--- a/multimedia/gstreamer1-plugins-resindvd/Makefile
+++ b/multimedia/gstreamer1-plugins-resindvd/Makefile
@@ -1,11 +1,11 @@
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 COMMENT=	GStreamer resindvd DVD playback plugin
 
 GST_PLUGIN=	resindvd
 DIST=		bad
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index 61e4de2c652a..393cc7ce84d3 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -1,292 +1,293 @@
 PORTNAME=	kodi
 DISTVERSION=	19.0
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-${KODI_CODENAME}
 CATEGORIES=	multimedia java
 
 MAINTAINER=	yzrh@noema.org
 COMMENT=	Award winning media center application
 
 LICENSE=	GPLv2+
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	flatbuffers>0:devel/flatbuffers \
 		rapidjson>0:devel/rapidjson \
 		swig>0: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 \
 		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 \
 		liblzo2.so:archivers/lzo2 \
 		libpcre.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 \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		cmake compiler:c++14-lang gettext \
 		gnome iconv jpeg pkgconfig python:3.5+ sqlite ssl
 
 KODI_CODENAME=	Matrix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xbmc
 GH_PROJECT=	xbmc
 
 KODI_ARCH_aarch64=	aarch64
 KODI_ARCH_amd64=	x86_64
 KODI_ARCH_i386=		x86
 KODI_ARCH_armv7=	armv7
 KODI_ARCH_armv6=	armv6
 KODI_ARCH_powerpc64=	powerpc64
 KODI_ARCH_powerpc64le=	powerpc64le
 
 PLIST_SUB=	ARCH=${KODI_ARCH_${ARCH}}
 
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 USE_JAVA=	yes
 JAVA_BUILD=	jre
 USE_GNOME=	libxml2
 CMAKE_ARGS=	-DGIT_VERSION="${GH_TAGNAME}" \
 		-DDVDNAV_LIBRARY="${LOCALBASE}/lib/libdvdnav.so" \
 		-DDVDREAD_LIBRARY="${LOCALBASE}/lib/libdvdread.so" \
 		-DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include"
 CMAKE_OFF=	ENABLE_INTERNAL_CROSSGUID
 CONFIGURE_ENV=	_CPU_FEATURE="${CPU_FEATURE}"
 
 OPTIONS_SUB=		yes
 # Broken: BLUETOOTH
 OPTIONS_DEFINE=		AIRPLAY AVAHI LIBBLURAY CEC DBUS DVDCSS LCMS2 \
 			LIRC WEBSERVER NFS DVD SMB TEST UDEV UPNP \
 			VAAPI VDPAU XSLT DOCS
 OPTIONS_DEFAULT=	LIBBLURAY CEC DVDCSS LCMS2 WEBSERVER \
 			DVD UPNP VAAPI VDPAU XSLT WAYLAND X11 GL
 OPTIONS_DEFAULT_amd64=	SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2
 OPTIONS_DEFAULT_i386=	SSE SSE2 SSE3
 OPTIONS_SINGLE=		RENDER
 OPTIONS_SINGLE_RENDER=	GL GLES
 OPTIONS_RADIO=		DATABASE
 OPTIONS_RADIO_DATABASE=	MARIADB MYSQL
 OPTIONS_GROUP=		SOUND FEATURE PLATFORM
 # Broken: ALSA
 OPTIONS_GROUP_SOUND=	PULSEAUDIO SNDIO
 OPTIONS_GROUP_FEATURE=	SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2
 OPTIONS_GROUP_PLATFORM=GBM WAYLAND X11
 OPTIONS_EXCLUDE_aarch64=FEATURE
 OPTIONS_EXCLUDE_armv7=	FEATURE
 OPTIONS_EXCLUDE_armv6=	FEATURE
 
 PLATFORM_DESC=	Kodi platform
 DATABASE_DESC=	Database
 FEATURE_DESC=	X86 CPU feature
 
 AIRPLAY_DESC=	AirPlay support
 BLUETOOTH_DESC=	Bluetooth support
 CEC_DESC=	CEC adapter support
 DVD_DESC=	DVD support
 UDEV_DESC=	Use libudev-devd
 XSLT_DESC=	Use libxslt
 
 RENDER_DESC=	Render system
 GL_DESC=	OpenGL
 GLES_DESC=	OpenGL ES
 
 GBM_DESC=	GBM support
 MARIADB_DESC=	MariaDB database support
 
 SSE2_DESC=	Use SSE2 optimized routines
 SSE3_DESC=	Use SSE3 optimized routines
 SSSE3_DESC=	Use SSSE3 optimized routines
 SSE4_1_DESC=	Use SSE4.1 optimized routines
 SSE4_2_DESC=	Use SSE4.2 optimized routines
 AVX_DESC=	Use AVX optimized routines
 AVX2_DESC=	Use AVX2 optimized routines
 
 AIRPLAY_LIB_DEPENDS=	libplist-2.0.so:devel/libplist \
 			libshairplay.so:audio/shairplay
 AIRPLAY_CMAKE_BOOL=	ENABLE_PLIST \
 			ENABLE_AIRTUNES
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CMAKE_BOOL=	ENABLE_AVAHI
 
 BLUETOOTH_CMAKE_BOOL=	ENABLE_BLUETOOTH
 BLUETOOTH_CMAKE_ON=	-DBLUETOOTH_INCLUDE_DIR="${LOCALBASE}/include"
 
 LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CMAKE_BOOL=	ENABLE_BLURAY
 
 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
 
 DVDCSS_LIB_DEPENDS=	libdvdcss.so:multimedia/libdvdcss
 DVDCSS_CMAKE_BOOL=	ENABLE_DVDCSS
 DVDCSS_CMAKE_ON=	-DDVDCSS_LIBRARY="${LOCALBASE}/lib/libdvdcss.so"
 
 LCMS2_LIB_DEPENDS=	liblcms2.so.2:graphics/lcms2
 LCMS2_CMAKE_BOOL=	ENABLE_LCMS2
 
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CMAKE_BOOL=	ENABLE_LIRCCLIENT
 
 WEBSERVER_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
 WEBSERVER_CMAKE_BOOL=	ENABLE_MICROHTTPD
 
 NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
 NFS_CMAKE_BOOL=		ENABLE_NFS
 
 DVD_CMAKE_BOOL=		ENABLE_OPTICAL
 
 SMB_USES=		samba:lib
 SMB_CMAKE_BOOL=		ENABLE_SMBCLIENT
 
 TEST_LIB_DEPENDS=	libgtest.so:devel/googletest
 TEST_CMAKE_BOOL=	ENABLE_TESTING
 
 UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 UDEV_CMAKE_BOOL=	ENABLE_UDEV
 
 UPNP_CMAKE_BOOL=	ENABLE_UPNP
 
 VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CMAKE_BOOL=	ENABLE_VAAPI
 
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CMAKE_BOOL=	ENABLE_VDPAU
 
 XSLT_LIB_DEPENDS=	libxslt.so:textproc/libxslt
 XSLT_CMAKE_BOOL=	ENABLE_XSLT
 
 GL_CMAKE_ON=		-DAPP_RENDER_SYSTEM:STRING="gl"
 
 GLES_CMAKE_ON=		-DAPP_RENDER_SYSTEM:STRING="gles"
 
 MARIADB_USES=		mysql:105m
 MARIADB_CMAKE_BOOL=	ENABLE_MARIADBCLIENT
 MARIADB_CMAKE_ON=	-DMARIADBCLIENT_INCLUDE_DIR="${LOCALBASE}/include"
 
 MYSQL_USES=		mysql
 MYSQL_CMAKE_BOOL=	ENABLE_MYSQLCLIENT
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	ENABLE_ALSA
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	ENABLE_PULSEAUDIO
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CMAKE_BOOL=	ENABLE_SNDIO
 
 SSE_VARS=		CPU_FEATURE+=SSE
 SSE2_VARS=		CPU_FEATURE+=SSE2
 SSE3_VARS=		CPU_FEATURE+=SSE3
 SSSE3_VARS=		CPU_FEATURE+=SSSE3
 SSE4_1_VARS=		CPU_FEATURE+=SSE4.1
 SSE4_2_VARS=		CPU_FEATURE+=SSE4.2
 AVX_VARS=		CPU_FEATURE+=AVX
 AVX2_VARS=		CPU_FEATURE+=AVX2
 
 GBM_IMPLIES=		UDEV
 GBM_USES=		gl
 GBM_USE=		GL=egl,gbm,glu
 GBM_CFLAGS=		-I${LOCALBASE}/include/libepoll-shim
 GBM_LDFLAGS=		-L${LOCALBASE}/lib -lepoll-shim
 GBM_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 GBM_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libdrm.so:graphics/libdrm \
 			libxkbcommon.so:x11/libxkbcommon \
 			libinput.so:x11/libinput
 
 WAYLAND_USES=		gl
 WAYLAND_USE=		GL=egl,glu
 WAYLAND_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 			wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 			libxkbcommon.so:x11/libxkbcommon \
 			libinput.so:x11/libinput \
 			libwayland-client++.so:graphics/waylandpp
 
 X11_USES=		xorg gl
 X11_USE=		XORG=x11,xext,xrandr GL=egl,gbm,gl,glu
 X11_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 
 .include <bsd.port.options.mk>
 
 .if !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm wayland x11"
 .elif empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="wayland x11"
 .elif !empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm x11"
 .elif !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm wayland"
 .elif empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="x11"
 .elif empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="wayland"
 .elif !empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11)
 CMAKE_ARGS+=	-DCORE_PLATFORM_NAME:STRING="gbm"
 .endif
 
 .if !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) || !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MX11) || !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 PLIST_SUB+=	KODICOMBINED="" \
 		KODIGBM="@comment " \
 		KODIWAYLAND="@comment " \
 		KODIX11="@comment "
 .else
 PLIST_SUB+=	KODICOMBINED="@comment "
 
 .if !empty(PORT_OPTIONS:MGBM)
 PLIST_SUB+=	KODIGBM=""
 .else
 PLIST_SUB+=	KODIGBM="@comment "
 .endif
 
 .if !empty(PORT_OPTIONS:MWAYLAND)
 PLIST_SUB+=	KODIWAYLAND=""
 .else
 PLIST_SUB+=	KODIWAYLAND="@comment "
 .endif
 
 .if !empty(PORT_OPTIONS:MX11)
 PLIST_SUB+=	KODIX11=""
 .else
 PLIST_SUB+=	KODIX11="@comment "
 .endif
 .endif
 
 post-patch:
 	${REINPLACE_CMD} 's|KODI_DEPENDSBUILD|true|' \
 		${WRKSRC}/cmake/modules/FindLibDvd.cmake
 	${REINPLACE_CMD} 's|/usr/share|${LOCALBASE}/share|' \
 		${WRKSRC}/xbmc/platform/linux/input/LibInputSettings.cpp
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -s kodi.bin.1.gz kodi.1.gz
 	cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} TexturePacker JsonSchemaBuilder
 	${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -type f -name '*.so' -print0 | ${XARGS} -0 ${STRIP_CMD}
 	${RM} -rf ${STAGEDIR}${PREFIX}/lib/firewalld
 
 .include <bsd.port.mk>
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index f384f62ff196..68a8d563815a 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -1,26 +1,26 @@
 # Created by: MANTANI Nobutaka <nobutaka@nobutaka.com>
 
 PORTNAME=	libdvdnav
-PORTVERSION=	6.1.0
+PORTVERSION=	6.1.1
 CATEGORIES=	multimedia
 MASTER_SITES=	https://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Videolan version of the libdvdnav project
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		libtool pathfix pkgconfig tar:bz2
 USE_CSTD=	c99
 USE_LDCONFIG=	yes
 
 PORTDOCS=	AUTHORS COPYING ChangeLog README TODO
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/multimedia/libdvdnav/distinfo b/multimedia/libdvdnav/distinfo
index 2816063086d9..979f2a21878c 100644
--- a/multimedia/libdvdnav/distinfo
+++ b/multimedia/libdvdnav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585069260
-SHA256 (libdvdnav-6.1.0.tar.bz2) = f697b15ea9f75e9f36bdf6ec3726308169f154e2b1e99865d0bbe823720cee5b
-SIZE (libdvdnav-6.1.0.tar.bz2) = 370145
+TIMESTAMP = 1619470334
+SHA256 (libdvdnav-6.1.1.tar.bz2) = c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48
+SIZE (libdvdnav-6.1.1.tar.bz2) = 367606
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index 782c4d715d91..fe4e5455584f 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -1,39 +1,39 @@
 # Created by: Marc van Woerkom <3d@FreeBSD.org>
 
 PORTNAME=	libdvdread
-PORTVERSION=	6.1.0
+PORTVERSION=	6.1.2
 CATEGORIES=	multimedia
 MASTER_SITES=	https://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Videolan version of the libdvdread project
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		libtool pathfix pkgconfig tar:bz2
 USE_CSTD=	c99
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_RADIO=		DVDCSS
 OPTIONS_RADIO_DVDCSS=	DVDCSS_DLOPEN DVDCSS_LINK
 .if !defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT=	DVDCSS_DLOPEN
 .endif
 
 DVDCSS_DLOPEN_DESC=	Use library via dlopen() function (recommended)
 # XXX DVDCSS version hardcoded in src/dvd_input.c
 DVDCSS_DLOPEN_LIB_DEPENDS=	libdvdcss.so.2:multimedia/libdvdcss
 
 DVDCSS_LINK_DESC=	Link with library
 DVDCSS_LINK_LIB_DEPENDS=	libdvdcss.so.2:multimedia/libdvdcss
 DVDCSS_LINK_USES=		localbase
 DVDCSS_LINK_CONFIGURE_WITH=	libdvdcss
 
 .include <bsd.port.mk>
diff --git a/multimedia/libdvdread/distinfo b/multimedia/libdvdread/distinfo
index acd75218e8f5..2c19228a4aa2 100644
--- a/multimedia/libdvdread/distinfo
+++ b/multimedia/libdvdread/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1584981910
-SHA256 (libdvdread-6.1.0.tar.bz2) = 501bbd7d1e7d5f2d2a0ff8d0a6ac2fbd7e5e7e0e80ef82fef818f43a30b4750c
-SIZE (libdvdread-6.1.0.tar.bz2) = 391316
+TIMESTAMP = 1619465265
+SHA256 (libdvdread-6.1.2.tar.bz2) = cc190f553758ced7571859e301f802cb4821f164d02bfacfd320c14a4e0da763
+SIZE (libdvdread-6.1.2.tar.bz2) = 391536
diff --git a/multimedia/libdvdread/pkg-plist b/multimedia/libdvdread/pkg-plist
index f6bcab6d807e..3beab053f349 100644
--- a/multimedia/libdvdread/pkg-plist
+++ b/multimedia/libdvdread/pkg-plist
@@ -1,15 +1,15 @@
 include/dvdread/bitreader.h
 include/dvdread/dvd_reader.h
 include/dvdread/dvd_udf.h
 include/dvdread/ifo_print.h
 include/dvdread/ifo_read.h
 include/dvdread/ifo_types.h
 include/dvdread/nav_print.h
 include/dvdread/nav_read.h
 include/dvdread/nav_types.h
 include/dvdread/version.h
 lib/libdvdread.a
 lib/libdvdread.so
-lib/libdvdread.so.7
-lib/libdvdread.so.7.1.0
+lib/libdvdread.so.8
+lib/libdvdread.so.8.0.0
 libdata/pkgconfig/dvdread.pc
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 40fda455c476..835e95a4dd18 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -1,184 +1,184 @@
 # Created by: alex
 
 PORTNAME=	xine
 DISTVERSION=	1.2.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
 DISTNAME=	${PORTNAME}-lib-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libraries for xine multimedia player
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libFLAC.so:audio/flac \
 		liba52.so:audio/liba52 \
 		libvorbis.so:audio/libvorbis \
 		libspeex.so:audio/speex \
 		libmng.so:graphics/libmng \
 		libpng.so:graphics/png \
 		libdvdread.so:multimedia/libdvdread \
 		libfreetype.so:print/freetype2 \
 		libfame.so:multimedia/libfame \
 		libcdio_paranoia.so:sysutils/libcdio-paranoia \
 		libmodplug.so:audio/libmodplug \
 		libvcdinfo.so:multimedia/vcdimager \
 		libtheora.so:multimedia/libtheora \
 		libmad.so:audio/libmad \
 		libdca.so:multimedia/libdca \
 		libavcodec.so:multimedia/ffmpeg \
 		libfaad.so:audio/faad \
 		libvdpau.so:multimedia/libvdpau \
 		libvpx.so:multimedia/libvpx \
 		libiso9660.so:sysutils/libcdio \
 		libogg.so:audio/libogg \
 		libdvdnav.so:multimedia/libdvdnav
 
 USES=		compiler cpe gl gmake gnome iconv libtool:keepla jpeg \
 		localbase pathfix perl5 pkgconfig tar:xz xorg
 LLD_UNSAFE=	yes
 CPE_PRODUCT=	xine-lib
 CPE_VENDOR=	xine
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xcb xv xinerama xext sm ice
 USE_GL=		gl glu
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-libflac \
 		--enable-musepack \
 		--enable-real-codecs \
 		--without-esound
 
 MAKE_ENV=	V=1
 MAKE_ARGS=	pkgdatadir="${DATADIR}" \
 		datadir="${DATADIR}" \
 		libdir="${PREFIX}/lib"
 
 CFLAGS_i386=	-fomit-frame-pointer
 
 DOCSDIR=	${PREFIX}/share/doc/xine-lib
 # Please sync with XINE_PLUGINSDIR in multimedia/xine
 # and multimedia/vdr-plugin-xineliboutput
 PLUGINSDIR=	lib/xine/plugins/2.9
 PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
 
 OPTIONS_DEFINE=		AALIB ALSA AOM CACA DAV1D DOCS DMX_IMAGE DVB GNOMEVFS2 \
 			IMAGEMAGICK IPV6 JACK LIBBLURAY NFS NLS PIXBUF PULSEAUDIO \
 			SDL SFTP SMB SNDIO V4L VAAPI WAVPACK WAYLAND XVMC
 OPTIONS_DEFAULT=	DVB OPENSSL PIXBUF VAAPI
 OPTIONS_DEFINE_i386=	W32DLL
 OPTIONS_DEFAULT_i386=	W32DLL
 OPTIONS_GROUP=		TLS
 OPTIONS_GROUP_TLS=	GNUTLS OPENSSL
 OPTIONS_SUB=		yes
 
 AOM_DESC=		Enable libaom AV1 decoder support
 DAV1D_DESC=		Enable dav1d AV1 decoder support
 DMX_IMAGE_DESC=		DMX image plugin
 DVB_DESC=		DVB plugin
 NFS_DESC=		Enable NFS support using libnfs
 SDL_DESC=		Enable support for SDL 1 video output
 SFTP_DESC=		Enable SFTP support using libssh2
 TLS_DESC=		Enable TLS support for https and ftps
 W32DLL_DESC=		Win32 codec support
 WAYLAND_DESC=		Enable Wayland support
 
 AALIB_LIB_DEPENDS=		libaa.so:graphics/aalib
 AALIB_CONFIGURE_ENABLE=		aalib
 ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_WITH=		alsa
 AOM_LIB_DEPENDS=		libaom.so:multimedia/aom
 AOM_CONFIGURE_WITH=		libaom
 CACA_LIB_DEPENDS=		libcaca.so:graphics/libcaca
 CACA_CONFIGURE_WITH=		caca
 DAV1D_LIB_DEPENDS=		libdav1d.so:multimedia/dav1d
 DAV1D_CONFIGURE_WITH=		dav1d
 DVB_BUILD_DEPENDS=		v4l_compat>=1.0.20100321:multimedia/v4l_compat
 DVB_CONFIGURE_ENABLE=		dvb
 GNOMEVFS2_USE=			GNOME=glib20,gconf2,gnomevfs2
 GNOMEVFS2_CONFIGURE_ENABLE=	gnomevfs
 GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=		--enable-tls
 IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
 IMAGEMAGICK_CONFIGURE_WITH=	imagemagick
 IMAGEMAGICK_IMPLIES=		DMX_IMAGE
 IPV6_CONFIGURE_ENABLE=		ipv6
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_CONFIGURE_WITH=		jack
 LIBBLURAY_LIB_DEPENDS=		libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_ENABLE=	bluray
 NLS_USES=			gettext
 NLS_CONFIGURE_ENABLE=		nls
 NFS_LIB_DEPENDS=		libnfs.so:net/libnfs
 NFS_CONFIGURE_ENABLE=		nfs
 OPENSSL_CONFIGURE_ON=		--enable-tls
 OPENSSL_CONFIGURE_ENV=		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
 				OPENSSL_CFLAGS="-I${OPENSSLINC}"
 OPENSSL_USES=			ssl
 PIXBUF_CONFIGURE_ENABLE=	gdkpixbuf
 PIXBUF_IMPLIES=			DMX_IMAGE
 PIXBUF_USE=			GNOME=gdkpixbuf2,glib20
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
 SDL_CONFIGURE_WITH=		sdl
 SDL_USE=			SDL=sdl
 SFTP_LIB_DEPENDS=		libssh2.so:security/libssh2
 SFTP_CONFIGURE_ENABLE=		sftp
 SMB_USES=			samba:lib
 SMB_CONFIGURE_ENV=		LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \
 				LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}"
 SMB_CONFIGURE_ENABLE=		samba
 SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
 SNDIO_CONFIGURE_ENABLE=		sndio
 VAAPI_LIB_DEPENDS=		libva.so:multimedia/libva \
 				libva-glx.so:multimedia/libva-glx
 VAAPI_CONFIGURE_ENABLE=		vaapi
 V4L_BUILD_DEPENDS=		v4l_compat>=1.0.20100321:multimedia/v4l_compat
 V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_ENABLE=		libv4l v4l v4l2
 W32DLL_CONFIGURE_ENABLE=	w32dll
 W32DLL_PLIST_FILES=		${PLUGINSDIR}/xineplug_decode_w32dll.so
 WAVPACK_LIB_DEPENDS=		libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_WITH=		wavpack
 WAYLAND_LIB_DEPENDS=		libwayland-egl.so:graphics/wayland \
 				libwayland-client.so:graphics/wayland
 WAYLAND_CONFIGURE_ENABLE=	wayland
 
 .if defined(WITH_NVIDIA304_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1)
 XVMC_CONFIGURE_WITH=		xvmc-lib=XvMCNVIDIA
 XVMC_LIB_DEPENDS=		libXvMCNVIDIA.so:x11/nvidia-driver-304
 .else
 XVMC_CONFIGURE_WITH=		xvmc-lib=XvMCW
 XVMC_LIB_DEPENDS=		libXvMC.so:x11/libXvMC
 .endif
 XVMC_CONFIGURE_ENABLE=		xvmc
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64
 BUILD_DEPENDS+=	as:devel/binutils
 .endif
 
 .if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}
 CONFIGURE_ARGS+=	--disable-tls
 .endif
 
 pre-configure-GNUTLS-off:
 	@${REINPLACE_CMD} -e 's|have_gnutls=yes|have_gnutls=no|' \
 		${WRKSRC}/configure
 
 post-patch:
 .if ${COMPILER_TYPE} == "clang"
 	@${REINPLACE_CMD} -e 's|-fno-rename-registers||' \
 		${WRKSRC}/src/libw32dll/Makefile.in
 .endif
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/post/*.so
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index ea0141bea8ab..d47f1f88b4b6 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -1,37 +1,37 @@
 # Created by: michael johnson <ahze@ahze.net>
 
 PORTNAME=	lsdvd
 PORTVERSION=	0.17
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Print information about the contents and structure of a DVD
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/lsdvd \
 		man/man1/lsdvd.1.gz
 
 WITH_DVD_DEVICE?=/dev/cd0
 
 pre-everything::
 	@${ECHO_MSG} "===> The default DVD device is ${WITH_DVD_DEVICE}"
 	@${ECHO_MSG} "===> Define WITH_DVD_DEVICE if you want to change the default"
 	@${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'"
 	@${ECHO_MSG} "===>"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/dev/dvd|${WITH_DVD_DEVICE}|' \
 		${WRKSRC}/lsdvd.c
 
 .include <bsd.port.mk>
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 9674f0739ba0..c107f8ecba3b 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,88 +1,89 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 
 PORTNAME=	mkvtoolnix
 PORTVERSION=	56.1.0
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		https://mkvtoolnix.download/sources/
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	Tools to extract from/get info about/create Matroska media streams
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_sparc64=	does not install
 
 BUILD_DEPENDS=	rake:devel/rubygem-rake \
 		docbook-xsl>=0:textproc/docbook-xsl \
 		xsltproc:textproc/libxslt
 LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg \
 		libebml.so:textproc/libebml \
 		libboost_regex.so:devel/boost-libs \
 		libpugixml.so:textproc/pugixml \
 		libmatroska.so:multimedia/libmatroska \
 		libpcre2-8.so:devel/pcre2
 
 USES=		compiler:c++17-lang iconv localbase pkgconfig tar:xz
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	ac_cv_path_PO4A=no
 CONFIGURE_ARGS=	--with-boost=${LOCALBASE} \
 		--with-boost-filesystem=boost_filesystem \
 		--with-boost-system=boost_system \
 		--with-boost-regex=boost_regex \
 		--with-docbook-xsl-root=${PREFIX}/share/xsl/docbook
 MAKE_ENV=	V=1
 MAKE_CMD=	rake -v
 MAKEFILE=	Rakefile
 ALL_TARGET=	#Empty
 
 OPTIONS_DEFINE=	DVDREAD FLAC NLS QT5 MANTRANS
 OPTIONS_DEFAULT=	FLAC QT5
 OPTIONS_SUB=	yes
 
 .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mssl=*}
 # Blocked by net/qt5-network: cannot use QT5 with default OpenSSL
 OPTIONS_EXCLUDE_FreeBSD_11+=	QT5
 .endif
 
 DVDREAD_DESC=		Support reading DVD chapters via libdvdread
 DVDREAD_LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 DVDREAD_CONFIGURE_WITH=	dvdread
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_WITH=	flac
 
 NLS_USES=	gettext
 NLS_CONFIGURE_WITH=	gettext
 
 QT5_DESC=	Build and install GUI application (Qt 5)
 QT5_USES=	desktop-file-utils qt:5 shared-mime-info
 QT5_USE=	QT=buildtools_build,concurrent,core,dbus,declarative,gui,multimedia,network,widgets
 QT5_CONFIGURE_ENABLE=	qt
 QT5_BUILD_DEPENDS=	qmake:devel/qt5-qmake
 QT5_LIB_DEPENDS=	libcmark.so:textproc/cmark
 
 MANTRANS_DESC=		Build and install manpage translations
 MANTRANS_BUILD_DEPENDS=	po4a:textproc/po4a
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} != clang
 USE_CXXSTD=	c++17
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBS="-lintl/s,-liconv,$$ICONV_LIBS,' \
 		${WRKSRC}/configure
 
 post-configure-NLS-off:
 # https://github.com/mbunkus/mkvtoolnix/issues/1501
 # Fixed in 8.6.0
 	@${REINPLACE_CMD} -e 's|LIBINTL_LIBS =|#LIBINTL_LIBS =|g' ${WRKSRC}/build-config
 	@${REINPLACE_CMD} -e 's|#define HAVE_LIBINTL_H|//#define HAVE_LIBINTL_H|g' ${WRKSRC}/config.h
 	@${REINPLACE_CMD} -e 's|S["LIBINTL_LIBS"]=|#S["LIBINTL_LIBS"]=|g' ${WRKSRC}/config.status
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index 41141f019469..db11b1dffff5 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -1,192 +1,193 @@
 # Created by: Grzegorz Blach <gblach@FreeBSD.org>
 
 PORTNAME=	mpv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.33.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	https://waf.io/:waf
 DISTFILES=	${WAF_RELEASE}${EXTRACT_SUFX}:waf
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	1bb2665e3d09.patch:-p1 59c32a04b04d.patch:-p1 62fb374349e0.patch:-p1
 PATCHFILES+=	24525e4ef9ba.patch:-p1 4dd5fdc0876e.patch:-p1 4d80314c5c88.patch:-p1
 PATCHFILES+=	1b2e5137e04b.patch:-p1 # https://github.com/mpv-player/mpv/pull/8312
 PATCHFILES+=	7c4465cefb27.patch:-p1 # libplacebo 3.104
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Free and open-source general-purpose video player
 
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	ffmpeg>=4.0.2,1:multimedia/ffmpeg
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libass.so:multimedia/libass
 
 USES=		compiler:c11 desktop-file-utils iconv jpeg localbase:ldflags \
 		pkgconfig python:build tar:bz2 waf
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mpv-player
 
 # Keep in sync with bootstrap.py to avoid regressions
 WAF_CMD=	${WRKDIR}/${WAF_RELEASE}/waf-light
 WAF_RELEASE=	waf-2.0.20
 
 CONFIGURE_ENV=	BIN_PYTHON="${PYTHON_CMD}"
 CONFIGURE_ARGS=	--docdir="${EXAMPLESDIR}" \
 		--htmldir="${DOCSDIR}/html" \
 		--mandir="${MANPREFIX}/man" \
 		--disable-debug-build \
 		--disable-optimize \
 		--disable-pdf \
 		--disable-rubberband \
 		--disable-shaderc \
 		--disable-vapoursynth \
 		--enable-libmpv-shared
 
 OPTIONS_DEFINE=		ARCHIVE DOCS LCMS2 LUAJIT MANPAGES MUJS TEST UCHARDET EXAMPLES ZIMG
 OPTIONS_DEFAULT=	ARCHIVE DVDNAV MANPAGES OPENGL UCHARDET \
 			V4L VAAPI VDPAU VULKAN WAYLAND X11 YTDL
 OPTIONS_GROUP=		IN VO AO
 OPTIONS_GROUP_IN=	CDIO DVDNAV LIBBLURAY V4L YTDL
 OPTIONS_GROUP_VO=	CACA OPENGL SIXEL VAAPI VDPAU VULKAN WAYLAND X11
 OPTIONS_GROUP_AO=	ALSA JACK OPENAL PULSEAUDIO SDL
 OPTIONS_SUB=		yes
 
 DVDNAV_DESC=		DVD menu navigation
 LUAJIT_DESC=		Use LuaJIT instead of Lua scripting language support
 MUJS_DESC=		Use MuJS for Javascript language support
 SIXEL_DESC=		Sixel graphics support
 UCHARDET_DESC=		Guess subtitle encoding via uchardet
 VULKAN_DESC=		Vulkan output support
 YTDL_DESC=		Install youtube-dl
 ZIMG_DESC=		High quality software scaling via "z" library
 IN_DESC=		Input
 VO_DESC=		Video Output
 AO_DESC=		Audio Output
 
 ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_OFF=		--disable-alsa
 
 ARCHIVE_USES=			libarchive
 ARCHIVE_CONFIGURE_ON=		--enable-libarchive
 
 CACA_LIB_DEPENDS=		libcaca.so:graphics/libcaca
 CACA_CONFIGURE_OFF=		--disable-caca
 
 CDIO_LIB_DEPENDS=		libcdio_paranoia.so:sysutils/libcdio-paranoia
 CDIO_CONFIGURE_ON=		--enable-cdda
 
 DOCS_BUILD_DEPENDS=		rst2html:textproc/py-docutils
 DOCS_CONFIGURE_ON=		--enable-html
 
 DVDNAV_LIB_DEPENDS=		libdvdnav.so:multimedia/libdvdnav \
 				libdvdread.so:multimedia/libdvdread
 DVDNAV_CONFIGURE_ON=		--enable-dvdnav
 
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_CONFIGURE_OFF=		--disable-jack
 
 LCMS2_LIB_DEPENDS=		liblcms2.so:graphics/lcms2
 LCMS2_CONFIGURE_OFF=		--disable-lcms2
 
 LIBBLURAY_LIB_DEPENDS=		libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_ON=		--enable-libbluray
 LIBBLURAY_CONFIGURE_OFF=	--disable-libbluray
 
 LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:lang/luajit
 LUAJIT_USES_OFF=		lua
 LUAJIT_CONFIGURE_ON=		--lua=luajit
 LUAJIT_CONFIGURE_OFF=		--lua=${LUA_VER_STR}fbsd
 
 MANPAGES_BUILD_DEPENDS=		rst2man:textproc/py-docutils
 MANPAGES_CONFIGURE_OFF=		--disable-manpage
 
 MUJS_LIB_DEPENDS=		libmujs.so:lang/mujs
 MUJS_CONFIGURE_ON=		--enable-javascript
 MUJS_CONFIGURE_OFF=		--disable-javascript
 
 OPENAL_CONFIGURE_ENABLE=	openal
 OPENAL_USES=			openal
 OPENAL_LDFLAGS=			${_OPENAL_LDFLAGS_${ARCH}}
 _OPENAL_LDFLAGS_i386=		-Wl,-znotext
 
 OPENGL_USES=			gl
 OPENGL_USE=			GL=egl,gbm
 OPENGL_CONFIGURE_OFF=		--disable-gl
 
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 
 SDL_USES=			sdl
 SDL_USE=			SDL=sdl2
 SDL_CONFIGURE_ON=		--enable-sdl2
 
 SIXEL_LIB_DEPENDS=		libsixel.so:graphics/libsixel
 SIXEL_CONFIGURE_OFF=		--disable-sixel
 
 TEST_CONFIGURE_ON=		--enable-tests
 
 UCHARDET_LIB_DEPENDS=		libuchardet.so:textproc/uchardet
 UCHARDET_CONFIGURE_OFF=		--disable-uchardet
 
 V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/dvb/dmx.h:multimedia/v4l_compat
 V4L_CONFIGURE_ON=		--enable-dvbin
 
 VAAPI_LIB_DEPENDS=		libva.so:multimedia/libva
 VAAPI_CONFIGURE_OFF=		--disable-vaapi
 
 VDPAU_LIB_DEPENDS=		libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_OFF=		--disable-vdpau
 
 VULKAN_BUILD_DEPENDS=		${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=		libplacebo.so:graphics/libplacebo \
 				libvulkan.so:graphics/vulkan-loader
 VULKAN_CONFIGURE_OFF=		--disable-vulkan --disable-libplacebo
 
 WAYLAND_BUILD_DEPENDS=		wayland-protocols>=1.14:graphics/wayland-protocols \
 				${LOCALBASE}/include/linux/input-event-codes.h:devel/evdev-proto
 WAYLAND_LIB_DEPENDS=		libwayland-client.so:graphics/wayland \
 				libwayland-cursor.so:graphics/wayland \
 				libxkbcommon.so:x11/libxkbcommon
 WAYLAND_CONFIGURE_OFF=		--disable-wayland
 WAYLAND_IMPLIES=		OPENGL
 
 X11_USES=			gnome xorg
 X11_USE=			XORG=x11,xext,xinerama,xorgproto,xrandr,xscrnsaver,xv,xxf86vm
 X11_VARS=			INSTALLS_ICONS=yes
 X11_CONFIGURE_OFF=		--disable-x11
 
 YTDL_RUN_DEPENDS=		youtube-dl:www/youtube_dl
 
 ZIMG_LIB_DEPENDS=		libzimg.so:graphics/sekrit-twc-zimg
 ZIMG_CONFIGURE_OFF=		--disable-zimg
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVAAPI} && ${PORT_OPTIONS:MWAYLAND}
 CONFIGURE_ARGS+=	--enable-vaapi-wayland
 LIB_DEPENDS+=		libva-wayland.so:multimedia/libva
 .else
 CONFIGURE_ARGS+=	--disable-vaapi-wayland
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/pkgconfig/mpv.pc|data/pkgconfig/mpv.pc|g' \
 		${WRKSRC}/wscript_build.py
 
 post-patch-MANPAGES-on:
 	@${FIND} ${WRKSRC}/DOCS/man -name '*.rst' | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|/usr/local|${PREFIX}|g'
 
 pre-install-TEST-on:
 	@(cd ${WRKSRC} && ${SETENV} ${TEST_ENV} build/mpv --unittest=all-simple)
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mpv
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmpv.so
 
 .include <bsd.port.mk>
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index b4748e59f6ce..0fe2d2df9ad9 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -1,82 +1,82 @@
 # Created by: Herve Quiroz <hq@FreeBSD.org>
 
 PORTNAME=	ogmrip
 PORTVERSION=	1.0.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application and libraries for encoding DVDs into DivX/OGM files
 
 LICENSE=	GPLv2+  # from source, though COPYING says LGPLv2
 
 BUILD_DEPENDS=	mencoder:multimedia/mencoder \
 		mplayer:multimedia/mplayer \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libenca.so:converters/enca \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libdvdread.so:multimedia/libdvdread
 RUN_DEPENDS=	lame:audio/lame \
 		oggenc:audio/vorbis-tools \
 		mencoder:multimedia/mencoder \
 		mplayer:multimedia/mplayer \
 		ogmmerge:multimedia/ogmtools
 
 USES=		desktop-file-utils gmake gnome libtool localbase:ldflags \
 		pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 intlhack libxml2
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	GTK2 ENCHANT MATROSKA NLS THEORA FAAC SRT DEBUG
 OPTIONS_DEFAULT=GTK2
 OPTIONS_SUB=	yes
 ENCHANT_DESC=	Enable spell checking for text subtitles
 MATROSKA_DESC=	Enable Matroska container support
 THEORA_DESC=	Enable Ogg Theora video codec support
 SRT_DESC=	Enable SRT text subtitles support
 
 GTK2_CONFIGURE_ENABLE=	gtk-support dbus-support libnotify-support
 GTK2_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 			libnotify.so:devel/libnotify
 GTK2_USE=		GNOME=gconf2,libglade2
 GTK2_VARS=		GCONF_SCHEMAS=ogmrip.schemas
 
 ENCHANT_CONFIGURE_ENABLE=enchant-support
 ENCHANT_LIB_DEPENDS=	libenchant.so:textproc/enchant
 
 MATROSKA_CONFIGURE_ENABLE=mkv-support
 MATROSKA_RUN_DEPENDS=	mkvmerge:multimedia/mkvtoolnix
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 THEORA_CONFIGURE_ENABLE=theora-support
 THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 
 FAAC_CONFIGURE_ENABLE=	aac-support
 FAAC_RUN_DEPENDS=	faac:audio/faac
 
 SRT_CONFIGURE_ENABLE=	srt-support
 SRT_RUN_DEPENDS=	gocr:graphics/gocr
 
 DEBUG_CONFIGURE_ON=	--enable-maintainer-mode --enable-devel-mode
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "This port requires a version of MEncoder compiled with XviD and/or"
 	@${ECHO_MSG} "x264 support if you want to use these codecs."
 	@${ECHO_MSG} ""
 
 post-patch:
 	@${REINPLACE_CMD} -e '/local/s|^CFLAGS=|#CFLAGS=|g ; \
 		 /local/s|^CPPFLAGS=|#CPPFLAGS=|g ; \
 		 /local/s|^LDFLAGS=|#LDFLAGS=|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|^SUBDIRS|#SUBDIRS|g' ${WRKSRC}/docs/Makefile.in
 	@${REINPLACE_CMD} -e \
 		'/PROGRAM/s|MP4Box|mp4box|g' ${WRKSRC}/libogmrip/ogmrip-mp4.c
 
 .include <bsd.port.mk>
diff --git a/multimedia/ogmtools/Makefile b/multimedia/ogmtools/Makefile
index 2f89c61e35ab..ea816756dfc2 100644
--- a/multimedia/ogmtools/Makefile
+++ b/multimedia/ogmtools/Makefile
@@ -1,52 +1,52 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 
 PORTNAME=	ogmtools
 PORTVERSION=	1.5
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/ogmtools/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Tools to extract from/get info about/create OGG media streams
 
 LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 USES=	tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ogg-prefix=${LOCALBASE} \
 		--with-vorbis-prefix=${LOCALBASE}
 
 OPTIONS_DEFINE=	DVDREAD
 OPTIONS_DEFAULT=	DVDREAD
 DVDREAD_DESC=	DVD title chapter extraction via libdvdread
 
 DVDREAD_LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 DVDREAD_CONFIGURE_ON=	--with-dvdread \
 			--with-dvdread-includes=${LOCALBASE} \
 			--with-dvdread-libs=${LOCALBASE}
 DVDREAD_CONFIGURE_OFF=	--without-dvdread
 OPTIONS_SUB=	yes
 
 post-patch:
 # disable GNU auto* tools
 	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
 		-n 10 ${REINPLACE_CMD} -E -e \
 		's!^(ACLOCAL|AUTOCONF|AUTOMAKE|AUTOHEADER).+$$!\1=${TRUE}!'
 # C{,XX}FLAGS safeness
 	@${REINPLACE_CMD} -E -e \
 		's|^(CFLAGS).*(-DLINUX)|\1=${CFLAGS} \2|' \
 		${WRKSRC}/avilib/Makefile.in
 	@${REINPLACE_CMD} -E -e \
 		's|^(CFLAGS[[:space:]]*)=|\1+=|; \
 		s|^(CXXFLAGS[[:space:]]*)=|\1+=|' \
 		${WRKSRC}/Makefile.in
 
 post-configure:
 # malloc.h -> stdlib.h
 # stdint.h -> inttypes.h
 	@${FIND} ${WRKSRC} -type f | ${XARGS} \
 		-n 10 ${REINPLACE_CMD} -E -e \
 		's!malloc.h!stdlib.h!; \
 		s|stdint.h|inttypes.h|'
 
 .include <bsd.port.mk>
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 487eb16920f2..fe7b1c2a655b 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,165 +1,165 @@
 # Created by: Hendrik Scholz <hendrik@scholz.net>
 
 PORTNAME=	transcode
 PORTVERSION=	1.1.7
-PORTREVISION=	45
+PORTREVISION=	46
 CATEGORIES=	multimedia
 MASTER_SITES=	https://bitbucket.org/france/transcode-tcforge/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Text-console utility for video stream processing
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 USE_LDCONFIG=	yes
 USES=		gmake libtool pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-oss
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 CFLAGS+=		-fcommon
 
 DEPRECATED=	Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 EXPIRATION_DATE=2021-04-01
 
 OPTIONS_DEFINE=		DOCS OPTIMIZED_CFLAGS X11 MPEG2 BKTR POSTPROC FREETYPE LAME \
 			XVID X264 OGG VORBIS THEORA DVDREAD DV QUICKTIME LZO A52 \
 			FAAC LIBXML2 MJPEGTOOLS SDL IMAGEMAGICK JPEG ICONV V4L
 OPTIONS_DEFAULT=	LAME DVDREAD JPEG ICONV
 BKTR_DESC=		Bktr capture card support
 POSTPROC_DESC=		Libpostproc support
 DVDREAD_DESC=		Libdvdread support
 
 X11_USES=			xorg
 X11_USE=			xorg=xv,xaw,xpm
 X11_CONFIGURE_WITH=		x
 
 MPEG2_LIB_DEPENDS=		libmpeg2.so:multimedia/libmpeg2
 MPEG2_CONFIGURE_ENABLE=		libmpeg2 libmpeg2convert
 
 BKTR_CONFIGURE_ENABLE=		bktr
 
 POSTPROC_CONFIGURE_ENABLE=	libpostproc
 
 FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	freetype2
 
 LAME_LIB_DEPENDS=		libmp3lame.so:audio/lame
 LAME_CONFIGURE_ENABLE=		lame
 LAME_CONFIGURE_ON=		--with-lame-prefix=${LOCALBASE}
 
 XVID_LIB_DEPENDS=		libxvidcore.so:multimedia/xvid
 XVID_CONFIGURE_ENABLE=		xvid
 XVID_CONFIGURE_ON=		--with-xvid-prefix=${LOCALBASE}
 
 X264_LIB_DEPENDS=		libx264.so:multimedia/libx264
 X264_CONFIGURE_ENABLE=		x264
 
 OGG_LIB_DEPENDS=		libogg.so:audio/libogg
 OGG_CONFIGURE_ENABLE=		ogg
 
 VORBIS_LIB_DEPENDS=		libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	vorbis
 
 THEORA_LIB_DEPENDS=		libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=	theora
 
 DVDREAD_LIB_DEPENDS=		libdvdread.so:multimedia/libdvdread
 DVDREAD_CONFIGURE_ENABLE=	libdvdread
 DVDREAD_CONFIGURE_ON=		--with-libdvdread-prefix=${LOCALBASE}
 
 DV_LIB_DEPENDS=			libdv.so:multimedia/libdv
 DV_CONFIGURE_ENABLE=		libdv
 
 QUICKTIME_LIB_DEPENDS=		libquicktime.so:multimedia/libquicktime
 QUICKTIME_CONFIGURE_ENABLE=	libquicktime
 
 LZO_LIB_DEPENDS=		liblzo2.so:archivers/lzo2
 LZO_CONFIGURE_ENABLE=		lzo
 LZO_CONFIGURE_ON=		--with-lzo-prefix=${LOCALBASE} --with-lzo-includes=${LOCALBASE}
 
 A52_LIB_DEPENDS=		liba52.so:audio/liba52
 A52_CONFIGURE_ENABLE=		a52
 A52_CONFIGURE_ON=		--with-a52-prefix=${LOCALBASE}
 
 FAAC_LIB_DEPENDS=		libfaac.so:audio/faac
 FAAC_CONFIGURE_ENABLE=		faac
 FAAC_CONFIGURE_ON=		--with-faac-prefix=${LOCALBASE}
 
 LIBXML2_USES=			gnome
 LIBXML2_USE=			GNOME=libxml2
 LIBXML2_CONFIGURE_ENABLE=	libxml2
 
 MJPEGTOOLS_LIB_DEPENDS=		liblavjpeg.so:multimedia/mjpegtools
 MJPEGTOOLS_CONFIGURE_ENABLE=	mjpegtools
 
 SDL_USES=			sdl
 SDL_USE=			SDL=sdl
 SDL_CONFIGURE_ENABLE=		sdl
 
 IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
 IMAGEMAGICK_CONFIGURE_ENABLE=	imagemagick
 IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick-prefix=${LOCALBASE}
 
 JPEG_USES=			jpeg
 JPEG_CONFIGURE_ENABLE=		libjpeg
 JPEG_CONFIGURE_ON=		--with-libjpeg-prefix=${LOCALBASE}
 
 ICONV_USES=			iconv
 ICONV_CONFIGURE_ENABLE=		iconv
 ICONV_CONFIGURE_ON=		--with-iconv-prefix=${ICONV_PREFIX}
 
 V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_CONFIGURE_ENABLE=		v4l
 
 .include <bsd.port.pre.mk>
 
 LDFLAGS_i386+=	-Wl,-z,notext
 
 .if empty(ICONV_LIB)
 CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \
 		ac_cv_lib_iconv_libiconv_open=no
 .endif
 
 post-extract:
 	@${RM} ${WRKSRC}/import/v4l/videodev*
 
 post-patch:
 	@${REINPLACE_CMD} -E -e 's|loff_t|uint64_t|' ${WRKSRC}/avilib/avidump.c
 	@${REINPLACE_CMD} -E -e 's|<SDL/|<|' ${WRKSRC}/filter/preview/display.h
 	@${REINPLACE_CMD} -e '/^static.*lrint/s|static ||' ${WRKSRC}/filter/filter_modfps.c
 
 	@${REINPLACE_CMD} -E -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|g ; \
 		s|FFMPEG_VERSION|LIBAVCODEC_IDENT|g ; \
 		s|-lMagick|-lMagickCore|g' \
 			${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 	@${REINPLACE_CMD} -E -e 's|-ldl||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -E -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -E -e 's|WRKSRC|${WRKSRC}|g' ${WRKSRC}/export/Makefile.in
 	@${REINPLACE_CMD} -E -e 's|<quicktime/|<lqt/|g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/export/export_mov.c \
 		${WRKSRC}/import/decode_mov.c \
 		${WRKSRC}/import/import_mov.c \
 		${WRKSRC}/import/probe_mov.c
 
 post-patch-LZO-on:
 	@${REINPLACE_CMD} -e 's|%%NUV%%|nuv|' ${WRKSRC}/import/Makefile.in
 
 post-patch-LZO-off:
 	@${REINPLACE_CMD} -e 's|%%NUV%%||' ${WRKSRC}/import/Makefile.in
 
 post-patch-OPTIMIZED_CFLAGS-off:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${REINPLACE_CMD} \
 		-e 's|-O[236]|${CFLAGS}|'
 
 post-stage:
 	@(cd ${STAGEDIR}${PREFIX} && \
 		${FIND} -s lib/transcode -type f -or -type l >> ${TMPPLIST})
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/vamps/Makefile b/multimedia/vamps/Makefile
index 99557cf98295..f1fee95d7919 100644
--- a/multimedia/vamps/Makefile
+++ b/multimedia/vamps/Makefile
@@ -1,28 +1,28 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 
 PORTNAME=	vamps
 PORTVERSION=	0.99.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/Vamps/${PORTVERSION}
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	High performance tool to transcode DVD videos to a smaller size
 
 LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 
 USES=		gmake
 
 CFLAGS+=	-DHAVE_BUILTIN_EXPECT -I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 PROGRAM_FILES=	play_cell/play_cell \
 		vamps/vamps
 
 PLIST_FILES=	${PROGRAM_FILES:H:S,^,bin/,}
 
 do-install:
 	(cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} ${PROGRAM_FILES} ${STAGEDIR}${PREFIX}/bin)
 
 .include <bsd.port.mk>
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index ce797bae509e..01d375b6ff79 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,412 +1,412 @@
 # Created by: Brian Somers <brian@FreeBSD.org>
 
 PORTNAME=	vlc
 DISTVERSION=	3.0.12
-PORTREVISION=	2
+PORTREVISION=	3
 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
 
 .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mssl=*}
 # Blocked by net/qt5-network: cannot use QT5 with default OpenSSL
 OPTIONS_EXCLUDE_FreeBSD_11+=	QT5
 .endif
 
 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>
diff --git a/sysutils/dvdbackup/Makefile b/sysutils/dvdbackup/Makefile
index 3fd63ede83f9..3741edf229d5 100644
--- a/sysutils/dvdbackup/Makefile
+++ b/sysutils/dvdbackup/Makefile
@@ -1,41 +1,41 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 
 PORTNAME=	dvdbackup
 PORTVERSION=	0.4.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Backup content from DVD to hard disk
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 
 GNU_CONFIGURE=	yes
 USES=		gmake
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	NEWS README
 
 DEFAULT_DVD_DEVICE?=	/dev/cd0
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} "s|/dev/dvd|${DEFAULT_DVD_DEVICE}|g" \
 		${WRKSRC}/src/main.c ${WRKSRC}/po/*.po ${WRKSRC}/po/*.pot \
 		${WRKSRC}/README ${WRKSRC}/man/dvdbackup.1
 
 pre-configure-DOCS-off:
 	@${REINPLACE_CMD} 's|^install-data-am: .*|install-data-am: |' \
 		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 62a9542053d8..5585194fc148 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -1,53 +1,54 @@
 PORTNAME=	k3b
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils multimedia kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE CD/DVD writing suite
 
 LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libKF5Cddb.so:audio/libkcddb \
 		libcdda_paranoia.so:audio/cdparanoia \
 		libdvdread.so:multimedia/libdvdread \
 		libmad.so:audio/libmad \
 		libmp3lame.so:audio/lame \
 		libogg.so:audio/libogg \
 		libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile \
 		libtag.so:audio/taglib \
 		libvorbis.so:audio/libvorbis
 RUN_DEPENDS=	cdrecord:sysutils/cdrtools
 BUILD_DEPENDS=	cdrecord:sysutils/cdrtools
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext iconv \
 		kde:5 pkgconfig qt:5 shared-mime-info tar:xz
 
 USE_KDE=	archive attica auth bookmarks codecs completion config \
 		configwidgets coreaddons ecm filemetadata i18n iconthemes \
 		itemviews jobwidgets kcmutils kio newstuff notifications \
 		notifyconfig service solid widgetsaddons xmlgui
 USE_QT=		concurrent core dbus gui network webkit widgets xml \
 		buildtools_build qmake_build
 
 # The ffmpeg-plugin needs patching
 CMAKE_ARGS=	-DK3B_BUILD_FFMPEG_DECODER_PLUGIN:BOOL=FALSE
 
 OPTIONS_DEFINE=		CDRDAO CDRSKIN DVDPLUSRW EMOVIX VCDIMAGER DOCS
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 CDRDAO_DESC=		Burning: cdrdao
 CDRDAO_RUN_DEPENDS=	cdrdao:sysutils/cdrdao
 
 DVDPLUSRW_DESC=		Burning: DVD+RW tools (DVD+/-R(W))
 DVDPLUSRW_RUN_DEPENDS=	dvd+rw-format:sysutils/dvd+rw-tools
 
 EMOVIX_DESC=		Burning: eMovix (bootable video CDs)
 EMOVIX_RUN_DEPENDS=	mkmovixiso:multimedia/emovix
 
 VCDIMAGER_DESC=		Burning: VCDImager (video CDs)
 VCDIMAGER_RUN_DEPENDS=	vcdxrip:multimedia/vcdimager
 
 CDRSKIN_DESC=		Burning: cdrskin (improved performance)
 CDRSKIN_RUN_DEPENDS=	cdrskin:devel/libburn
 
 .include <bsd.port.mk>
diff --git a/sysutils/vobcopy/Makefile b/sysutils/vobcopy/Makefile
index f83e0d663080..6325a8f54813 100644
--- a/sysutils/vobcopy/Makefile
+++ b/sysutils/vobcopy/Makefile
@@ -1,61 +1,61 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 
 PORTNAME=	vobcopy
 PORTVERSION=	1.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://vobcopy.org/download/ \
 		LOCAL/ehaupt
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Decrypts and copies DVD .vob files
 
 LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.sh
 CONFIGURE_ARGS=	--with-lfs --with-dvdread-libs=${LOCALBASE}
 
 ALL_TARGET=	${PORTNAME}
 
 PLIST_FILES=	bin/vobcopy man/man1/vobcopy.1.gz
 PORTDOCS=	COPYING Changelog README TODO \
 		alternative_programs.txt
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -E -e 's|(fopen\( *"/etc/)mtab|\1fstab|; \
 		s|iso9660|cd9660|' ${WRKSRC}/dvd.c
 	@${REINPLACE_CMD} -E -e 's|declare -i i=0||' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 # -CURRENT after 500041 has getopt_long
 # do not use libgnugetopt
 	@${REINPLACE_CMD} -E \
 		-e 's|-lgnugetopt||' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 # fix typo
 	@${REINPLACE_CMD} -E \
 		-e 's|FreeBSD_Version|FreeBSD_version|' \
 		${WRKSRC}/dvd.c
 # no such flag under FreeBSD
 # fdatasync(2) -> fsync(2)
 	@${REINPLACE_CMD} -E \
 		-e 's|O_LARGEFILE|0|' \
 		-e 's|fdatasync|fsync|g' \
 		${WRKSRC}/vobcopy.c
 
 post-configure:
 	@${REINPLACE_CMD} -E -e 's|^CC.+||; s|^PREFIX.+||; \
 		s|/usr/local/|${LOCALBASE}/|' \
 		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vobcopy ${STAGEDIR}${PREFIX}/bin/vobcopy
 	${INSTALL_MAN} ${WRKSRC}/vobcopy.1${MAN1_SUFX} \
 		${STAGEDIR}${MANPREFIX}/man/man1/vobcopy.1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>