From root@cnpm.embrapa.br  Mon Apr  3 12:10:52 2006
Return-Path: <root@cnpm.embrapa.br>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 26AF216A400
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 Apr 2006 12:10:52 +0000 (UTC)
	(envelope-from root@cnpm.embrapa.br)
Received: from inga.cnpm.embrapa.br (inga.cnpm.embrapa.br [200.136.111.23])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 42A2A43D68
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 Apr 2006 12:10:46 +0000 (GMT)
	(envelope-from root@cnpm.embrapa.br)
Received: from caraiba.cnpm.embrapa.br (caraiba.cnpm.embrapa.br [200.136.111.98])
	by inga.cnpm.embrapa.br (Postfix) with ESMTP id EDE1D8A027
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 Apr 2006 09:10:39 -0300 (BRT)
Received: from localhost (localhost [127.0.0.1])
	by caraiba.cnpm.embrapa.br (Postfix) with ESMTP id 81AF716A420
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 Apr 2006 09:10:38 -0300 (BRT)
Received: from mogno.local.cnpm.embrapa.br (mogno.local.cnpm.embrapa.br [10.0.0.241])
	by caraiba.cnpm.embrapa.br (Postfix) with ESMTP id 71BFA16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 Apr 2006 09:10:37 -0300 (BRT)
Received: by mogno.local.cnpm.embrapa.br (Postfix, from userid 0)
	id 08A0517042; Mon,  3 Apr 2006 09:10:29 -0300 (BRT)
Message-Id: <20060403121030.08A0517042@mogno.local.cnpm.embrapa.br>
Date: Mon,  3 Apr 2006 09:10:29 -0300 (BRT)
From: Anderson S. Ferreira <anderson@cnpm.embrapa.br>
Reply-To: Anderson S. Ferreira <anderson@cnpm.embrapa.br>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [UPDATE] Patch to build audio/audacity on amd64
X-Send-Pr-Version: 3.113
X-GNATS-Notify: craig@yekse.gank.org

>Number:         95259
>Category:       ports
>Synopsis:       [UPDATE] Patch to build audio/audacity on amd64
>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:   Mon Apr 03 12:20:11 GMT 2006
>Closed-Date:    Tue May 09 17:39:44 GMT 2006
>Last-Modified:  Tue May 09 17:39:44 GMT 2006
>Originator:     Anderson S. Ferreira
>Release:        FreeBSD 6.1-PRERELEASE amd64
>Organization:
Embrapa Monitoramento por Satelite
>Environment:
System: FreeBSD mogno.local.cnpm.embrapa.br 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #7: Wed Mar 29 09:30:20 BRT 2006 anderson@mogno.local.cnpm.embrapa.br:/usr/src/sys/amd64/compile/MOGNO amd64

>Description:
        Patch to build Audacity on amd64 platform
	
>How-To-Repeat:

>Fix:

	

--- audacity.patch begins here ---
diff -uNr audacity/Makefile audacity.new/Makefile
--- audacity.old/Makefile	Thu Feb 23 07:34:23 2006
+++ audacity/Makefile	Mon Apr  3 08:54:49 2006
@@ -6,6 +6,7 @@
 
 PORTNAME=	audacity
 PORTVERSION=	1.2.4b
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -31,12 +32,10 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386" && ${OSVERSION} >= 501103
-SSE_CFLAGS=	-mno-sse -mno-sse2
-.endif
+ONLY_FOR_ARCHS=	i386 amd64
 
-.if ${ARCH} != "i386"
-BROKEN=		"Does not build on !i386"
+.if ( ${ARCH} == "i386" || ${ARCH} == "amd64" ) && ${OSVERSION} >= 501103
+SSE_CFLAGS=	-mno-sse -mno-sse2
 .endif
 
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
diff -uNr audacity/files/patch-effects-tonegen.cpp audacity.new/files/patch-effects-tonegen.cpp
--- audacity/files/patch-effects-tonegen.cpp	Wed Dec 31 21:00:00 1969
+++ audacity.new/files/patch-effects-tonegen.cpp	Mon Apr  3 08:31:09 2006
@@ -0,0 +1,11 @@
+--- src/effects/ToneGen.cpp	Mon Apr  3 07:58:06 2006
++++ src/effects/ToneGen.cpp	Mon Apr  3 07:58:29 2006
+@@ -265,7 +265,7 @@
+    item2->Add(item3, 0, wxALIGN_CENTRE | wxALL, 5);
+ 
+    wxChoice *item4 = new wxChoice(parent, ID_WAVEFORM, wxDefaultPosition,
+-                                  wxSize(80, -1), 0, NULL);
++                                  wxSize(80, -1), 0, (const wxString *) NULL);
+    item2->Add(item4, 0, wxALIGN_CENTRE | wxALL, 5);
+ 
+    item0->Add(item2, 1, wxALIGN_CENTRE | wxALL, 5);
--- audacity.patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Apr 3 12:24:10 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

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

From: Craig Boston <craig@yekse.gank.org>
To: bug-followup@FreeBSD.org
Cc: edwin@freebsd.org
Subject: Re: ports/95259: [UPDATE] Patch to build audio/audacity on amd64
Date: Mon, 3 Apr 2006 08:09:21 -0500

 This is the same as ports/93191 except also contains the makefile bits.
 Maintainer approved.  Please commit one or the other and close both PRs.
State-Changed-From-To: feedback->closed 
State-Changed-By: vs 
State-Changed-When: Tue May 9 17:39:14 UTC 2006 
State-Changed-Why:  
Obsoleted by commit of PR ports/93191 

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