From amdmi3@amdmi3.ru  Mon Jul 28 20:49:01 2008
Return-Path: <amdmi3@amdmi3.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8CF85106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 28 Jul 2008 20:49:01 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from smtp.timeweb.ru (smtp.timeweb.ru [217.170.79.85])
	by mx1.freebsd.org (Postfix) with ESMTP id D0DCC8FC1D
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 28 Jul 2008 20:49:00 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from [213.148.20.85] (helo=hive.panopticon)
	by smtp.timeweb.ru with esmtpsa (TLSv1:AES256-SHA:256)
	(Exim 4.69)
	(envelope-from <amdmi3@amdmi3.ru>)
	id 1KNZeN-0002aG-5e; Tue, 29 Jul 2008 00:48:59 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
	by hive.panopticon (Postfix) with ESMTP id 5DDAC43A4;
	Tue, 29 Jul 2008 00:46:22 +0400 (MSD)
Received: by hades.panopticon (Postfix, from userid 1000)
	id CF0CB1702F; Tue, 29 Jul 2008 00:49:30 +0400 (MSD)
Message-Id: <20080728204930.CF0CB1702F@hades.panopticon>
Date: Tue, 29 Jul 2008 00:49:30 +0400 (MSD)
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: dnelson@allantgroup.com
Subject: [PATCH] audio/sox: fix build after ffmpeg update
X-Send-Pr-Version: 3.113
X-GNATS-Notify: dnelson@allantgroup.com

>Number:         126049
>Category:       ports
>Synopsis:       [PATCH] audio/sox: fix build after ffmpeg update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    amdmi3
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 28 20:50:03 UTC 2008
>Closed-Date:    Mon Jul 28 23:49:28 UTC 2008
>Last-Modified:  Mon Jul 28 23:49:28 UTC 2008
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 7.0-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #1: Wed Jun 25 15:36:22 MSD 2008
>Description:
- Fix build after ffmpeg update

Port maintainer (dnelson@allantgroup.com) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- sox-14.0.1_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/audio/sox/Makefile,v
retrieving revision 1.38
diff -u -u -r1.38 Makefile
--- Makefile	7 Apr 2008 20:37:19 -0000	1.38
+++ Makefile	28 Jul 2008 14:08:06 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	sox
 PORTVERSION=	14.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -159,5 +159,7 @@
 post-patch:
 	@${REINPLACE_CMD} -Ee 's![[:<:]]gsm/gsm.h!gsm.h!' ${WRKSRC}/configure \
 		${WRKSRC}/src/gsm.c ${WRKSRC}/src/wav.c
+	@${REINPLACE_CMD} -Ee 's!ffmpeg/avformat.h!libavformat/avformat.h!' \
+		${WRKSRC}/configure ${WRKSRC}/src/ffmpeg.c
 
 .include <bsd.port.post.mk>
--- sox-14.0.1_2.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jul 28 20:50:13 UTC 2008 
Responsible-Changed-Why:  
miwi@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126049 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Jul 28 20:50:16 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: dnelson@allantgroup.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/126049: [PATCH] audio/sox: fix build after ffmpeg update
Date: Mon, 28 Jul 2008 20:50:15 UT

 Maintainer of audio/sox,
 
 Please note that PR ports/126049 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/126049
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: miwi->amdmi3 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Mon Jul 28 21:09:34 UTC 2008 
Responsible-Changed-Why:  
Submitter has gnats access. 

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

From: Dan Nelson <dnelson@allantgroup.com>
To: bug-followup@FreeBSD.ORG
Cc:  
Subject: Re: ports/126049: [PATCH] audio/sox: fix build after ffmpeg update
Date: Mon, 28 Jul 2008 16:51:52 -0500

 > - Fix build after ffmpeg update
 > 
 > --- Makefile     7 Apr 2008 20:37:19 -0000       1.38
 > +++ Makefile     28 Jul 2008 14:08:06 -0000
 > @@ -7,7 +7,7 @@
 >  PORTNAME=       sox
 >  PORTVERSION=    14.0.1
 > -PORTREVISION=   1
 > +PORTREVISION=   2
 >  CATEGORIES=     audio
 >  MASTER_SITES=   SF
 > @@ -159,5 +159,7 @@
 >  post-patch:
 >  	@${REINPLACE_CMD} -Ee 's![[:<:]]gsm/gsm.h!gsm.h!' ${WRKSRC}/configure \
 >  	    ${WRKSRC}/src/gsm.c ${WRKSRC}/src/wav.c
 > +	@${REINPLACE_CMD} -Ee 's!ffmpeg/avformat.h!libavformat/avformat.h!' \
 > +	    ${WRKSRC}/configure ${WRKSRC}/src/ffmpeg.c
 >  .include <bsd.port.post.mk>
 
 The patch works for me.  Please commit!
 
 -- 
 	Dan Nelson
 	dnelson@allantgroup.com
State-Changed-From-To: feedback->closed 
State-Changed-By: amdmi3 
State-Changed-When: Mon Jul 28 23:49:26 UTC 2008 
State-Changed-Why:  
Actually, compatibility fix for ffmpeg was committed, so Ithis change is 
no longer needed. `if it works, don't fix it' :) 

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