Attachment 156440 Details for Bug 199994 – youtube_dl.diff

[patch] youtube_dl.diff

youtube_dl.diff (text/plain), 7.16 KB, created by Po-Chuan Hsieh on 2015-05-06 18:55:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Po-Chuan Hsieh

Created: 2015-05-06 18:55:02 UTC

Size: 7.16 KB

patch

obsolete

>Index: www/youtube_dl/Makefile
>===================================================================
>--- www/youtube_dl/Makefile	(revision 385467)
>+++ www/youtube_dl/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	youtube_dl
>-PORTVERSION=	2015.03.03.1
>+PORTVERSION=	2015.05.04
> CATEGORIES=	www
> MASTER_SITES=	https://yt-dl.org/downloads/${PORTVERSION}/
> DISTNAME=	youtube-dl-${PORTVERSION}
>@@ -18,49 +18,30 @@
> 
> ALL_TARGET=	youtube-dl
> MAKE_ARGS=	PYTHON=${PYTHON_CMD}
>-USES=		python:run
>+USES=		python
> NO_ARCH=	yes
>+WRKSRC=		${WRKDIR}/youtube-dl
> 
> OPTIONS_DEFINE=	BASH FISH RTMPDUMP FFMPEG ZSH
> OPTIONS_DEFAULT=RTMPDUMP
>-
>+OPTIONS_SUB=	yes
> FISH_DESC=	Install programmable completions for Fish
> RTMPDUMP_DESC=	Use RTMPDUMP to download rtmp video streams
> 
> PLIST_FILES=	bin/youtube-dl \
>-		man/man1/youtube-dl.1.gz
>+		man/man1/youtube-dl.1.gz \
>+		%%BASH%%etc/bash_completion.d/youtube-dl.sh \
>+		%%FISH%%share/fish/completions/youtube-dl.fish \
>+		%%ZSH%%share/zsh/site-functions/_youtube-dl
> 
>-WRKSRC=		${WRKDIR}/youtube-dl
>-
>-BASH_PLIST_FILES=	etc/bash_completion.d/youtube-dl.sh
>-FISH_PLIST_FILES=	share/fish/completions/youtube-dl.fish
>-ZSH_PLIST_FILES=	share/zsh/site-functions/_youtube-dl
> FFMPEG_RUN_DEPENDS=	${LOCALBASE}/bin/ffprobe:${PORTSDIR}/multimedia/ffmpeg
> RTMPDUMP_RUN_DEPENDS=	${LOCALBASE}/bin/rtmpdump:${PORTSDIR}/multimedia/rtmpdump
> 
>-.include <bsd.port.options.mk>
>-
> post-extract:
> 	@# remove tarball provided version, build our own
> 	@${RM} -f ${WRKSRC}/youtube-dl
> 
>-do-install:
>-	${INSTALL_SCRIPT} ${WRKSRC}/youtube-dl ${STAGEDIR}${PREFIX}/bin/youtube-dl
>-	${INSTALL_DATA} ${WRKSRC}/youtube-dl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
>-.if ${PORT_OPTIONS:MBASH}
>-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
>-	${INSTALL_DATA} ${WRKSRC}/youtube-dl.bash-completion \
>-		${STAGEDIR}${PREFIX}/etc/bash_completion.d/youtube-dl.sh
>-.endif
>-.if ${PORT_OPTIONS:MFISH}
>-	${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
>-	${INSTALL_DATA} ${WRKSRC}/youtube-dl.fish \
>-		${STAGEDIR}${PREFIX}/share/fish/completions/
>-.endif
>-.if ${PORT_OPTIONS:MZSH}
>-	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
>-	${INSTALL_DATA} ${WRKSRC}/youtube-dl.zsh \
>-		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_youtube-dl
>-.endif
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|python devscripts/|${PYTHON_CMD} devscripts/|' ${WRKSRC}/Makefile
> 
> .include <bsd.port.mk>
>Index: www/youtube_dl/distinfo
>===================================================================
>--- www/youtube_dl/distinfo	(revision 385467)
>+++ www/youtube_dl/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (youtube-dl-2015.03.03.1.tar.gz) = 31e4dd019c1564f9a2b9ad187b461d2fd0c9d1fa3f636ea36d5dd970fb77f539
>-SIZE (youtube-dl-2015.03.03.1.tar.gz) = 1407072
>+SHA256 (youtube-dl-2015.05.04.tar.gz) = 3ebafe6257bfd8a9feb1e16f44c92258b038de07e8754560f05bd9909f9e113b
>+SIZE (youtube-dl-2015.05.04.tar.gz) = 1518117
>Index: www/youtube_dl/files/patch-Makefile
>===================================================================
>--- www/youtube_dl/files/patch-Makefile	(revision 385467)
>+++ www/youtube_dl/files/patch-Makefile	(working copy)
>@@ -1,8 +1,8 @@
>---- Makefile.orig	2014-09-14 14:48:07 UTC
>+--- Makefile.orig	2015-04-26 20:44:31 UTC
> +++ Makefile
>-@@ -10,17 +10,7 @@
>- BINDIR ?= $(PREFIX)/bin
>+@@ -9,17 +9,7 @@ BINDIR ?= $(PREFIX)/bin
>  MANDIR ?= $(PREFIX)/man
>+ SHAREDIR ?= $(PREFIX)/share
>  PYTHON ?= /usr/bin/env python
> -
> -# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
>@@ -15,7 +15,34 @@
> -		SYSCONFDIR=$(PREFIX)/etc
> -	endif
> -endif
>-+SYSCONFDIR ?= /etc
>++SYSCONFDIR ?= $(PREFIX)/etc
>  
>- install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
>+ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
>  	install -d $(DESTDIR)$(BINDIR)
>+@@ -27,11 +17,11 @@ install: youtube-dl youtube-dl.1 youtube
>+ 	install -d $(DESTDIR)$(MANDIR)/man1
>+ 	install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1
>+ 	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
>+-	install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
>++	install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl.sh
>+ 	install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
>+ 	install -m 644 youtube-dl.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dl
>+-	install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions
>+-	install -m 644 youtube-dl.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dl.fish
>++	install -d $(DESTDIR)$(SHAREDIR)/fish/completions
>++	install -m 644 youtube-dl.fish $(DESTDIR)$(SHAREDIR)/fish/completions/youtube-dl.fish
>+ 
>+ codetest:
>+ 	flake8 .
>+@@ -72,11 +62,6 @@ supportedsites:
>+ README.txt: README.md
>+ 	pandoc -f markdown -t plain README.md -o README.txt
>+ 
>+-youtube-dl.1: README.md
>+-	python devscripts/prepare_manpage.py >youtube-dl.1.temp.md
>+-	pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1
>+-	rm -f youtube-dl.1.temp.md
>+-
>+ youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in
>+ 	python devscripts/bash-completion.py
>+ 
>Index: www/youtube_dl/files/patch-youtube_dl____init__.py
>===================================================================
>--- www/youtube_dl/files/patch-youtube_dl____init__.py	(revision 385467)
>+++ www/youtube_dl/files/patch-youtube_dl____init__.py	(working copy)
>@@ -1,6 +1,6 @@
>---- youtube_dl/__init__.py.orig	2014-11-23 17:50:21.000000000 +0800
>-+++ youtube_dl/__init__.py	2014-11-23 21:17:37.918929006 +0800
>-@@ -34,7 +34,6 @@
>+--- youtube_dl/__init__.py.orig	2015-04-28 07:10:54 UTC
>++++ youtube_dl/__init__.py
>+@@ -36,7 +36,6 @@ from .utils import (
>      std_headers,
>      write_string,
>  )
>@@ -8,7 +8,7 @@
>  from .downloader import (
>      FileDownloader,
>  )
>-@@ -347,17 +346,13 @@ def _real_main(argv=None):
>+@@ -366,17 +365,13 @@ def _real_main(argv=None):
>      }
>  
>      with YoutubeDL(ydl_opts) as ydl:
>Index: www/youtube_dl/files/patch-youtube_dl__options.py
>===================================================================
>--- www/youtube_dl/files/patch-youtube_dl__options.py	(revision 385467)
>+++ www/youtube_dl/files/patch-youtube_dl__options.py	(working copy)
>@@ -1,13 +1,13 @@
>---- youtube_dl/options.py.orig	2014-11-15 22:16:23.000000000 +0800
>-+++ youtube_dl/options.py	2014-11-22 12:34:15.188052389 +0800
>-@@ -125,10 +125,6 @@
>+--- youtube_dl/options.py.orig	2015-04-28 07:10:54 UTC
>++++ youtube_dl/options.py
>+@@ -127,10 +127,6 @@ def parseOpts(overrideArguments=None):
>          action='version',
>-         help='print program version and exit')
>+         help='Print program version and exit')
>      general.add_option(
> -        '-U', '--update',
> -        action='store_true', dest='update_self',
>--        help='update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')
>+-        help='Update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')
> -    general.add_option(
>          '-i', '--ignore-errors',
>          action='store_true', dest='ignoreerrors', default=False,
>-         help='continue on download errors, for example to skip unavailable videos in a playlist')
>+         help='Continue on download errors, for example to skip unavailable videos in a playlist')

Actions: View | Diff

Attachments on bug 199994: 156426 | 156440