Index: head/www/youtube_dl/Makefile =================================================================== --- head/www/youtube_dl/Makefile (revision 470564) +++ head/www/youtube_dl/Makefile (revision 470565) @@ -1,46 +1,45 @@ # $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} MAINTAINER= araujo@FreeBSD.org COMMENT= Program for downloading videos from YouTube.com LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= zip:archivers/zip ALL_TARGET= youtube-dl MAKE_ARGS= PYTHON=${PYTHON_CMD} USES= gmake python NO_ARCH= yes WRKSRC= ${WRKDIR}/youtube-dl OPTIONS_DEFINE= BASH FISH RTMPDUMP FFMPEG ZSH OPTIONS_DEFAULT=BASH FISH RTMPDUMP ZSH 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 FFMPEG_RUN_DEPENDS= ${LOCALBASE}/bin/ffprobe:multimedia/ffmpeg RTMPDUMP_RUN_DEPENDS= ${LOCALBASE}/bin/rtmpdump:multimedia/rtmpdump post-extract: @# remove tarball provided version, build our own @${RM} ${WRKSRC}/youtube-dl post-patch: @${REINPLACE_CMD} -e 's|python devscripts/|${PYTHON_CMD} devscripts/|' ${WRKSRC}/Makefile .include Index: head/www/youtube_dl/distinfo =================================================================== --- head/www/youtube_dl/distinfo (revision 470564) +++ head/www/youtube_dl/distinfo (revision 470565) @@ -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 Index: head/www/youtube_dl/files/patch-Makefile =================================================================== --- head/www/youtube_dl/files/patch-Makefile (revision 470564) +++ head/www/youtube_dl/files/patch-Makefile (revision 470565) @@ -1,38 +1,38 @@ ---- 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 # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local -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 - 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 . -@@ -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 $(PYTHON) devscripts/bash-completion.py Index: head/www/youtube_dl/files/patch-youtube_dl____init__.py =================================================================== --- head/www/youtube_dl/files/patch-youtube_dl____init__.py (revision 470564) +++ head/www/youtube_dl/files/patch-youtube_dl____init__.py (revision 470565) @@ -1,29 +1,29 @@ ---- 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: - # Update version - if opts.update_self: - update_self(ydl.to_screen, opts.verbose, ydl._opener) - # Remove cache dir if opts.rm_cachedir: ydl.cache.remove() # Maybe do nothing if (len(all_urls) < 1) and (opts.load_info_filename is None): - if opts.update_self or opts.rm_cachedir: + if opts.rm_cachedir: sys.exit() ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv) Index: head/www/youtube_dl/files/patch-youtube_dl__options.py =================================================================== --- head/www/youtube_dl/files/patch-youtube_dl__options.py (revision 470564) +++ head/www/youtube_dl/files/patch-youtube_dl__options.py (revision 470565) @@ -1,13 +1,13 @@ ---- 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( - '-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')