Index: multimedia/mpv/Makefile
===================================================================
--- multimedia/mpv/Makefile
+++ multimedia/mpv/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	mpv
 PORTVERSION=	0.25.0
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
-DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 
@@ -28,10 +28,10 @@
 		pkgconfig python:build waf
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	BIN_PYTHON=${PYTHON_CMD}
-CONFIGURE_ARGS=	--docdir=${EXAMPLESDIR} \
-		--htmldir=${DOCSDIR}/html \
-		--mandir=${MANPREFIX}/man \
+CONFIGURE_ENV=	BIN_PYTHON="${PYTHON_CMD}"
+CONFIGURE_ARGS=	--docdir="${EXAMPLESDIR}" \
+		--htmldir="${DOCSDIR}/html" \
+		--mandir="${MANPREFIX}/man" \
 		--disable-debug-build \
 		--disable-d3d-hwaccel \
 		--disable-optimize \
@@ -45,7 +45,7 @@
 		--disable-wayland \
 		--enable-libmpv-shared
 
-OPTIONS_DEFINE=		ASS DOCS LCMS2 LIBARCHIVE LUAJIT MANPAGES UCHARDET ZSH
+OPTIONS_DEFINE=		ASS DOCS LCMS2 LIBARCHIVE LUAJIT MANPAGES TEST UCHARDET ZSH
 OPTIONS_DEFAULT=	ASS DVDREAD DVDNAV LIBARCHIVE MANPAGES OPENGL UCHARDET \
 			V4L VAAPI VDPAU X11 YTDL ZSH
 OPTIONS_GROUP=		IN VO AO
@@ -59,8 +59,9 @@
 DVDNAV_DESC=		DVD menu navigation
 LIBARCHIVE_DESC=	Enable libarchive support
 LUAJIT_DESC=		Use LuaJIT instead of Lua scripting language support
+TEST_DESC=		Enable test suite
+UCHARDET_DESC=		Guess subtitle encoding via uchardet
 YTDL_DESC=		Install youtube-dl
-UCHARDET_DESC=		Guess subtitle encoding via uchardet
 IN_DESC=		Input
 VO_DESC=		Video Output
 AO_DESC=		Audio Output
@@ -124,6 +125,10 @@
 SMB_USES=			samba:lib
 SMB_CONFIGURE_OFF=		--disable-libsmbclient
 
+TEST_LIB_DEPENDS=		libcmocka.so:sysutils/cmocka
+TEST_CONFIGURE_ENV=		PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig"
+TEST_CONFIGURE_ON=		--enable-test
+
 UCHARDET_LIB_DEPENDS=		libuchardet.so:textproc/uchardet
 UCHARDET_CONFIGURE_OFF=		--disable-uchardet
 
@@ -145,7 +150,7 @@
 
 ZSH_USES=			perl5
 ZSH_USE=			PERL5=build
-ZSH_CONFIGURE_ENV=		BIN_PERL=${PERL}
+ZSH_CONFIGURE_ENV=		BIN_PERL="${PERL}"
 ZSH_CONFIGURE_ENABLE=		zsh-comp
 
 post-patch:
@@ -160,4 +165,9 @@
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mpv
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmpv.so
 
+do-test-TEST-on:
+.for test in chmap chmap_sel gl_video
+	@cd ${WRKSRC}/build/test && ./${test}
+.endfor
+
 .include <bsd.port.mk>