Index: head/multimedia/mpv/Makefile
===================================================================
--- head/multimedia/mpv/Makefile	(revision 345828)
+++ head/multimedia/mpv/Makefile	(revision 345829)
@@ -1,197 +1,141 @@
 # Created by: Grzegorz Blach <gblach@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mpv
-PORTVERSION=	0.3.3
-PORTREVISION=	1
+PORTVERSION=	0.3.5
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
-MASTER_SITES=	GH:0 GHC:0 https://waf.googlecode.com/files/:1
+MASTER_SITES=	GH:0 GHC:0 http://waf.googlecode.com/files/:1
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:0 waf-${WAF_VERSION}:1
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Free and open-source general-purpose video player
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libass.so:${PORTSDIR}/multimedia/libass \
 		libdvdread.so:${PORTSDIR}/multimedia/libdvdread
 BUILD_DEPENDS=	rst2man:${PORTSDIR}/textproc/py-docutils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mpv-player
 GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	d276f75
+GH_COMMIT=	76d771a
 
 WAF_VERSION=	1.7.15
 
 USES=		compiler:c11 desktop-file-utils gmake iconv pkgconfig
 USE_PYTHON_BUILD=	yes
 USE_LUA=	5.1-5.2
 USE_XORG=	x11 xv xxf86vm
 INSTALLS_ICONS=	yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--mandir=${MANPREFIX}/man \
 		--disable-debug-build \
 		--disable-mpg123 \
 		--disable-alsa \
 		--disable-portaudio \
 		--disable-libguess \
 		--disable-pdf
 
 OPTIONS_DEFINE=		BS2B ENCA LADSPA LCMS2 LIRC
 OPTIONS_GROUP=		IN VO AO
 OPTIONS_GROUP_IN=	CDIO DVDNAV LIBBLURAY V4L QUVI SMB
 OPTIONS_GROUP_VO=	CACA OPENGL VAAPI VDPAU XINERAMA
 OPTIONS_GROUP_AO=	JACK PULSEAUDIO
 
 BS2B_DESC=	Enable Bauer Stereophonic-to-Binaural DSP support
 DVDNAV_DESC=	Enable DVD navigation menus support
 ENCA_DESC=	Enable encoding detection support
 QUVI_DESC=	Enable flash media stream support
 IN_DESC=	Input
 VO_DESC=	Video Output
 AO_DESC=	Audio Output
 
-.include <bsd.port.options.mk>
+BS2B_LIB_DEPENDS=		libbs2b.so:${PORTSDIR}/audio/libbs2b
+BS2B_CONFIGURE_ENABLE=		libbs2b
 
-.if ${PORT_OPTIONS:MBS2B}
-LIB_DEPENDS+=		libbs2b.so:${PORTSDIR}/audio/libbs2b
-.else
-CONFIGURE_ARGS+=	--disable-libbs2b
-.endif
+ENCA_LIB_DEPENDS=		libenca.so:${PORTSDIR}/converters/enca
+ENCA_CONFIGURE_ENABLE=		enca
 
-.if ${PORT_OPTIONS:MENCA}
-LIB_DEPENDS+=		libenca.so:${PORTSDIR}/converters/enca
-.else
-CONFIGURE_ARGS+=	--disable-enca
-.endif
+LADSPA_LIB_DEPENDS=		ladspa/amp.so:${PORTSDIR}/audio/ladspa
+LADSPA_CONFIGURE_ENABLE=	ladspa
 
-.if ${PORT_OPTIONS:MLADSPA}
-LIB_DEPENDS+=		ladspa/amp.so:${PORTSDIR}/audio/ladspa
-.else
-CONFIGURE_ARGS+=	--disable-ladspa
-.endif
+LCMS2_LIB_DEPENDS=		liblcms2.so:${PORTSDIR}/graphics/lcms2
+LCMS2_CONFIGURE_ENABLE=		lcms2
 
-.if ${PORT_OPTIONS:MLCMS2}
-LIB_DEPENDS+=		liblcms2.so:${PORTSDIR}/graphics/lcms2
-.else
-CONFIGURE_ARGS+=	--disable-lcms2
-.endif
+LIRC_LIB_DEPENDS=		liblirc_client.so:${PORTSDIR}/comms/lirc
+LIRC_CONFIGURE_ENABLE=		lirc
 
-.if ${PORT_OPTIONS:MLIRC}
-LIB_DEPENDS+=		liblirc_client.so:${PORTSDIR}/comms/lirc
-.else
-CONFIGURE_ARGS+=	--disable-lirc
-.endif
+CDIO_LIB_DEPENDS=		libcdio.so:${PORTSDIR}/sysutils/libcdio
+CDIO_CONFIGURE_ENABLE=		cdda
 
-.if ${PORT_OPTIONS:MCDIO}
-LIB_DEPENDS+=		libcdio.so:${PORTSDIR}/sysutils/libcdio
-.else
-CONFIGURE_ARGS+=	--disable-cdda
-.endif
+DVDNAV_LIB_DEPENDS=		libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
+DVDNAV_CONFIGURE_ENABLE=	dvdnav
 
-.if ${PORT_OPTIONS:MDVDNAV}
-LIB_DEPENDS+=		libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
-.else
-CONFIGURE_ARGS+=	--disable-dvdnav
-.endif
+LIBBLURAY_LIB_DEPENDS=		libbluray.so:${PORTSDIR}/multimedia/libbluray
+LIBBLURAY_CONFIGURE_ENABLE=	libbluray
 
