Index: head/www/youtube_dl/Makefile =================================================================== --- head/www/youtube_dl/Makefile (revision 378058) +++ head/www/youtube_dl/Makefile (revision 378059) @@ -1,53 +1,66 @@ # $FreeBSD$ PORTNAME= youtube_dl -PORTVERSION= 2014.11.24 +PORTVERSION= 2015.01.25 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:${PORTSDIR}/archivers/zip ALL_TARGET= youtube-dl MAKE_ARGS= PYTHON=${PYTHON_CMD} USES= python:run +NO_ARCH= yes -OPTIONS_DEFINE= BASH RTMPDUMP FFMPEG +OPTIONS_DEFINE= BASH FISH RTMPDUMP FFMPEG ZSH OPTIONS_DEFAULT=RTMPDUMP -BASH_DESC= Install programmable completions for Bash +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 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 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 Index: head/www/youtube_dl/distinfo =================================================================== --- head/www/youtube_dl/distinfo (revision 378058) +++ head/www/youtube_dl/distinfo (revision 378059) @@ -1,2 +1,2 @@ -SHA256 (youtube-dl-2014.11.24.tar.gz) = 3bae2155e429c3409bfac431330a86c931ea36d87c4c07e793bf0ea0cbfc1cbf -SIZE (youtube-dl-2014.11.24.tar.gz) = 1149666 +SHA256 (youtube-dl-2015.01.25.tar.gz) = f5345af6eba6f0f76cbddf920d311bc6e169cc07b58eeaa0295a7fc4bab587e7 +SIZE (youtube-dl-2015.01.25.tar.gz) = 1305777 Index: head/www/youtube_dl/files/patch-youtube_dl____init__.py =================================================================== --- head/www/youtube_dl/files/patch-youtube_dl____init__.py (revision 378058) +++ head/www/youtube_dl/files/patch-youtube_dl____init__.py (revision 378059) @@ -1,29 +1,29 @@ --- youtube_dl/__init__.py.orig 2014-11-23 17:50:21.000000000 +0800 +++ youtube_dl/__init__.py 2014-11-23 21:17:37.918929006 +0800 @@ -34,7 +34,6 @@ std_headers, write_string, ) -from .update import update_self from .downloader import ( FileDownloader, ) -@@ -324,17 +323,13 @@ - ydl.add_post_processor(ExecAfterDownloadPP( - verboseOutput=opts.verbose, exec_cmd=opts.exec_cmd)) +@@ -347,17 +346,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) - # 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)