Index: head/www/youtube_dl/Makefile =================================================================== --- head/www/youtube_dl/Makefile (revision 414246) +++ head/www/youtube_dl/Makefile (revision 414247) @@ -1,47 +1,47 @@ # $FreeBSD$ PORTNAME= youtube_dl -PORTVERSION= 2016.03.01 +PORTVERSION= 2016.04.24 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_NAME= The Unlicense LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= zip:archivers/zip ALL_TARGET= youtube-dl MAKE_ARGS= PYTHON=${PYTHON_CMD} USES= 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} -f ${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 414246) +++ head/www/youtube_dl/distinfo (revision 414247) @@ -1,2 +1,2 @@ -SHA256 (youtube-dl-2016.03.01.tar.gz) = fc0f9aebcf3983a848a35631ed1aa465ff3feca507387bff72286a9b49f14d70 -SIZE (youtube-dl-2016.03.01.tar.gz) = 1983124 +SHA256 (youtube-dl-2016.04.24.tar.gz) = 9ca83ae9cf783b3d9a231611ef5e446fa61fa77d0f4c9d0545895e6ce691321f +SIZE (youtube-dl-2016.04.24.tar.gz) = 2084276 Index: head/www/youtube_dl/files/patch-Makefile =================================================================== --- head/www/youtube_dl/files/patch-Makefile (revision 414246) +++ head/www/youtube_dl/files/patch-Makefile (revision 414247) @@ -1,48 +1,39 @@ ---- Makefile.orig 2015-04-26 20:44:31 UTC +--- Makefile.orig 2016-04-28 22:59:03 UTC +++ Makefile -@@ -9,17 +9,7 @@ BINDIR ?= $(PREFIX)/bin - MANDIR ?= $(PREFIX)/man +@@ -11,8 +11,7 @@ MANDIR ?= $(PREFIX)/man SHAREDIR ?= $(PREFIX)/share PYTHON ?= /usr/bin/env python -- + -# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local --ifeq ($(PREFIX),/usr) -- SYSCONFDIR=/etc --else -- ifeq ($(PREFIX),/usr/local) -- SYSCONFDIR=/etc -- else -- SYSCONFDIR=$(PREFIX)/etc -- endif --endif +-SYSCONFDIR != 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) -@@ -27,11 +17,11 @@ install: youtube-dl youtube-dl.1 youtube +@@ -20,11 +19,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: +@@ -68,11 +67,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: head/www/youtube_dl/files/patch-youtube_dl____init__.py =================================================================== --- head/www/youtube_dl/files/patch-youtube_dl____init__.py (revision 414246) +++ head/www/youtube_dl/files/patch-youtube_dl____init__.py (revision 414247) @@ -1,29 +1,29 @@ ---- youtube_dl/__init__.py.orig 2015-11-24 09:44:40.030482000 +0100 -+++ youtube_dl/__init__.py 2015-11-24 09:45:54.856110000 +0100 -@@ -36,7 +36,6 @@ +--- youtube_dl/__init__.py.orig 2016-04-28 23:05:35 UTC ++++ youtube_dl/__init__.py +@@ -36,7 +36,6 @@ from .utils import ( std_headers, write_string, ) -from .update import update_self from .downloader import ( FileDownloader, ) -@@ -375,17 +374,13 @@ +@@ -384,17 +383,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 414246) +++ head/www/youtube_dl/files/patch-youtube_dl__options.py (revision 414247) @@ -1,13 +1,13 @@ ---- youtube_dl/options.py.orig 2015-05-29 05:52:12 UTC +--- youtube_dl/options.py.orig 2016-04-28 23:04:36 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')