-.if ${PORT_OPTIONS:MLIBBLURAY}
-LIB_DEPENDS+=		libbluray.so:${PORTSDIR}/multimedia/libbluray
-.else
-CONFIGURE_ARGS+=	--disable-libbluray
-.endif
+V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+V4L_LIB_DEPENDS=		libv4l2.so:${PORTSDIR}/multimedia/libv4l
+V4L_CONFIGURE_ENABLE=		tv-v4l2
 
-.if ${PORT_OPTIONS:MV4L}
-BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS+=		libv4l2.so:${PORTSDIR}/multimedia/libv4l
-CONFIGURE_ARGS+=	--enable-tv-v4l2
-.else
-CONFIGURE_ARGS+=	--disable-tv-v4l2
-.endif
+QUVI_LIB_DEPENDS=		libquvi.so:${PORTSDIR}/multimedia/libquvi
+QUVI_CONFIGURE_ENABLE=		libquvi
 
-.if ${PORT_OPTIONS:MQUVI}
-LIB_DEPENDS+=		libquvi.so:${PORTSDIR}/multimedia/libquvi
-.else
-CONFIGURE_ARGS+=	--disable-libquvi
-.endif
+SMB_LIB_DEPENDS=		libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_CONFIGURE_ENABLE=		libsmbclient
 
-.if ${PORT_OPTIONS:MSMB}
-LIB_DEPENDS+=		libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
-.else
-CONFIGURE_ARGS+=	--disable-libsmbclient
-.endif
+CACA_LIB_DEPENDS=		libcaca.so:${PORTSDIR}/graphics/libcaca
+CACA_CONFIGURE_ENABLE=		caca
 
-.if ${PORT_OPTIONS:MCACA}
-LIB_DEPENDS+=		libcaca.so:${PORTSDIR}/graphics/libcaca
-.else
-CONFIGURE_ARGS+=	--disable-caca
-.endif
+OPENGL_USE=			XORG=glproto
+OPENGL_LIB_DEPENDS=		libGL.so:${PORTSDIR}/graphics/libGL
+OPENGL_CONFIGURE_ENABLE=	gl
 
-.if ${PORT_OPTIONS:MOPENGL}
-USE_XORG+=		glproto
-LIB_DEPENDS+=		libGL.so:${PORTSDIR}/graphics/libGL
-.else
-CONFIGURE_ARGS+=	--disable-gl
-.endif
+VAAPI_LIB_DEPENDS=		libva.so:${PORTSDIR}/multimedia/libva
+VAAPI_CONFIGURE_ENABLE=		vaapi
 
-.if ${PORT_OPTIONS:MVAAPI}
-LIB_DEPENDS+=		libva.so:${PORTSDIR}/multimedia/libva
-.else
-CONFIGURE_ARGS+=	--disable-vaapi
-.endif
+VDPAU_LIB_DEPENDS=		libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+VDPAU_CONFIGURE_ENABLE=		vdpau
 
-.if ${PORT_OPTIONS:MVDPAU}
-LIB_DEPENDS+=		libvdpau.so:${PORTSDIR}/multimedia/libvdpau
-.else
-CONFIGURE_ARGS+=	--disable-vdpau
-.endif
+XINERAMA_USE=			XORG=xinerama,xineramaproto
+XINERAMA_CONFIGURE_ENABLE=	xinerama
 
-.if ${PORT_OPTIONS:MXINERAMA}
-USE_XORG+=		xinerama xineramaproto
-.else
-CONFIGURE_ARGS+=	--disable-xinerama
-.endif
+JACK_LIB_DEPENDS=		libjack.so:${PORTSDIR}/audio/jack
+JACK_CONFIGURE_ENABLE=		jack
 
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=		libjack.so:${PORTSDIR}/audio/jack
-.else
-CONFIGURE_ARGS+=	--disable-jack
-.endif
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=		libpulse.so:${PORTSDIR}/audio/pulseaudio
-.else
-CONFIGURE_ARGS+=	--disable-pulse
-.endif
+.include <bsd.port.options.mk>
 
 post-extract:
 	${CP} ${DISTDIR}/waf-${WAF_VERSION} ${WRKSRC}/waf
 	@${CHMOD} +x ${WRKSRC}/waf
 
 post-patch:
 	@${FIND} ${WRKSRC}/DOCS/man -name '*.rst' | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|/usr/local|${PREFIX}|g'
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		waf configure ${_MAKE_JOBS} ${CONFIGURE_ARGS}
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		waf build ${_MAKE_JOBS}
 
 do-install:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		waf install --destdir=${STAGEDIR}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/mpv
 	${INSTALL_DATA} ${WRKSRC}/etc/example.conf ${STAGEDIR}${PREFIX}/etc/mpv/mpv.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/etc/input.conf ${STAGEDIR}${PREFIX}/etc/mpv/input.conf.sample
 
 .include <bsd.port.mk>
Index: head/multimedia/mpv/distinfo
===================================================================
--- head/multimedia/mpv/distinfo	(revision 345828)
+++ head/multimedia/mpv/distinfo	(revision 345829)
@@ -1,4 +1,4 @@
-SHA256 (mpv-0.3.3.tar.gz) = 73d0ee4c1d73e97c3b1911b5c4513f08072b20f4d81b76ae923ba82dc4a5b1da
-SIZE (mpv-0.3.3.tar.gz) = 2514903
+SHA256 (mpv-0.3.5.tar.gz) = d09a302d61948fb81ea6014306be6b654294254f9133af5d5cda700a6ee0eb7a
+SIZE (mpv-0.3.5.tar.gz) = 2516763
 SHA256 (waf-1.7.15) = e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6
 SIZE (waf-1.7.15) = 90909