- Update to 0.6.1

- Remove PULSEAUDIO option. Depends on version 1.0,
  but only 0.9 is available in ports.

3 files changed, 13 insertions, 18 deletions

diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index e7b42ac5270c..3d4df9de981c 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mpv
-PORTVERSION=	0.6.0
+PORTVERSION=	0.6.1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	GH:0 GHC:0 http://ftp.waf.io/pub/release/:1 \
@@ -24,7 +24,7 @@ BUILD_DEPENDS=	rst2man:${PORTSDIR}/textproc/py-docutils
 USE_GITHUB=	yes
 GH_ACCOUNT=	mpv-player
 GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	03bfc2b
+GH_COMMIT=	7d9f8f7
 
 WAF_VERSION=	1.7.16
 
@@ -45,11 +45,11 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--disable-portaudio \
 		--disable-pdf
 
-OPTIONS_DEFINE=		BS2B ENCA LADSPA LCMS2 LIBGUESS LIRC LUAJIT ZSH
+OPTIONS_DEFINE=		BS2B DOCS ENCA LADSPA LCMS2 LIBGUESS LIRC LUAJIT ZSH
 OPTIONS_GROUP=		IN VO AO
 OPTIONS_GROUP_IN=	CDIO LIBBLURAY V4L QUVI SMB
 OPTIONS_GROUP_VO=	CACA OPENGL VAAPI VDPAU XINERAMA
-OPTIONS_GROUP_AO=	JACK PULSEAUDIO
+OPTIONS_GROUP_AO=	JACK #PULSEAUDIO
 OPTIONS_SUB=		yes
 
 BS2B_DESC=	Enable Bauer Stereophonic-to-Binaural DSP support
@@ -123,8 +123,8 @@ XINERAMA_CONFIGURE_ENABLE=	xinerama
 JACK_LIB_DEPENDS=		libjack.so:${PORTSDIR}/audio/jack
 JACK_CONFIGURE_ENABLE=		jack
 
-PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
-PULSEAUDIO_CONFIGURE_ENABLE=	pulse
+#PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+#PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 
 .include <bsd.port.options.mk>
 
@@ -136,8 +136,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/pkgconfig/mpv.pc|data/pkgconfig/mpv.pc|g' \
 		-e 's|/zsh/vendor-completions|/zsh/site-functions|' \
 		${WRKSRC}/wscript_build.py
-	@${REINPLACE_CMD} -e "s|'libpulse', '>= 1.0'|'libpulse', '>= 0.9'|" \
-		${WRKSRC}/wscript
 	@${FIND} ${WRKSRC}/DOCS/man -name '*.rst' | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|/usr/local|${PREFIX}|g'
 
@@ -153,11 +151,6 @@ 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
-
 post-stage:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mpv
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmpv.so
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo
index 4abc3758fd11..f5fc231daa3b 100644
--- a/multimedia/mpv/distinfo
+++ b/multimedia/mpv/distinfo
@@ -1,4 +1,4 @@
-SHA256 (mpv-0.6.0.tar.gz) = 158ef6066c1270e66bcf865bb250c8c6e1d7a1ace1d30c9a193956b30ee650c4
-SIZE (mpv-0.6.0.tar.gz) = 2598770
+SHA256 (mpv-0.6.1.tar.gz) = 727315548db2f9914f4991875f64aa4f4cbc456976aeca5ad2fc6eae0f19b614
+SIZE (mpv-0.6.1.tar.gz) = 2599680
 SHA256 (waf-1.7.16) = b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61
 SIZE (waf-1.7.16) = 91846
diff --git a/multimedia/mpv/pkg-plist b/multimedia/mpv/pkg-plist
index e8b12dbc9147..1e4ee0b907dc 100644
--- a/multimedia/mpv/pkg-plist
+++ b/multimedia/mpv/pkg-plist
@@ -1,7 +1,5 @@
 bin/mpv
-etc/mpv/encoding-profiles.conf
-etc/mpv/input.conf.sample
-etc/mpv/mpv.conf.sample
+%%ETCDIR%%/encoding-profiles.conf
 include/mpv/client.h
 lib/libmpv.so
 lib/libmpv.so.1
@@ -12,4 +10,8 @@ share/applications/mpv.desktop
 share/icons/hicolor/16x16/apps/mpv.png
 share/icons/hicolor/32x32/apps/mpv.png
 share/icons/hicolor/64x64/apps/mpv.png
+%%PORTDOCS%%%%DOCSDIR%%/example.conf
+%%PORTDOCS%%%%DOCSDIR%%/input.conf
+%%PORTDOCS%%%%DOCSDIR%%/mplayer-input.conf
+%%PORTDOCS%%%%DOCSDIR%%/restore-old-bindings.conf
 %%ZSH%%share/zsh/site-functions/_mpv