5 files changed, 28 insertions, 21 deletions

diff --git a/multimedia/mps-youtube/Makefile b/multimedia/mps-youtube/Makefile
index 1a5714a487f2..50ca4f08eb72 100644
--- a/multimedia/mps-youtube/Makefile
+++ b/multimedia/mps-youtube/Makefile
@@ -2,10 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	mps-youtube
-PORTVERSION=	0.2.3
+PORTVERSION=	0.2.5
 PORTREVISION=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	CHEESESHOP
+DISTFILES=	${PORTNAME}-${PORTVERSION}-2.tar.gz
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Terminal based YouTube jukebox with playlist management
@@ -13,7 +14,7 @@ COMMENT=	Terminal based YouTube jukebox with playlist management
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	ca_root_nss>=3.17.3:${PORTSDIR}/security/ca_root_nss \
-		${PYTHON_PKGNAMEPREFIX}pafy>=0.3.72:${PORTSDIR}/www/py-pafy
+		${PYTHON_PKGNAMEPREFIX}pafy>=0.3.74:${PORTSDIR}/www/py-pafy
 
 CONVERTER_DESC=	Converter to MP3 and other formats
 
@@ -34,12 +35,14 @@ OPTIONS_SINGLE=	PLAYER
 OPTIONS_SINGLE_PLAYER=	MPLAYER MPV
 
 PLAYER_DESC=	Video player
+PLIST_FILES=	bin/${PORTNAME}
 
-USES=		python
+SUB_FILES=	${PORTNAME}
+
+USES=		python:3.2+
 USE_PYTHON=	autoplist distutils
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},1' \
-		${WRKSRC}/mps_youtube/main.py
+post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/multimedia/mps-youtube/distinfo b/multimedia/mps-youtube/distinfo
index 7a5b115bfaa8..5a55ef3919b3 100644
--- a/multimedia/mps-youtube/distinfo
+++ b/multimedia/mps-youtube/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mps-youtube-0.2.3.tar.gz) = 7a0d0f6df4793d8ebf49cf323426ec802cf4f6013078513e09fc0c790e96867c
-SIZE (mps-youtube-0.2.3.tar.gz) = 47439
+SHA256 (mps-youtube-0.2.5-2.tar.gz) = 13ff7a5748174a40c64429a2a59de7a058efdd35c58683f30c694725a02474ef
+SIZE (mps-youtube-0.2.5-2.tar.gz) = 54835
diff --git a/multimedia/mps-youtube/files/mps-youtube.in b/multimedia/mps-youtube/files/mps-youtube.in
new file mode 100644
index 000000000000..af6081f00b16
--- /dev/null
+++ b/multimedia/mps-youtube/files/mps-youtube.in
@@ -0,0 +1,4 @@
+#!/bin/sh
+SSL_CERT_FILE='/etc/ssl/cert.pem'
+export SSL_CERT_FILE
+exec mpsyt ${1+"$@"}
diff --git a/multimedia/mps-youtube/files/patch-mps__youtube_main.py b/multimedia/mps-youtube/files/patch-mps__youtube_main.py
deleted file mode 100644
index 0a5bd740a5c5..000000000000
--- a/multimedia/mps-youtube/files/patch-mps__youtube_main.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- mps_youtube/main.py.orig	2015-01-25 16:46:50 UTC
-+++ mps_youtube/main.py
-@@ -856,6 +856,10 @@ def init():
-     init_cache()
-     init_transcode()
- 
-+    # see https://github.com/np1/mps-youtube/issues/179
-+    if 34015728 <= sys.hexversion and not 'SSL_CERT_FILE' in os.environ:
-+        os.environ['SSL_CERT_FILE'] = '%%LOCALBASE%%/share/certs/ca-root-nss.crt'
-+
-     # set player to mpv or mplayer if found, otherwise unset
-     E = os.path.exists
-     suffix = ".exe" if mswin else ""
diff --git a/multimedia/mps-youtube/files/patch-setup.py b/multimedia/mps-youtube/files/patch-setup.py
new file mode 100644
index 000000000000..4981f4c94b94
--- /dev/null
+++ b/multimedia/mps-youtube/files/patch-setup.py
@@ -0,0 +1,13 @@
+--- setup.py.orig	2015-06-27 09:00:49 UTC
++++ setup.py
+@@ -55,8 +55,8 @@ options = dict(
+     long_description=open("README.rst").read()
+ )
+ 
+-if sys.platform.startswith('linux'):
+-    # Install desktop file. Required for mpris on Ubuntu
++if sys.platform.startswith(('freebsd', 'linux')):
++    # Install desktop file. Required for mpris on FreeBSD and Ubuntu
+     options['data_files'] = [('share/applications/', ['mps-youtube.desktop'])]
+ 
+ try: