From sunpoet@sunpoet.net  Tue Feb  5 18:05:41 2008
Return-Path: <sunpoet@sunpoet.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 986B116A417
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  5 Feb 2008 18:05:41 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: from sunpoet.net (sunpoet.net [203.204.205.212])
	by mx1.freebsd.org (Postfix) with ESMTP id 33BE413C46A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  5 Feb 2008 18:05:40 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: by sunpoet.net (Postfix, from userid 1000)
	id 4DCF217020; Wed,  6 Feb 2008 02:06:31 +0800 (CST)
Message-Id: <20080205180631.4DCF217020@sunpoet.net>
Date: Wed,  6 Feb 2008 02:06:31 +0800 (CST)
From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
Reply-To: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: pankov_p@mail.ru
Subject: [PATCH] www/youtube_dl: fix conv2avi.patch 
X-Send-Pr-Version: 3.113
X-GNATS-Notify: pankov_p@mail.ru

>Number:         120298
>Category:       ports
>Synopsis:       [PATCH] www/youtube_dl: fix conv2avi.patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 05 18:10:02 UTC 2008
>Closed-Date:    Fri Feb 22 01:37:50 UTC 2008
>Last-Modified:  Fri Feb 22 01:37:50 UTC 2008
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 6.3-STABLE i386
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD IRIS.sunpoet.net 6.3-STABLE FreeBSD 6.3-STABLE #12: Sun Jan 20 02:27:29 CST 2008 sunpoet@IRIS.sunpoet.net:/usr/obj/usr/src/sys/sunpoet i386

	
>Description:
Fix files/conv2avi.patch.
Maintainer is cc'd.
	
>How-To-Repeat:
% cd /usr/ports/www/youtube_dl
% make
% cd work
% find * -type f
www/youtube_dl/files/conv2avi.patch
www/youtube_dl/files/conv2avi.patch.orig
youtube-dl
youtube-dl.bak
youtube-dl.orig
	
>Fix:
--- /usr/ports/www/youtube_dl/files/conv2avi.patch	2008-02-04 18:24:47.000000000 +0800
+++ /usr/ports/sunpoet/youtube_dl/files/conv2avi.patch	2008-02-06 01:56:10.000000000 +0800
@@ -1,44 +1,37 @@
-Index: www/youtube_dl/files/conv2avi.patch
-===================================================================
-RCS file: www/youtube_dl/files/conv2avi.patch
-diff -N www/youtube_dl/files/conv2avi.patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ www/youtube_dl/files/conv2avi.patch	31 Jan 2008 19:32:45 -0000
-@@ -0,0 +1,37 @@
-+--- youtube-dl.orig	Wed Jan 30 14:18:50 2008
-++++ youtube-dl	Thu Jan 31 21:36:49 2008
-+@@ -208,6 +208,7 @@
-+ cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', help='use title in file name')
-+ cmdl_parser.add_option('-l', '--literal', action='store_true', dest='use_literal', help='use literal title in file name')
-+ cmdl_parser.add_option('-n', '--netrc', action='store_true', dest='use_netrc', help='use .netrc authentication data')
-++cmdl_parser.add_option('-a', '--avi', action='store_true', dest='use_avi', help='output file in avi format')
-+ cmdl_parser.add_option('-g', '--get-url', action='store_true', dest='get_url', help='print final video URL only')
-+ cmdl_parser.add_option('-2', '--title-too', action='store_true', dest='get_title', help='used with -g, print title too')
-+ (cmdl_opts, cmdl_args) = cmdl_parser.parse_args()
-+@@ -382,6 +383,26 @@
-+ 
-+ except KeyboardInterrupt:
-+ 	sys.exit('\n')
-++
-++# Convert to avi if needed
-++if cmdl_opts.use_avi:
-++	if cmdl_opts.outfile is None:
-++		avi_filename = '%s.avi' % video_filename[:-4]
-++	else:
-++		avi_filename = '%s.avi' % video_filename
-++
-++	try:
-++		os.system('%%CONV2AVI_CMD%% "%s" "%s" > %s 2> %s' % (video_filename, avi_filename, os.path.devnull, os.path.devnull))
-++		cond_print('Video file converted to %s\n' % avi_filename)
-++	except OSError:
-++		sys.exit('Error: unable to convert file.\n')
-++	except KeyboardInterrupt:
-++		sys.exit('\n')
-++
-++	try:
-++		os.unlink(video_filename)
-++	except OSError:
-++		sys.exit('Error: unable to remove downloaded file.\n')
-+ 
-+ # Finish
-+ sys.exit()
+--- youtube-dl.orig	Wed Jan 30 14:18:50 2008
++++ youtube-dl	Thu Jan 31 21:36:49 2008
+@@ -208,6 +208,7 @@
+ cmdl_parser.add_option('-t', '--title', action='store_true', dest='use_title', help='use title in file name')
+ cmdl_parser.add_option('-l', '--literal', action='store_true', dest='use_literal', help='use literal title in file name')
+ cmdl_parser.add_option('-n', '--netrc', action='store_true', dest='use_netrc', help='use .netrc authentication data')
++cmdl_parser.add_option('-a', '--avi', action='store_true', dest='use_avi', help='output file in avi format')
+ cmdl_parser.add_option('-g', '--get-url', action='store_true', dest='get_url', help='print final video URL only')
+ cmdl_parser.add_option('-2', '--title-too', action='store_true', dest='get_title', help='used with -g, print title too')
+ (cmdl_opts, cmdl_args) = cmdl_parser.parse_args()
+@@ -382,6 +383,26 @@
+ 
+ except KeyboardInterrupt:
+ 	sys.exit('\n')
++
++# Convert to avi if needed
++if cmdl_opts.use_avi:
++	if cmdl_opts.outfile is None:
++		avi_filename = '%s.avi' % video_filename[:-4]
++	else:
++		avi_filename = '%s.avi' % video_filename
++
++	try:
++		os.system('%%CONV2AVI_CMD%% "%s" "%s" > %s 2> %s' % (video_filename, avi_filename, os.path.devnull, os.path.devnull))
++		cond_print('Video file converted to %s\n' % avi_filename)
++	except OSError:
++		sys.exit('Error: unable to convert file.\n')
++	except KeyboardInterrupt:
++		sys.exit('\n')
++
++	try:
++		os.unlink(video_filename)
++	except OSError:
++		sys.exit('Error: unable to remove downloaded file.\n')
+ 
+ # Finish
+ sys.exit()
	


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Feb 5 18:10:10 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=120298 

From: Pankov Pavel <pankov_p@mail.ru>
To: bug-followup@freebsd.org,
 sunpoet@sunpoet.net
Cc:  
Subject: Re: ports/120298: [PATCH] www/youtube_dl: fix conv2avi.patch
Date: Thu, 7 Feb 2008 00:09:26 +0300

 Duplicate of ports/120301 PR. I've just submitted the same patch there. Sorry.
State-Changed-From-To: feedback->closed 
State-Changed-By: linimon 
State-Changed-When: Fri Feb 22 01:37:08 UTC 2008 
State-Changed-Why:  
Duplicate of ports/120301. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=120298 
>Unformatted:
