Index: head/multimedia/mpv/Makefile
===================================================================
--- head/multimedia/mpv/Makefile
+++ head/multimedia/mpv/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mpv
-PORTVERSION=	0.22.0
+PORTVERSION=	0.23.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 
@@ -14,12 +13,13 @@
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
+BUILD_DEPENDS=	ffmpeg>=3.2.2,1:multimedia/ffmpeg
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	mpv-player waf-project:waf
-GH_PROJECT=	waf:waf
-GH_TAGNAME=	waf-1.8.19:waf
+GH_ACCOUNT=	mpv-player
+# Keep in sync with bootstrap.py to avoid regressions
+GH_TUPLE=	waf-project:waf:waf-1.8.12:waf
 
 WAF_CMD=	${WRKSRC_waf}/waf-light
 
@@ -27,6 +27,7 @@
 		pkgconfig python:build waf
 USE_LDCONFIG=	yes
 
+CONFIGURE_ENV=	BIN_PYTHON=${PYTHON_CMD}
 CONFIGURE_ARGS=	--docdir=${EXAMPLESDIR} \
 		--htmldir=${DOCSDIR}/html \
 		--mandir=${MANPREFIX}/man \
@@ -44,9 +45,8 @@
 		--disable-wayland \
 		--enable-libmpv-shared
 
-OPTIONS_DEFINE=		ASS DOCS ENCA LCMS2 LIBGUESS LUAJIT \
-			MANPAGES UCHARDET ZSH
-OPTIONS_DEFAULT=	ASS DVDREAD DVDNAV ENCA MANPAGES OPENGL \
+OPTIONS_DEFINE=		ASS DOCS LCMS2 LUAJIT MANPAGES UCHARDET ZSH
+OPTIONS_DEFAULT=	ASS DVDREAD DVDNAV MANPAGES OPENGL UCHARDET \
 			V4L VAAPI VDPAU X11 XINERAMA YTDL ZSH
 OPTIONS_GROUP=		IN VO AO
 OPTIONS_GROUP_IN=	CDIO DVDREAD DVDNAV LIBBLURAY V4L YTDL SMB
@@ -57,11 +57,9 @@
 ASS_DESC=	ASS/SSA subtitle and OSD rendering
 DVDREAD_DESC=	DVD Playback support
 DVDNAV_DESC=	DVD menu navigation
-ENCA_DESC=	Enable encoding detection support
-LIBGUESS_DESC=	Enable high-speed character set detection support
 LUAJIT_DESC=	Use LuaJIT instead of Lua scripting language support
 YTDL_DESC=	Install youtube-dl
-UCHARDET_DESC=	Use UCHARDET instead ENCA support
+UCHARDET_DESC=	Guess subtitle encoding via uchardet
 IN_DESC=	Input
 VO_DESC=	Video Output
 AO_DESC=	Audio Output
@@ -87,9 +85,6 @@
 DVDREAD_LIB_DEPENDS=		libdvdread.so:multimedia/libdvdread
 DVDREAD_CONFIGURE_OFF=		--disable-dvdread
 
-ENCA_LIB_DEPENDS=		libenca.so:converters/enca
-ENCA_CONFIGURE_OFF=		--disable-enca
-
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_CONFIGURE_OFF=		--disable-jack
 
@@ -99,9 +94,6 @@
 LIBBLURAY_LIB_DEPENDS=		libbluray.so:multimedia/libbluray
 LIBBLURAY_CONFIGURE_OFF=	--disable-libbluray
 
-LIBGUESS_LIB_DEPENDS=		libguess.so:textproc/libguess
-LIBGUESS_CONFIGURE_OFF=		--disable-libguess
-
 LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:lang/luajit
 LUAJIT_USES_OFF=		lua
 LUAJIT_CONFIGURE_ON=		--lua=luajit
@@ -153,6 +145,7 @@
 
 ZSH_USES=			perl5
 ZSH_USE=			PERL5=build
+ZSH_CONFIGURE_ENV=		BIN_PERL=${PERL}
 ZSH_CONFIGURE_ENABLE=		zsh-comp
 
 post-patch:
Index: head/multimedia/mpv/distinfo
===================================================================
--- head/multimedia/mpv/distinfo
+++ head/multimedia/mpv/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1479825938
-SHA256 (mpv-player-mpv-v0.22.0_GH0.tar.gz) = c0f9ac8f0e37a391d19007b333ef8787c2f45d75a0d4401c0098cde52c5082f6
-SIZE (mpv-player-mpv-v0.22.0_GH0.tar.gz) = 2822645
-SHA256 (waf-project-waf-waf-1.8.19_GH0.tar.gz) = 4d9000e19aa279e997aaf744336cd055864bd4e10062578a957f541d6c761a40
-SIZE (waf-project-waf-waf-1.8.19_GH0.tar.gz) = 1390391
+TIMESTAMP = 1482671558
+SHA256 (mpv-player-mpv-v0.23.0_GH0.tar.gz) = 8aeefe5970587dfc454d2b89726b603f156bd7a9ae427654eef0d60c68d94998
+SIZE (mpv-player-mpv-v0.23.0_GH0.tar.gz) = 2812103
+SHA256 (waf-project-waf-waf-1.8.12_GH0.tar.gz) = 5ba55fef2811a54c86c99270f3a43e6327f927b182c6e0af70647dfe7ee2973f
+SIZE (waf-project-waf-waf-1.8.12_GH0.tar.gz) = 1349077
Index: head/multimedia/mpv/pkg-plist
===================================================================
--- head/multimedia/mpv/pkg-plist
+++ head/multimedia/mpv/pkg-plist
@@ -6,7 +6,7 @@
 include/mpv/stream_cb.h
 lib/libmpv.so
 lib/libmpv.so.1
-lib/libmpv.so.1.23.0
+lib/libmpv.so.1.24.0
 libdata/pkgconfig/mpv.pc
 %%MANPAGES%%man/man1/mpv.1.gz
 share/applications/mpv.desktop