- Update to 2016.04.24.

- Regenerate patches.

PR:		ports/209140
Submitted by:	cpm

5 files changed, 14 insertions, 23 deletions

diff --git a/www/youtube_dl/Makefile b/www/youtube_dl/Makefile
index 0acbe308c809..292918090283 100644
--- a/www/youtube_dl/Makefile
+++ b/www/youtube_dl/Makefile
@@ -1,7 +1,7 @@
 # $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}
diff --git a/www/youtube_dl/distinfo b/www/youtube_dl/distinfo
index 9245ec03913c..33622ac116b4 100644
--- a/www/youtube_dl/distinfo
+++ b/www/youtube_dl/distinfo
@@ -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
diff --git a/www/youtube_dl/files/patch-Makefile b/www/youtube_dl/files/patch-Makefile
index d46bfb58e14c..e64efb595136 100644
--- a/www/youtube_dl/files/patch-Makefile
+++ b/www/youtube_dl/files/patch-Makefile
@@ -1,25 +1,16 @@
---- 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
@@ -34,7 +25,7 @@
  
  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
  
diff --git a/www/youtube_dl/files/patch-youtube_dl____init__.py b/www/youtube_dl/files/patch-youtube_dl____init__.py
index 625feec8e476..fe7010199acd 100644
--- a/www/youtube_dl/files/patch-youtube_dl____init__.py
+++ b/www/youtube_dl/files/patch-youtube_dl____init__.py
@@ -1,6 +1,6 @@
---- 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,
  )
@@ -8,7 +8,7 @@
  from .downloader import (
      FileDownloader,
  )
-@@ -375,17 +374,13 @@
+@@ -384,17 +383,13 @@ def _real_main(argv=None):
      }
  
      with YoutubeDL(ydl_opts) as ydl:
diff --git a/www/youtube_dl/files/patch-youtube_dl__options.py b/www/youtube_dl/files/patch-youtube_dl__options.py
index a2136480e8b6..b4a2ef72a5a9 100644
--- a/www/youtube_dl/files/patch-youtube_dl__options.py
+++ b/www/youtube_dl/files/patch-youtube_dl__options.py
@@ -1,4 +1,4 @@
---- 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',