Index: head/www/youtube_dl/Makefile =================================================================== --- head/www/youtube_dl/Makefile (revision 404711) +++ head/www/youtube_dl/Makefile (revision 404712) @@ -1,47 +1,47 @@ # $FreeBSD$ PORTNAME= youtube_dl -PORTVERSION= 2015.11.27.1 +PORTVERSION= 2015.12.23 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 NO_ARCH= yes WRKSRC= ${WRKDIR}/youtube-dl OPTIONS_DEFINE= BASH FISH RTMPDUMP FFMPEG ZSH OPTIONS_DEFAULT=RTMPDUMP 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:${PORTSDIR}/multimedia/ffmpeg RTMPDUMP_RUN_DEPENDS= ${LOCALBASE}/bin/rtmpdump:${PORTSDIR}/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 404711) +++ head/www/youtube_dl/distinfo (revision 404712) @@ -1,2 +1,2 @@ -SHA256 (youtube-dl-2015.11.27.1.tar.gz) = 35a7b2947200209bef9e642d1203e9d4a4103e279222c3ca3b5ee3adf3c8c535 -SIZE (youtube-dl-2015.11.27.1.tar.gz) = 1803857 +SHA256 (youtube-dl-2015.12.23.tar.gz) = fe7088979c78eb900c3db110a577866a01e1dd537cddda25258893f099fff9ba +SIZE (youtube-dl-2015.12.23.tar.gz) = 1850244 Index: head/www/youtube_dl/files/patch-Makefile =================================================================== --- head/www/youtube_dl/files/patch-Makefile (revision 404711) +++ head/www/youtube_dl/files/patch-Makefile (revision 404712) @@ -1,48 +1,48 @@ --- Makefile.orig 2015-04-26 20:44:31 UTC +++ Makefile @@ -9,17 +9,7 @@ BINDIR ?= $(PREFIX)/bin 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 ?= $(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 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: 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 +- $(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 + $(PYTHON) devscripts/bash-completion.py