Attachment #156426 for bug #199994




# $FreeBSD$

PORTNAME=	youtube_dl
PORTVERSION=	2015.05.04
CATEGORIES=	www
MASTER_SITES=	https://yt-dl.org/downloads/${PORTVERSION}/
DISTNAME=	youtube-dl-${PORTVERSION}

MAKE_ARGS=	PYTHON=${PYTHON_CMD}
USES=		python:run
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 \
		%%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

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)www/youtube_dl/distinfo (-2 / +2 lines)
1	SHA256 (youtube-dl-2015.03.03.1.tar.gz) = 31e4dd019c1564f9a2b9ad187b461d2fd0c9d1fa3f636ea36d5dd970fb77f539	1	SHA256 (youtube-dl-2015.05.04.tar.gz) = 3ebafe6257bfd8a9feb1e16f44c92258b038de07e8754560f05bd9909f9e113b
2	SIZE (youtube-dl-2015.03.03.1.tar.gz) = 1407072	2	SIZE (youtube-dl-2015.05.04.tar.gz) = 1518117




--- Makefile.orig	2015-04-26 20:44:31 UTC
+++ Makefile
@@ -9,17 +9,7 @@ BINDIR ?= $(PREFIX)/bin
 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

-		SYSCONFDIR=$(PREFIX)/etc
-	endif
-endif
+SYSCONFDIR ?= $(PREFIX)/etc
 
 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
 

Lines 1-6 Link Here

(-)www/youtube_dl/files/patch-youtube_dl____init__.py (-4 / +4 lines)
1	--- youtube_dl/__init__.py.orig 2014-11-23 17:50:21.000000000 +0800	1	--- youtube_dl/__init__.py.orig 2015-04-28 07:10:54 UTC
2	+++ youtube_dl/__init__.py 2014-11-23 21:17:37.918929006 +0800	2	+++ youtube_dl/__init__.py
3	@@ -34,7 +34,6 @@	3	@@ -36,7 +36,6 @@ from .utils import (
4	std_headers,	4	std_headers,
5	write_string,	5	write_string,
6	)	6	)
Lines 8-14 Link Here
8	from .downloader import (	8	from .downloader import (
9	FileDownloader,	9	FileDownloader,
10	)	10	)
11	@@ -347,17 +346,13 @@ def _real_main(argv=None):	11	@@ -366,17 +365,13 @@ def _real_main(argv=None):
12	}	12	}
13		13
14	with YoutubeDL(ydl_opts) as ydl:	14	with YoutubeDL(ydl_opts) as ydl:




--- 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')
     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)')
-    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')

Return to bug 199994

Lines 1-7 Link Here

