Attachment #146959 for bug #193398

View | Details | Raw Unified | Return to bug 193398
Collapse All | Expand All

Lines 1-7 Link Here

(-)www/youtube_dl/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= youtube_dl	3	PORTNAME= youtube_dl
4	PORTVERSION= 2014.08.10	4	PORTVERSION= 2014.09.06
5	PORTREVISION= 1	5	PORTREVISION= 1
6	CATEGORIES= www	6	CATEGORIES= www
7	MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/	7	MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/

Lines 1-2 Link Here

(-)www/youtube_dl/distinfo (-2 / +2 lines)
1	SHA256 (youtube-dl-2014.08.10.tar.gz) = a1131ff8aa636b6e99baf1b6226dab137500cd0a5cdeb4d76db102be4138caa9	1	SHA256 (youtube-dl-2014.09.06.tar.gz) = ad99a911a4b9c1983d797b208f292ead55da4ca30aea618e8092a7fb1fdea0a8
2	SIZE (youtube-dl-2014.08.10.tar.gz) = 931916	2	SIZE (youtube-dl-2014.09.06.tar.gz) = 1006637

Lines 1-9 Link Here

(-)www/youtube_dl/files/patch-Makefile (-5 / +5 lines)
1	--- Makefile.orig 2013-10-17 06:55:06.000000000 +0800	1	--- Makefile.orig 2014-08-21 06:32:24.000000000 -0400
2	+++ Makefile 2013-10-26 18:28:59.588795031 +0800	2	+++ Makefile 2014-09-06 14:55:53.064579993 -0400
3	@@ -10,17 +10,7 @@	3	@@ -10,17 +10,7 @@
4	BINDIR=$(PREFIX)/bin	4	BINDIR ?= $(PREFIX)/bin
5	MANDIR=$(PREFIX)/man	5	MANDIR ?= $(PREFIX)/man
6	PYTHON=/usr/bin/env python	6	PYTHON ?= /usr/bin/env python
7	-	7	-
8	-# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local	8	-# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
9	-ifeq ($(PREFIX),/usr)	9	-ifeq ($(PREFIX),/usr)




--- youtube_dl/__init__.py.orig 2014-09-06 09:26:34.000000000 -0400
+++ youtube_dl/__init__.py      2014-09-06 14:40:42.240857186 -0400
@@ -104,7 +104,6 @@
     std_headers,
     write_string,
 )

 from .downloader import (
     FileDownloader,
 )
@@ -238,8 +237,6 @@
             action='help', help='print this help text and exit')
     general.add_option('-v', '--version',
             action='version', help='print program version and exit')

     general.add_option('-i', '--ignore-errors',
             action='store_true', dest='ignoreerrors', help='continue on download errors, for example to skip unavailable videos in a playlist', default=False)
     general.add_option('--abort-on-error',
@@ -865,17 +862,13 @@
             ydl.add_post_processor(ExecAfterDownloadPP(
                 verboseOutput=opts.verbose, exec_cmd=opts.exec_cmd))
 
-        # Update version
-        if opts.update_self:

-
         # Remove cache dir
         if opts.rm_cachedir:
             ydl.cache.remove()
@@ -867,7 +860,7 @@
 
         # Maybe do nothing
         if (len(all_urls) < 1) and (opts.load_info_filename is None):

                 parser.error(u'you must provide at least one URL')
             else:
                 sys.exit()


Return to bug 193398

Lines 1-6 Link Here

(-)www/youtube_dl/files/patch-youtube_dl____init__.py (-9 / +9 lines)
1	--- youtube_dl/__init__.py.orig 2014-07-29 23:18:51.000000000 +0800	1	--- youtube_dl/__init__.py.orig 2014-09-06 09:26:34.000000000 -0400
2	+++ youtube_dl/__init__.py 2014-07-31 01:10:45.923443081 +0800	2	+++ youtube_dl/__init__.py 2014-09-06 14:40:42.240857186 -0400
3	@@ -97,7 +97,6 @@	3	@@ -104,7 +104,6 @@
4	std_headers,	4	std_headers,
5	write_string,	5	write_string,
6	)	6	)
Lines 8-14 Link Here
8	from .downloader import (	8	from .downloader import (
9	FileDownloader,	9	FileDownloader,
10	)	10	)
11	@@ -230,8 +229,6 @@	11	@@ -238,8 +237,6 @@
12	action='help', help='print this help text and exit')	12	action='help', help='print this help text and exit')
13	general.add_option('-v', '--version',	13	general.add_option('-v', '--version',
14	action='version', help='print program version and exit')	14	action='version', help='print program version and exit')
Lines 17-25 Link Here
17	general.add_option('-i', '--ignore-errors',	17	general.add_option('-i', '--ignore-errors',
18	action='store_true', dest='ignoreerrors', help='continue on download errors, for example to skip unavailable videos in a playlist', default=False)	18	action='store_true', dest='ignoreerrors', help='continue on download errors, for example to skip unavailable videos in a playlist', default=False)
19	general.add_option('--abort-on-error',	19	general.add_option('--abort-on-error',
20	@@ -844,10 +841,6 @@	20	@@ -865,17 +862,13 @@
21	ydl.add_post_processor(FFmpegAudioFixPP())	21	ydl.add_post_processor(ExecAfterDownloadPP(
22	ydl.add_post_processor(AtomicParsleyPP())	22	verboseOutput=opts.verbose, exec_cmd=opts.exec_cmd))
23		23
24	- # Update version	24	- # Update version
25	- if opts.update_self:	25	- if opts.update_self:
Lines 27-34 Link Here
27	-	27	-
28	# Remove cache dir	28	# Remove cache dir
29	if opts.rm_cachedir:	29	if opts.rm_cachedir:
30	if opts.cachedir is None:	30	ydl.cache.remove()
31	@@ -867,7 +860,7 @@
32		31
33	# Maybe do nothing	32	# Maybe do nothing
34	if (len(all_urls) < 1) and (opts.load_info_filename is None):	33	if (len(all_urls) < 1) and (opts.load_info_filename is None):
Lines 37-39 Link Here
37	parser.error(u'you must provide at least one URL')	36	parser.error(u'you must provide at least one URL')
38	else:	37	else:
39	sys.exit()	38	sys.exit()
		39