Attachment #169796 for bug #209140

View | Details | Raw Unified | Return to bug 209140
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= 2016.03.01	4	PORTVERSION= 2016.04.24
5	CATEGORIES= www	5	CATEGORIES= www
6	MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/	6	MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/
7	DISTNAME= youtube-dl-${PORTVERSION}	7	DISTNAME= youtube-dl-${PORTVERSION}

Lines 1-2 Link Here

(-)www/youtube_dl/distinfo (-2 / +2 lines)
1	SHA256 (youtube-dl-2016.03.01.tar.gz) = fc0f9aebcf3983a848a35631ed1aa465ff3feca507387bff72286a9b49f14d70	1	SHA256 (youtube-dl-2016.04.24.tar.gz) = 9ca83ae9cf783b3d9a231611ef5e446fa61fa77d0f4c9d0545895e6ce691321f
2	SIZE (youtube-dl-2016.03.01.tar.gz) = 1983124	2	SIZE (youtube-dl-2016.04.24.tar.gz) = 2084276




--- Makefile.orig	2016-04-28 22:59:03 UTC
+++ Makefile
@@ -11,8 +11,7 @@ MANDIR ?= $(PREFIX)/man
 MANDIR ?= $(PREFIX)/man
 SHAREDIR ?= $(PREFIX)/share
 PYTHON ?= /usr/bin/env python
 
-# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
-SYSCONFDIR != if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi
-	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)
@@ -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

 
 codetest:
 	flake8 .
@@ -68,11 +67,6 @@ supportedsites:
 README.txt: README.md
 	pandoc -f markdown -t plain README.md -o README.txt
 

Lines 1-6 Link Here

(-)www/youtube_dl/files/patch-youtube_dl____init__.py (-4 / +4 lines)
1	--- youtube_dl/__init__.py.orig 2015-11-24 09:44:40.030482000 +0100	1	--- youtube_dl/__init__.py.orig 2016-04-28 23:05:35 UTC
2	+++ youtube_dl/__init__.py 2015-11-24 09:45:54.856110000 +0100	2	+++ youtube_dl/__init__.py
3	@@ -36,7 +36,6 @@	3	@@ -36,7 +36,6 @@ from .utils import (
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	@@ -375,17 +374,13 @@	11	@@ -384,17 +383,13 @@ def _real_main(argv=None):
12	}	12	}
13		13
14	with YoutubeDL(ydl_opts) as ydl:	14	with YoutubeDL(ydl_opts) as ydl:

Lines 1-4 Link Here

(-)www/youtube_dl/files/patch-youtube_dl__options.py (-1 / +1 lines)
1	--- youtube_dl/options.py.orig 2015-05-29 05:52:12 UTC	1	--- youtube_dl/options.py.orig 2016-04-28 23:04:36 UTC
2	+++ youtube_dl/options.py	2	+++ youtube_dl/options.py
3	@@ -127,10 +127,6 @@ def parseOpts(overrideArguments=None):	3	@@ -127,10 +127,6 @@ def parseOpts(overrideArguments=None):
4	action='version',	4	action='version',

Return to bug 209140

Lines 1-25 Link Here

(-)www/youtube_dl/files/patch-Makefile (-15 / +6 lines)
1	--- Makefile.orig 2015-04-26 20:44:31 UTC	1	--- Makefile.orig 2016-04-28 22:59:03 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -9,17 +9,7 @@ BINDIR ?= $(PREFIX)/bin	3	@@ -11,8 +11,7 @@ MANDIR ?= $(PREFIX)/man
4	MANDIR ?= $(PREFIX)/man
5	SHAREDIR ?= $(PREFIX)/share	4	SHAREDIR ?= $(PREFIX)/share
6	PYTHON ?= /usr/bin/env python	5	PYTHON ?= /usr/bin/env python
7	-	6
8	-# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local	7	-# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
9	-ifeq ($(PREFIX),/usr)	8	-SYSCONFDIR != if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi
10	- SYSCONFDIR=/etc
11	-else
12	- ifeq ($(PREFIX),/usr/local)
13	- SYSCONFDIR=/etc
14	- else
15	- SYSCONFDIR=$(PREFIX)/etc
16	- endif
17	-endif
18	+SYSCONFDIR ?= $(PREFIX)/etc	9	+SYSCONFDIR ?= $(PREFIX)/etc
19		10
20	install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish	11	install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
21	install -d $(DESTDIR)$(BINDIR)	12	install -d $(DESTDIR)$(BINDIR)
22	@@ -27,11 +17,11 @@ install: youtube-dl youtube-dl.1 youtube	13	@@ -20,11 +19,11 @@ install: youtube-dl youtube-dl.1 youtube
23	install -d $(DESTDIR)$(MANDIR)/man1	14	install -d $(DESTDIR)$(MANDIR)/man1
24	install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1	15	install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1
25	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d	16	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
Lines 34-40 Link Here
34		25
35	codetest:	26	codetest:
36	flake8 .	27	flake8 .
37	@@ -72,11 +62,6 @@ supportedsites:	28	@@ -68,11 +67,6 @@ supportedsites:
38	README.txt: README.md	29	README.txt: README.md
39	pandoc -f markdown -t plain README.md -o README.txt	30	pandoc -f markdown -t plain README.md -o README.txt
40		31