(-)www/youtube_dl/Makefile (-29 / +7 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= youtube_dl	3	PORTNAME= youtube_dl
4	PORTVERSION= 2015.03.03.1	4	PORTVERSION= 2015.05.04
5	CATEGORIES= www	5	CATEGORIES= www
6	MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/	6	MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/
7	DISTNAME= youtube-dl-${PORTVERSION}	7	DISTNAME= youtube-dl-${PORTVERSION}
Lines 20-66 Link Here
20	MAKE_ARGS= PYTHON=${PYTHON_CMD}	20	MAKE_ARGS= PYTHON=${PYTHON_CMD}
21	USES= python:run	21	USES= python:run
22	NO_ARCH= yes	22	NO_ARCH= yes
		23	WRKSRC= ${WRKDIR}/youtube-dl
23		24
24	OPTIONS_DEFINE= BASH FISH RTMPDUMP FFMPEG ZSH	25	OPTIONS_DEFINE= BASH FISH RTMPDUMP FFMPEG ZSH
25	OPTIONS_DEFAULT=RTMPDUMP	26	OPTIONS_DEFAULT=RTMPDUMP
26		27	OPTIONS_SUB= yes
27	FISH_DESC= Install programmable completions for Fish	28	FISH_DESC= Install programmable completions for Fish
28	RTMPDUMP_DESC= Use RTMPDUMP to download rtmp video streams	29	RTMPDUMP_DESC= Use RTMPDUMP to download rtmp video streams
29		30
30	PLIST_FILES= bin/youtube-dl \	31	PLIST_FILES= bin/youtube-dl \
31	man/man1/youtube-dl.1.gz	32	man/man1/youtube-dl.1.gz \
		33	%%BASH%%etc/bash_completion.d/youtube-dl.sh \
		34	%%FISH%%share/fish/completions/youtube-dl.fish \
		35	%%ZSH%%share/zsh/site-functions/_youtube-dl
32		36
33	WRKSRC= ${WRKDIR}/youtube-dl
34
35	BASH_PLIST_FILES= etc/bash_completion.d/youtube-dl.sh
36	FISH_PLIST_FILES= share/fish/completions/youtube-dl.fish
37	ZSH_PLIST_FILES= share/zsh/site-functions/_youtube-dl
38	FFMPEG_RUN_DEPENDS= ${LOCALBASE}/bin/ffprobe:${PORTSDIR}/multimedia/ffmpeg	37	FFMPEG_RUN_DEPENDS= ${LOCALBASE}/bin/ffprobe:${PORTSDIR}/multimedia/ffmpeg
39	RTMPDUMP_RUN_DEPENDS= ${LOCALBASE}/bin/rtmpdump:${PORTSDIR}/multimedia/rtmpdump	38	RTMPDUMP_RUN_DEPENDS= ${LOCALBASE}/bin/rtmpdump:${PORTSDIR}/multimedia/rtmpdump
40		39
41	.include <bsd.port.options.mk>
42
43	post-extract:	40	post-extract:
44	@# remove tarball provided version, build our own	41	@# remove tarball provided version, build our own
45	@${RM} -f ${WRKSRC}/youtube-dl	42	@${RM} -f ${WRKSRC}/youtube-dl
46		43
47	do-install:
48	${INSTALL_SCRIPT} ${WRKSRC}/youtube-dl ${STAGEDIR}${PREFIX}/bin/youtube-dl
49	${INSTALL_DATA} ${WRKSRC}/youtube-dl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
50	.if ${PORT_OPTIONS:MBASH}
51	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
52	${INSTALL_DATA} ${WRKSRC}/youtube-dl.bash-completion \
53	${STAGEDIR}${PREFIX}/etc/bash_completion.d/youtube-dl.sh
54	.endif
55	.if ${PORT_OPTIONS:MFISH}
56	${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
57	${INSTALL_DATA} ${WRKSRC}/youtube-dl.fish \
58	${STAGEDIR}${PREFIX}/share/fish/completions/
59	.endif
60	.if ${PORT_OPTIONS:MZSH}
61	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
62	${INSTALL_DATA} ${WRKSRC}/youtube-dl.zsh \
63	${STAGEDIR}${PREFIX}/share/zsh/site-functions/_youtube-dl
64	.endif
65
66	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Lines 1-8 Link Here

(-)www/youtube_dl/files/patch-Makefile (-5 / +32 lines)
1	--- Makefile.orig 2014-09-14 14:48:07 UTC	1	--- Makefile.orig 2015-04-26 20:44:31 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -10,17 +10,7 @@	3	@@ -9,17 +9,7 @@ BINDIR ?= $(PREFIX)/bin
4	BINDIR ?= $(PREFIX)/bin
5	MANDIR ?= $(PREFIX)/man	4	MANDIR ?= $(PREFIX)/man
		5	SHAREDIR ?= $(PREFIX)/share
6	PYTHON ?= /usr/bin/env python	6	PYTHON ?= /usr/bin/env python
7	-	7	-
8	-# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local	8	-# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
Lines 15-21 Link Here
15	- SYSCONFDIR=$(PREFIX)/etc	15	- SYSCONFDIR=$(PREFIX)/etc
16	- endif	16	- endif
17	-endif	17	-endif
18	+SYSCONFDIR ?= /etc	18	+SYSCONFDIR ?= $(PREFIX)/etc
19		19
20	install: youtube-dl youtube-dl.1 youtube-dl.bash-completion	20	install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
21	install -d $(DESTDIR)$(BINDIR)	21	install -d $(DESTDIR)$(BINDIR)
		22	@@ -27,11 +17,11 @@ install: youtube-dl youtube-dl.1 youtube
		23	install -d $(DESTDIR)$(MANDIR)/man1
		24	install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1
		25	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
		26	- install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
		27	+ install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl.sh
		28	install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
		29	install -m 644 youtube-dl.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dl
		30	- install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions
		31	- install -m 644 youtube-dl.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dl.fish
		32	+ install -d $(DESTDIR)$(SHAREDIR)/fish/completions
		33	+ install -m 644 youtube-dl.fish $(DESTDIR)$(SHAREDIR)/fish/completions/youtube-dl.fish
		34
		35	codetest:
		36	flake8 .
		37	@@ -72,11 +62,6 @@ supportedsites:
		38	README.txt: README.md
		39	pandoc -f markdown -t plain README.md -o README.txt
		40
		41	-youtube-dl.1: README.md
		42	- python devscripts/prepare_manpage.py >youtube-dl.1.temp.md
		43	- pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1
		44	- rm -f youtube-dl.1.temp.md
		45	-
		46	youtube-dl.bash-completion: youtube_dl/.py youtube_dl//*.py devscripts/bash-completion.in
		47	python devscripts/bash-completion.py
		48

Lines 1-13 Link Here

(-)www/youtube_dl/files/patch-youtube_dl__options.py (-6 / +6 lines)
1	--- youtube_dl/options.py.orig 2014-11-15 22:16:23.000000000 +0800	1	--- youtube_dl/options.py.orig 2015-04-28 07:10:54 UTC
2	+++ youtube_dl/options.py 2014-11-22 12:34:15.188052389 +0800	2	+++ youtube_dl/options.py
3	@@ -125,10 +125,6 @@	3	@@ -127,10 +127,6 @@ def parseOpts(overrideArguments=None):
4	action='version',	4	action='version',
5	help='print program version and exit')	5	help='Print program version and exit')
6	general.add_option(	6	general.add_option(
7	- '-U', '--update',	7	- '-U', '--update',
8	- action='store_true', dest='update_self',	8	- action='store_true', dest='update_self',
9	- help='update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')	9	- help='Update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')
10	- general.add_option(	10	- general.add_option(
11	'-i', '--ignore-errors',	11	'-i', '--ignore-errors',
12	action='store_true', dest='ignoreerrors', default=False,	12	action='store_true', dest='ignoreerrors', default=False,
13	help='continue on download errors, for example to skip unavailable videos in a playlist')	13	help='Continue on download errors, for example to skip unavailable videos in a playlist')