1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

Update to 2018.05.09

PR:		ports/228238
Submitted by:	takefu@airport.fm
This commit is contained in:
Marcelo Araujo 2018-05-21 17:43:16 +00:00
parent 2423c22ae6
commit 4ffa7fbe82
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=470565
5 changed files with 16 additions and 17 deletions

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= youtube_dl
PORTVERSION= 2018.03.10
PORTREVISION= 1
PORTVERSION= 2018.05.09
CATEGORIES= www
MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/
DISTNAME= youtube-dl-${PORTVERSION}

View File

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

View File

@ -1,4 +1,4 @@
--- Makefile.orig 2016-11-01 19:43:06 UTC
--- Makefile.orig 2018-05-09 02:36:21 UTC
+++ Makefile
@@ -12,7 +12,7 @@ SHAREDIR ?= $(PREFIX)/share
PYTHON ?= /usr/bin/env python
@ -7,9 +7,9 @@
-SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi)
+SYSCONFDIR ?= $(PREFIX)/etc
install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
install -d $(DESTDIR)$(BINDIR)
@@ -20,11 +20,11 @@ install: youtube-dl youtube-dl.1 youtube
# 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
@ -24,13 +24,13 @@
codetest:
flake8 .
@@ -68,11 +68,6 @@ supportedsites:
@@ -87,11 +87,6 @@ supportedsites:
README.txt: README.md
pandoc -f markdown -t plain README.md -o README.txt
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
- 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

View File

@ -1,14 +1,14 @@
--- youtube_dl/__init__.py.orig 2016-04-28 23:05:35 UTC
--- 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,
)
@@ -384,17 +383,13 @@ def _real_main(argv=None):
@@ -437,17 +436,13 @@ def _real_main(argv=None):
}
with YoutubeDL(ydl_opts) as ydl:

View File

@ -1,6 +1,6 @@
--- youtube_dl/options.py.orig 2016-04-28 23:04:36 UTC
--- youtube_dl/options.py.orig 2018-05-09 02:36:28 UTC
+++ youtube_dl/options.py
@@ -127,10 +127,6 @@ def parseOpts(overrideArguments=None):
@@ -138,10 +138,6 @@ def parseOpts(overrideArguments=None):
action='version',
help='Print program version and exit')
general.add_option(