Attachment #193379 for bug #228238

View | Details | Raw Unified | Return to bug 228238
Collapse All | Expand All

Lines 1-8 Link Here

(-)./Makefile (-2 / +1 lines)
1	# $FreeBSD: head/www/youtube_dl/Makefile 468844 2018-05-02 15:07:27Z jbeich $	1	# $FreeBSD: head/www/youtube_dl/Makefile 468844 2018-05-02 15:07:27Z jbeich $
2		2
3	PORTNAME= youtube_dl	3	PORTNAME= youtube_dl
4	PORTVERSION= 2018.03.10	4	PORTVERSION= 2018.05.09
5	PORTREVISION= 1
6	CATEGORIES= www	5	CATEGORIES= www
7	MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/	6	MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/
8	DISTNAME= youtube-dl-${PORTVERSION}	7	DISTNAME= youtube-dl-${PORTVERSION}

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1521015507	1	TIMESTAMP = 1526267997
2	SHA256 (youtube-dl-2018.03.10.tar.gz) = 4bfadccb19e379ce38f5601c72dacf0ac5e03881230afee6df2152ab42fa75c5	2	SHA256 (youtube-dl-2018.05.09.tar.gz) = 2db4d85d56381845b8b797bb25e7d4dcac801b5e5c09d3f20964682a455c846a
3	SIZE (youtube-dl-2018.03.10.tar.gz) = 2925069	3	SIZE (youtube-dl-2018.05.09.tar.gz) = 2962389




--- Makefile.orig	2018-05-09 02:36:21 UTC
+++ Makefile
@@ -12,7 +12,7 @@ SHAREDIR ?= $(PREFIX)/share
 PYTHON ?= /usr/bin/env python

-SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi)
+SYSCONFDIR ?= $(PREFIX)/etc
 
 # set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
 MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
@@ -23,11 +23,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

 
 codetest:
 	flake8 .
@@ -87,11 +87,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




--- youtube_dl/__init__.py.orig	2018-05-09 02:36:28 UTC
+++ youtube_dl/__init__.py
@@ -36,7 +36,6 @@ from .utils import (
     std_headers,
     write_string,
     render_table,
 )
-from .update import update_self
 from .downloader import (
     FileDownloader,
 )
@@ -437,17 +436,13 @@ def _real_main(argv=None):
     }
 
     with YoutubeDL(ydl_opts) as ydl:

Lines 1-6 Link Here

(-)./files/patch-youtube_dl__options.py (-2 / +2 lines)
1	--- youtube_dl/options.py.orig 2016-04-28 23:04:36 UTC	1	--- youtube_dl/options.py.orig 2018-05-09 02:36:28 UTC
2	+++ youtube_dl/options.py	2	+++ youtube_dl/options.py
3	@@ -127,10 +127,6 @@ def parseOpts(overrideArguments=None):	3	@@ -138,10 +138,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(

Return to bug 228238

Lines 1-4 Link Here

(-)./files/patch-Makefile (-7 / +7 lines)
1	--- Makefile.orig 2016-11-01 19:43:06 UTC	1	--- Makefile.orig 2018-05-09 02:36:21 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -12,7 +12,7 @@ SHAREDIR ?= $(PREFIX)/share	3	@@ -12,7 +12,7 @@ SHAREDIR ?= $(PREFIX)/share
4	PYTHON ?= /usr/bin/env python	4	PYTHON ?= /usr/bin/env python
Lines 7-15 Link Here
7	-SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi)	7	-SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi)
8	+SYSCONFDIR ?= $(PREFIX)/etc	8	+SYSCONFDIR ?= $(PREFIX)/etc
9		9
10	install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish	10	# set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
11	install -d $(DESTDIR)$(BINDIR)	11	MARKDOWN = $(shell if [ `pandoc -v \| head -n1 \| cut -d" " -f2 \| head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
12	@@ -20,11 +20,11 @@ install: youtube-dl youtube-dl.1 youtube	12	@@ -23,11 +23,11 @@ install: youtube-dl youtube-dl.1 youtube
13	install -d $(DESTDIR)$(MANDIR)/man1	13	install -d $(DESTDIR)$(MANDIR)/man1
14	install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1	14	install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1
15	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d	15	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
Lines 24-36 Link Here
24		24
25	codetest:	25	codetest:
26	flake8 .	26	flake8 .
27	@@ -68,11 +68,6 @@ supportedsites:	27	@@ -87,11 +87,6 @@ supportedsites:
28	README.txt: README.md	28	README.txt: README.md
29	pandoc -f markdown -t plain README.md -o README.txt	29	pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
30		30
31	-youtube-dl.1: README.md	31	-youtube-dl.1: README.md
32	- $(PYTHON) devscripts/prepare_manpage.py youtube-dl.1.temp.md	32	- $(PYTHON) devscripts/prepare_manpage.py youtube-dl.1.temp.md
33	- pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1	33	- pandoc -s -f $(MARKDOWN) -t man youtube-dl.1.temp.md -o youtube-dl.1
34	- rm -f youtube-dl.1.temp.md	34	- rm -f youtube-dl.1.temp.md
35	-	35	-
36	youtube-dl.bash-completion: youtube_dl/.py youtube_dl//*.py devscripts/bash-completion.in	36	youtube-dl.bash-completion: youtube_dl/.py youtube_dl//*.py devscripts/bash-completion.in

Lines 1-14 Link Here

(-)./files/patch-youtube_dl____init__.py (-3 / +3 lines)
1	--- youtube_dl/__init__.py.orig 2016-04-28 23:05:35 UTC	1	--- youtube_dl/__init__.py.orig 2018-05-09 02:36:28 UTC
2	+++ youtube_dl/__init__.py	2	+++ youtube_dl/__init__.py
3	@@ -36,7 +36,6 @@ from .utils import (	3	@@ -36,7 +36,6 @@ from .utils import (
4	std_headers,
5	write_string,	4	write_string,
		5	render_table,
6	)	6	)
7	-from .update import update_self	7	-from .update import update_self
8	from .downloader import (	8	from .downloader import (
9	FileDownloader,	9	FileDownloader,
10	)	10	)
11	@@ -384,17 +383,13 @@ def _real_main(argv=None):	11	@@ -437,17 +436,13 @@ def _real_main(argv=None):
12	}	12	}
13		13
14	with YoutubeDL(ydl_opts) as ydl:	14	with YoutubeDL(ydl_opts) as ydl: