Index: head/www/youtube_dl/Makefile =================================================================== --- head/www/youtube_dl/Makefile (revision 525493) +++ head/www/youtube_dl/Makefile (revision 525494) @@ -1,46 +1,44 @@ # $FreeBSD$ PORTNAME= youtube_dl -PORTVERSION= 2019.11.28 +PORTVERSION= 2020.01.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_FILE= ${WRKSRC}/LICENSE - -BUILD_DEPENDS= zip:archivers/zip USES= gmake python ALL_TARGET= youtube-dl MAKE_ARGS= PYTHON=${PYTHON_CMD} 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 525493) +++ head/www/youtube_dl/distinfo (revision 525494) @@ -1,3 +1,3 @@ -TIMESTAMP = 1575280448 -SHA256 (youtube-dl-2019.11.28.tar.gz) = 93dfcb77811cafb5aef090504eb43e8fd3fca0df694676a4ff71023a6ce3b1a7 -SIZE (youtube-dl-2019.11.28.tar.gz) = 3148365 +TIMESTAMP = 1579862121 +SHA256 (youtube-dl-2020.01.24.tar.gz) = 0b1dcc96d204984df1ee364e81cddd5645421f6065d2815472258ccdad5c36ff +SIZE (youtube-dl-2020.01.24.tar.gz) = 3159926 Index: head/www/youtube_dl/files/patch-Makefile =================================================================== --- head/www/youtube_dl/files/patch-Makefile (revision 525493) +++ head/www/youtube_dl/files/patch-Makefile (revision 525494) @@ -1,38 +1,47 @@ ---- Makefile.orig 2018-05-09 02:36:21 UTC -+++ Makefile -@@ -12,7 +12,7 @@ SHAREDIR ?= $(PREFIX)/share +--- Makefile.orig 2019-12-24 22:21:59.865317000 +0100 ++++ Makefile 2019-12-24 22:24:39.962172000 +0100 +@@ -12,7 +12,7 @@ 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 # 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 +@@ -23,11 +23,11 @@ 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 . -@@ -87,11 +87,6 @@ supportedsites: +@@ -65,7 +65,7 @@ + done + touch -t 200001010101 zip/youtube_dl/*.py zip/youtube_dl/*/*.py + mv zip/youtube_dl/__main__.py zip/ +- cd zip ; zip -q ../youtube-dl youtube_dl/*.py youtube_dl/*/*.py __main__.py ++ cd zip ; bsdtar -a -cf ../youtube-dl.zip youtube_dl/*.py youtube_dl/*/*.py __main__.py + rm -rf zip + echo '#!$(PYTHON)' > youtube-dl + cat youtube-dl.zip >> youtube-dl +@@ -90,11 +90,6 @@ + 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 -