Index: head/www/youtube_dl/Makefile
===================================================================
--- head/www/youtube_dl/Makefile	(revision 535761)
+++ head/www/youtube_dl/Makefile	(revision 535762)
@@ -1,44 +1,41 @@
 # $FreeBSD$
 
 PORTNAME=	youtube_dl
-PORTVERSION=	2020.03.24
+PORTVERSION=	2020.05.08
 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
+# Implicit approval to commit trivial version updates.
+MAINTAINER=	tobik@FreeBSD.org
+COMMENT=	Program for downloading videos from various services
 
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake python
 
-ALL_TARGET=	youtube-dl
 MAKE_ARGS=	PYTHON=${PYTHON_CMD}
+ALL_TARGET=	youtube-dl
 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 \
+		etc/bash_completion.d/youtube-dl.sh \
 		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
+		share/fish/vendor_completions.d/youtube-dl.fish \
+		share/zsh/site-functions/_youtube-dl
 
-FFMPEG_RUN_DEPENDS=	${LOCALBASE}/bin/ffprobe:multimedia/ffmpeg
-RTMPDUMP_RUN_DEPENDS=	${LOCALBASE}/bin/rtmpdump:multimedia/rtmpdump
+OPTIONS_DEFINE=		FFMPEG RTMPDUMP
+OPTIONS_DEFAULT=	RTMPDUMP
 
+RTMPDUMP_DESC=	Use rtmpdump to download rtmp video streams
+
+FFMPEG_RUN_DEPENDS=	ffprobe:multimedia/ffmpeg
+RTMPDUMP_RUN_DEPENDS=	rtmpdump:multimedia/rtmpdump
+
 post-extract:
-	@# remove tarball provided version, build our own
+# 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 <bsd.port.mk>
Index: head/www/youtube_dl/distinfo
===================================================================
--- head/www/youtube_dl/distinfo	(revision 535761)
+++ head/www/youtube_dl/distinfo	(revision 535762)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585003402
-SHA256 (youtube-dl-2020.03.24.tar.gz) = 45a398a41e4a06862413d9c8d57e6c1fa0e60660c6f69df928b64f3595568416
-SIZE (youtube-dl-2020.03.24.tar.gz) = 3165706
+TIMESTAMP = 1589750099
+SHA256 (youtube-dl-2020.05.08.tar.gz) = 86310db8516f41d697dc8923d4bb252ec110913e267a3c373b6a66a13552fd9b
+SIZE (youtube-dl-2020.05.08.tar.gz) = 3172744
Index: head/www/youtube_dl/files/patch-Makefile
===================================================================
--- head/www/youtube_dl/files/patch-Makefile	(revision 535761)
+++ head/www/youtube_dl/files/patch-Makefile	(revision 535762)
@@ -1,47 +1,47 @@
 --- 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 -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
++	install -d $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d
++	install -m 644 youtube-dl.fish $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/youtube-dl.fish
  
  codetest:
  	flake8 .
 @@ -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