From 9e9aa438fd406664cf78f183aa948cc61462693c Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 21 Jun 2014 18:16:39 +0000 Subject: Avoid SyntaxError: Non-UTF-8 code starting with '\xb7' in file youtube-dl on line 3, but no encoding declared; see http://python.org/dev/peps/pep-0263/ for details by installing the original unmodified file and a wrapper script. I'm not sure why it broke or why this works better, but it does for me (TM). Bump PKGREVISION. --- net/youtube-dl/Makefile | 15 ++++++++++++--- net/youtube-dl/PLIST | 3 ++- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'net/youtube-dl') diff --git a/net/youtube-dl/Makefile b/net/youtube-dl/Makefile index a67f5237e5a..175ec506303 100644 --- a/net/youtube-dl/Makefile +++ b/net/youtube-dl/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.51 2014/05/18 07:40:54 tron Exp $ +# $NetBSD: Makefile,v 1.52 2014/06/21 18:16:39 wiz Exp $ VERSION_DATE= 2014.05.16.1 DISTNAME= youtube-dl-${VERSION_DATE} PKGNAME= youtube-dl-${VERSION_DATE:S/.//S/.//} +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://youtube-dl.org/downloads/${VERSION_DATE}/ @@ -16,10 +17,18 @@ NO_BUILD= yes WRKSRC= ${WRKDIR}/youtube-dl USE_TOOLS+= gmake -REPLACE_PYTHON= youtube-dl - MAKE_FLAGS+= PREFIX=${PREFIX} \ BASHCOMPDIR=${PREFIX}/share/bash-completion/completions +INSTALLATION_DIRS= share/youtube-dl +CHECK_INTERPRETER_SKIP= share/youtube-dl/youtube-dl + +post-patch: + ${ECHO} '#!/bin/sh' > ${WRKSRC}/youtube-dl.sh + ${ECHO} 'exec ${PYTHONBIN} ${PREFIX}/share/youtube-dl/youtube-dl "$$@"' >> ${WRKSRC}/youtube-dl.sh + +post-install: + mv ${DESTDIR}${PREFIX}/bin/youtube-dl ${DESTDIR}${PREFIX}/share/youtube-dl + ${INSTALL_SCRIPT} ${WRKSRC}/youtube-dl.sh ${DESTDIR}${PREFIX}/bin/youtube-dl .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/youtube-dl/PLIST b/net/youtube-dl/PLIST index 563ffd53704..23102868258 100644 --- a/net/youtube-dl/PLIST +++ b/net/youtube-dl/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2013/07/20 05:07:15 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.3 2014/06/21 18:16:39 wiz Exp $ bin/youtube-dl man/man1/youtube-dl.1 share/bash-completion/completions/youtube-dl +share/youtube-dl/youtube-dl -- cgit v1.2.3